diff --git a/.cargo/config b/.cargo/config
index d08998512b..9884717112 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -6,8 +6,8 @@ rustflags = [
 [alias]
 generate = "run --package tools --"
 test-server = "-Zpackage-features run --bin veloren-server-cli --no-default-features" 
-tracy-server = "-Zunstable-options -Zpackage-features run --bin veloren-server-cli --no-default-features --features tracy --profile dev"
+tracy-server = "-Zunstable-options -Zpackage-features run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
 test-voxygen = "-Zpackage-features run --bin veloren-voxygen --no-default-features --features gl,simd"
-tracy-voxygen = "-Zunstable-options -Zpackage-features run --bin veloren-voxygen --no-default-features --features tracy,gl,simd --profile dev"
+tracy-voxygen = "-Zunstable-options -Zpackage-features run --bin veloren-voxygen --no-default-features --features tracy,gl,simd --profile no_overflow"
 server = "run --bin veloren-server-cli"
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8778c1399..e2382628d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Wind SFX system
 - Added Norwegian language
 - Roll can now interrupt attacks
+- Birch forests
+- Willow forests
+- More significant temperature variation across the world
+- Initial implementation of real-time world simulation
+- Travellers that explore the world
+- HDR rendering
+- Map site icons
+- Map panning
+- Innumerable minor improvements to world generation
+- Variable dungeon difficulty
+- Aurora Borealis (localised entirely within the kitchen)
+- Block-based voxel lighting
 
 ### Changed
 
@@ -81,7 +93,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adjusted some keybindings
 - Consumables can now trigger multiple effects and buffs
 - Overhauled overworld spawns depending on chunk attributes
-- Fixed a bug which caused campfires and other stuff to duplicate
+- Improved cloud and water shader quality
 
 ### Removed
 
@@ -96,6 +108,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a bug where a nearby item would also be collected when collecting collectible blocks
 - Fixed a bug where firing fast projectile at a downwards angle caused them to veer off at a higher angle
 - Fixed a bug where ui scale in the login menu was not updated when changed in-game
+- Fixed a bug which caused campfires and other stuff to duplicate
+- Significantly improved water movement AI to stop entities getting stuck
+- Prevented entities, sprites and particles being lit when not visible to the sun
 
 ## [0.7.0] - 2020-08-15
 
diff --git a/Cargo.lock b/Cargo.lock
index a53854a3ea..ac5f03837b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5406,6 +5406,7 @@ dependencies = [
  "scan_fmt",
  "serde",
  "serde_json",
+ "slab",
  "specs",
  "specs-idvs",
  "tiny_http",
diff --git a/assets/common/items/armor/back/backpack_0.ron b/assets/common/items/armor/back/backpack_0.ron
new file mode 100644
index 0000000000..145163ba89
--- /dev/null
+++ b/assets/common/items/armor/back/backpack_0.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Traveler's Backpack",
+    description: "Comfort and capacity united.",
+    kind: Armor(
+        (
+            kind: Back("Backpack0"),
+            stats: (
+                protection: Normal(0.0)),            
+        )
+    ),
+    quality: High,
+)
diff --git a/assets/common/items/armor/back/warlock.ron b/assets/common/items/armor/back/warlock.ron
new file mode 100644
index 0000000000..aefb29bf8f
--- /dev/null
+++ b/assets/common/items/armor/back/warlock.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlock cape",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Back("Warlock"),
+            stats: (
+                protection: Normal(4.0)),
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/back/warlord.ron b/assets/common/items/armor/back/warlord.ron
new file mode 100644
index 0000000000..c1bf1dad60
--- /dev/null
+++ b/assets/common/items/armor/back/warlord.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlord cape",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Back("Warlord"),
+            stats: (
+                protection: Normal(4.0)),
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/belt/assassin.ron
index 1a25e1bf89..bc784b4abe 100644
--- a/assets/common/items/armor/belt/assassin.ron
+++ b/assets/common/items/armor/belt/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Belt("Assassin"),
             stats: (
-                protection: Normal(1.0)
-                ),            
+                protection: Normal(2.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/belt/warlock.ron b/assets/common/items/armor/belt/warlock.ron
new file mode 100644
index 0000000000..1ae5d83c5d
--- /dev/null
+++ b/assets/common/items/armor/belt/warlock.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlock Belt",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Belt("Warlock"),
+            stats: (
+                protection: Normal(8.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/belt/warlord.ron b/assets/common/items/armor/belt/warlord.ron
new file mode 100644
index 0000000000..ca0173c1cc
--- /dev/null
+++ b/assets/common/items/armor/belt/warlord.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlord Belt",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Belt("Warlord"),
+            stats: (
+                protection: Normal(8.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/chest/assassin.ron
index 3be92f61a1..8aff55ab7e 100644
--- a/assets/common/items/armor/chest/assassin.ron
+++ b/assets/common/items/armor/chest/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Chest("Assassin"),
             stats: (
-                protection: Normal(6.0)
-                ),            
+                protection: Normal(15.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/chest/warlock.ron b/assets/common/items/armor/chest/warlock.ron
new file mode 100644
index 0000000000..9095ae409a
--- /dev/null
+++ b/assets/common/items/armor/chest/warlock.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlock Vest",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Chest("Warlock"),
+            stats: (
+                protection: Normal(40.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/chest/warlord.ron b/assets/common/items/armor/chest/warlord.ron
new file mode 100644
index 0000000000..5400ffcc0b
--- /dev/null
+++ b/assets/common/items/armor/chest/warlord.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlord Cuirass",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Chest("Warlord"),
+            stats: (
+                protection: Normal(40.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/foot/assassin.ron
index 5e7fdfad80..de74557c1d 100644
--- a/assets/common/items/armor/foot/assassin.ron
+++ b/assets/common/items/armor/foot/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Foot("Assassin"),
             stats: (
-                protection: Normal(1.0)
-                ),            
+                protection: Normal(4.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/foot/warlock.ron b/assets/common/items/armor/foot/warlock.ron
new file mode 100644
index 0000000000..3bd1951429
--- /dev/null
+++ b/assets/common/items/armor/foot/warlock.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlock Slippers",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Foot("Warlock"),
+            stats: (
+                protection: Normal(8.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/foot/warlord.ron b/assets/common/items/armor/foot/warlord.ron
new file mode 100644
index 0000000000..74f7cef132
--- /dev/null
+++ b/assets/common/items/armor/foot/warlord.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlord Feet",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Foot("Warlord"),
+            stats: (
+                protection: Normal(8.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/hand/assassin.ron
index 30cdbc71eb..f1f5892eb7 100644
--- a/assets/common/items/armor/hand/assassin.ron
+++ b/assets/common/items/armor/hand/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Hand("Assassin"),
             stats: (
-                protection: Normal(2.0)
-                ),            
+                protection: Normal(6.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/hand/warlock.ron b/assets/common/items/armor/hand/warlock.ron
new file mode 100644
index 0000000000..371868f9ec
--- /dev/null
+++ b/assets/common/items/armor/hand/warlock.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlock Gloves",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Hand("Warlock"),
+            stats: (
+                protection: Normal(15.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/armor/hand/warlord.ron b/assets/common/items/armor/hand/warlord.ron
new file mode 100644
index 0000000000..b923282a31
--- /dev/null
+++ b/assets/common/items/armor/hand/warlord.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlord Handguards",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Hand("Warlord"),
+            stats: (
+                protection: Normal(15.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/armor/head/warlock.ron b/assets/common/items/armor/head/warlock.ron
new file mode 100644
index 0000000000..b0a56ec629
--- /dev/null
+++ b/assets/common/items/armor/head/warlock.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlock",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Head("Warlock"),
+            stats: (
+                protection: Normal(10.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/armor/head/warlord.ron b/assets/common/items/armor/head/warlord.ron
new file mode 100644
index 0000000000..6ecc46f802
--- /dev/null
+++ b/assets/common/items/armor/head/warlord.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlord Helmet",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Head("Warlord"),
+            stats: (
+                protection: Normal(10.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/pants/assassin.ron
index 69e654ea88..9de8dc7603 100644
--- a/assets/common/items/armor/pants/assassin.ron
+++ b/assets/common/items/armor/pants/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Pants("Assassin"),
             stats: (
-                protection: Normal(5.0)
-                ),            
+                protection: Normal(10.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/pants/warlock.ron b/assets/common/items/armor/pants/warlock.ron
new file mode 100644
index 0000000000..782b2bbf05
--- /dev/null
+++ b/assets/common/items/armor/pants/warlock.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlock Kilt",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Pants("Warlock"),
+            stats: (
+                protection: Normal(30.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/pants/warlord.ron b/assets/common/items/armor/pants/warlord.ron
new file mode 100644
index 0000000000..3836043c68
--- /dev/null
+++ b/assets/common/items/armor/pants/warlord.ron
@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Warlord Legguards",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Pants("Warlord"),
+            stats: (
+                protection: Normal(30.0)
+                ),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/shoulder/assassin.ron
index 24d0d9e19d..7ab33f9c58 100644
--- a/assets/common/items/armor/shoulder/assassin.ron
+++ b/assets/common/items/armor/shoulder/assassin.ron
@@ -5,8 +5,8 @@ ItemDef(
         (
             kind: Shoulder("Assassin"),
             stats: (
-                protection: Normal(3.0)
-                ),            
+                protection: Normal(8.0)
+                ),
         )
     ),
     quality: Moderate,
diff --git a/assets/common/items/armor/shoulder/warlock.ron b/assets/common/items/armor/shoulder/warlock.ron
new file mode 100644
index 0000000000..ee077bbc5f
--- /dev/null
+++ b/assets/common/items/armor/shoulder/warlock.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlock Shoulders",
+    description: "Belong to a mighty warlock.",
+    kind: Armor(
+        (
+            kind: Shoulder("Warlock"),
+            stats: (
+                protection: Normal(22.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/armor/shoulder/warlord.ron b/assets/common/items/armor/shoulder/warlord.ron
new file mode 100644
index 0000000000..d7163c9155
--- /dev/null
+++ b/assets/common/items/armor/shoulder/warlord.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Warlord Shoulderguards",
+    description: "Belong to a mighty warlord.",
+    kind: Armor(
+        (
+            kind: Shoulder("Warlord"),
+            stats: (
+                protection: Normal(22.0)),            
+        )
+    ),
+    quality: Common,
+)
diff --git a/assets/common/items/npc_armor/back/leather_blue_0.ron b/assets/common/items/npc_armor/back/leather_blue_0.ron
new file mode 100644
index 0000000000..3cc34c285d
--- /dev/null
+++ b/assets/common/items/npc_armor/back/leather_blue_0.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Blue Traveler Coat",
+    description: "",
+    kind: Armor(
+        (
+            kind: Back("LeatherBlue0"),
+            stats: (
+                protection: Normal(1.0)),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/npc_armor/chest/leather_blue_0.ron b/assets/common/items/npc_armor/chest/leather_blue_0.ron
new file mode 100644
index 0000000000..0a07cbe40a
--- /dev/null
+++ b/assets/common/items/npc_armor/chest/leather_blue_0.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Blue Leather Cuirass",
+    description: "",
+    kind: Armor(
+        (
+            kind: Chest("LeatherBlue0"),
+            stats: (
+                protection: Normal(5.0)),            
+        )
+    ),
+    quality: Moderate,
+)
diff --git a/assets/common/items/npc_armor/pants/leather_blue_0.ron b/assets/common/items/npc_armor/pants/leather_blue_0.ron
new file mode 100644
index 0000000000..02eab70c3e
--- /dev/null
+++ b/assets/common/items/npc_armor/pants/leather_blue_0.ron
@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Blue Leather Guards",
+    description: "",
+    kind: Armor(
+        (
+            kind: Pants("LeatherBlue0"),
+            stats: (
+                protection: Normal(10.0)),            
+        )
+    ),
+    quality: Low,
+)
diff --git a/assets/voxygen/element/icons/m2.png b/assets/voxygen/element/icons/m2.png
index 70041f10f3..0ff11d29a7 100644
--- a/assets/voxygen/element/icons/m2.png
+++ b/assets/voxygen/element/icons/m2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:512b97dd8fe8a0ec484fb811ce92cb0cf51e6929c3e1bcce170b18e7872330e4
-size 2015
+oid sha256:04d4a0fd8ff1e433ad63b73b80591a9797ef21c6edac9a6ded29ad9ed55eeb7c
+size 2218
diff --git a/assets/voxygen/element/icons/m_move.png b/assets/voxygen/element/icons/m_move.png
new file mode 100644
index 0000000000..2af725e545
--- /dev/null
+++ b/assets/voxygen/element/icons/m_move.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64e4edb4c781d9da9d82a4d8ea20fcdd9f88220d5eb7b500fe8b0049da834264
+size 2241
diff --git a/assets/voxygen/element/icons/m_scroll.png b/assets/voxygen/element/icons/m_scroll.png
new file mode 100644
index 0000000000..e8f825a7b6
--- /dev/null
+++ b/assets/voxygen/element/icons/m_scroll.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d642e0eecd73f2e3876a10b98e21988de1ae6822ff45d6da649fae41532f1ea6
+size 2323
diff --git a/assets/voxygen/element/map/castle.png b/assets/voxygen/element/map/castle.png
new file mode 100644
index 0000000000..43c6e5e57a
--- /dev/null
+++ b/assets/voxygen/element/map/castle.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cf4022394f4c40d61cdd3d1ad466719676795b8e43fad353d9d20afdc0714af
+size 1925
diff --git a/assets/voxygen/element/map/castle_bg.png b/assets/voxygen/element/map/castle_bg.png
new file mode 100644
index 0000000000..72e9175be6
--- /dev/null
+++ b/assets/voxygen/element/map/castle_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fc98a082eb4170d70b17be76aa1e632a4868772c9f17d110e33d6f7ea46a462
+size 1901
diff --git a/assets/voxygen/element/map/castle_hover.png b/assets/voxygen/element/map/castle_hover.png
new file mode 100644
index 0000000000..8e42645eef
--- /dev/null
+++ b/assets/voxygen/element/map/castle_hover.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a1c88e7468faa607393a2fe565b0b77bee44ee4bb8d7ba948182495bc2b20f2
+size 1953
diff --git a/assets/voxygen/element/map/dif_0.png b/assets/voxygen/element/map/dif_0.png
new file mode 100644
index 0000000000..292954f5e1
--- /dev/null
+++ b/assets/voxygen/element/map/dif_0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7edcd2cd1dcdbf64a89bd00dd353ceb461330db4bfa3d26343ac8d4ce991801
+size 1798
diff --git a/assets/voxygen/element/map/dif_1.png b/assets/voxygen/element/map/dif_1.png
new file mode 100644
index 0000000000..13480e7a4d
--- /dev/null
+++ b/assets/voxygen/element/map/dif_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee9de87421d694fb4950bdd584ba0234be444af5c7b25ac8d1b7f4af785cfdf1
+size 1803
diff --git a/assets/voxygen/element/map/dif_2.png b/assets/voxygen/element/map/dif_2.png
new file mode 100644
index 0000000000..8e0ca35ed0
--- /dev/null
+++ b/assets/voxygen/element/map/dif_2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87936f3cf93567e8913bf7263d73c6fc71a728014bf59663dd35e952cb30d980
+size 1804
diff --git a/assets/voxygen/element/map/dif_3.png b/assets/voxygen/element/map/dif_3.png
new file mode 100644
index 0000000000..8c6f98e063
--- /dev/null
+++ b/assets/voxygen/element/map/dif_3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18fb560e7235cd028b3bf3be38b4ee987920b678abfdda862328d7bb16516e8f
+size 1804
diff --git a/assets/voxygen/element/map/dif_4.png b/assets/voxygen/element/map/dif_4.png
new file mode 100644
index 0000000000..1727907a86
--- /dev/null
+++ b/assets/voxygen/element/map/dif_4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53f7b6c30cfe0ad22633b6dcdeba72eecf9fb228e59d8fb62b011447df48c7de
+size 1805
diff --git a/assets/voxygen/element/map/dif_5.png b/assets/voxygen/element/map/dif_5.png
new file mode 100644
index 0000000000..9a08746b0e
--- /dev/null
+++ b/assets/voxygen/element/map/dif_5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e87c2c6e3fd597cfc21acc4ac4b3d38e396b3466a949635c25fa8ece0907c6a
+size 2060
diff --git a/assets/voxygen/element/map/dungeon.png b/assets/voxygen/element/map/dungeon.png
index 1b34184085..f5f37ce2e9 100644
--- a/assets/voxygen/element/map/dungeon.png
+++ b/assets/voxygen/element/map/dungeon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e44cb3198f5b0dade540712d134519d036bfeb619475220b09cc8ab8d14d8be
-size 932
+oid sha256:4466f4de43b6f57c9b44c294275a8424f870899db346203bdd616fcceecab36d
+size 1924
diff --git a/assets/voxygen/element/map/dungeon_bg.png b/assets/voxygen/element/map/dungeon_bg.png
new file mode 100644
index 0000000000..f402248b95
--- /dev/null
+++ b/assets/voxygen/element/map/dungeon_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4248a7031e67a1e4304f78dd2447e41e664386e8466bcbcf46924e9feefd694
+size 2226
diff --git a/assets/voxygen/element/map/dungeon_bg2.png b/assets/voxygen/element/map/dungeon_bg2.png
new file mode 100644
index 0000000000..a1f6199bc8
--- /dev/null
+++ b/assets/voxygen/element/map/dungeon_bg2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78181b95d7f3c8c4f103db7484e5689d7b01eb6b42e262e497d974940ac8c532
+size 1896
diff --git a/assets/voxygen/element/map/dungeon_hover.png b/assets/voxygen/element/map/dungeon_hover.png
new file mode 100644
index 0000000000..55e3ca28c8
--- /dev/null
+++ b/assets/voxygen/element/map/dungeon_hover.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0661e21c9574ea59e76397fae6bcd75d164b1e17582deab31b11a8a8f5ee22a
+size 1933
diff --git a/assets/voxygen/element/map/town.png b/assets/voxygen/element/map/town.png
index 48b05fd761..ee39472948 100644
--- a/assets/voxygen/element/map/town.png
+++ b/assets/voxygen/element/map/town.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7def75aedaa1ca86055a61d1e14c9034b9072640ee711714d9e7e87651b174c5
-size 1096
+oid sha256:1bdf49786520159d2f08a627c679583b5eabb8b08f6dac4f83782ec0a3a99caf
+size 1917
diff --git a/assets/voxygen/element/map/town_bg.png b/assets/voxygen/element/map/town_bg.png
new file mode 100644
index 0000000000..cf81c69212
--- /dev/null
+++ b/assets/voxygen/element/map/town_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2817befa7c789b8176d324dce890aa10caf9db51f129f0c6665df4db73464b2b
+size 1906
diff --git a/assets/voxygen/element/map/town_hover.png b/assets/voxygen/element/map/town_hover.png
new file mode 100644
index 0000000000..0c9bd46412
--- /dev/null
+++ b/assets/voxygen/element/map/town_hover.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cca54bae387fe056232c1332ecf9fb79913d71f03d2bdaa496e126a5e0574575
+size 1942
diff --git a/assets/voxygen/element/misc_bg/map_bg.png b/assets/voxygen/element/misc_bg/map_bg.png
index fba5549934..7ea4ec2de6 100644
--- a/assets/voxygen/element/misc_bg/map_bg.png
+++ b/assets/voxygen/element/misc_bg/map_bg.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f1c93ac6021ddd3509fb7b0303cb3e1936a6486bcf3c9de322ee44e0e029339
-size 5070
+oid sha256:29bf1dc5a534e139e3f95f2ac1b85d66ba24515e73b2c14aab90948676e32ac7
+size 5895
diff --git a/assets/voxygen/element/misc_bg/map_frame.png b/assets/voxygen/element/misc_bg/map_frame.png
index 9ca8ec9a4c..77fa89104a 100644
--- a/assets/voxygen/element/misc_bg/map_frame.png
+++ b/assets/voxygen/element/misc_bg/map_frame.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c60fdaef39e24811ea35c7aff0c7752dd5a1ee69b958426219baf5c24bda4478
-size 2427
+oid sha256:82186b65cc831c5e1222adcb5508bfb70f383d639efa56f216430d8c12431879
+size 4231
diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron
index 2c95575941..fb2229d7b2 100644
--- a/assets/voxygen/i18n/de_DE.ron
+++ b/assets/voxygen/i18n/de_DE.ron
@@ -400,8 +400,17 @@ magischen Gegenstände ergattern?"#,
 
         "hud.free_look_indicator": "Freie Sicht aktiv",
         "hud.auto_walk_indicator": "Automatisches Laufen aktiv",
-
-
+        "hud.map.difficulty": "Schwierigkeit",
+        "hud.map.towns": "Dörfer",
+        "hud.map.castles": "Festungen",
+        "hud.map.dungeons": "Dungeons",
+        "hud.map.town": "Dorf",
+        "hud.map.castle": "Festung",
+        "hud.map.dungeon": "Dungeon",
+        "hud.map.difficulty_dungeon": "Dungeon\n\nSchwierigkeit: {difficulty}",
+        "hud.map.drag": "Ziehen",
+        "hud.map.zoom": "Zoomen",
+        "hud.map.recenter": "Zurücksetzen",
         /// End HUD section
         /// Start GameInput section
 
@@ -530,7 +539,7 @@ Willenskraft
             "NPCs mit demselben Level können unterschiedlich schwierig zu besiegen sein.",
             "Behaltet den Boden um euch im Blick! Dort gibt es Nahrung, Kisten und Anderes zu finden.",
             "Ist Euer Inventar voll mit Nahrung? Wertet es einfach durch Crafting auf!",
-            "Ihr sucht nach einem Abenteuer? Dungeons sind mit braunen Markierungen auf der Karte vermerkt!",
+            "Ihr sucht nach einem Abenteuer? Dungeons sind mit Markierungen auf der Karte vermerkt!",
             "Vergesst nicht Eure Grafikeinstellungen anzupassen! Mit 'N' kommt ihr in die Einstellungen.",
             "Zusammen kämpfen macht mehr Spaß! Drückt 'O' um Eure Mitspieler anzuzeigen.",
             "Ein NPC mit einem Schädel unter seiner Lebensanzeige ist deutlich stärker als Ihr.",
diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index a705027832..5b58e3ec5e 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -335,6 +335,7 @@ magically infused items?"#,
         "hud.settings.maximum_fps": "Maximum FPS",
         "hud.settings.fov": "Field of View (deg)",
         "hud.settings.gamma": "Gamma",
+        "hud.settings.exposure": "Exposure",
         "hud.settings.ambiance": "Ambiance Brightness",
         "hud.settings.antialiasing_mode": "AntiAliasing Mode",
         "hud.settings.upscale_factor": "Upscale Factor",
@@ -346,6 +347,7 @@ magically infused items?"#,
         "hud.settings.cloud_rendering_mode.low": "Low",
         "hud.settings.cloud_rendering_mode.medium": "Medium",
         "hud.settings.cloud_rendering_mode.high": "High",
+        "hud.settings.cloud_rendering_mode.ultra": "Ultra",
         "hud.settings.fullscreen": "Fullscreen",
         "hud.settings.fullscreen_mode": "Fullscreen Mode",
         "hud.settings.fullscreen_mode.exclusive": "Exclusive",
@@ -412,6 +414,18 @@ magically infused items?"#,
         "hud.free_look_indicator": "Free look active. Press {key} to disable.",
         "hud.auto_walk_indicator": "Auto walk active",
 
+        "hud.map.difficulty": "Difficulty",
+        "hud.map.towns": "Towns",
+        "hud.map.castles": "Castles",
+        "hud.map.dungeons": "Dungeons",        
+        "hud.map.town": "Town",
+        "hud.map.castle": "Castle",
+        "hud.map.dungeon": "Dungeon",
+        "hud.map.difficulty_dungeon": "Dungeon\n\nDifficulty: {difficulty}",
+        "hud.map.drag": "Drag",
+        "hud.map.zoom": "Zoom",
+        "hud.map.recenter": "Recenter",
+
         /// End HUD section
 
 
@@ -551,7 +565,7 @@ Protection
             "NPCs with the same level can have a different difficulty.",
             "Keep an eye out for food, chests and other loot spread all around the world!",
             "Inventory filled with food? Try crafting better food from it!",
-            "Wondering what's there to do? Dungeons are marked with brown spots on the map!",
+            "Wondering what's there to do? Try out one of the dungeons marked on the map!",
             "Don't forget to adjust the graphics for your system. Press 'N' to open the settings.",
             "Playing with others is fun! Press 'O' to see who is online.",
             "An NPC with a skull beneath their healthbar is quite powerful compared to yourself.",
diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index a1ffe36729..53ecff32b9 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1198,6 +1198,56 @@
         "voxel.armor.shoulder.bonerattler_right",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
+    //Warlord Set
+    Armor(Chest("Warlord")): VoxTrans(
+        "voxel.armor.chest.warlord",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("Warlord")): VoxTrans(
+        "voxel.armor.pants.warlord",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("Warlord")): VoxTrans(
+        "voxel.armor.belt.warlord",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+    ),
+    Armor(Foot("Warlord")): VoxTrans(
+        "voxel.armor.foot.warlord",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("Warlord")): VoxTrans(
+        "voxel.armor.hand.warlord_right",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Warlord")): VoxTrans(
+        "voxel.armor.shoulder.warlord_right",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
+    //Warlock Set
+    Armor(Chest("Warlock")): VoxTrans(
+        "voxel.armor.chest.warlock",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Pants("Warlock")): VoxTrans(
+        "voxel.armor.pants.warlock",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
+    ),
+    Armor(Belt("Warlock")): VoxTrans(
+        "voxel.armor.belt.warlock",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
+    ),
+    Armor(Foot("Warlock")): VoxTrans(
+        "voxel.armor.foot.warlock",
+        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
+    ),
+    Armor(Hand("Warlock")): VoxTrans(
+        "voxel.armor.hand.warlock_right",
+        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Warlock")): VoxTrans(
+        "voxel.armor.shoulder.warlock_right",
+        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
+    ),
     //misc
      Armor(Pants("Hunting")): VoxTrans(
         "voxel.armor.pants.grayscale",
@@ -1232,6 +1282,14 @@
         "voxel.armor.back.backpack-0",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
+    Armor(Back("Warlord")): VoxTrans(
+        "voxel.armor.back.warlord",
+        (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
+    ),
+    Armor(Back("Warlock")): VoxTrans(
+        "voxel.armor.back.warlock",
+        (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
+    ),
     // Rings
     Armor(Ring("Ring0")): VoxTrans(
         "voxel.armor.ring.simple_purp-0",
diff --git a/assets/voxygen/shaders/figure-frag.glsl b/assets/voxygen/shaders/figure-frag.glsl
index e3dded50bb..3b69a17d8b 100644
--- a/assets/voxygen/shaders/figure-frag.glsl
+++ b/assets/voxygen/shaders/figure-frag.glsl
@@ -49,6 +49,7 @@ layout (std140)
 uniform u_locals {
     mat4 model_mat;
     vec4 highlight_col;
+    vec4 model_light;
     ivec4 atlas_offs;
     vec3 model_pos;
     // bit 0 - is player
@@ -82,13 +83,8 @@ void main() {
     // vec3 f_col = f_col_light.rgb;
     // float f_ao = f_col_light.a;
 
-    // vec2 f_uv_pos = f_uv_pos + atlas_offs.xy;
-    vec4 f_col_light = texelFetch(t_col_light, ivec2(f_uv_pos)/* + uv_delta*//* - f_norm * 0.00001*/, 0);
-    // vec4 f_col_light = texelFetch(t_col_light, ivec2(int(f_uv_pos.x), int(f_uv_pos.y)/* + uv_delta*//* - f_norm * 0.00001*/), 0);
-    vec3 f_col = /*linear_to_srgb*//*srgb_to_linear*/(f_col_light.rgb);
-    // vec3 f_col = vec3(1.0);
-    // vec2 texSize = textureSize(t_col_light, 0);
-    float f_ao = texture(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
+    float f_ao, f_glow;
+    vec3 f_col = greedy_extract_col_light_glow(t_col_light, f_uv_pos, f_ao, f_glow);
     // float /*f_light*/f_ao = textureProj(t_col_light, vec3(f_uv_pos, texSize)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
 
     // vec3 my_chunk_pos = (vec3((uvec3(f_pos_norm) >> uvec3(0, 9, 18)) & uvec3(0x1FFu)) - 256.0) / 2.0;
@@ -164,6 +160,10 @@ void main() {
 
     vec3 emitted_light, reflected_light;
 
+    // Make voxel shadows block the sun and moon
+    sun_info.block *= model_light.x;
+    moon_info.block *= model_light.x;
+
     // vec3 light_frac = /*vec3(1.0);*//*vec3(max(dot(f_norm, -sun_dir) * 0.5 + 0.5, 0.0));*/light_reflection_factor(f_norm, view_dir, vec3(0, 0, -1.0), vec3(1.0), vec3(R_s), alpha);
     // vec3 point_light = light_at(f_pos, f_norm);
     // vec3 light, diffuse_light, ambient_light;
@@ -181,6 +181,9 @@ void main() {
 
     float ao = f_ao * sqrt(f_ao);//0.25 + f_ao * 0.75; ///*pow(f_ao, 0.5)*/f_ao * 0.85 + 0.15;
 
+    vec3 glow = pow(model_light.y, 3) * 4 * GLOW_COLOR;
+    emitted_light += glow;
+
     reflected_light *= ao;
     emitted_light *= ao;
     /* reflected_light *= cloud_shadow(f_pos); */
diff --git a/assets/voxygen/shaders/figure-vert.glsl b/assets/voxygen/shaders/figure-vert.glsl
index dc2f09c351..50acb8e4eb 100644
--- a/assets/voxygen/shaders/figure-vert.glsl
+++ b/assets/voxygen/shaders/figure-vert.glsl
@@ -27,6 +27,7 @@ layout (std140)
 uniform u_locals {
     mat4 model_mat;
     vec4 highlight_col;
+    vec4 model_light;
     ivec4 atlas_offs;
     vec3 model_pos;
     // bit 0 - is player
diff --git a/assets/voxygen/shaders/fluid-frag/cheap.glsl b/assets/voxygen/shaders/fluid-frag/cheap.glsl
index 5130760f3d..91828bf179 100644
--- a/assets/voxygen/shaders/fluid-frag/cheap.glsl
+++ b/assets/voxygen/shaders/fluid-frag/cheap.glsl
@@ -179,12 +179,12 @@ void main() {
     // float reflected_light_point = /*length*/(diffuse_light_point.r) + f_light * point_shadow;
     // reflected_light += k_d * (diffuse_light_point + f_light * point_shadow * shade_frac) + specular_light_point;
 
-    float passthrough = /*pow(*/dot(cam_norm, -cam_to_frag/*view_dir*/)/*, 0.5)*/;
+    float passthrough = clamp(dot(cam_norm, -cam_to_frag) * 1.0 - 0.2, 0, 1);
     float min_refl = min(emitted_light.r, min(emitted_light.g, emitted_light.b));
 
     vec3 surf_color = illuminate(max_light, view_dir, water_color * /* fog_color * */emitted_light, /*surf_color * */water_color * reflected_light);
     // vec4 color = vec4(surf_color, passthrough * 1.0 / (1.0 + min_refl));// * (1.0 - /*log(1.0 + cam_attenuation)*//*cam_attenuation*/1.0 / (2.0 - log_cam)));
-    vec4 color = mix(vec4(surf_color, 1.0), vec4(surf_color, 1.0 / (1.0 + /*diffuse_light*//*(f_light * point_shadow + point_light)*//*4.0 * reflected_light_point*/min_refl/* * 0.25*/)), passthrough);
+    vec4 color = vec4(surf_color, (1.0 - passthrough) * 1.0 / (1.0 + min_refl));
 
     tgt_color = color;
 }
diff --git a/assets/voxygen/shaders/fluid-frag/shiny.glsl b/assets/voxygen/shaders/fluid-frag/shiny.glsl
index b3f0dfae89..3bdbf31961 100644
--- a/assets/voxygen/shaders/fluid-frag/shiny.glsl
+++ b/assets/voxygen/shaders/fluid-frag/shiny.glsl
@@ -77,13 +77,13 @@ float wave_height(vec3 pos) {
     );
 
     float height = (
-        (texture(t_noise, pos.xy * 0.03 + big_warp.xy + timer * 0.05).y - 0.5) * 1.0 +
-        (texture(t_noise, pos.yx * 0.03 + big_warp.yx - timer * 0.05).y - 0.5) * 1.0 +
-        (texture(t_waves, pos.xy * 0.1 + warp.xy + timer * 0.1).x - 0.5) * 0.5 +
-        (texture(t_waves, pos.yx * 0.1 + warp.yx - timer * 0.1).x - 0.5) * 0.5 +
-        (texture(t_noise, pos.yx * 0.3 + warp.xy * 0.5 + timer * 0.1).x - 0.5) * 0.2 +
-        (texture(t_noise, pos.yx * 0.3 + warp.yx * 0.5 - timer * 0.1).x - 0.5) * 0.2 +
-        (texture(t_noise, pos.yx * 1.0 + warp.yx * 0.0 - timer * 0.1).x - 0.5) * 0.05 +
+        (texture(t_noise, (pos.xy + pos.z) * 0.03 + big_warp.xy + timer * 0.05).y - 0.5) * 1.0 +
+        (texture(t_noise, (pos.yx + pos.z) * 0.03 + big_warp.yx - timer * 0.05).y - 0.5) * 1.0 +
+        (texture(t_waves, (pos.xy + pos.z) * 0.1 + warp.xy + timer * 0.1).x - 0.5) * 0.5 +
+        (texture(t_waves, (pos.yx + pos.z) * 0.1 + warp.yx - timer * 0.1).x - 0.5) * 0.5 +
+        (texture(t_noise, (pos.yx + pos.z) * 0.3 + warp.xy * 0.5 + timer * 0.1).x - 0.5) * 0.2 +
+        (texture(t_noise, (pos.xy + pos.z) * 0.3 + warp.yx * 0.5 - timer * 0.1).x - 0.5) * 0.2 +
+        (texture(t_noise, (pos.yx + pos.z) * 1.0 + warp.yx * 0.0 - timer * 0.1).x - 0.5) * 0.05 +
         0.0
     );
 
@@ -99,7 +99,9 @@ void main() {
     // Increase array access by 3 to access positive values
     uint norm_dir = ((f_pos_norm >> 29) & 0x1u) * 3u;
     // Use an array to avoid conditional branching
-    vec3 f_norm = normals[norm_axis + norm_dir];
+    // Temporarily assume all water faces up (this is incorrect but looks better)
+    vec3 f_norm = vec3(0, 0, 1);//normals[norm_axis + norm_dir];
+    vec3 cam_to_frag = normalize(f_pos - cam_pos.xyz);
 
     // vec4 light_pos[2];
 //#if (SHADOW_MODE == SHADOW_MODE_MAP)
@@ -111,7 +113,6 @@ void main() {
 //    vec4 sun_pos = vec4(0.0);
 //#endif
 
-    vec3 cam_to_frag = normalize(f_pos - cam_pos.xyz);
     // vec4 vert_pos4 = view_mat * vec4(f_pos, 1.0);
     // vec3 view_dir = normalize(-vec3(vert_pos4)/* / vert_pos4.w*/);
     vec3 view_dir = -cam_to_frag;
@@ -145,6 +146,7 @@ void main() {
 
     nmap = mix(f_norm, normalize(nmap), min(1.0 / pow(frag_dist, 0.75), 1));
 
+    //float suppress_waves = max(dot(), 0);
     vec3 norm = vec3(0, 0, 1) * nmap.z + b_norm * nmap.x + c_norm * nmap.y;
     // vec3 norm = f_norm;
 
@@ -176,8 +178,8 @@ void main() {
     // vec3 cam_to_frag = normalize(f_pos - cam_pos.xyz);
     // Squared to account for prior saturation.
     float f_light = 1.0;// pow(f_light, 1.5);
-    vec3 reflect_color = get_sky_color(/*reflect_ray_dir*/beam_view_dir, time_of_day.x, f_pos, vec3(-100000), 0.25, true);
-    reflect_color = get_cloud_color(reflect_color, reflect_ray_dir, cam_pos.xyz, time_of_day.x, 100000.0, 1.0);
+    vec3 reflect_color = get_sky_color(/*reflect_ray_dir*/beam_view_dir, time_of_day.x, f_pos, vec3(-100000), 0.125, true);
+    reflect_color = get_cloud_color(reflect_color, reflect_ray_dir, cam_pos.xyz, time_of_day.x, 100000.0, 0.25);
     reflect_color *= f_light;
     // /*const */vec3 water_color = srgb_to_linear(vec3(0.2, 0.5, 1.0));
     // /*const */vec3 water_color = srgb_to_linear(vec3(0.8, 0.9, 1.0));
@@ -289,7 +291,8 @@ void main() {
     // diffuse_light += point_light;
     // reflected_light += point_light;
     // vec3 surf_color = srgb_to_linear(vec3(0.2, 0.5, 1.0)) * light * diffuse_light * ambient_light;
-    vec3 surf_color = illuminate(max_light, view_dir, water_color * emitted_light/* * log(1.0 - MU_WATER)*/, /*cam_attenuation * *//*water_color * */reflect_color * reflected_light/* * log(1.0 - MU_WATER)*/);
+    const float REFLECTANCE = 0.5;
+    vec3 surf_color = illuminate(max_light, view_dir, water_color * emitted_light/* * log(1.0 - MU_WATER)*/, /*cam_attenuation * *//*water_color * */reflect_color * REFLECTANCE/** reflected_light*//* * log(1.0 - MU_WATER)*/);
 
     // passthrough = pow(passthrough, 1.0 / (1.0 + water_depth_to_camera));
     /* surf_color = cam_attenuation.g < 0.5 ?
diff --git a/assets/voxygen/shaders/include/cloud/regular.glsl b/assets/voxygen/shaders/include/cloud/regular.glsl
index a53fb17795..f6ede5a697 100644
--- a/assets/voxygen/shaders/include/cloud/regular.glsl
+++ b/assets/voxygen/shaders/include/cloud/regular.glsl
@@ -7,66 +7,114 @@ const float CLOUD_DENSITY = 150.0;
 
 vec2 get_cloud_heights(vec2 pos) {
     const float CLOUD_HALF_WIDTH = 300;
-    const float CLOUD_HEIGHT_VARIATION = 1000.0;
-    float cloud_alt = CLOUD_AVG_ALT + (texture(t_noise, pos.xy * 0.0001).x - 0.5) * CLOUD_HEIGHT_VARIATION;
-    #if (CLOUD_MODE != CLOUD_MODE_MINIMAL)
+    const float CLOUD_HEIGHT_VARIATION = 1500.0;
+    float cloud_alt = CLOUD_AVG_ALT + (texture(t_noise, pos.xy * 0.00005).x - 0.5) * CLOUD_HEIGHT_VARIATION;
+    #if (CLOUD_MODE > CLOUD_MODE_MINIMAL)
         cloud_alt += (texture(t_noise, pos.xy * 0.001).x - 0.5) * 0.1 * CLOUD_HEIGHT_VARIATION;
     #endif
     return vec2(cloud_alt, CLOUD_HALF_WIDTH);
 }
 
+float emission_strength = clamp((sin(time_of_day.x / (3600 * 24)) - 0.8) / 0.1, 0, 1);
+
 // Returns vec4(r, g, b, density)
-vec3 cloud_at(vec3 pos, float dist) {
+vec4 cloud_at(vec3 pos, float dist, out vec3 emission) {
     // Natural attenuation of air (air naturally attenuates light that passes through it)
-    // Simulate the atmosphere thinning above 3000 metres down to nothing at 5000 metres
-    float air = 0.00005 * clamp((3000.0 - pos.z) / 2000, 0, 1);
+    // Simulate the atmosphere thinning as you get higher. Not physically accurate, but then
+    // it can't be since Veloren's world is flat, not spherical.
+    float air = 0.00035 * clamp((10000.0 - pos.z) / 7000, 0, 1);
 
     // Mist sits close to the ground in valleys (TODO: use base_alt to put it closer to water)
-    float MIST_MIN = 300;
-    const float MIST_FADE_HEIGHT = 250;
-    float mist = 0.00025 * pow(clamp(1.0 - (pos.z - MIST_MIN) / MIST_FADE_HEIGHT, 0.0, 1), 2) / (1.0 + pow(1.0 + dist / 20000.0, 2.0));
+    float mist_min_alt = 0.5;
+    #if (CLOUD_MODE > CLOUD_MODE_LOW)
+        mist_min_alt = (texture(t_noise, pos.xy * 0.00015).x - 0.5) * 1.25 + 0.5;
+    #endif
+    mist_min_alt *= 250;
+    const float MIST_FADE_HEIGHT = 500;
+    float mist = 0.005 * pow(clamp(1.0 - (pos.z - mist_min_alt) / MIST_FADE_HEIGHT, 0.0, 1), 4.0) / (1.0 + pow(1.0 + dist / 20000.0, 2.0));
 
     vec3 wind_pos = vec3(pos.xy + wind_offset, pos.z);
 
     // Clouds
     float cloud_tendency = cloud_tendency_at(pos.xy);
-    float sun_access = 0.05;
     float cloud = 0;
 
     vec2 cloud_attr = get_cloud_heights(wind_pos.xy);
     float cloud_factor = 0.0;
+    float turb_noise = 0.0;
+    float sun_access = 0.0;
+    float moon_access = 0.0;
     // This is a silly optimisation but it actually nets us a fair few fps by skipping quite a few expensive calcs
     if (cloud_tendency > 0 || mist > 0.0) {
         // Turbulence (small variations in clouds/mist)
         const float turb_speed = -1.0; // Turbulence goes the opposite way
         vec3 turb_offset = vec3(1, 1, 0) * time_of_day.x * turb_speed;
-        #if (CLOUD_MODE == CLOUD_MODE_MINIMAL)
-            float turb_noise = 0.0;
-        #else
-            float turb_noise = noise_3d((wind_pos + turb_offset) * 0.001) - 0.5;
+        #if (CLOUD_MODE >= CLOUD_MODE_MINIMAL)
+            turb_noise = noise_3d((wind_pos + turb_offset) * 0.001) - 0.5;
         #endif
-        #if (CLOUD_MODE == CLOUD_MODE_MEDIUM || CLOUD_MODE == CLOUD_MODE_HIGH)
-            turb_noise += (noise_3d((wind_pos + turb_offset * 0.3) * 0.004) - 0.5) * 0.25;
+        #if (CLOUD_MODE >= CLOUD_MODE_MEDIUM)
+            turb_noise += (noise_3d((wind_pos + turb_offset * 0.3) * 0.004) - 0.5) * 0.35;
         #endif
-        mist *= (1.0 + turb_noise);
+        #if (CLOUD_MODE >= CLOUD_MODE_HIGH)
+            turb_noise += (noise_3d((wind_pos + turb_offset * 0.3) * 0.01) - 0.5) * 0.125;
+        #endif
+        mist *= 1.0 + turb_noise;
 
-        cloud_factor = 0.25 * (1.0 - pow(min(abs(pos.z - cloud_attr.x) / (cloud_attr.y * pow(max(cloud_tendency * 20.0, 0), 0.5)), 1.0), 2.0));
+        cloud_factor = 0.25 * (1.0 - pow(min(abs(pos.z - cloud_attr.x) / (cloud_attr.y * pow(max(cloud_tendency * 20.0, 0), 0.5)), 1.0), 1.0));
         float cloud_flat = min(cloud_tendency, 0.07) * 0.05;
         cloud_flat *= (1.0 + turb_noise * 7.0 * max(0, 1.0 - cloud_factor * 5));
-        cloud = cloud_flat * pow(cloud_factor, 2) * 20 / (1 + pow(1.0 + dist / 10000.0, 2.0));
+        cloud = cloud_flat * pow(cloud_factor, 2) * 20;
+
+        // What proportion of sunlight is *not* being blocked by nearby cloud? (approximation)
+        sun_access = clamp((pos.z - cloud_attr.x + turb_noise * 250.0) * 0.002 + 0.35 + max(mist * 20000, 0), 0, 1);
+        // Since we're assuming the sun/moon is always above (not always correct) it's the same for the moon
+        moon_access = sun_access;
+
+        #if (CLOUD_MODE >= CLOUD_MODE_HIGH)
+            // Try to calculate a reasonable approximation of the cloud normal
+            float cloud_tendency_x = cloud_tendency_at(pos.xy + vec2(100, 0));
+            float cloud_tendency_y = cloud_tendency_at(pos.xy + vec2(0, 100));
+            vec3 cloud_norm = vec3(
+                (cloud_tendency - cloud_tendency_x) * 4,
+                (cloud_tendency - cloud_tendency_y) * 4,
+                (pos.z - cloud_attr.x) / 250 + turb_noise + 0.25
+            );
+            sun_access = mix(max(dot(-sun_dir.xyz, cloud_norm) + 0.0, 0.025), sun_access, 0.25);
+            moon_access = mix(max(dot(-moon_dir.xyz, cloud_norm) + 0.35, 0.025), moon_access, 0.25);
+        #endif
     }
 
-    // What proportion of sunlight is *not* being blocked by nearby cloud? (approximation)
-    sun_access = clamp((pos.z - cloud_attr.x) * 0.002 + 0.35 + mist * 10000, 0.0, 1);
+    // Prevent mist (i.e: vapour beneath clouds) being accessible to the sun to avoid visual problems
+    //float suppress_mist = clamp((pos.z - cloud_attr.x + cloud_attr.y) / 300, 0, 1);
+    //sun_access *= suppress_mist;
+    //moon_access *= suppress_mist;
 
     // Prevent clouds and mist appearing underground (but fade them out gently)
     float not_underground = clamp(1.0 - (alt_at(pos.xy - focus_off.xy) - (pos.z - focus_off.z)) / 80.0, 0, 1);
+    air *= not_underground;
     float vapor_density = (mist + cloud) * not_underground;
 
+    if (emission_strength <= 0.0) {
+        emission = vec3(0);
+    } else {
+        float z = clamp(pos.z, 0, 10000);
+        float emission_alt = 4000.0;
+        #if (CLOUD_MODE >= CLOUD_MODE_LOW)
+            emission_alt += (noise_3d(vec3(wind_pos.xy * 0.00003 + cloud_tendency * 0.2, time_of_day.x * 0.0001)) - 0.5) * 6000;
+        #endif
+        float tail = (texture(t_noise, wind_pos.xy * 0.00005).x - 0.5) * 10 + (z - emission_alt) * 0.001;
+        vec3 emission_col = vec3(0.6 + tail * 0.6, 1.0, 0.3 + tail * 0.2);
+        float emission_nz = max(texture(t_noise, wind_pos.xy * 0.00003).x - 0.6, 0) / (10.0 + abs(z - emission_alt) / 40);
+        #if (CLOUD_MODE >= CLOUD_MODE_MEDIUM)
+            emission_nz *= (1.0 + (noise_3d(vec3(wind_pos.xy * 0.05, time_of_day.x * 0.15) * 0.004) - 0.5) * 4.0);
+        #endif
+        emission = emission_col * emission_nz * emission_strength * max(sun_dir.z, 0) * 20;
+    }
+
     // We track vapor density and air density separately. Why? Because photons will ionize particles in air
     // leading to rayleigh scattering, but water vapor will not. Tracking these indepedently allows us to
     // get more correct colours.
-    return vec3(sun_access, vapor_density, air);
+    return vec4(sun_access, moon_access, vapor_density, air);
 }
 
 float atan2(in float y, in float x) {
@@ -75,24 +123,26 @@ float atan2(in float y, in float x) {
 }
 
 const float DIST_CAP = 50000;
-#if (CLOUD_MODE == CLOUD_MODE_HIGH)
-    const uint QUALITY = 100u;
+#if (CLOUD_MODE == CLOUD_MODE_ULTRA)
+    const uint QUALITY = 200u;
+#elif (CLOUD_MODE == CLOUD_MODE_HIGH)
+    const uint QUALITY = 50u;
 #elif (CLOUD_MODE == CLOUD_MODE_MEDIUM)
-    const uint QUALITY = 40u;
+    const uint QUALITY = 30u;
 #elif (CLOUD_MODE == CLOUD_MODE_LOW)
-    const uint QUALITY = 20u;
+    const uint QUALITY = 16u;
 #elif (CLOUD_MODE == CLOUD_MODE_MINIMAL)
-    const uint QUALITY = 7u;
+    const uint QUALITY = 5u;
 #endif
 
 const float STEP_SCALE = DIST_CAP / (10.0 * float(QUALITY));
 
-float step_to_dist(float step) {
-    return pow(step, 2) * STEP_SCALE;
+float step_to_dist(float step, float quality) {
+    return pow(step, 2) * STEP_SCALE / quality;
 }
 
-float dist_to_step(float dist) {
-    return pow(dist / STEP_SCALE, 0.5);
+float dist_to_step(float dist, float quality) {
+    return pow(dist / STEP_SCALE * quality, 0.5);
 }
 
 vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of_day, float max_dist, const float quality) {
@@ -107,47 +157,51 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
     vec3 dir_diff = vec3(0);
     #if (CLOUD_MODE == CLOUD_MODE_MINIMAL)
         /* splay += (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.5 - time_of_day * 0.000025).x - 0.5) * 0.4 / (1.0 + pow(dir.z, 2) * 10); */
-        dir_diff = vec3(
-            (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10),
-            (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10),
-            (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10)
-        ) * 2000;
-    #endif
-    #if (CLOUD_MODE == CLOUD_MODE_MINIMAL || CLOUD_MODE == CLOUD_MODE_LOW)
-        splay += (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 10.0 - time_of_day * 0.00005).x - 0.5) * 0.075 / (1.0 + pow(dir.z, 2) * 10);
+        /* dir_diff = vec3( */
+        /*     (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10), */
+        /*     (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10), */
+        /*     (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 1.0 - time_of_day * 0.00005).x - 0.5) * 0.2 / (1.0 + pow(dir.z, 2) * 10) */
+        /* ) * 1500; */
+        splay += (texture(t_noise, vec2(atan2(dir.x, dir.y) * 2 / PI, dir.z) * 5.0 - time_of_day * 0.00005).x - 0.5) * 0.075 / (1.0 + pow(dir.z, 2) * 10);
     #endif
 
     // Proportion of sunlight that get scattered back into the camera by clouds
     float sun_scatter = max(dot(-dir, sun_dir.xyz), 0.5);
     float moon_scatter = max(dot(-dir, moon_dir.xyz), 0.5);
     vec3 sky_color = get_sky_color();
-    vec3 directed_scatter =
-        // Sun scatter
-        get_sun_color() * get_sun_brightness() * sun_scatter +
-        // Moon scatter
-        get_moon_color() * get_moon_brightness() * moon_scatter;
+    float net_light = get_sun_brightness() + get_moon_brightness();
 
     float cdist = max_dist;
-    while (cdist > 1) {
-        float ndist = step_to_dist(trunc(dist_to_step(cdist - 0.25)));
-        vec3 sample = cloud_at(origin + (dir + dir_diff / ndist) * ndist * splay, ndist);
+    float ldist = cdist;
+    // i is an emergency brake
+    float min_dist = clamp(max_dist / 4, 0.25, 24);
+    for (int i = 0; cdist > min_dist && i < 250; i ++) {
+        ldist = cdist;
+        cdist = step_to_dist(trunc(dist_to_step(cdist - 0.25, quality)), quality);
 
-        vec2 density_integrals = max(sample.yz, vec2(0)) * (cdist - ndist);
+        vec3 emission;
+        vec4 sample = cloud_at(origin + (dir + dir_diff / ldist) * ldist * splay, cdist, emission);
+
+        vec2 density_integrals = max(sample.zw, vec2(0)) * (ldist - cdist);
 
         float sun_access = sample.x;
+        float moon_access = sample.y;
         float scatter_factor = 1.0 - 1.0 / (1.0 + density_integrals.x);
 
-        surf_color =
-            // Attenuate light passing through the clouds, removing light due to rayleigh scattering (transmission component)
-            surf_color * (1.0 - scatter_factor) - surf_color * density_integrals.y * sky_color +
-            // This is not rayleigh scattering, but it's good enough for our purposes
-            sky_color * density_integrals.y +
-            // Add the directed light light scattered into the camera by the clouds
-            directed_scatter * sun_access * scatter_factor +
-            // Global illumination (uniform scatter from the sky)
-            sky_color * sun_access * scatter_factor;
+        const float RAYLEIGH = 0.25;
 
-        cdist = ndist;
+        surf_color =
+            // Attenuate light passing through the clouds
+            surf_color * (1.0 - scatter_factor) +
+            // This is not rayleigh scattering, but it's good enough for our purposes (only considers sun)
+            (1.0 - surf_color) * net_light * sky_color * density_integrals.y * RAYLEIGH +
+            // Add the directed light light scattered into the camera by the clouds
+            get_sun_color() * sun_scatter * sun_access * scatter_factor * get_sun_brightness() +
+            get_moon_color() * moon_scatter * moon_access * scatter_factor * get_moon_brightness() +
+            emission * density_integrals.y +
+            // Global illumination (uniform scatter from the sky)
+            sky_color * sun_access * scatter_factor * get_sun_brightness() +
+            sky_color * moon_access * scatter_factor * get_moon_brightness();
     }
 
     return surf_color;
diff --git a/assets/voxygen/shaders/include/constants.glsl b/assets/voxygen/shaders/include/constants.glsl
index 8d83b88955..f1bc2a8aa9 100644
--- a/assets/voxygen/shaders/include/constants.glsl
+++ b/assets/voxygen/shaders/include/constants.glsl
@@ -14,6 +14,7 @@
 #define CLOUD_MODE_LOW 2
 #define CLOUD_MODE_MEDIUM 3
 #define CLOUD_MODE_HIGH 4
+#define CLOUD_MODE_ULTRA 5
 
 #define LIGHTING_ALGORITHM_LAMBERTIAN 0
 #define LIGHTING_ALGORITHM_BLINN_PHONG 1
diff --git a/assets/voxygen/shaders/include/globals.glsl b/assets/voxygen/shaders/include/globals.glsl
index 11ed591a19..6b3c8373be 100644
--- a/assets/voxygen/shaders/include/globals.glsl
+++ b/assets/voxygen/shaders/include/globals.glsl
@@ -16,7 +16,7 @@ uniform u_globals {
     vec4 shadow_proj_factors;
     uvec4 medium;
     ivec4 select_pos;
-    vec4 gamma;
+    vec4 gamma_exposure;
     float ambiance;
     // 0 - FirstPerson
     // 1 - ThirdPerson
diff --git a/assets/voxygen/shaders/include/lod.glsl b/assets/voxygen/shaders/include/lod.glsl
index 5abec7a626..2644c2a4fe 100644
--- a/assets/voxygen/shaders/include/lod.glsl
+++ b/assets/voxygen/shaders/include/lod.glsl
@@ -205,6 +205,9 @@ vec2 splay(vec2 pos) {
     // /const float CBRT_2 = cbrt(2.0) / 2.0;
     // vec2 splayed = pos * (view_distance.x * SQRT_2 + pow(len * 0.5, 3.0) * (SPLAY_MULT - view_distance.x));
     vec2 splayed = pos * (view_distance.x * SQRT_2 + len_pow * (textureSize(t_alt, 0) * 32.0/* - view_distance.x*/));
+    if (abs(pos.x) > 0.99 || abs(pos.y) > 0.99) {
+        splayed *= 10.0;
+    }
     return splayed;
 
     // Radial: pos.x = r - view_distance.x from focus_pos, pos.y = θ from cam_pos to focus_pos on xy plane.
diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl
index 2a5c4ba93f..a65962c099 100644
--- a/assets/voxygen/shaders/include/sky.glsl
+++ b/assets/voxygen/shaders/include/sky.glsl
@@ -7,6 +7,8 @@
 struct DirectionalLight {
     // vec3 dir;
     float shadow;
+    // Fully blocks all light, including ambience
+    float block;
     // vec3 color;
     // float brightness;
 };
@@ -16,19 +18,19 @@ const float PI = 3.141592;
 const vec3 SKY_DAY_TOP = vec3(0.1, 0.5, 0.9);
 const vec3 SKY_DAY_MID = vec3(0.02, 0.28, 0.8);
 const vec3 SKY_DAY_BOT = vec3(0.1, 0.2, 0.3);
-const vec3 DAY_LIGHT   = vec3(1.9, 1.75, 0.9);//vec3(1.5, 1.4, 1.0);
-const vec3 SUN_HALO_DAY = vec3(0.35, 0.35, 0.0);
+const vec3 DAY_LIGHT   = vec3(2.8, 3.5, 1.8);
+const vec3 SUN_HALO_DAY = vec3(0.06, 0.06, 0.005);
 
 const vec3 SKY_DUSK_TOP = vec3(0.06, 0.1, 0.20);
 const vec3 SKY_DUSK_MID = vec3(0.35, 0.1, 0.15);
 const vec3 SKY_DUSK_BOT = vec3(0.0, 0.1, 0.23);
-const vec3 DUSK_LIGHT   = vec3(9.0, 1.5, 0.15);
-const vec3 SUN_HALO_DUSK = vec3(1.2, 0.25, 0.0);
+const vec3 DUSK_LIGHT   = vec3(8.0, 1.5, 0.15);
+const vec3 SUN_HALO_DUSK = vec3(1.2, 0.15, 0.01);
 
 const vec3 SKY_NIGHT_TOP = vec3(0.001, 0.001, 0.0025);
 const vec3 SKY_NIGHT_MID = vec3(0.001, 0.005, 0.02);
 const vec3 SKY_NIGHT_BOT = vec3(0.002, 0.004, 0.004);
-const vec3 NIGHT_LIGHT   = vec3(0.002, 0.02, 0.02);
+const vec3 NIGHT_LIGHT   = vec3(5.0, 0.75, 0.2);
 // const vec3 NIGHT_LIGHT   = vec3(0.0, 0.0, 0.0);
 
 // Linear RGB, scattering coefficients for atmosphere at roughly R, G, B wavelengths.
@@ -42,6 +44,9 @@ const float UNDERWATER_MIST_DIST = 100.0;
 
 const float PERSISTENT_AMBIANCE = 1.0 / 32.0;// 1.0 / 80; // 1.0 / 512; // 0.00125 // 0.1;// 0.025; // 0.1;
 
+// Allowed to be > 1 due to HDR
+const vec3 GLOW_COLOR = vec3(2, 1.30, 0.1);
+
 //vec3 get_sun_dir(float time_of_day) {
 //    const float TIME_FACTOR = (PI * 2.0) / (3600.0 * 24.0);
 //
@@ -70,11 +75,16 @@ const float wind_speed = 0.25;
 vec2 wind_offset = vec2(time_of_day.x * wind_speed);
 
 float cloud_tendency_at(vec2 pos) {
-    return clamp(texture(t_noise, (pos + wind_offset) * 0.000075).x - 0.5, 0, 1);
+    float nz = texture(t_noise, (pos + wind_offset) * 0.000075).x - 0.5;
+    nz = clamp(nz, 0, 1);
+    #if (CLOUD_MODE >= CLOUD_MODE_MEDIUM)
+        nz += (texture(t_noise, (pos + wind_offset) * 0.00035).x - 0.5) * 0.15;
+    #endif
+    return nz;
 }
 
 float cloud_shadow(vec3 pos, vec3 light_dir) {
-    #if (CLOUD_MODE == CLOUD_MODE_NONE || CLOUD_MODE == CLOUD_MODE_MINIMAL)
+    #if (CLOUD_MODE <= CLOUD_MODE_MINIMAL)
         return 1.0;
     #else
         vec2 xy_offset = light_dir.xy * ((CLOUD_AVG_ALT - pos.z) / -light_dir.z);
@@ -82,17 +92,20 @@ float cloud_shadow(vec3 pos, vec3 light_dir) {
         // Fade out shadow if the sun angle is too steep (simulates a widening penumbra with distance)
         const vec2 FADE_RANGE = vec2(1500, 10000);
         float fade = 1.0 - clamp((length(xy_offset) - FADE_RANGE.x) / (FADE_RANGE.y - FADE_RANGE.x), 0, 1);
+        float cloud = cloud_tendency_at(pos.xy + focus_off.xy - xy_offset);
 
-        return max(0, 1 - fade * cloud_tendency_at(pos.xy + focus_off.xy - xy_offset) * 3.0);
+        cloud = cloud * 2.0;
+
+        return clamp(1 - fade * cloud * 1.65, 0, 1);
     #endif
 }
 
 float get_sun_brightness(/*vec3 sun_dir*/) {
-    return max(-sun_dir.z + 0.6, 0.0) * 0.9;
+    return max(-sun_dir.z + 0.5, 0.0);
 }
 
 float get_moon_brightness(/*vec3 moon_dir*/) {
-    return max(-moon_dir.z + 0.6, 0.0) * 0.1;
+    return max(-moon_dir.z + 0.6, 0.0) * 0.2;
 }
 
 vec3 get_sun_color(/*vec3 sun_dir*/) {
@@ -127,6 +140,7 @@ vec3 get_moon_color(/*vec3 moon_dir*/) {
 
 DirectionalLight get_sun_info(vec4 _dir, float shade_frac/*, vec4 light_pos[2]*/, /*vec4 sun_pos*/vec3 f_pos) {
     float shadow = shade_frac;
+    float block = 1.0;
 #ifdef HAS_SHADOW_MAPS
 #if (SHADOW_MODE == SHADOW_MODE_MAP)
     if (sun_dir.z < /*0.6*/0.0) {
@@ -143,15 +157,16 @@ DirectionalLight get_sun_info(vec4 _dir, float shade_frac/*, vec4 light_pos[2]*/
     }
 #endif
 #endif
-    return DirectionalLight(/*dir, */shadow/*, get_sun_color(dir), get_sun_brightness(dir)*/);
+    return DirectionalLight(/*dir, */shadow, block/*, get_sun_color(dir), get_sun_brightness(dir)*/);
 }
 
 DirectionalLight get_moon_info(vec4 _dir, float shade_frac/*, vec4 light_pos[2]*/) {
     float shadow = shade_frac;
+    float block = 1.0;
 // #ifdef HAS_SHADOW_MAPS
 //     shadow = min(shade_frac, ShadowCalculationDirected(light_pos, 1u));
 // #endif
-    return DirectionalLight(/*dir, */shadow/*, get_moon_color(dir), get_moon_brightness(dir)*/);
+    return DirectionalLight(/*dir, */shadow, block/*, get_moon_color(dir), get_moon_brightness(dir)*/);
 }
 
 // // Calculates extra emission and reflectance (due to sunlight / moonlight).
@@ -219,8 +234,8 @@ float get_sun_diffuse2(DirectionalLight sun_info, DirectionalLight moon_info, ve
     vec3 sun_dir = sun_dir.xyz;
     vec3 moon_dir = moon_dir.xyz;
 
-    float sun_light = get_sun_brightness(/*sun_dir*/);//sun_info.brightness;;
-    float moon_light = get_moon_brightness(/*moon_dir*/);//moon_info.brightness;
+    float sun_light = get_sun_brightness(/*sun_dir*/) * sun_info.block;//sun_info.brightness;;
+    float moon_light = get_moon_brightness(/*moon_dir*/) * moon_info.block;//moon_info.brightness;
 
     vec3 sun_color = get_sun_color(/*sun_dir*/) * SUN_COLOR_FACTOR;//sun_info.color * SUN_COLOR_FACTOR;
     vec3 moon_color = get_moon_color(/*moon_dir*/);//moon_info.color;
@@ -372,6 +387,7 @@ float get_sun_diffuse2(DirectionalLight sun_info, DirectionalLight moon_info, ve
 
 // This has been extracted into a function to allow quick exit when detecting a star.
 float is_star_at(vec3 dir) {
+
     float star_scale = 80.0;
 
     // Star positions
@@ -384,11 +400,13 @@ float is_star_at(vec3 dir) {
     float dist = length(pos - dir);
 
     // Star threshold
-    if (dist < 0.0015) {
-        return 1.0;
-    }
+    //if (dist < 0.0015) {
+    //    return 2.5;
+    //}
 
-    return 0.0;
+    //return 0.0;
+
+    return 1.0 / (1.0 + pow(dist * 1000, 8));
 }
 
 vec3 get_sky_color(vec3 dir, float time_of_day, vec3 origin, vec3 f_pos, float quality, bool with_features, float refractionIndex) {
@@ -409,7 +427,7 @@ vec3 get_sky_color(vec3 dir, float time_of_day, vec3 origin, vec3 f_pos, float q
     }
 
     // Sun
-    const vec3 SUN_SURF_COLOR = vec3(1.5, 0.9, 0.35) * 200.0;
+    const vec3 SUN_SURF_COLOR = vec3(1.5, 0.9, 0.35) * 3.0;
 
     vec3 sun_halo_color = mix(
         SUN_HALO_DUSK,
@@ -417,21 +435,24 @@ vec3 get_sky_color(vec3 dir, float time_of_day, vec3 origin, vec3 f_pos, float q
         max(-sun_dir.z, 0.0)
     );
 
-    vec3 sun_halo = pow(max(dot(dir, -sun_dir) + 0.1, 0.0), 8.0) * sun_halo_color;
+    vec3 sun_halo = sun_halo_color * 16 * pow(max(dot(dir, -sun_dir), 0), 8.0);
     vec3 sun_surf = vec3(0);
     if (with_features) {
-        sun_surf = pow(max(dot(dir, -sun_dir) - 0.001, 0.0), 5000.0) * SUN_SURF_COLOR * SUN_COLOR_FACTOR; // Hack to prevent sun vanishing too early
+        float angle = 0.00035;
+        sun_surf = clamp((dot(dir, -sun_dir) - (1.0 - angle)) * 4 / angle, 0, 1) * SUN_SURF_COLOR * SUN_COLOR_FACTOR;
     }
     vec3 sun_light = sun_halo + sun_surf;
 
     // Moon
-    const vec3 MOON_SURF_COLOR = vec3(0.7, 1.0, 1.5) * 500.0;
-    const vec3 MOON_HALO_COLOR = vec3(0.015, 0.015, 0.05);
+    const vec3 MOON_SURF_COLOR = vec3(0.7, 1.0, 1.5) * 3.0;
+    const vec3 MOON_HALO_COLOR = vec3(0.015, 0.015, 0.05) * 25;
 
-    vec3 moon_halo = pow(max(dot(dir, -moon_dir) + 0.1, 0.0), 8.0) * MOON_HALO_COLOR;
+    vec3 moon_halo_color = MOON_HALO_COLOR;
+    vec3 moon_halo = moon_halo_color * pow(max(dot(dir, -moon_dir), 0), 500.0);
     vec3 moon_surf = vec3(0);
     if (with_features) {
-        moon_surf = pow(max(dot(dir, -moon_dir) - 0.001, 0.0), 5000.0) * MOON_SURF_COLOR; // Hack to prevent moon vanishing too early
+        float angle = 0.00035;
+        moon_surf = clamp((dot(dir, -moon_dir) - (1.0 - angle)) * 4 / angle, 0, 1) * MOON_SURF_COLOR;
     }
     vec3 moon_light = moon_halo + moon_surf;
 
diff --git a/assets/voxygen/shaders/include/srgb.glsl b/assets/voxygen/shaders/include/srgb.glsl
index 9db36c1cb1..96aa0d0ec7 100644
--- a/assets/voxygen/shaders/include/srgb.glsl
+++ b/assets/voxygen/shaders/include/srgb.glsl
@@ -617,3 +617,28 @@ vec3 compute_attenuation_point(vec3 wpos, vec3 ray_dir, vec3 mu, float surface_a
 //    return 1.0;
 //}
 //#endif
+
+vec3 greedy_extract_col_light_glow(sampler2D t_col_light, vec2 f_uv_pos, out float f_light, out float f_glow) {
+    uvec4 f_col_light = uvec4(texelFetch(t_col_light, ivec2(f_uv_pos), 0) * 255);
+    vec3 f_col = vec3(
+        float(((f_col_light.r << 1u) & 0xFu) | (((f_col_light.b >> 4u) & 0xFu) << 4u)),
+        float(f_col_light.a),
+        float(((f_col_light.g << 1u) & 0xFu) | (((f_col_light.b >> 0u) & 0xFu) << 4u))
+    ) / 255.0;
+
+    // TODO: Figure out how to use `texture` and modulation to avoid needing to do manual filtering
+    vec2 light_00 = vec2(uvec2(f_col_light.rg) >> 3u);
+    vec2 light_10 = vec2(uvec2(texelFetch(t_col_light, ivec2(f_uv_pos) + ivec2(1, 0), 0).rg * 255.0) >> 3u);
+    vec2 light_01 = vec2(uvec2(texelFetch(t_col_light, ivec2(f_uv_pos) + ivec2(0, 1), 0).rg * 255.0) >> 3u);
+    vec2 light_11 = vec2(uvec2(texelFetch(t_col_light, ivec2(f_uv_pos) + ivec2(1, 1), 0).rg * 255.0) >> 3u);
+    vec2 light_0 = mix(light_00, light_01, fract(f_uv_pos.y));
+    vec2 light_1 = mix(light_10, light_11, fract(f_uv_pos.y));
+    vec2 light = mix(light_0, light_1, fract(f_uv_pos.x));
+    // TODO: Use `texture` instead
+    //vec2 light = texture(t_col_light, f_uv_pos).xy / 31;
+
+
+    f_light = light.x / 31.0;
+    f_glow = light.y / 31.0;
+    return srgb_to_linear(f_col);
+}
diff --git a/assets/voxygen/shaders/light-shadows-figure-vert.glsl b/assets/voxygen/shaders/light-shadows-figure-vert.glsl
index 1aa10a6728..154cc23b88 100644
--- a/assets/voxygen/shaders/light-shadows-figure-vert.glsl
+++ b/assets/voxygen/shaders/light-shadows-figure-vert.glsl
@@ -39,6 +39,7 @@ layout (std140)
 uniform u_locals {
     mat4 model_mat;
     vec4 highlight_col;
+    vec4 model_light;
     ivec4 atlas_offs;
     vec3 model_pos;
     // bit 0 - is player
diff --git a/assets/voxygen/shaders/lod-terrain-frag.glsl b/assets/voxygen/shaders/lod-terrain-frag.glsl
index af3eb9edd8..217f1ea460 100644
--- a/assets/voxygen/shaders/lod-terrain-frag.glsl
+++ b/assets/voxygen/shaders/lod-terrain-frag.glsl
@@ -278,8 +278,8 @@ void main() {
     //   return true;
     // }
 
-    bvec3 hit_yz_xz_xy;
-    vec3 dist_yz_xz_xy;
+    //bvec3 hit_yz_xz_xy;
+    //vec3 dist_yz_xz_xy;
     /* {
         // vec3 rDotn = -f_orig_view_dir * -sides;
         // vec3 rDotn = f_orig_view_dir * sides;
@@ -301,8 +301,8 @@ void main() {
         // vec3 s = -sides * (f_pos + delta_sides - cam_pos.xyz) / (-f_orig_view_dir * -sides);
         // vec3 s = (f_pos + delta_sides - cam_pos.xyz) / -f_orig_view_dir;
         // dist_yz_xz_xy = abs(s);
-        hit_yz_xz_xy = greaterThanEqual(f_orig_view_dir * sides, vec3(0.000001));
-        dist_yz_xz_xy = abs((f_pos + delta_sides - cam_pos.xyz) / f_orig_view_dir);
+        //hit_yz_xz_xy = greaterThanEqual(f_orig_view_dir * sides, vec3(0.000001));
+        //dist_yz_xz_xy = abs((f_pos + delta_sides - cam_pos.xyz) / f_orig_view_dir);
     }
 
     // vec3 xy_point = f_pos, xz_point = f_pos, yz_point = f_pos;
@@ -310,11 +310,12 @@ void main() {
     // bool hit_xz = (/*ao_xy < 1.0 || ao_yz < 1.0*//*min(f_ao_vec.x, f_ao_vec.z)*//*f_ao_vec.y < 1.0*/true/*min(corner_xy.y, corner_yz.x) < 1.0*//*min(corner_xz.x, corner_xz.y) < 1.0*/) && IntersectRayPlane(cam_pos.xyz, -f_orig_view_dir, vec3(f_pos.x, f_pos.y + delta_sides.y/* - sides.y*/, f_pos.z), vec3(0.0, -sides.y, 0.0), xz_point);
     // bool hit_yz = (/*ao_xy < 1.0 || ao_xz < 1.0*//*min(f_ao_vec.y, f_ao_vec.z) < 1.0*//*f_ao_vec.x < 1.0*/true/*true*//*min(corner_xy.x, corner_xz.x) < 1.0*//*min(corner_yz.x, corner_yz.y) < 1.0*/) && IntersectRayPlane(cam_pos.xyz, -f_orig_view_dir, vec3(f_pos.x + delta_sides.x/* - sides.x*/, f_pos.y, f_pos.z), vec3(-sides.x, 0.0, 0.0), yz_point);
     // float xy_dist = distance(cam_pos.xyz, xy_point), xz_dist = distance(cam_pos.xyz, xz_point), yz_dist = distance(cam_pos.xyz, yz_point);
-    bool hit_xy = hit_yz_xz_xy.z, hit_xz = hit_yz_xz_xy.y, hit_yz = hit_yz_xz_xy.x;
-    float xy_dist = dist_yz_xz_xy.z, xz_dist = dist_yz_xz_xy.y, yz_dist = dist_yz_xz_xy.x;
+    //bool hit_xy = hit_yz_xz_xy.z, hit_xz = hit_yz_xz_xy.y, hit_yz = hit_yz_xz_xy.x;
+    //float xy_dist = dist_yz_xz_xy.z, xz_dist = dist_yz_xz_xy.y, yz_dist = dist_yz_xz_xy.x;
     // hit_xy = hit_xy && distance(f_pos.xy + delta_sides.xy, xy_point.xy) <= 1.0;
     // hit_xz = hit_xz && distance(f_pos.xz + delta_sides.xz, xz_point.xz) <= 1.0;
     // hit_yz = hit_yz && distance(f_pos.yz + delta_sides.yz, yz_point.yz) <= 1.0;
+    /*
     vec3 voxel_norm =
         hit_yz ?
             hit_xz ?
@@ -325,6 +326,29 @@ void main() {
             hit_xz ?
                 hit_xy ? xz_dist < xy_dist ? vec3(0.0, sides.y, 0.0) : vec3(0.0, 0.0, sides.z) : vec3(0.0, sides.y, 0.0) :
                 hit_xy ? vec3(0.0, 0.0, sides.z) : vec3(0.0, 0.0, 0.0);
+    */
+    vec3 voxel_norm;
+
+    const float VOXELIZE_DIST = 2000;
+    float voxelize_factor = clamp(1.0 - (distance(focus_pos.xy, f_pos.xy) - view_distance.x) / VOXELIZE_DIST, 0, 1);
+    vec3 cam_dir = normalize(cam_pos.xyz - f_pos.xyz);
+    vec3 side_norm = normalize(vec3(my_norm.xy, 0));
+    vec3 top_norm = vec3(0, 0, 1);
+    float side_factor = 1.0 - my_norm.z;
+    // min(dot(vec3(0, -sign(cam_dir.y), 0), -cam_dir), dot(vec3(-sign(cam_dir.x), 0, 0), -cam_dir))
+    if (max(abs(my_norm.x), abs(my_norm.y)) < 0.01 || fract(my_alt) * clamp(dot(normalize(vec3(cam_dir.xy, 0)), side_norm), 0, 1) < cam_dir.z / my_norm.z) {
+        f_ao *= mix(1.0, clamp(fract(my_alt) / length(my_norm.xy) + clamp(dot(side_norm, -cam_dir), 0, 1), 0, 1), voxelize_factor);
+        voxel_norm = top_norm;
+    } else {
+        f_ao *= mix(1.0, clamp(pow(fract(my_alt), 0.5), 0, 1), voxelize_factor);
+
+        if (fract(f_pos.x) * abs(my_norm.y / cam_dir.x) < fract(f_pos.y) * abs(my_norm.x / cam_dir.y)) {
+            voxel_norm = vec3(sign(cam_dir.x), 0, 0);
+        } else {
+            voxel_norm = vec3(0, sign(cam_dir.y), 0);
+        }
+    }
+
     // vec3 f_ao_view = max(vec3(dot(f_orig_view_dir.yz, sides.yz), dot(f_orig_view_dir.xz, sides.xz), dot(f_orig_view_dir.xy, sides.xy)), 0.0);
     // delta_sides *= sqrt(1.0 - f_ao_view * f_ao_view);
     // delta_sides *= 1.0 - mix(view_dir / f_ao_view, vec3(0.0), equal(f_ao_view, vec3(0.0)));// sqrt(1.0 - f_ao_view * f_ao_view);
@@ -446,7 +470,7 @@ void main() {
     voxel_norm = normalize(mix(voxel_norm, lerpy_norm, clamp(my_norm.z * my_norm.z - (1.0 - DIST), 0, 1) / DIST));
 
     f_pos.xyz += abs(voxel_norm) * delta_sides;
-    voxel_norm = mix(voxel_norm == vec3(0.0) ? f_norm : voxel_norm, my_norm, clamp((f_orig_len - view_distance.x) / 3500, 0, 1));
+    voxel_norm = mix(my_norm, voxel_norm == vec3(0.0) ? f_norm : voxel_norm, voxelize_factor);
 
     vec3 hash_pos = f_pos + focus_off.xyz;
     const float A = 0.055;
@@ -470,7 +494,7 @@ void main() {
     // f_ao = 1.0;
     // f_ao = dot(f_ao_vec, sqrt(1.0 - delta_sides * delta_sides));
 
-    f_ao = dot(f_ao_vec, abs(voxel_norm));
+    f_ao *= dot(f_ao_vec, abs(voxel_norm));
     // f_ao = sqrt(dot(f_ao_vec * abs(voxel_norm), sqrt(1.0 - delta_sides * delta_sides)) / 3.0);
 
     // vec3 ao_pos2 = min(fract(f_pos), 1.0 - fract(f_pos));
diff --git a/assets/voxygen/shaders/lod-terrain-vert.glsl b/assets/voxygen/shaders/lod-terrain-vert.glsl
index f23284b4ff..c482ad367b 100644
--- a/assets/voxygen/shaders/lod-terrain-vert.glsl
+++ b/assets/voxygen/shaders/lod-terrain-vert.glsl
@@ -36,8 +36,8 @@ out float pull_down;
 // out float f_light;
 
 void main() {
-    // Find distances between vertices.
-    f_pos = lod_pos(v_pos, focus_pos.xy);
+    // Find distances between vertices. Pull down a tiny bit more to reduce z fighting near the ocean.
+    f_pos = lod_pos(v_pos, focus_pos.xy) - vec3(0, 0, 0.1);
     vec2 dims = vec2(1.0 / view_distance.y);
     vec4 f_square = focus_pos.xyxy + vec4(splay(v_pos - dims), splay(v_pos + dims));
     f_norm = lod_norm(f_pos.xy, f_square);
diff --git a/assets/voxygen/shaders/particle-frag.glsl b/assets/voxygen/shaders/particle-frag.glsl
index c4a66e6cd1..b5efe862a0 100644
--- a/assets/voxygen/shaders/particle-frag.glsl
+++ b/assets/voxygen/shaders/particle-frag.glsl
@@ -19,6 +19,7 @@
 in vec3 f_pos;
 flat in vec3 f_norm;
 in vec4 f_col;
+in float f_reflect;
 
 out vec4 tgt_color;
 
@@ -59,12 +60,19 @@ void main() {
     const float R_s1s2 = pow((1.3325 - 1.0) / (1.3325 + 1.0), 2);
     float R_s = (f_pos.z < f_alt) ? mix(R_s2s1 * R_s1s0, R_s1s0, medium.x) : mix(R_s2s0, R_s1s2 * R_s2s0, medium.x);
 
-    vec3 k_a = vec3(1.0);
-    vec3 k_d = vec3(1.0);
-    vec3 k_s = vec3(R_s);
+    vec3 k_a = vec3(1.0) * f_reflect;
+    vec3 k_d = vec3(1.0) * f_reflect;
+    vec3 k_s = vec3(R_s) * f_reflect;
 
     vec3 emitted_light, reflected_light;
 
+    // This is a bit of a hack. Because we can't find the volumetric lighting of each particle (they don't talk to the
+    // CPU) we need to some how find an approximation of how much the sun is blocked. We do this by fading out the sun
+    // as the particle moves underground. This isn't perfect, but it does at least mean that particles don't look like
+    // they're exposed to the sun when in dungeons
+    const float SUN_FADEOUT_DIST = 20.0;
+    sun_info.block *= clamp((f_pos.z - f_alt) / SUN_FADEOUT_DIST + 1, 0, 1);
+
     // To account for prior saturation.
     float max_light = 0.0;
     max_light += get_sun_diffuse2(sun_info, moon_info, f_norm, view_dir, k_a, k_d, k_s, alpha, emitted_light, reflected_light);
@@ -75,7 +83,8 @@ void main() {
     // TODO: Not this
     emitted_light += max(f_col.rgb - 1.0, vec3(0));
 
-    surf_color = illuminate(max_light, view_dir, surf_color * emitted_light, surf_color * reflected_light);
+    surf_color = illuminate(max_light, view_dir, surf_color * emitted_light, surf_color * reflected_light * f_reflect);
 
-    tgt_color = vec4(surf_color, f_col.a);
+    // Temporarily disable particle transparency to avoid artifacts
+    tgt_color = vec4(surf_color, 1.0 /*f_col.a*/);
 }
diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl
index 39a1d3ddfe..ba4b815033 100644
--- a/assets/voxygen/shaders/particle-vert.glsl
+++ b/assets/voxygen/shaders/particle-vert.glsl
@@ -31,6 +31,7 @@ flat out vec3 f_norm;
 out vec4 f_col;
 out float f_ao;
 out float f_light;
+out float f_reflect;
 
 const float SCALE = 1.0 / 11.0;
 
@@ -53,6 +54,7 @@ const int HEALING_BEAM = 13;
 const int ENERGY_NATURE = 14;
 const int FLAMETHROWER = 15;
 const int FIRE_SHOCKWAVE = 16;
+const int FIRE_BOWL = 17;
 
 // meters per second squared (acceleration)
 const float earth_gravity = 9.807;
@@ -139,6 +141,7 @@ void main() {
     float rand9 = hash(vec4(inst_entropy + 9));
 
     Attr attr;
+    f_reflect = 1.0;
 
     if (inst_mode == SMOKE) {
         attr = Attr(
@@ -147,24 +150,36 @@ void main() {
                 vec3(rand2 * 0.02, rand3 * 0.02, 1.0 + rand4 * 0.1)
             ),
             vec3(linear_scale(0.5)),
-            vec4(1, 1, 1, start_end(1.0, 0.0)),
+            vec4(vec3(0.8, 0.8, 1) * 0.5, start_end(1.0, 0.0)),
             spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3 + lifetime * 0.5)
         );
     } else if (inst_mode == FIRE) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
-                vec3(rand0 * 0.25, rand1 * 0.25, 0.3),
+                vec3(normalize(vec2(rand0, rand1)) * 0.25, 0.3),
                 vec3(rand2 * 0.1, rand3 * 0.1, 2.0 + rand4 * 1.0)
             ),
             vec3(1.0),
-            vec4(2, 0.8 + rand5 * 0.3, 0, 1),
+            vec4(2, 1.5 + rand5 * 0.5, 0, start_end(1.0, 0.0)),
+            spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3)
+        );
+        } else if (inst_mode == FIRE_BOWL) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
+        attr = Attr(
+            linear_motion(
+                vec3(normalize(vec2(rand0, rand1)) * 0.1, 0.6),
+                vec3(rand2 * 0.2, rand3 * 0.5, 0.8 + rand4 * 0.5)
+            ),
+            vec3(0.2), // Size
+            vec4(2, 1.5 + rand5 * 0.5, 0, start_end(1.0, 0.0)), // Colour
             spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3)
         );
     } else if (inst_mode == GUN_POWDER_SPARK) {
         attr = Attr(
             linear_motion(
-                vec3(rand0, rand1, rand3) * 0.3,
-                vec3(rand4, rand5, rand6) * 2.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand0, rand1, rand3)) * 0.3,
+                normalize(vec3(rand4, rand5, rand6)) * 2.0 + grav_vel(earth_gravity)
             ),
             vec3(1.0),
             vec4(3.5, 3 + rand7, 0, 1),
@@ -174,57 +189,62 @@ void main() {
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand4, rand5, rand6) * 30.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand4, rand5, rand6)) * 30.0 + grav_vel(earth_gravity)
             ),
             vec3(2.0 + rand0),
             vec4(vec3(0.6 + rand7 * 0.4), 1),
             spin_in_axis(vec3(1,0,0),0)
         );
     } else if (inst_mode == FIREWORK_BLUE) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand1, rand2, rand3) * 40.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
             ),
             vec3(3.0 + rand0),
             vec4(0.15, 0.4, 1, 1),
             identity()
         );
     } else if (inst_mode == FIREWORK_GREEN) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand1, rand2, rand3) * 40.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
             ),
             vec3(3.0 + rand0),
             vec4(0, 1, 0, 1),
             identity()
         );
     } else if (inst_mode == FIREWORK_PURPLE) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand1, rand2, rand3) * 40.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
             ),
             vec3(3.0 + rand0),
             vec4(0.7, 0.0, 1.0, 1.0),
             identity()
         );
     } else if (inst_mode == FIREWORK_RED) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand1, rand2, rand3) * 40.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
             ),
             vec3(3.0 + rand0),
             vec4(1, 0, 0, 1),
             identity()
         );
     } else if (inst_mode == FIREWORK_YELLOW) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             linear_motion(
                 vec3(0),
-                vec3(rand1, rand2, rand3) * 40.0 + grav_vel(earth_gravity)
+                normalize(vec3(rand1, rand2, rand3)) * 40.0 + grav_vel(earth_gravity)
             ),
             vec3(3.0 + rand0),
             vec4(1, 1, 0, 1),
@@ -272,34 +292,38 @@ void main() {
             spin_in_axis(vec3(1,0,0),0)
         );
     } else if (inst_mode == HEALING_BEAM) {
+        f_reflect = 0.0;
         attr = Attr(
             spiral_motion(inst_dir, 0.3 * (floor(2 * rand0 + 0.5) - 0.5) * min(linear_scale(10), 1), lifetime / inst_lifespan),
             vec3((1.7 - 0.7 * abs(floor(2 * rand0 - 0.5) + 0.5)) * (1.5 + 0.5 * sin(tick.x * 10 - lifetime * 4))),
-            vec4(vec3(0.3, 0.7 + 0.4 * sin(tick.x * 8 - lifetime * 3), 0.3 + 0.1 * sin (tick.x * 2)), 0.3),
+            vec4(vec3(0.4, 2.7 + 0.4 * sin(tick.x * 8 - lifetime * 3 + 4), 0.5 + 0.6 * sin(tick.x * 7)), start_end(1.0, 0.0) /*0.3*/),
             spin_in_axis(inst_dir, tick.z)
         );
     } else if (inst_mode == ENERGY_NATURE) {
+        f_reflect = 0.0;
         attr = Attr(
             linear_motion(
                 vec3(rand0 * 1, rand1 * 1, rand2 * 1),
                 vec3(rand3 * 2, rand4 * 2, rand5 * 2)
             ),
             vec3(0.8),
-            vec4(vec3(0, 1, 0), 1),
+            vec4(vec3(0, 2.5, 1.5 + rand7 * 0.7), start_end(1.0, 0.0)),
             spin_in_axis(vec3(rand6, rand7, rand8), rand9 * 3)
         );
     } else if (inst_mode == FLAMETHROWER) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             (inst_dir * lifetime / inst_lifespan) + vec3(rand0, rand1, rand2) * (lifetime * 5 + 0.25),
             vec3(0.6 + rand3 * 0.5 + lifetime / inst_lifespan * 5),
-            vec4(1, 0.6 + rand5 * 0.3 - 0.6 * lifetime / inst_lifespan, 0, 0.8 - 0.6 * lifetime / inst_lifespan),
+            vec4(3, 1.6 + rand5 * 0.3 - 0.4 * lifetime / inst_lifespan, 0.2, start_end(1.0, 0.0) /*0.8 - 0.6 * lifetime / inst_lifespan*/),
             spin_in_axis(vec3(rand6, rand7, rand8), lifetime / inst_lifespan * 10 + 3 * rand9)
         );
     } else if (inst_mode == FIRE_SHOCKWAVE) {
+        f_reflect = 0.0; // Fire doesn't reflect light, it emits it
         attr = Attr(
             vec3(rand0, rand1, lifetime * 10 + rand2),
             vec3(1.6 + rand3 * 1.5 + 10 * (lifetime + inst_lifespan)),
-            vec4(1, 0.6 + rand7 * 0.3 - 5 * inst_lifespan + 2 * lifetime, 0, 0.8 - 3.5 * inst_lifespan),
+            vec4(3, 1.6 + rand7 * 0.3 - 5 * inst_lifespan + 2 * lifetime, 0.2, start_end(1.0, 0.0) /*0.8 - 3.5 * inst_lifespan*/),
             spin_in_axis(vec3(rand3, rand4, rand5), rand6)
         );
     } else {
@@ -314,6 +338,9 @@ void main() {
         );
     }
 
+    // Temporary: use shrinking particles as a substitute for fading ones
+    attr.scale *= pow(attr.col.a, 0.25);
+
     f_pos = (inst_pos - focus_off.xyz) + (v_pos * attr.scale * SCALE * mat3(attr.rot) + attr.offs);
 
     // First 3 normals are negative, next 3 are positive
@@ -324,7 +351,7 @@ void main() {
         ((normals[(v_norm_ao >> 0) & 0x7u]) * attr.rot).xyz;
 
     //vec3 col = vec3((uvec3(v_col) >> uvec3(0, 8, 16)) & uvec3(0xFFu)) / 255.0;
-    f_col = vec4(srgb_to_linear(attr.col.rgb), attr.col.a);
+    f_col = vec4(attr.col.rgb, attr.col.a);
 
     gl_Position =
         all_mat *
diff --git a/assets/voxygen/shaders/player-shadow-frag.glsl b/assets/voxygen/shaders/player-shadow-frag.glsl
index e8b7bf15c4..dd28aaba34 100644
--- a/assets/voxygen/shaders/player-shadow-frag.glsl
+++ b/assets/voxygen/shaders/player-shadow-frag.glsl
@@ -25,6 +25,7 @@ layout (std140)
 uniform u_locals {
     mat4 model_mat;
     vec4 highlight_col;
+    vec4 model_light;
     ivec4 atlas_offs;
     vec3 model_pos;
     int flags;
diff --git a/assets/voxygen/shaders/postprocess-frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl
index a1ff97f132..89ae9c1b59 100644
--- a/assets/voxygen/shaders/postprocess-frag.glsl
+++ b/assets/voxygen/shaders/postprocess-frag.glsl
@@ -204,6 +204,14 @@ void main() {
 
     vec4 aa_color = aa_apply(src_color, uv * screen_res.xy, screen_res.xy);
 
+    // Tonemapping
+    float exposure_offset = 1.0;
+    // Adding an in-code offset to gamma and exposure let us have more precise control over the game's look
+    float gamma_offset = 0.3;
+    aa_color.rgb = vec3(1.0) - exp(-aa_color.rgb * (gamma_exposure.y + exposure_offset));
+    // gamma correction
+    aa_color.rgb = pow(aa_color.rgb, vec3(gamma_exposure.x + gamma_offset));
+
     /*
     // Apply clouds to `aa_color`
     #if (CLOUD_MODE != CLOUD_MODE_NONE)
@@ -238,7 +246,7 @@ void main() {
     //hsva_color.z = 1.0 - 1.0 / (1.0 * hsva_color.z + 1.0);
     //vec4 final_color = vec4(hsv2rgb(hsva_color.rgb), hsva_color.a);
 
-    vec4 final_color = pow(aa_color, gamma);
+    vec4 final_color = aa_color;
 
 #if (FLUID_MODE == FLUID_MODE_CHEAP)
     if (medium.x == 1u) {
diff --git a/assets/voxygen/shaders/sprite-frag.glsl b/assets/voxygen/shaders/sprite-frag.glsl
index 84c1b09be6..5295423998 100644
--- a/assets/voxygen/shaders/sprite-frag.glsl
+++ b/assets/voxygen/shaders/sprite-frag.glsl
@@ -21,6 +21,7 @@ flat in vec3 f_norm;
 flat in float f_light;
 // flat in vec3 f_pos_norm;
 in vec2 f_uv_pos;
+in vec2 f_inst_light;
 // flat in uint f_atlas_pos;
 // in vec3 f_col;
 // in float f_ao;
@@ -61,17 +62,8 @@ void main() {
     // vec3 dv = dFdy(f_pos);
     // vec3 f_norm = normalize(cross(du, dv));
 
-    // vec4 f_col_light = texture(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0)/* + uv_delta*//* - f_norm * 0.00001*/);
-    // vec4 f_col_light = textureGrad(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0), vec2(0.5), vec2(0.5));
-    vec4 f_col_light = texelFetch(t_col_light, ivec2(f_uv_pos)/* + uv_delta*//* - f_norm * 0.00001*/, 0);
-    vec3 f_col = /*linear_to_srgb*//*srgb_to_linear*/(f_col_light.rgb);
-    // vec3 f_col = vec3(1.0);
-    // vec2 texSize = textureSize(t_col_light, 0);
-    // float f_ao = f_col_light.a;
-    // float f_ao = f_col_light.a + length(vec2(dFdx(f_col_light.a), dFdy(f_col_light.a)));
-    float f_ao = texture(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
-    // float f_ao = 1.0;
-    // float /*f_light*/f_ao = textureProj(t_col_light, vec3(f_uv_pos, texSize)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
+    float f_ao, f_glow;
+    vec3 f_col = greedy_extract_col_light_glow(t_col_light, f_uv_pos, f_ao, f_glow);
 
     // vec3 my_chunk_pos = f_pos_norm;
     // tgt_color = vec4(hash(floor(vec4(my_chunk_pos.x, 0, 0, 0))), hash(floor(vec4(0, my_chunk_pos.y, 0, 1))), hash(floor(vec4(0, 0, my_chunk_pos.z, 2))), 1.0);
@@ -142,6 +134,10 @@ void main() {
 
     vec3 emitted_light, reflected_light;
 
+    // Make voxel shadows block the sun and moon
+    sun_info.block = f_inst_light.x;
+    moon_info.block = f_inst_light.x;
+
     // To account for prior saturation.
     // float vert_light = pow(f_light, 1.5);
     // vec3 light_frac = light_reflection_factor(f_norm/*vec3(0, 0, 1.0)*/, view_dir, vec3(0, 0, -1.0), vec3(1.0), vec3(R_s), alpha);
@@ -178,6 +174,9 @@ void main() {
     reflected_light += point_light; */
 
     // float ao = /*pow(f_ao, 0.5)*/f_ao * 0.85 + 0.15;
+    vec3 glow = pow(f_inst_light.y, 3) * 4 * GLOW_COLOR;
+    emitted_light += glow;
+
     float ao = f_ao;
     emitted_light *= ao;
     reflected_light *= ao;
diff --git a/assets/voxygen/shaders/sprite-vert.glsl b/assets/voxygen/shaders/sprite-vert.glsl
index 4146be684d..7da031a16c 100644
--- a/assets/voxygen/shaders/sprite-vert.glsl
+++ b/assets/voxygen/shaders/sprite-vert.glsl
@@ -25,7 +25,7 @@ in vec4 inst_mat0;
 in vec4 inst_mat1;
 in vec4 inst_mat2;
 in vec4 inst_mat3;
-// in vec3 inst_col;
+in vec4 inst_light;
 in float inst_wind_sway;
 
 struct SpriteLocals {
@@ -77,6 +77,7 @@ flat out float f_light;
 // out vec3 f_col;
 // out float f_ao;
 out vec2 f_uv_pos;
+out vec2 f_inst_light;
 // flat out uint f_atlas_pos;
 // out vec3 light_pos[2];
 // out float f_light;
@@ -117,6 +118,8 @@ void main() {
     // float inst_wind_sway = wind_sway.w;
     // vec3 inst_offs = model_offs - focus_off.xyz;
 
+    f_inst_light = inst_light.xy;
+
     // vec3 sprite_pos = floor(inst_mat3.xyz * SCALE) + inst_offs;
 
     // f_pos_norm = v_pos;
@@ -139,6 +142,9 @@ void main() {
     // f_pos = v_pos + (model_offs - focus_off.xyz);
 
     f_pos = (inst_mat * vec4(v_pos_, 1.0)).xyz * SCALE + inst_offs;
+
+    // Terrain 'pop-in' effect
+    f_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(tick.x - load_time, 10.0), 1.0));
     // f_pos = (inst_mat * v_pos_) * SCALE + sprite_pos;
 
     // f_pos = (inst_mat * vec4(v_pos * SCALE, 1)).xyz + (model_offs - focus_off.xyz);
diff --git a/assets/voxygen/shaders/terrain-frag.glsl b/assets/voxygen/shaders/terrain-frag.glsl
index 34d5c5ff38..d81466ea6c 100644
--- a/assets/voxygen/shaders/terrain-frag.glsl
+++ b/assets/voxygen/shaders/terrain-frag.glsl
@@ -27,6 +27,7 @@ in vec3 f_pos;
 // in vec3 f_chunk_pos;
 // #ifdef FLUID_MODE_SHINY
 flat in uint f_pos_norm;
+flat in float f_load_time;
 // #else
 // const uint f_pos_norm = 0u;
 // #endif
@@ -60,6 +61,13 @@ out vec4 tgt_color;
 #include <lod.glsl>
 
 void main() {
+    /*
+    float nz = abs(hash(vec4(floor((f_pos + focus_off.xyz) * 5.0), 0)));
+    if (nz > (tick.x - load_time) / 0.5 || distance(focus_pos.xy, f_pos.xy) / view_distance.x + nz * 0.1 > 1.0) {
+        discard;
+    }
+    */
+
     // discard;
     // vec4 f_col_light = textureGrad(t_col_light, f_uv_pos / texSize, 0.25, 0.25);
     // vec4 f_col_light = texture(t_col_light, (f_uv_pos) / texSize);
@@ -73,12 +81,9 @@ void main() {
     vec2 f_uv_pos = f_uv_pos + atlas_offs.xy;
     // vec4 f_col_light = textureProj(t_col_light, vec3(f_uv_pos + 0.5, textureSize(t_col_light, 0)));//(f_uv_pos/* + 0.5*/) / texSize);
     // float f_light = textureProj(t_col_light, vec3(f_uv_pos + 0.5, textureSize(t_col_light, 0))).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
-    vec4 f_col_light = texelFetch(t_col_light, ivec2(f_uv_pos)/* + uv_delta*//* - f_norm * 0.00001*/, 0);
-    // float f_light = f_col_light.a;
-    // vec4 f_col_light = texelFetch(t_col_light, ivec2(int(f_uv_pos.x), int(f_uv_pos.y)/* + uv_delta*//* - f_norm * 0.00001*/), 0);
-    vec3 f_col = /*linear_to_srgb*//*srgb_to_linear*/(f_col_light.rgb);
-    // vec3 f_col = vec3(1.0);
-    float f_light = texture(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
+    float f_light, f_glow;
+    vec3 f_col = greedy_extract_col_light_glow(t_col_light, f_uv_pos, f_light, f_glow);
+    //float f_light = (uint(texture(t_col_light, (f_uv_pos + 0.5) / textureSize(t_col_light, 0)).r * 255.0) & 0x1Fu) / 31.0;
     // vec2 texSize = textureSize(t_col_light, 0);
     // float f_light = texture(t_col_light, f_uv_pos/* + vec2(atlas_offs.xy)*/).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
     // float f_light = textureProj(t_col_light, vec3(f_uv_pos/* + vec2(atlas_offs.xy)*/, texSize.x)).a;//1.0;//f_col_light.a * 4.0;// f_light = float(v_col_light & 0x3Fu) / 64.0;
@@ -260,6 +265,11 @@ void main() {
     reflected_light *= f_light;
     max_light *= f_light;
 
+    // TODO: Apply AO after this
+    vec3 glow = GLOW_COLOR * (pow(f_glow, 6) * 8 + pow(f_glow, 2) * 0.5);
+    emitted_light += glow;
+    reflected_light += glow;
+
     max_light += lights_at(f_pos, f_norm, view_dir, mu, cam_attenuation, fluid_alt, k_a, k_d, k_s, alpha, f_norm, 1.0, emitted_light, reflected_light);
 
     // float f_ao = 1.0;
diff --git a/assets/voxygen/shaders/terrain-vert.glsl b/assets/voxygen/shaders/terrain-vert.glsl
index d50f14d820..821b380d94 100644
--- a/assets/voxygen/shaders/terrain-vert.glsl
+++ b/assets/voxygen/shaders/terrain-vert.glsl
@@ -48,6 +48,7 @@ uniform u_locals {
 out vec3 f_pos;
 // #ifdef FLUID_MODE_SHINY
 flat out uint f_pos_norm;
+flat out float f_load_time;
 
 // #if (SHADOW_MODE == SHADOW_MODE_MAP)
 // out vec4 sun_pos;
@@ -73,7 +74,10 @@ void main() {
     vec3 f_chunk_pos = vec3(ivec3((uvec3(v_pos_norm) >> uvec3(0, 6, 12)) & uvec3(0x3Fu, 0x3Fu, 0xFFFFu)) - ivec3(0, 0, EXTRA_NEG_Z));
     f_pos = f_chunk_pos + model_offs - focus_off.xyz;
 
-    // f_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(tick.x - load_time, 10.0), 1.0));
+    f_load_time = load_time;
+
+    // Terrain 'pop-in' effect
+    f_pos.z -= 250.0 * (1.0 - min(1.0001 - 0.02 / pow(tick.x - load_time, 10.0), 1.0));
     // f_pos.z -= min(32.0, 25.0 * pow(distance(focus_pos.xy, f_pos.xy) / view_distance.x, 20.0));
 
     // vec3 light_col = vec3(
diff --git a/assets/voxygen/voxel/armor/back/leather_blue-0.vox b/assets/voxygen/voxel/armor/back/leather_blue-0.vox
new file mode 100644
index 0000000000..79589497d5
--- /dev/null
+++ b/assets/voxygen/voxel/armor/back/leather_blue-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7217171cb2da7bfcc3f5b184d30d9815b0af15ccfe629d5b0641070c80f97c29
+size 1400
diff --git a/assets/voxygen/voxel/armor/back/warlock.vox b/assets/voxygen/voxel/armor/back/warlock.vox
new file mode 100644
index 0000000000..fb82350fac
--- /dev/null
+++ b/assets/voxygen/voxel/armor/back/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85ffa4d74176319b1e5d04ee77f30f0302da07de21ffbcdd2a5f1d8b08ad56a6
+size 1672
diff --git a/assets/voxygen/voxel/armor/back/warlord.vox b/assets/voxygen/voxel/armor/back/warlord.vox
new file mode 100644
index 0000000000..fb82350fac
--- /dev/null
+++ b/assets/voxygen/voxel/armor/back/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85ffa4d74176319b1e5d04ee77f30f0302da07de21ffbcdd2a5f1d8b08ad56a6
+size 1672
diff --git a/assets/voxygen/voxel/armor/belt/warlock.vox b/assets/voxygen/voxel/armor/belt/warlock.vox
new file mode 100644
index 0000000000..1bb7882da2
--- /dev/null
+++ b/assets/voxygen/voxel/armor/belt/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c89b30d7c27160da2b3ebf630fc72ec848b61a0ff2ea7d2a858f9d1f04760fe
+size 1480
diff --git a/assets/voxygen/voxel/armor/belt/warlord.vox b/assets/voxygen/voxel/armor/belt/warlord.vox
new file mode 100644
index 0000000000..0d9caebb57
--- /dev/null
+++ b/assets/voxygen/voxel/armor/belt/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5dbe296ee96535eef6c0cb0003b0de0db3e755f3e617f2e59ac3fd5393bbafa
+size 1480
diff --git a/assets/voxygen/voxel/armor/chest/leather_blue-0.vox b/assets/voxygen/voxel/armor/chest/leather_blue-0.vox
new file mode 100644
index 0000000000..4c13c7782a
--- /dev/null
+++ b/assets/voxygen/voxel/armor/chest/leather_blue-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b72a6e4e80a7af313c60c93b0e2f34b04b57238bf5004ff31741414a4eb52cf
+size 2704
diff --git a/assets/voxygen/voxel/armor/chest/warlock.vox b/assets/voxygen/voxel/armor/chest/warlock.vox
new file mode 100644
index 0000000000..2e1acd3be6
--- /dev/null
+++ b/assets/voxygen/voxel/armor/chest/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3c589d0251aec0de2caba5418ff2423d636ddbe9b31119992cc119a886f2ee1
+size 3232
diff --git a/assets/voxygen/voxel/armor/chest/warlord.vox b/assets/voxygen/voxel/armor/chest/warlord.vox
new file mode 100644
index 0000000000..f9d37970e9
--- /dev/null
+++ b/assets/voxygen/voxel/armor/chest/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b738090936daddd8115a30595fc90a149dabf90a32269f7359166bc6decbdc3
+size 3248
diff --git a/assets/voxygen/voxel/armor/foot/warlock.vox b/assets/voxygen/voxel/armor/foot/warlock.vox
new file mode 100644
index 0000000000..2cfa84c5ad
--- /dev/null
+++ b/assets/voxygen/voxel/armor/foot/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad381a9188748c38906b7a6543a19351ffc5d214cd93a0f6019bae0feba01911
+size 1516
diff --git a/assets/voxygen/voxel/armor/foot/warlord.vox b/assets/voxygen/voxel/armor/foot/warlord.vox
new file mode 100644
index 0000000000..2cfa84c5ad
--- /dev/null
+++ b/assets/voxygen/voxel/armor/foot/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad381a9188748c38906b7a6543a19351ffc5d214cd93a0f6019bae0feba01911
+size 1516
diff --git a/assets/voxygen/voxel/armor/hand/warlock_left.vox b/assets/voxygen/voxel/armor/hand/warlock_left.vox
new file mode 100644
index 0000000000..50ba1f3a0a
--- /dev/null
+++ b/assets/voxygen/voxel/armor/hand/warlock_left.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2c67bd39f3c37c7df0cbac15070a710ae3905fb2713af844f2906aded93452d
+size 1688
diff --git a/assets/voxygen/voxel/armor/hand/warlock_right.vox b/assets/voxygen/voxel/armor/hand/warlock_right.vox
new file mode 100644
index 0000000000..50ba1f3a0a
--- /dev/null
+++ b/assets/voxygen/voxel/armor/hand/warlock_right.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2c67bd39f3c37c7df0cbac15070a710ae3905fb2713af844f2906aded93452d
+size 1688
diff --git a/assets/voxygen/voxel/armor/hand/warlord_left.vox b/assets/voxygen/voxel/armor/hand/warlord_left.vox
new file mode 100644
index 0000000000..32fdee7476
--- /dev/null
+++ b/assets/voxygen/voxel/armor/hand/warlord_left.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c6f6270d10ae68f1262e00da2d32051710c754e3c1c1cf92fb22b3bfe67c2f3
+size 1516
diff --git a/assets/voxygen/voxel/armor/hand/warlord_right.vox b/assets/voxygen/voxel/armor/hand/warlord_right.vox
new file mode 100644
index 0000000000..1fc34f044a
--- /dev/null
+++ b/assets/voxygen/voxel/armor/hand/warlord_right.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03f4b54df2558f027ee3a51a428a10d9566586f6a158dfc02b45c5f1251cde4f
+size 1516
diff --git a/assets/voxygen/voxel/armor/head/warlock.vox b/assets/voxygen/voxel/armor/head/warlock.vox
new file mode 100644
index 0000000000..a372de58d3
--- /dev/null
+++ b/assets/voxygen/voxel/armor/head/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:173b64c09e786e3f6a5a3eb64ecaaaff3e282e867ab92b5ec3c742ccde4cd8cc
+size 4848
diff --git a/assets/voxygen/voxel/armor/head/warlord.vox b/assets/voxygen/voxel/armor/head/warlord.vox
new file mode 100644
index 0000000000..ac585a3032
--- /dev/null
+++ b/assets/voxygen/voxel/armor/head/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87d742de7978c48db24dd0e556dec87e5e899cbb1ee992a9227882cbcb1b35c2
+size 5440
diff --git a/assets/voxygen/voxel/armor/pants/leather_blue-0.vox b/assets/voxygen/voxel/armor/pants/leather_blue-0.vox
new file mode 100644
index 0000000000..2bf2ca8a82
--- /dev/null
+++ b/assets/voxygen/voxel/armor/pants/leather_blue-0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d0b1e347b3e3767404e98b23e7e8111b1becaf64aaf9063bda24c16a173931e
+size 1912
diff --git a/assets/voxygen/voxel/armor/pants/warlock.vox b/assets/voxygen/voxel/armor/pants/warlock.vox
new file mode 100644
index 0000000000..ef55208e60
--- /dev/null
+++ b/assets/voxygen/voxel/armor/pants/warlock.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30afe2c1a60843ce0f91fc4429e2bcdc9ed5237c87cc2a3b33113d912a21759f
+size 2480
diff --git a/assets/voxygen/voxel/armor/pants/warlord.vox b/assets/voxygen/voxel/armor/pants/warlord.vox
new file mode 100644
index 0000000000..55d5629c82
--- /dev/null
+++ b/assets/voxygen/voxel/armor/pants/warlord.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4607f047cc371df192d77e048a4594c18eb4c2392ada71258f221f1dc255fcdd
+size 2352
diff --git a/assets/voxygen/voxel/armor/shoulder/warlock_left.vox b/assets/voxygen/voxel/armor/shoulder/warlock_left.vox
new file mode 100644
index 0000000000..1b99ab2ebe
--- /dev/null
+++ b/assets/voxygen/voxel/armor/shoulder/warlock_left.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd195cdd8de946cf0042fd7795463070927edc02d58dfa0feaaa7ee10bd63850
+size 1564
diff --git a/assets/voxygen/voxel/armor/shoulder/warlock_right.vox b/assets/voxygen/voxel/armor/shoulder/warlock_right.vox
new file mode 100644
index 0000000000..1b99ab2ebe
--- /dev/null
+++ b/assets/voxygen/voxel/armor/shoulder/warlock_right.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd195cdd8de946cf0042fd7795463070927edc02d58dfa0feaaa7ee10bd63850
+size 1564
diff --git a/assets/voxygen/voxel/armor/shoulder/warlord_left.vox b/assets/voxygen/voxel/armor/shoulder/warlord_left.vox
new file mode 100644
index 0000000000..cdc653b8ff
--- /dev/null
+++ b/assets/voxygen/voxel/armor/shoulder/warlord_left.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d523571667d4bd47a0d2ae9bbfe6a9809ea159257dd9e85416c6286552700a4
+size 1668
diff --git a/assets/voxygen/voxel/armor/shoulder/warlord_right.vox b/assets/voxygen/voxel/armor/shoulder/warlord_right.vox
new file mode 100644
index 0000000000..563c4ea73f
--- /dev/null
+++ b/assets/voxygen/voxel/armor/shoulder/warlord_right.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e2a124d8094437c719a97d8b6b2a755c7cd1d3180dafca0634d67b9cfe8b55a
+size 1668
diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
index fdc124bc48..933113d6cd 100644
--- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron
@@ -4,37 +4,49 @@
         color: None
     ),
     map: {
-      "Short0": (
-          vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
-          color: None
-      ), 
-      "Admin": (
-          vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
-          color: None
-      ),    
-      "DungPurp0": (
-          vox_spec: ("armor.back.dung_purp-0", (-5.0, -1.0, -14.0)),
-          color: None
-      ),   
-      "Short1": (
-          vox_spec: ("armor.back.short-1", (-5.0, -1.0, -11.0)),
-          color: None
-      ),   
-      "Short2": (
-          vox_spec: ("armor.back.short-2", (-5.0, -1.0, -11.0)),
-          color: None
-      ),
-      "Backpack0": (
-          vox_spec: ("armor.back.backpack-0", (-7.0, -5.0, -10.0)),
-          color: None
-      ),   
-      "BackpackBlue0": (
-          vox_spec: ("armor.back.backpack-grey", (-7.0, -5.0, -10.0)),
-          color: Some((76, 72, 178))
-      ),   
-      "VeloriteMage0": (
-          vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)),
-          color: None
-      ),   
+        "Short0": (
+            vox_spec: ("armor.back.short-0", (-5.0, -1.0, -11.0)),
+            color: None
+        ),
+        "Admin": (
+            vox_spec: ("armor.back.admin", (-5.0, -1.0, -11.0)),
+            color: None
+        ),
+        "DungPurp0": (
+            vox_spec: ("armor.back.dung_purp-0", (-5.0, -1.0, -14.0)),
+            color: None
+        ),
+        "Short1": (
+            vox_spec: ("armor.back.short-1", (-5.0, -1.0, -11.0)),
+            color: None
+        ),
+        "Short2": (
+            vox_spec: ("armor.back.short-2", (-5.0, -1.0, -11.0)),
+            color: None
+        ),
+        "Backpack0": (
+            vox_spec: ("armor.back.backpack-0", (-7.0, -5.0, -10.0)),
+            color: None
+        ),
+        "BackpackBlue0": (
+            vox_spec: ("armor.back.backpack-grey", (-7.0, -5.0, -10.0)),
+            color: Some((76, 72, 178))
+        ),
+        "VeloriteMage0": (
+            vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)),
+            color: None
+        ),
+        "LeatherBlue0": (
+            vox_spec: ("armor.back.leather_blue-0", (-5.0, -1.0, -11.0)),
+            color: None
+        ),
+        "Warlord": (
+            vox_spec: ("armor.back.warlord", (-5.0, -1.0, -14.0)),
+            color: None
+        ),
+        "Warlock": (
+            vox_spec: ("armor.back.warlock", (-5.0, -1.5, -15.5)),
+            color: None
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 4e6ced2872..c7251d3ee7 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -87,6 +87,14 @@
         "VeloriteMage0": (
           vox_spec: ("armor.belt.velorite_battlemage", (-5.0, -3.5, 2.0)),
           color: None
-      ),
+        ),
+        "Warlord":(
+            vox_spec: ("armor.belt.warlord", (-4.0, -3.5, 1.0)),
+            color: None
+        ),
+        "Warlock":(
+            vox_spec: ("armor.belt.warlock", (-4.0, -3.0, 2.0)),
+            color: None
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
index 95d8103777..786d64cb9d 100644
--- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
@@ -48,6 +48,10 @@
             vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
             color: None
         ),
+        "LeatherBlue0": (
+            vox_spec: ("armor.chest.leather_blue-0", (-7.0, -3.5, 2.0)),
+            color: None
+        ),
         "ClothPurple0": (
             vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
             color: None
@@ -84,27 +88,27 @@
         "WorkerPurple0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
-        ),  
+        ),
         "WorkerPurple1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((64, 47, 56))
-        ),   
+        ),
         "WorkerYellow0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((184, 132, 40))
-        ), 
+        ),
         "WorkerYellow1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
-            color: Some((184, 132, 40)) 
-        ), 
+            color: Some((184, 132, 40))
+        ),
         "WorkerOrange0": (
             vox_spec: ("armor.chest.worker_white-0", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
-        ), 
+        ),
         "WorkerOrange1": (
             vox_spec: ("armor.chest.shirt_white-0", (-7.0, -3.5, 2.0)),
             color: Some((135, 82, 67))
-        ),      
+        ),
         "Druid": (
             vox_spec: ("armor.chest.druid", (-7.0, -3.5, 2.0)),
             color: None
@@ -149,7 +153,14 @@
         "VeloriteMage0": (
           vox_spec: ("armor.chest.velorite_battlemage", (-7.0, -3.5, 0.5)),
           color: None
-      ),
+        ),
+        "Warlord": (
+          vox_spec: ("armor.chest.warlord", (-7.0, -3.5, -0.5)),
+          color: None
+        ),
+        "Warlock": (
+          vox_spec: ("armor.chest.warlock", (-7.0, -3.5, 0.5)),
+          color: None
+        ),
     },
-)
-)
+))
diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
index ff4958709c..0e86f2f0d8 100644
--- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
@@ -1,4 +1,4 @@
-((    
+((
     default: (
         vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -2.0)),
         color: None
@@ -11,7 +11,7 @@
         "Assassin": (
             vox_spec: ("armor.foot.assa", (-2.5, -3.5, -2.0)),
             color: None
-        ),        
+        ),
         "Jester": (
             vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -2.0)),
             color: None
@@ -83,6 +83,14 @@
         "VeloriteMage0": (
           vox_spec: ("armor.foot.velorite_battlemage", (-2.5, -3.5, -2.0)),
           color: None
-      ),
+        ),
+        "Warlord": (
+          vox_spec: ("armor.foot.warlord", (-2.5, -3.5, -2.0)),
+          color: None
+        ),
+        "Warlock": (
+          vox_spec: ("armor.foot.warlock", (-2.5, -3.5, -2.0)),
+          color: None
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index a88e064de7..32503f4e36 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -190,5 +190,25 @@
                 color: None
             )
         ),
+        "Warlord": (
+            left: (
+                vox_spec: ("armor.hand.warlord_left", (-3.0, -2.0, -5.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.warlord_right", (-2.0, -2.0, -5.0)),
+                color: None
+            )
+        ),
+        "Warlock": (
+            left: (
+                vox_spec: ("armor.hand.warlock_left", (-4.5, -3.5, -5.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.warlock_right", (-2.5, -3.5, -5.0)),
+                color: None
+            )
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
index bc6c1dfd7f..81e6991489 100644
--- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
@@ -31,7 +31,7 @@
         "Kimono": (
             vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
             color: None
-        ),    
+        ),
         "PlateGreen0": (
             vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
             color: None
@@ -67,7 +67,7 @@
         "CultistPurple": (
             vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
             color: Some((30, 0, 64))
-        ),        
+        ),
         "Steel0": (
             vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
             color: None
@@ -101,8 +101,20 @@
             color: None
         ),
         "VeloriteMage0": (
-          vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)),
-          color: None
-      ),
+            vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)),
+            color: None
+        ),
+        "LeatherBlue0": (
+            vox_spec: ("armor.pants.leather_blue-0", (-5.0, -3.5, 1.0)),
+            color: None
+        ),
+        "Warlord": (
+            vox_spec: ("armor.pants.warlord", (-6.0, -4.5, -2.0)),
+            color: None
+        ),
+        "Warlock": (
+            vox_spec: ("armor.pants.warlock", (-5.0, -4.0, -2.0)),
+            color: None
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index d2b24f4141..fd8ce1ab32 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -170,7 +170,7 @@
                 vox_spec: ("armor.shoulder.twigsflowers_shoulder_right", (-1.5, -5.0, 0.0)),
                 color: None
             ),
-        ),        
+        ),
         "ClothBlue1": (
             left: (
                 vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)),
@@ -240,7 +240,7 @@
                 vox_spec: ("armor.shoulder.leather_strips_right", (-2.0, -2.5, -2.0)),
                 color: None
             )
-        ),      
+        ),
         "DruidShoulder": (
             left: (
                 vox_spec: ("armor.shoulder.druid_left", (-4.0, -4.5 , -3.0)),
@@ -281,5 +281,25 @@
                 color: None
             )
         ),
+        "Warlord": (
+            left: (
+                vox_spec: ("armor.shoulder.warlord_left", (-8.0, -3.5 , -2.5)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.warlord_right", (-1.0, -3.5 , -2.5)),
+                color: None
+            )
+        ),
+        "Warlock": (
+            left: (
+                vox_spec: ("armor.shoulder.warlock_left", (-6.0, -4.0 , -2.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.warlock_left", (0.0, -4.0, -2.0)),
+                color: None
+            )
+        ),
     },
 ))
diff --git a/assets/voxygen/voxel/sprite/misc/lantern_ground_open.vox b/assets/voxygen/voxel/sprite/misc/lantern_ground_open.vox
new file mode 100644
index 0000000000..09d1f97a07
--- /dev/null
+++ b/assets/voxygen/voxel/sprite/misc/lantern_ground_open.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e69543d22dad412516ef8fbb3016b1ace791bff4010157d78d5f4c9a26cd73fc
+size 1680
diff --git a/assets/voxygen/voxel/sprite/misc/street_lamp.vox b/assets/voxygen/voxel/sprite/misc/street_lamp.vox
index ec36daeb42..7111fd2ae7 100644
--- a/assets/voxygen/voxel/sprite/misc/street_lamp.vox
+++ b/assets/voxygen/voxel/sprite/misc/street_lamp.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:976da129142c18f06cdf0f4f89d50f328ba9a374985560d22fa1ae944843b0e4
-size 3608
+oid sha256:9bb8f969cf070ffb45a79af52a77cbfdd31b47e90b77789a67bcaf853304810c
+size 3380
diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron
index 72354dbcb8..a271d51272 100644
--- a/assets/voxygen/voxel/sprite_manifest.ron
+++ b/assets/voxygen/voxel/sprite_manifest.ron
@@ -2005,6 +2005,17 @@ PotionMinor: Some((
 ],
     wind_sway: 0.0,
 )),
+// Ground Fire Bowls
+FireBowlGround: Some((
+    variations: [
+        (
+            model: "voxygen.voxel.sprite.misc.lantern_ground_open",
+            offset: (-3.5, -3.5, 0.0),
+            lod_axes: (1.0, 1.0, 1.0),
+        ),
+],
+    wind_sway: 0.0,
+)),
 // Underwater Grass
 GrassBlue: Some((
     variations: [
diff --git a/assets/world/manifests/quirky_dry.ron b/assets/world/manifests/quirky_dry.ron
index 3b4814b5f0..c7d49998d1 100644
--- a/assets/world/manifests/quirky_dry.ron
+++ b/assets/world/manifests/quirky_dry.ron
@@ -13,4 +13,8 @@
         specifier: "world.structure.natural.skull-large",
         center: (15, 20, 4)
     ),
+    (
+        specifier: "world.structure.natural.airship-crashsite_0",
+        center: (28, 40, 14)
+    ),
 ]
diff --git a/assets/world/manifests/swamp_trees.ron b/assets/world/manifests/swamp_trees.ron
new file mode 100644
index 0000000000..b4fa3aa3f4
--- /dev/null
+++ b/assets/world/manifests/swamp_trees.ron
@@ -0,0 +1,20 @@
+#![enable(unwrap_newtypes)]
+
+[
+    (
+        specifier: "world.tree.willow.1",
+        center: (18, 18, 8)
+    ),
+    (
+        specifier: "world.tree.willow.2",
+        center: (17, 18, 7)
+    ),
+    (
+        specifier: "world.tree.willow.3",
+        center: (15, 17, 8)
+    ),
+    (
+        specifier: "world.tree.willow.4",
+        center: (15, 16, 8)
+    ),   
+]
diff --git a/assets/world/structure/natural/airship-crashsite_0.vox b/assets/world/structure/natural/airship-crashsite_0.vox
new file mode 100644
index 0000000000..ab1fc16e41
--- /dev/null
+++ b/assets/world/structure/natural/airship-crashsite_0.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c86aa8448d18f56ebe0625c026ba0d3699f7670f096f9b49d4cabda252c8b88a
+size 23264
diff --git a/assets/world/style/colors.ron b/assets/world/style/colors.ron
index 6f234e82d0..3f56568c85 100644
--- a/assets/world/style/colors.ron
+++ b/assets/world/style/colors.ron
@@ -132,7 +132,7 @@
                     ),
                 ),
             ),
-            plot_town_path: (90, 70, 45),
+            plot_town_path: (80, 40, 20),
 
             plot_field_dirt: (55, 20, 5),
             plot_field_mound: (40, 60, 10),
@@ -147,7 +147,7 @@
             plot_dirt: (90, 70, 50),
             plot_grass: (100, 200, 0),
             plot_water: (100, 150, 250),
-            plot_town: (150, 110, 60),
+            plot_town: (80, 40, 20),
             // TODO: Add field furrow stuff.
         ),
     ),
diff --git a/assets/world/tree/willow/1.vox b/assets/world/tree/willow/1.vox
index 1ca5ecc517..3b2362e0e5 100644
--- a/assets/world/tree/willow/1.vox
+++ b/assets/world/tree/willow/1.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:749ebea80dee38d0a287ec370c378fcb873e306d95a33c9c3858758896afde39
-size 44492
+oid sha256:009ea5969be242ca107300ffc184268e6aa4ad0cd13adfa2720c81061aea4be0
+size 32424
diff --git a/assets/world/tree/willow/2.vox b/assets/world/tree/willow/2.vox
index a5e8f56817..73f689a824 100644
--- a/assets/world/tree/willow/2.vox
+++ b/assets/world/tree/willow/2.vox
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3af5f90f9ac95c3cee1188b6d760e057dffa5d460486290f35e13026f61a4e6b
-size 23536
+oid sha256:d8c4873cb7cb7da491f870cb71243a9f4fadce7d81e32a16de67c6e552e73eee
+size 29368
diff --git a/assets/world/tree/willow/3.vox b/assets/world/tree/willow/3.vox
new file mode 100644
index 0000000000..3cd5b79840
--- /dev/null
+++ b/assets/world/tree/willow/3.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8fac2b0ba49f1d07fce7a787fb5c84cce1793fb201f16c1ec3ddaa82d6252d4
+size 30856
diff --git a/assets/world/tree/willow/4.vox b/assets/world/tree/willow/4.vox
new file mode 100644
index 0000000000..9cfa11103f
--- /dev/null
+++ b/assets/world/tree/willow/4.vox
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:370eb8452d1c86f2c2cbb7cca0b7865b9ae0f8ef80126279da32432f4bea5f96
+size 31772
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 231a2b6e36..58e609771f 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -25,10 +25,10 @@ use common::{
     },
     event::{EventBus, LocalEvent},
     msg::{
-        validate_chat_msg, ChatMsgValidationError, ClientGeneral, ClientMsg, ClientRegister,
-        ClientType, DisconnectReason, InviteAnswer, Notification, PingMsg, PlayerInfo,
-        PlayerListUpdate, PresenceKind, RegisterError, ServerGeneral, ServerInfo, ServerInit,
-        ServerRegisterAnswer, MAX_BYTES_CHAT_MSG,
+        validate_chat_msg, world_msg::SiteInfo, ChatMsgValidationError, ClientGeneral, ClientMsg,
+        ClientRegister, ClientType, DisconnectReason, InviteAnswer, Notification, PingMsg,
+        PlayerInfo, PlayerListUpdate, PresenceKind, RegisterError, ServerGeneral, ServerInfo,
+        ServerInit, ServerRegisterAnswer, MAX_BYTES_CHAT_MSG,
     },
     outcome::Outcome,
     recipe::RecipeBook,
@@ -101,6 +101,7 @@ pub struct Client {
     pub world_map: (Arc<DynamicImage>, Vec2<u16>, Vec2<f32>),
     pub player_list: HashMap<Uid, PlayerInfo>,
     pub character_list: CharacterList,
+    sites: Vec<SiteInfo>,
     recipe_book: RecipeBook,
     available_recipes: HashSet<String>,
 
@@ -191,6 +192,7 @@ impl Client {
             lod_alt,
             lod_horizon,
             world_map,
+            sites,
             recipe_book,
             max_group_size,
             client_timeout,
@@ -255,7 +257,7 @@ impl Client {
                 let horizons = [unzip_horizons(&west), unzip_horizons(&east)];
 
                 // Redraw map (with shadows this time).
-                let mut world_map = vec![0u32; rgba.len()];
+                let mut world_map_rgba = vec![0u32; rgba.len()];
                 let mut map_config = common::terrain::map::MapConfig::orthographic(
                     map_size_lg,
                     core::ops::RangeInclusive::new(0.0, max_height),
@@ -322,13 +324,13 @@ impl Client {
                         })
                     },
                     |pos, (r, g, b, a)| {
-                        world_map[pos.y * map_size.x as usize + pos.x] =
+                        world_map_rgba[pos.y * map_size.x as usize + pos.x] =
                             u32::from_le_bytes([r, g, b, a]);
                     },
                 );
                 ping_stream.send(PingMsg::Ping)?;
                 let make_raw = |rgba| -> Result<_, Error> {
-                    let mut raw = vec![0u8; 4 * world_map.len()];
+                    let mut raw = vec![0u8; 4 * world_map_rgba.len()];
                     LittleEndian::write_u32_into(rgba, &mut raw);
                     Ok(Arc::new(
                         image::DynamicImage::ImageRgba8({
@@ -345,7 +347,7 @@ impl Client {
                 ping_stream.send(PingMsg::Ping)?;
                 let lod_base = rgba;
                 let lod_alt = alt;
-                let world_map = make_raw(&world_map)?;
+                let world_map_img = make_raw(&world_map_rgba)?;
                 let horizons = (west.0, west.1, east.0, east.1)
                     .into_par_iter()
                     .map(|(wa, wh, ea, eh)| u32::from_le_bytes([wa, wh, ea, eh]))
@@ -360,7 +362,8 @@ impl Client {
                     lod_base,
                     lod_alt,
                     lod_horizon,
-                    (world_map, map_size, map_bounds),
+                    (world_map_img, map_size, map_bounds),
+                    world_map.sites,
                     recipe_book,
                     max_group_size,
                     client_timeout,
@@ -389,6 +392,7 @@ impl Client {
             lod_horizon,
             player_list: HashMap::new(),
             character_list: CharacterList::default(),
+            sites,
             recipe_book,
             available_recipes: HashSet::default(),
 
@@ -640,6 +644,9 @@ impl Client {
             .collect();
     }
 
+    /// Unstable, likely to be removed in a future release
+    pub fn sites(&self) -> &[SiteInfo] { &self.sites }
+
     pub fn enable_lantern(&mut self) {
         self.send_msg(ClientGeneral::ControlEvent(ControlEvent::EnableLantern));
     }
diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs
index 3d4fa82a90..5bbd3d61db 100644
--- a/common/src/comp/agent.rs
+++ b/common/src/comp/agent.rs
@@ -1,6 +1,7 @@
 use crate::{
     comp::{humanoid, quadruped_low, quadruped_medium, quadruped_small, Body},
     path::Chaser,
+    rtsim::RtSimController,
     sync::Uid,
 };
 use specs::{Component, Entity as EcsEntity};
@@ -68,6 +69,7 @@ impl Component for Alignment {
 pub struct Psyche {
     pub aggro: f32, // 0.0 = always flees, 1.0 = always attacks, 0.5 = flee at 50% health
 }
+
 impl<'a> From<&'a Body> for Psyche {
     fn from(body: &'a Body) -> Self {
         Self {
@@ -137,6 +139,7 @@ impl<'a> From<&'a Body> for Psyche {
 
 #[derive(Clone, Debug, Default)]
 pub struct Agent {
+    pub rtsim_controller: RtSimController,
     pub patrol_origin: Option<Vec3<f32>>,
     pub activity: Activity,
     /// Does the agent talk when e.g. hit by the player
@@ -151,8 +154,7 @@ impl Agent {
         self
     }
 
-    pub fn new(origin: Vec3<f32>, can_speak: bool, body: &Body) -> Self {
-        let patrol_origin = Some(origin);
+    pub fn new(patrol_origin: Option<Vec3<f32>>, can_speak: bool, body: &Body) -> Self {
         Agent {
             patrol_origin,
             can_speak,
@@ -168,7 +170,10 @@ impl Component for Agent {
 
 #[derive(Clone, Debug)]
 pub enum Activity {
-    Idle(Vec2<f32>),
+    Idle {
+        bearing: Vec2<f32>,
+        chaser: Chaser,
+    },
     Follow {
         target: EcsEntity,
         chaser: Chaser,
@@ -189,5 +194,10 @@ impl Activity {
 }
 
 impl Default for Activity {
-    fn default() -> Self { Activity::Idle(Vec2::zero()) }
+    fn default() -> Self {
+        Activity::Idle {
+            bearing: Vec2::zero(),
+            chaser: Chaser::default(),
+        }
+    }
 }
diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs
index f5a2d09891..bafc001db2 100644
--- a/common/src/comp/projectile.rs
+++ b/common/src/comp/projectile.rs
@@ -105,13 +105,16 @@ impl ProjectileConstructor {
             } => Projectile {
                 hit_solid: vec![
                     Effect::Explode(Explosion {
-                        effects: vec![RadiusEffect::Entity(
-                            Some(GroupTarget::OutOfGroup),
-                            effect::Effect::Damage(Damage {
-                                source: DamageSource::Explosion,
-                                value: damage,
-                            }),
-                        )],
+                        effects: vec![
+                            RadiusEffect::Entity(
+                                Some(GroupTarget::OutOfGroup),
+                                effect::Effect::Damage(Damage {
+                                    source: DamageSource::Explosion,
+                                    value: damage,
+                                }),
+                            ),
+                            RadiusEffect::TerrainDestruction(2.0),
+                        ],
                         radius,
                         energy_regen,
                     }),
diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs
index 11b063689a..a30ea0db20 100644
--- a/common/src/comp/stats.rs
+++ b/common/src/comp/stats.rs
@@ -133,6 +133,11 @@ impl Stats {
             body_type: comp::Body::Humanoid(comp::body::humanoid::Body::random()),
         }
     }
+
+    pub fn with_level(mut self, level: u32) -> Self {
+        self.level.set_level(level);
+        self
+    }
 }
 
 impl Component for Stats {
diff --git a/common/src/event.rs b/common/src/event.rs
index e9da671203..d53df9d410 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -1,4 +1,4 @@
-use crate::{character::CharacterId, comp, sync::Uid, util::Dir, Explosion};
+use crate::{character::CharacterId, comp, rtsim::RtSimEntity, sync::Uid, util::Dir, Explosion};
 use comp::{
     item::{Item, Reagent},
     Ori, Pos,
@@ -37,6 +37,7 @@ pub enum ServerEvent {
         entity: EcsEntity,
         change: comp::HealthChange,
     },
+    Delete(EcsEntity),
     Destroy {
         entity: EcsEntity,
         cause: comp::HealthSource,
@@ -95,6 +96,7 @@ pub enum ServerEvent {
     ExitIngame {
         entity: EcsEntity,
     },
+    // TODO: to avoid breakage when adding new fields, perhaps have an `NpcBuilder` type?
     CreateNpc {
         pos: comp::Pos,
         stats: comp::Stats,
@@ -106,6 +108,7 @@ pub enum ServerEvent {
         scale: comp::Scale,
         home_chunk: Option<comp::HomeChunk>,
         drop_item: Option<Item>,
+        rtsim_entity: Option<RtSimEntity>,
     },
     CreateWaypoint(Vec3<f32>),
     ClientDisconnect(EcsEntity),
diff --git a/common/src/generation.rs b/common/src/generation.rs
index d3bb340817..f040ec18ca 100644
--- a/common/src/generation.rs
+++ b/common/src/generation.rs
@@ -1,5 +1,6 @@
 use crate::{
     comp::{self, humanoid, Alignment, Body, Item},
+    loadout_builder::LoadoutConfig,
     npc::{self, NPC_NAMES},
 };
 use vek::*;
@@ -22,6 +23,8 @@ pub struct EntityInfo {
     pub scale: f32,
     pub level: Option<u32>,
     pub loot_drop: Option<Item>,
+    pub config: Option<LoadoutConfig>,
+    pub pet: Option<Box<EntityInfo>>,
 }
 
 impl EntityInfo {
@@ -39,6 +42,8 @@ impl EntityInfo {
             scale: 1.0,
             level: None,
             loot_drop: None,
+            config: None,
+            pet: None,
         }
     }
 
@@ -104,6 +109,11 @@ impl EntityInfo {
         self
     }
 
+    pub fn with_config(mut self, config: LoadoutConfig) -> Self {
+        self.config = Some(config);
+        self
+    }
+
     pub fn with_automatic_name(mut self) -> Self {
         self.name = match &self.body {
             Body::Humanoid(body) => Some(get_npc_name(&NPC_NAMES.humanoid, body.species)),
diff --git a/common/src/lib.rs b/common/src/lib.rs
index 25ea1b3669..b7ba8f0e4b 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -40,6 +40,7 @@ pub mod path;
 pub mod ray;
 pub mod recipe;
 pub mod region;
+pub mod rtsim;
 pub mod spiral;
 pub mod state;
 pub mod states;
diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs
index 0ef9f7ca36..6f3687c48b 100644
--- a/common/src/loadout_builder.rs
+++ b/common/src/loadout_builder.rs
@@ -26,6 +26,20 @@ use rand::Rng;
 ///     )))
 ///     .build();
 /// ```
+
+#[derive(Copy, Clone)]
+pub enum LoadoutConfig {
+    Guard,
+    Villager,
+    Outcast,
+    Highwayman,
+    Bandit,
+    CultistNovice,
+    CultistAcolyte,
+    Warlord,
+    Warlock,
+}
+
 pub struct LoadoutBuilder(Loadout);
 
 impl LoadoutBuilder {
@@ -74,183 +88,193 @@ impl LoadoutBuilder {
     #[allow(clippy::single_match)]
     pub fn build_loadout(
         body: Body,
-        alignment: Alignment,
+        _alignment: Alignment,
         mut main_tool: Option<Item>,
         is_giant: bool,
         map: &AbilityMap,
+        config: Option<LoadoutConfig>,
     ) -> Self {
-        match body {
-            Body::Golem(golem) => match golem.species {
-                golem::Species::StoneGolem => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.unique.stone_golems_fist",
-                    ));
-                },
-                _ => {},
-            },
-            Body::BipedLarge(biped_large) => match (biped_large.species, biped_large.body_type) {
-                (biped_large::Species::Occultsaurok, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.staff.saurok_staff",
-                    ));
-                },
-                (biped_large::Species::Mightysaurok, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.sword.saurok_sword",
-                    ));
-                },
-                (biped_large::Species::Slysaurok, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.bow.saurok_bow",
-                    ));
-                },
-                (biped_large::Species::Ogre, biped_large::BodyType::Male) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.hammer.ogre_hammer",
-                    ));
-                },
-                (biped_large::Species::Ogre, biped_large::BodyType::Female) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.staff.ogre_staff",
-                    ));
-                },
-                (biped_large::Species::Troll, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.hammer.troll_hammer",
-                    ));
-                },
-                (biped_large::Species::Wendigo, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.unique.beast_claws",
-                    ));
-                },
-                (biped_large::Species::Werewolf, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.unique.beast_claws",
-                    ));
-                },
-                (biped_large::Species::Cyclops, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.hammer.cyclops_hammer",
-                    ));
-                },
-                (biped_large::Species::Dullahan, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.sword.dullahan_sword",
-                    ));
-                },
-                (biped_large::Species::Mindflayer, _) => {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.staff.mindflayer_staff",
-                    ));
-                },
-            },
-            Body::Humanoid(_) => {
-                if is_giant {
-                    main_tool = Some(Item::new_from_asset_expect(
-                        "common.items.npc_weapons.sword.zweihander_sword_0",
-                    ));
-                }
-            },
-            _ => {},
-        };
+        let loadout = if let Some(config) = config {
+            let active_item = if let Some(ItemKind::Tool(_)) = main_tool.as_ref().map(|i| i.kind())
+            {
+                main_tool.map(|item| ItemConfig::from((item, map)))
+            } else {
+                Some(ItemConfig {
+                    // We need the empty item so npcs can attack
+                    item: Item::new_from_asset_expect("common.items.weapons.empty.empty"),
+                    ability1: Some(CharacterAbility::default()),
+                    ability2: None,
+                    ability3: None,
+                    block_ability: None,
+                    dodge_ability: None,
+                })
+            };
 
-        let active_item = if let Some(ItemKind::Tool(_)) = main_tool.as_ref().map(|i| i.kind()) {
-            main_tool.map(|item| ItemConfig::from((item, map)))
-        } else {
-            Some(ItemConfig {
-                // We need the empty item so npcs can attack
-                item: Item::new_from_asset_expect("common.items.weapons.empty.empty"),
-                ability1: Some(CharacterAbility::default()),
-                ability2: None,
-                ability3: None,
-                block_ability: None,
-                dodge_ability: None,
-            })
-        };
-
-        let loadout = match body {
-            Body::Humanoid(_) => match alignment {
-                Alignment::Npc => {
-                    if is_giant {
-                        Loadout {
-                            active_item,
-                            second_item: None,
-                            shoulder: Some(Item::new_from_asset_expect(
-                                "common.items.armor.shoulder.plate_0",
-                            )),
-                            chest: Some(Item::new_from_asset_expect(match alignment {
-                                Alignment::Enemy => "common.items.npc_armor.chest.plate_red_0",
-                                _ => "common.items.npc_armor.chest.plate_green_0",
-                            })),
-                            belt: Some(Item::new_from_asset_expect(
-                                "common.items.armor.belt.plate_0",
-                            )),
-                            hand: Some(Item::new_from_asset_expect(
-                                "common.items.armor.hand.plate_0",
-                            )),
-                            pants: Some(Item::new_from_asset_expect(match alignment {
-                                Alignment::Enemy => "common.items.npc_armor.pants.plate_red_0",
-                                _ => "common.items.npc_armor.pants.plate_green_0",
-                            })),
-                            foot: Some(Item::new_from_asset_expect(
-                                "common.items.armor.foot.plate_0",
-                            )),
-                            back: None,
-                            ring: None,
-                            neck: None,
-                            lantern: Some(Item::new_from_asset_expect(
-                                "common.items.lantern.black_0",
-                            )),
-                            glider: None,
-                            head: None,
-                            tabard: None,
-                        }
-                    } else {
-                        Loadout {
-                            active_item,
-                            second_item: None,
-                            shoulder: None,
-                            chest: Some(Item::new_from_asset_expect(
-                                match rand::thread_rng().gen_range(0, 10) {
-                                    0 => "common.items.armor.chest.worker_green_0",
-                                    1 => "common.items.armor.chest.worker_green_1",
-                                    2 => "common.items.armor.chest.worker_red_0",
-                                    3 => "common.items.armor.chest.worker_red_1",
-                                    4 => "common.items.armor.chest.worker_purple_0",
-                                    5 => "common.items.armor.chest.worker_purple_1",
-                                    6 => "common.items.armor.chest.worker_yellow_0",
-                                    7 => "common.items.armor.chest.worker_yellow_1",
-                                    8 => "common.items.armor.chest.worker_orange_0",
-                                    _ => "common.items.armor.chest.worker_orange_1",
-                                },
-                            )),
-                            belt: Some(Item::new_from_asset_expect(
-                                "common.items.armor.belt.leather_0",
-                            )),
-                            hand: None,
-                            pants: Some(Item::new_from_asset_expect(
-                                "common.items.armor.pants.worker_blue_0",
-                            )),
-                            foot: Some(Item::new_from_asset_expect(
-                                match rand::thread_rng().gen_range(0, 2) {
-                                    0 => "common.items.armor.foot.leather_0",
-                                    _ => "common.items.armor.starter.sandals_0",
-                                },
-                            )),
-                            back: None,
-                            ring: None,
-                            neck: None,
-                            lantern: Some(Item::new_from_asset_expect(
-                                "common.items.lantern.black_0",
-                            )),
-                            glider: None,
-                            head: None,
-                            tabard: None,
-                        }
-                    }
+            use LoadoutConfig::*;
+            match config {
+                Guard => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.steel_0",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.steel_0",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.steel_0",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.steel_0",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.steel_0",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.steel_0",
+                    )),
+                    back: None,
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
                 },
-                Alignment::Enemy => Loadout {
+                Outcast => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.cloth_purple_0",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.cloth_purple_0",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.cloth_purple_0",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.cloth_purple_0",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.cloth_purple_0",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.cloth_purple_0",
+                    )),
+                    back: None,
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                Highwayman => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.leather_0",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.leather_0",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.leather_0",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.leather_0",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.leather_0",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.leather_0",
+                    )),
+                    back: None,
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                Bandit => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.assassin",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.assassin",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.assassin",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.assassin",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.assassin",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.assassin",
+                    )),
+                    back: None,
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                CultistNovice => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.steel_0",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.steel_0",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.steel_0",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.steel_0",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.steel_0",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.steel_0",
+                    )),
+                    back: Some(Item::new_from_asset_expect(
+                        "common.items.armor.back.dungeon_purple-0",
+                    )),
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                CultistAcolyte => Loadout {
                     active_item,
                     second_item: None,
                     shoulder: Some(Item::new_from_asset_expect(
@@ -284,10 +308,229 @@ impl LoadoutBuilder {
                     head: None,
                     tabard: None,
                 },
-                _ => LoadoutBuilder::animal(body).build(),
-            },
-            Body::Golem(golem) => match golem.species {
-                golem::Species::StoneGolem => Loadout {
+                Warlord => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.warlord",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.warlord",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.warlord",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.warlord",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.warlord",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.warlord",
+                    )),
+                    back: Some(Item::new_from_asset_expect(
+                        "common.items.armor.back.warlord",
+                    )),
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                Warlock => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: Some(Item::new_from_asset_expect(
+                        "common.items.armor.shoulder.warlock",
+                    )),
+                    chest: Some(Item::new_from_asset_expect(
+                        "common.items.armor.chest.warlock",
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.warlock",
+                    )),
+                    hand: Some(Item::new_from_asset_expect(
+                        "common.items.armor.hand.warlock",
+                    )),
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.warlock",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        "common.items.armor.foot.warlock",
+                    )),
+                    back: Some(Item::new_from_asset_expect(
+                        "common.items.armor.back.warlock",
+                    )),
+                    ring: None,
+                    neck: None,
+                    lantern: match rand::thread_rng().gen_range(0, 3) {
+                        0 => Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                        _ => None,
+                    },
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+                Villager => Loadout {
+                    active_item,
+                    second_item: None,
+                    shoulder: None,
+                    chest: Some(Item::new_from_asset_expect(
+                        match rand::thread_rng().gen_range(0, 10) {
+                            0 => "common.items.armor.chest.worker_green_0",
+                            1 => "common.items.armor.chest.worker_green_1",
+                            2 => "common.items.armor.chest.worker_red_0",
+                            3 => "common.items.armor.chest.worker_red_1",
+                            4 => "common.items.armor.chest.worker_purple_0",
+                            5 => "common.items.armor.chest.worker_purple_1",
+                            6 => "common.items.armor.chest.worker_yellow_0",
+                            7 => "common.items.armor.chest.worker_yellow_1",
+                            8 => "common.items.armor.chest.worker_orange_0",
+                            _ => "common.items.armor.chest.worker_orange_1",
+                        },
+                    )),
+                    belt: Some(Item::new_from_asset_expect(
+                        "common.items.armor.belt.leather_0",
+                    )),
+                    hand: None,
+                    pants: Some(Item::new_from_asset_expect(
+                        "common.items.armor.pants.worker_blue_0",
+                    )),
+                    foot: Some(Item::new_from_asset_expect(
+                        match rand::thread_rng().gen_range(0, 2) {
+                            0 => "common.items.armor.foot.leather_0",
+                            _ => "common.items.armor.starter.sandals_0",
+                        },
+                    )),
+                    back: None,
+                    ring: None,
+                    neck: None,
+                    lantern: Some(Item::new_from_asset_expect("common.items.lantern.black_0")),
+                    glider: None,
+                    head: None,
+                    tabard: None,
+                },
+            }
+        } else {
+            match body {
+                Body::Golem(golem) => match golem.species {
+                    golem::Species::StoneGolem => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.unique.stone_golems_fist",
+                        ));
+                    },
+                    _ => {},
+                },
+                Body::BipedLarge(biped_large) => match (biped_large.species, biped_large.body_type)
+                {
+                    (biped_large::Species::Occultsaurok, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.staff.saurok_staff",
+                        ));
+                    },
+                    (biped_large::Species::Mightysaurok, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.sword.saurok_sword",
+                        ));
+                    },
+                    (biped_large::Species::Slysaurok, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.bow.saurok_bow",
+                        ));
+                    },
+                    (biped_large::Species::Ogre, biped_large::BodyType::Male) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.hammer.ogre_hammer",
+                        ));
+                    },
+                    (biped_large::Species::Ogre, biped_large::BodyType::Female) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.staff.ogre_staff",
+                        ));
+                    },
+                    (biped_large::Species::Troll, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.hammer.troll_hammer",
+                        ));
+                    },
+                    (biped_large::Species::Wendigo, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.unique.beast_claws",
+                        ));
+                    },
+                    (biped_large::Species::Werewolf, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.unique.beast_claws",
+                        ));
+                    },
+                    (biped_large::Species::Cyclops, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.hammer.cyclops_hammer",
+                        ));
+                    },
+                    (biped_large::Species::Dullahan, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.sword.dullahan_sword",
+                        ));
+                    },
+                    (biped_large::Species::Mindflayer, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.staff.mindflayer_staff",
+                        ));
+                    },
+                },
+                Body::Humanoid(_) => {
+                    if is_giant {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.sword.zweihander_sword_0",
+                        ));
+                    }
+                },
+                _ => {},
+            };
+
+            let active_item = if let Some(ItemKind::Tool(_)) = main_tool.as_ref().map(|i| i.kind())
+            {
+                main_tool.map(|item| ItemConfig::from((item, map)))
+            } else {
+                Some(ItemConfig {
+                    // We need the empty item so npcs can attack
+                    item: Item::new_from_asset_expect("common.items.weapons.empty.empty"),
+                    ability1: Some(CharacterAbility::default()),
+                    ability2: None,
+                    ability3: None,
+                    block_ability: None,
+                    dodge_ability: None,
+                })
+            };
+
+            match body {
+                Body::Golem(golem) => match golem.species {
+                    golem::Species::StoneGolem => Loadout {
+                        active_item,
+                        second_item: None,
+                        shoulder: None,
+                        chest: None,
+                        belt: None,
+                        hand: None,
+                        pants: None,
+                        foot: None,
+                        back: None,
+                        ring: None,
+                        neck: None,
+                        lantern: None,
+                        glider: None,
+                        head: None,
+                        tabard: None,
+                    },
+                    _ => LoadoutBuilder::animal(body).build(),
+                },
+                Body::BipedLarge(_) => Loadout {
                     active_item,
                     second_item: None,
                     shoulder: None,
@@ -305,25 +548,7 @@ impl LoadoutBuilder {
                     tabard: None,
                 },
                 _ => LoadoutBuilder::animal(body).build(),
-            },
-            Body::BipedLarge(_) => Loadout {
-                active_item,
-                second_item: None,
-                shoulder: None,
-                chest: None,
-                belt: None,
-                hand: None,
-                pants: None,
-                foot: None,
-                back: None,
-                ring: None,
-                neck: None,
-                lantern: None,
-                glider: None,
-                head: None,
-                tabard: None,
-            },
-            _ => LoadoutBuilder::animal(body).build(),
+            }
         };
 
         Self(loadout)
diff --git a/common/src/msg/world_msg.rs b/common/src/msg/world_msg.rs
index c19c855166..be2d16292d 100644
--- a/common/src/msg/world_msg.rs
+++ b/common/src/msg/world_msg.rs
@@ -120,4 +120,20 @@ pub struct WorldMapMsg {
     /// angles, or that we don't need as much precision as we currently have
     /// (256 possible angles).
     pub horizons: [(Vec<u8>, Vec<u8>); 2],
+    pub sites: Vec<SiteInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SiteInfo {
+    pub kind: SiteKind,
+    pub wpos: Vec2<i32>,
+    pub name: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[repr(u8)]
+pub enum SiteKind {
+    Town,
+    Dungeon { difficulty: u32 },
+    Castle,
 }
diff --git a/common/src/path.rs b/common/src/path.rs
index 6f26190773..67de327692 100644
--- a/common/src/path.rs
+++ b/common/src/path.rs
@@ -65,8 +65,12 @@ pub struct TraversalConfig {
     pub slow_factor: f32,
     /// Whether the agent is currently on the ground.
     pub on_ground: bool,
+    /// Whether the agent is currently in water.
+    pub in_liquid: bool,
     /// The distance to the target below which it is considered reached.
     pub min_tgt_dist: f32,
+    /// Whether the agent can climb.
+    pub can_climb: bool,
 }
 
 const DIAGONALS: [Vec2<i32>; 8] = [
@@ -126,18 +130,22 @@ impl Route {
 
             // Determine whether we're close enough to the next to to consider it completed
             let dist_sqrd = pos.xy().distance_squared(closest_tgt.xy());
-            if dist_sqrd < traversal_cfg.node_tolerance.powf(2.0) * if be_precise { 0.25 } else { 1.0 }
-                && (pos.z - closest_tgt.z > 1.2 || (pos.z - closest_tgt.z > -0.2 && traversal_cfg.on_ground))
-                && (pos.z - closest_tgt.z < 1.2 || (pos.z - closest_tgt.z < 2.9 && vel.z < -0.05))
-                && vel.z <= 0.0
-                // Only consider the node reached if there's nothing solid between us and it
-                && (vol
-                    .ray(pos + Vec3::unit_z() * 1.5, closest_tgt + Vec3::unit_z() * 1.5)
-                    .until(Block::is_solid)
-                    .cast()
-                    .0
-                    > pos.distance(closest_tgt) * 0.9 || dist_sqrd < 0.5)
-                && self.next_idx < self.path.len()
+            if dist_sqrd
+                < traversal_cfg.node_tolerance.powf(2.0) * if be_precise { 0.25 } else { 1.0 }
+                && (((pos.z - closest_tgt.z > 1.2 || (pos.z - closest_tgt.z > -0.2 && traversal_cfg.on_ground))
+                    && (pos.z - closest_tgt.z < 1.2 || (pos.z - closest_tgt.z < 2.9 && vel.z < -0.05))
+                    && vel.z <= 0.0
+                    // Only consider the node reached if there's nothing solid between us and it
+                    && (vol
+                        .ray(pos + Vec3::unit_z() * 1.5, closest_tgt + Vec3::unit_z() * 1.5)
+                        .until(Block::is_solid)
+                        .cast()
+                        .0
+                        > pos.distance(closest_tgt) * 0.9 || dist_sqrd < 0.5)
+                    && self.next_idx < self.path.len())
+                    || (traversal_cfg.in_liquid
+                        && pos.z < closest_tgt.z + 0.8
+                        && pos.z > closest_tgt.z))
             {
                 // Node completed, move on to the next one
                 self.next_idx += 1;
@@ -387,7 +395,7 @@ impl Chaser {
             {
                 self.last_search_tgt = Some(tgt);
 
-                let (path, complete) = find_path(&mut self.astar, vol, pos, tgt);
+                let (path, complete) = find_path(&mut self.astar, vol, pos, tgt, &traversal_cfg);
 
                 self.route = path.map(|path| {
                     let start_index = path
@@ -415,7 +423,7 @@ impl Chaser {
                 vol.get(
                     (pos + Vec3::<f32>::from(tgt_dir) * 2.5).map(|e| e as i32) + Vec3::unit_z() * z,
                 )
-                .map(|b| !b.is_solid())
+                .map(|b| b.is_air())
                 .unwrap_or(false)
             });
 
@@ -433,17 +441,21 @@ fn walkable<V>(vol: &V, pos: Vec3<i32>) -> bool
 where
     V: BaseVol<Vox = Block> + ReadVol,
 {
-    vol.get(pos - Vec3::new(0, 0, 1))
-        .map(|b| b.is_solid() && b.solid_height() == 1.0)
-        .unwrap_or(false)
-        && vol
-            .get(pos + Vec3::new(0, 0, 0))
-            .map(|b| !b.is_solid())
-            .unwrap_or(true)
-        && vol
-            .get(pos + Vec3::new(0, 0, 1))
-            .map(|b| !b.is_solid())
-            .unwrap_or(true)
+    let below = vol
+        .get(pos - Vec3::unit_z())
+        .ok()
+        .copied()
+        .unwrap_or_else(Block::empty);
+    let a = vol.get(pos).ok().copied().unwrap_or_else(Block::empty);
+    let b = vol
+        .get(pos + Vec3::unit_z())
+        .ok()
+        .copied()
+        .unwrap_or_else(Block::empty);
+
+    let on_ground = below.is_filled();
+    let in_liquid = a.is_liquid();
+    (on_ground || in_liquid) && !a.is_solid() && !b.is_solid()
 }
 
 /// Attempt to search for a path to a target, returning the path (if one was
@@ -453,6 +465,7 @@ fn find_path<V>(
     vol: &V,
     startf: Vec3<f32>,
     endf: Vec3<f32>,
+    traversal_cfg: &TraversalConfig,
 ) -> (Option<Path<Vec3<i32>>>, bool)
 where
     V: BaseVol<Vox = Block> + ReadVol,
@@ -481,30 +494,33 @@ where
     let heuristic = |pos: &Vec3<i32>| (pos.distance_squared(end) as f32).sqrt();
     let neighbors = |pos: &Vec3<i32>| {
         let pos = *pos;
-        const DIRS: [Vec3<i32>; 21] = [
+        const DIRS: [Vec3<i32>; 17] = [
             Vec3::new(0, 1, 0),   // Forward
             Vec3::new(0, 1, 1),   // Forward upward
-            Vec3::new(0, 1, 2),   // Forward Upwardx2
             Vec3::new(0, 1, -1),  // Forward downward
             Vec3::new(0, 1, -2),  // Forward downwardx2
             Vec3::new(1, 0, 0),   // Right
             Vec3::new(1, 0, 1),   // Right upward
-            Vec3::new(1, 0, 2),   // Right Upwardx2
             Vec3::new(1, 0, -1),  // Right downward
             Vec3::new(1, 0, -2),  // Right downwardx2
             Vec3::new(0, -1, 0),  // Backwards
             Vec3::new(0, -1, 1),  // Backward Upward
-            Vec3::new(0, -1, 2),  // Backward Upwardx2
             Vec3::new(0, -1, -1), // Backward downward
             Vec3::new(0, -1, -2), // Backward downwardx2
             Vec3::new(-1, 0, 0),  // Left
             Vec3::new(-1, 0, 1),  // Left upward
-            Vec3::new(-1, 0, 2),  // Left Upwardx2
             Vec3::new(-1, 0, -1), // Left downward
             Vec3::new(-1, 0, -2), // Left downwardx2
             Vec3::new(0, 0, -1),  // Downwards
         ];
 
+        const JUMPS: [Vec3<i32>; 4] = [
+            Vec3::new(0, 1, 2),  // Forward Upwardx2
+            Vec3::new(1, 0, 2),  // Right Upwardx2
+            Vec3::new(0, -1, 2), // Backward Upwardx2
+            Vec3::new(-1, 0, 2), // Left Upwardx2
+        ];
+
         // let walkable = [
         //     is_walkable(&(pos + Vec3::new(1, 0, 0))),
         //     is_walkable(&(pos + Vec3::new(-1, 0, 0))),
@@ -524,6 +540,15 @@ where
         // ];
 
         DIRS.iter()
+            .chain(
+                Some(JUMPS.iter())
+                    .filter(|_| {
+                        vol.get(pos).map(|b| !b.is_liquid()).unwrap_or(true)
+                            || traversal_cfg.can_climb
+                    })
+                    .into_iter()
+                    .flatten(),
+            )
             .map(move |dir| (pos, dir))
             .filter(move |(pos, dir)| {
                 is_walkable(pos)
diff --git a/common/src/ray.rs b/common/src/ray.rs
index 5c6f694892..933251c2cd 100644
--- a/common/src/ray.rs
+++ b/common/src/ray.rs
@@ -1,10 +1,9 @@
 use crate::{span, vol::ReadVol};
 use vek::*;
 
-pub trait RayUntil<V> = FnMut(&V) -> bool;
 pub trait RayForEach<V> = FnMut(&V, Vec3<i32>);
 
-pub struct Ray<'a, V: ReadVol, F: RayUntil<V::Vox>, G: RayForEach<V::Vox>> {
+pub struct Ray<'a, V: ReadVol, F: FnMut(&V::Vox) -> bool, G: RayForEach<V::Vox>> {
     vol: &'a V,
     from: Vec3<f32>,
     to: Vec3<f32>,
@@ -14,7 +13,7 @@ pub struct Ray<'a, V: ReadVol, F: RayUntil<V::Vox>, G: RayForEach<V::Vox>> {
     ignore_error: bool,
 }
 
-impl<'a, V: ReadVol, F: RayUntil<V::Vox>, G: RayForEach<V::Vox>> Ray<'a, V, F, G> {
+impl<'a, V: ReadVol, F: FnMut(&V::Vox) -> bool, G: RayForEach<V::Vox>> Ray<'a, V, F, G> {
     pub fn new(vol: &'a V, from: Vec3<f32>, to: Vec3<f32>, until: F) -> Self {
         Self {
             vol,
@@ -27,7 +26,17 @@ impl<'a, V: ReadVol, F: RayUntil<V::Vox>, G: RayForEach<V::Vox>> Ray<'a, V, F, G
         }
     }
 
-    pub fn until(self, f: F) -> Ray<'a, V, F, G> { Ray { until: f, ..self } }
+    pub fn until<H: FnMut(&V::Vox) -> bool>(self, f: H) -> Ray<'a, V, H, G> {
+        Ray {
+            vol: self.vol,
+            from: self.from,
+            to: self.to,
+            until: f,
+            for_each: self.for_each,
+            max_iter: self.max_iter,
+            ignore_error: self.ignore_error,
+        }
+    }
 
     pub fn for_each<H: RayForEach<V::Vox>>(self, f: H) -> Ray<'a, V, F, H> {
         Ray {
diff --git a/common/src/rtsim.rs b/common/src/rtsim.rs
new file mode 100644
index 0000000000..065f8a343e
--- /dev/null
+++ b/common/src/rtsim.rs
@@ -0,0 +1,49 @@
+// We'd like to not have this file in `common`, but sadly there are
+// things in `common` that require it (currently, `ServerEvent` and
+// `Agent`). When possible, this should be moved to the `rtsim`
+// module in `server`.
+
+use specs::Component;
+use specs_idvs::IdvStorage;
+use vek::*;
+
+pub type RtSimId = usize;
+
+#[derive(Copy, Clone, Debug)]
+pub struct RtSimEntity(pub RtSimId);
+
+impl Component for RtSimEntity {
+    type Storage = IdvStorage<Self>;
+}
+
+/// This type is the map route through which the rtsim (real-time simulation)
+/// aspect of the game communicates with the rest of the game. It is analagous
+/// to `comp::Controller` in that it provides a consistent interface for
+/// simulation NPCs to control their actions. Unlike `comp::Controller`, it is
+/// very abstract and is intended for consumption by both the agent code and the
+/// internal rtsim simulation code (depending on whether the entity is loaded
+/// into the game as a physical entity or not). Agent code should attempt to act
+/// upon its instructions where reasonable although deviations for various
+/// reasons (obstacle avoidance, counter-attacking, etc.) are expected.
+#[derive(Clone, Debug)]
+pub struct RtSimController {
+    /// When this field is `Some(..)`, the agent should attempt to make progress
+    /// toward the given location, accounting for obstacles and other
+    /// high-priority situations like being attacked.
+    pub travel_to: Option<Vec3<f32>>,
+    /// Proportion of full speed to move
+    pub speed_factor: f32,
+}
+
+impl Default for RtSimController {
+    fn default() -> Self {
+        Self {
+            travel_to: None,
+            speed_factor: 1.0,
+        }
+    }
+}
+
+impl RtSimController {
+    pub fn reset(&mut self) { *self = Self::default(); }
+}
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index a2f5aec505..f13c205582 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -5,7 +5,10 @@ use crate::{
     },
     event::LocalEvent,
     states::*,
-    sys::{character_behavior::JoinData, phys::GRAVITY},
+    sys::{
+        character_behavior::JoinData,
+        phys::{FRIC_GROUND, GRAVITY},
+    },
     util::Dir,
 };
 use serde::{Deserialize, Serialize};
@@ -49,6 +52,25 @@ impl Body {
         }
     }
 
+    /// Attempt to determine the maximum speed of the character
+    /// when moving on the ground
+    pub fn max_speed_approx(&self) -> f32 {
+        // Inverse kinematics: at what velocity will acceleration
+        // be cancelled out by friction drag?
+        // Note: we assume no air (this is fine, current physics
+        // uses max(air_drag, ground_drag)).
+        // Derived via...
+        // v = (v + dv / 30) * (1 - drag).powf(2) (accel cancels drag)
+        // => 1 = (1 + (dv / 30) / v) * (1 - drag).powf(2)
+        // => 1 / (1 - drag).powf(2) = 1 + (dv / 30) / v
+        // => 1 / (1 - drag).powf(2) - 1 = (dv / 30) / v
+        // => 1 / (1 / (1 - drag).powf(2) - 1) = v / (dv / 30)
+        // => (dv / 30) / (1 / (1 - drag).powf(2) - 1) = v
+        let v = (-self.base_accel() / 30.0) / ((1.0 - FRIC_GROUND).powf(2.0) - 1.0);
+        debug_assert!(v >= 0.0, "Speed must be positive!");
+        v
+    }
+
     pub fn base_ori_rate(&self) -> f32 {
         match self {
             Body::Humanoid(_) => 20.0,
@@ -75,6 +97,14 @@ impl Body {
             _ => false,
         }
     }
+
+    #[allow(clippy::match_like_matches_macro)]
+    pub fn can_climb(&self) -> bool {
+        match self {
+            Body::Humanoid(_) => true,
+            _ => false,
+        }
+    }
 }
 
 /// Handles updating `Components` to move player based on state of `JoinData`
@@ -265,7 +295,7 @@ pub fn handle_climb(data: &JoinData, update: &mut StateUpdate) {
             .map(|depth| depth > 1.0)
             .unwrap_or(false)
         //&& update.vel.0.z < 0.0
-        && data.body.is_humanoid()
+        && data.body.can_climb()
         && update.energy.current() > 100
     {
         update.character = CharacterState::Climb;
diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs
index a1b6004c2d..2870852163 100644
--- a/common/src/sys/agent.rs
+++ b/common/src/sys/agent.rs
@@ -207,56 +207,79 @@ impl<'a> System<'a> for Sys {
             let node_tolerance = scale * 1.5;
             let slow_factor = body.map(|b| b.base_accel() / 250.0).unwrap_or(0.0).min(1.0);
 
+            let traversal_config = TraversalConfig {
+                node_tolerance,
+                slow_factor,
+                on_ground: physics_state.on_ground,
+                in_liquid: physics_state.in_liquid.is_some(),
+                min_tgt_dist: 1.0,
+                can_climb: body.map(|b| b.can_climb()).unwrap_or(false),
+            };
+
             let mut do_idle = false;
             let mut choose_target = false;
 
             'activity: {
                 match &mut agent.activity {
-                    Activity::Idle(bearing) => {
-                        *bearing += Vec2::new(
-                            thread_rng().gen::<f32>() - 0.5,
-                            thread_rng().gen::<f32>() - 0.5,
-                        ) * 0.1
-                            - *bearing * 0.003
-                            - agent.patrol_origin.map_or(Vec2::zero(), |patrol_origin| {
-                                (pos.0 - patrol_origin).xy() * 0.0002
-                            });
-
-                        // Stop if we're too close to a wall
-                        *bearing *= 0.1
-                            + if terrain
-                                .ray(
-                                    pos.0 + Vec3::unit_z(),
-                                    pos.0
-                                        + Vec3::from(*bearing)
-                                            .try_normalized()
-                                            .unwrap_or(Vec3::unit_y())
-                                            * 5.0
-                                        + Vec3::unit_z(),
-                                )
-                                .until(Block::is_solid)
-                                .cast()
-                                .1
-                                .map_or(true, |b| b.is_none())
+                    Activity::Idle { bearing, chaser } => {
+                        if let Some(travel_to) = agent.rtsim_controller.travel_to {
+                            if let Some((bearing, speed)) =
+                                chaser.chase(&*terrain, pos.0, vel.0, travel_to, TraversalConfig {
+                                    min_tgt_dist: 1.25,
+                                    ..traversal_config
+                                })
                             {
-                                0.9
-                            } else {
-                                0.0
-                            };
+                                inputs.move_dir =
+                                    bearing.xy().try_normalized().unwrap_or(Vec2::zero())
+                                        * speed.min(agent.rtsim_controller.speed_factor);
+                                inputs.jump.set_state(bearing.z > 1.5);
+                                inputs.climb = Some(comp::Climb::Up);
+                                //.filter(|_| bearing.z > 0.1 || physics_state.in_liquid.is_some());
+                                inputs.move_z = bearing.z + 0.05;
+                            }
+                        } else {
+                            *bearing += Vec2::new(
+                                thread_rng().gen::<f32>() - 0.5,
+                                thread_rng().gen::<f32>() - 0.5,
+                            ) * 0.1
+                                - *bearing * 0.003
+                                - agent.patrol_origin.map_or(Vec2::zero(), |patrol_origin| {
+                                    (pos.0 - patrol_origin).xy() * 0.0002
+                                });
 
-                        if bearing.magnitude_squared() > 0.5f32.powf(2.0) {
-                            inputs.move_dir = *bearing * 0.65;
+                            // Stop if we're too close to a wall
+                            *bearing *= 0.1
+                                + if terrain
+                                    .ray(
+                                        pos.0 + Vec3::unit_z(),
+                                        pos.0
+                                            + Vec3::from(*bearing)
+                                                .try_normalized()
+                                                .unwrap_or(Vec3::unit_y())
+                                                * 5.0
+                                            + Vec3::unit_z(),
+                                    )
+                                    .until(Block::is_solid)
+                                    .cast()
+                                    .1
+                                    .map_or(true, |b| b.is_none())
+                                {
+                                    0.9
+                                } else {
+                                    0.0
+                                };
+
+                            if bearing.magnitude_squared() > 0.5f32.powf(2.0) {
+                                inputs.move_dir = *bearing * 0.65;
+                            }
+
+                            // Sit
+                            if thread_rng().gen::<f32>() < 0.0035 {
+                                controller.actions.push(ControlAction::Sit);
+                            }
                         }
 
-                        // Put away weapon
-                        if thread_rng().gen::<f32>() < 0.005 {
-                            controller.actions.push(ControlAction::Unwield);
-                        }
-
-                        // Sit
-                        if thread_rng().gen::<f32>() < 0.0035 {
-                            controller.actions.push(ControlAction::Sit);
-                        }
+                        controller.actions.push(ControlAction::Unwield);
 
                         // Sometimes try searching for new targets
                         if thread_rng().gen::<f32>() < 0.1 {
@@ -276,10 +299,8 @@ impl<'a> System<'a> for Sys {
                                     vel.0,
                                     tgt_pos.0,
                                     TraversalConfig {
-                                        node_tolerance,
-                                        slow_factor,
-                                        on_ground: physics_state.on_ground,
                                         min_tgt_dist: AVG_FOLLOW_DIST,
+                                        ..traversal_config
                                     },
                                 ) {
                                     inputs.move_dir =
@@ -402,10 +423,8 @@ impl<'a> System<'a> for Sys {
                                                 .unwrap_or_else(Vec3::unit_y)
                                                 * 8.0,
                                         TraversalConfig {
-                                            node_tolerance,
-                                            slow_factor,
-                                            on_ground: physics_state.on_ground,
                                             min_tgt_dist: 1.25,
+                                            ..traversal_config
                                         },
                                     ) {
                                         inputs.move_dir =
@@ -563,10 +582,8 @@ impl<'a> System<'a> for Sys {
                                     vel.0,
                                     tgt_pos.0,
                                     TraversalConfig {
-                                        node_tolerance,
-                                        slow_factor,
-                                        on_ground: physics_state.on_ground,
                                         min_tgt_dist: 1.25,
+                                        ..traversal_config
                                     },
                                 ) {
                                     if can_see_tgt {
@@ -621,7 +638,10 @@ impl<'a> System<'a> for Sys {
             }
 
             if do_idle {
-                agent.activity = Activity::Idle(Vec2::zero());
+                agent.activity = Activity::Idle {
+                    bearing: Vec2::zero(),
+                    chaser: Chaser::default(),
+                };
             }
 
             // Choose a new target to attack: only go out of our way to attack targets we
diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index 937fc66cee..ecb6d4de6c 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -19,16 +19,16 @@ use std::ops::Range;
 use vek::*;
 
 pub const GRAVITY: f32 = 9.81 * 5.0;
-const BOUYANCY: f32 = 1.0;
+pub const BOUYANCY: f32 = 1.0;
 // Friction values used for linear damping. They are unitless quantities. The
 // value of these quantities must be between zero and one. They represent the
 // amount an object will slow down within 1/60th of a second. Eg. if the
 // friction is 0.01, and the speed is 1.0, then after 1/60th of a second the
 // speed will be 0.99. after 1 second the speed will be 0.54, which is 0.99 ^
 // 60.
-const FRIC_GROUND: f32 = 0.15;
-const FRIC_AIR: f32 = 0.0125;
-const FRIC_FLUID: f32 = 0.2;
+pub const FRIC_GROUND: f32 = 0.15;
+pub const FRIC_AIR: f32 = 0.0125;
+pub const FRIC_FLUID: f32 = 0.4;
 
 // Integrates forces, calculates the new velocity based off of the old velocity
 // dt = delta time
@@ -711,7 +711,7 @@ impl<'a> System<'a> for Sys {
                 },
                 Collider::Point => {
                     let (dist, block) = terrain.ray(pos.0, pos.0 + pos_delta)
-                        .until(|block| block.is_filled())
+                        .until(|block: &Block| block.is_filled())
                         .ignore_error().cast();
 
                     pos.0 += pos_delta.try_normalized().unwrap_or(Vec3::zero()) * dist;
diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs
index bfc7505ea3..6ff9d7cd12 100644
--- a/common/src/terrain/block.rs
+++ b/common/src/terrain/block.rs
@@ -125,6 +125,9 @@ impl Block {
         }
     }
 
+    #[inline]
+    pub const fn empty() -> Self { Self::air(SpriteKind::Empty) }
+
     /// TODO: See if we can generalize this somehow.
     #[inline]
     pub const fn water(sprite: SpriteKind) -> Self {
@@ -164,13 +167,14 @@ impl Block {
 
     #[inline]
     pub fn get_glow(&self) -> Option<u8> {
-        // TODO: When we have proper volumetric lighting
-        // match self.get_sprite()? {
-        //     SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(20),
-        //     SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(10),
-        //     _ => None,
-        // }
-        None
+        match self.get_sprite()? {
+            SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24),
+            SpriteKind::Ember => Some(20),
+            SpriteKind::WallLamp => Some(16),
+            SpriteKind::FireBowlGround => Some(16),
+            SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(6),
+            _ => None,
+        }
     }
 
     #[inline]
@@ -180,14 +184,20 @@ impl Block {
             .unwrap_or(true)
     }
 
+    /// Can this block be exploded? If so, what 'power' is required to do so?
+    /// Note that we don't really define what 'power' is. Consider the units
+    /// arbitrary and only important when compared to one-another.
     #[inline]
-    pub fn is_explodable(&self) -> bool {
+    pub fn explode_power(&self) -> Option<f32> {
         match self.kind() {
-            BlockKind::Leaves | BlockKind::Grass | BlockKind::WeakRock => true,
+            BlockKind::Leaves => Some(0.25),
+            BlockKind::Grass => Some(0.5),
+            BlockKind::WeakRock => Some(0.75),
+            BlockKind::Snow => Some(0.1),
             // Explodable means that the terrain sprite will get removed anyway, so all is good for
             // empty fluids.
             // TODO: Handle the case of terrain sprites we don't want to have explode
-            _ => self.get_sprite().is_some(),
+            _ => self.get_sprite().map(|_| 0.25),
         }
     }
 
diff --git a/common/src/terrain/mod.rs b/common/src/terrain/mod.rs
index 4832a3b53e..74591cd049 100644
--- a/common/src/terrain/mod.rs
+++ b/common/src/terrain/mod.rs
@@ -18,7 +18,10 @@ pub use self::{
 use roots::find_roots_cubic;
 use serde::{Deserialize, Serialize};
 
-use crate::{vol::RectVolSize, volumes::vol_grid_2d::VolGrid2d};
+use crate::{
+    vol::{ReadVol, RectVolSize},
+    volumes::vol_grid_2d::VolGrid2d,
+};
 use vek::*;
 
 // TerrainChunkSize
@@ -106,6 +109,26 @@ impl TerrainChunkMeta {
 pub type TerrainChunk = chonk::Chonk<Block, TerrainChunkSize, TerrainChunkMeta>;
 pub type TerrainGrid = VolGrid2d<TerrainChunk>;
 
+impl TerrainGrid {
+    /// Find a location suitable for spawning an entity near the given
+    /// position (but in the same chunk).
+    pub fn find_space(&self, pos: Vec3<i32>) -> Vec3<i32> {
+        const SEARCH_DIST: i32 = 63;
+        (0..SEARCH_DIST * 2 + 1)
+            .map(|i| if i % 2 == 0 { i } else { -i } / 2)
+            .map(|z_diff| pos + Vec3::unit_z() * z_diff)
+            .find(|test_pos| {
+                self.get(test_pos - Vec3::unit_z())
+                    .map_or(false, |b| b.is_filled())
+                    && (0..2).all(|z| {
+                        self.get(test_pos + Vec3::unit_z() * z)
+                            .map_or(true, |b| !b.is_solid())
+                    })
+            })
+            .unwrap_or(pos)
+    }
+}
+
 // Terrain helper functions used across multiple crates.
 
 /// Computes the position Vec2 of a SimChunk from an index, where the index was
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index 6dee9037e7..a9b97918a4 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -107,6 +107,7 @@ make_case_elim!(
         GrassBlue = 0x51,
         ChestBurried = 0x52,
         Mud = 0x53,
+        FireBowlGround = 0x54,
     }
 );
 
@@ -122,9 +123,10 @@ impl SpriteKind {
             SpriteKind::Pumpkin => 0.81,
             SpriteKind::Cabbage => 0.45,
             SpriteKind::Chest => 1.09,
-            SpriteKind::StreetLamp => 3.0,
+            SpriteKind::StreetLamp => 2.65,
             SpriteKind::Carrot => 0.18,
             SpriteKind::Radish => 0.18,
+            SpriteKind::FireBowlGround => 0.55,
             // TODO: Uncomment this when we have a way to open doors
             // SpriteKind::Door => 3.0,
             SpriteKind::Bed => 1.54,
@@ -234,6 +236,7 @@ impl SpriteKind {
                 | SpriteKind::Beehive
                 | SpriteKind::PotionMinor
                 | SpriteKind::VialEmpty
+                | SpriteKind::FireBowlGround
         )
     }
 }
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 3a7172e43f..4a809c8d71 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -43,3 +43,4 @@ libsqlite3-sys = { version = "0.18", features = ["bundled"] }
 diesel = { version = "1.4.3", features = ["sqlite"] }
 diesel_migrations = "1.4.0"
 dotenv = "0.15.0"
+slab  = "0.4"
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 88fca9a976..ae310aba21 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -423,32 +423,81 @@ fn handle_time(
 ) {
     let time = scan_fmt_some!(&args, &action.arg_fmt(), String);
     let new_time = match time.as_deref() {
-        Some("midnight") => NaiveTime::from_hms(0, 0, 0),
-        Some("night") => NaiveTime::from_hms(20, 0, 0),
-        Some("dawn") => NaiveTime::from_hms(5, 0, 0),
-        Some("morning") => NaiveTime::from_hms(8, 0, 0),
-        Some("day") => NaiveTime::from_hms(10, 0, 0),
-        Some("noon") => NaiveTime::from_hms(12, 0, 0),
-        Some("dusk") => NaiveTime::from_hms(17, 0, 0),
+        Some("midnight") => NaiveTime::from_hms(0, 0, 0).num_seconds_from_midnight() as f64,
+        Some("night") => NaiveTime::from_hms(20, 0, 0).num_seconds_from_midnight() as f64,
+        Some("dawn") => NaiveTime::from_hms(5, 0, 0).num_seconds_from_midnight() as f64,
+        Some("morning") => NaiveTime::from_hms(8, 0, 0).num_seconds_from_midnight() as f64,
+        Some("day") => NaiveTime::from_hms(10, 0, 0).num_seconds_from_midnight() as f64,
+        Some("noon") => NaiveTime::from_hms(12, 0, 0).num_seconds_from_midnight() as f64,
+        Some("dusk") => NaiveTime::from_hms(17, 0, 0).num_seconds_from_midnight() as f64,
         Some(n) => match n.parse() {
             Ok(n) => n,
             Err(_) => match NaiveTime::parse_from_str(n, "%H:%M") {
-                Ok(time) => time,
-                Err(_) => {
-                    server.notify_client(
-                        client,
-                        ChatType::CommandError.server_msg(format!("'{}' is not a valid time.", n)),
-                    );
-                    return;
+                Ok(time) => time.num_seconds_from_midnight() as f64,
+                // Accept `u12345`, seconds since midnight day 0
+                Err(_) => match n
+                    .get(1..)
+                    .filter(|_| n.starts_with('u'))
+                    .and_then(|n| n.trim_start_matches('u').parse::<u64>().ok())
+                {
+                    Some(n) => n as f64,
+                    None => {
+                        server.notify_client(
+                            client,
+                            ChatType::CommandError
+                                .server_msg(format!("'{}' is not a valid time.", n)),
+                        );
+                        return;
+                    },
                 },
             },
         },
         None => {
             let time_in_seconds = server.state.ecs_mut().read_resource::<TimeOfDay>().0;
 
+            // Would this ever change? Perhaps in a few hundred thousand years some
+            // game archeologists of the future will resurrect the best game of all
+            // time which, obviously, would be Veloren. By that time, the inescapable
+            // laws of thermodynamics will mean that the earth's rotation period
+            // would be slower. Of course, a few hundred thousand years is enough
+            // for the circadian rhythm of human biology to have shifted to account
+            // accordingly. When booting up Veloren for the first time in 337,241
+            // years, they might feel a touch of anguish at the fact that their
+            // earth days and the days within the game do not neatly divide into
+            // one-another. Understandably, they'll want to change this. Who
+            // wouldn't? It would be like turning the TV volume up to an odd number
+            // or having a slightly untuned radio (assuming they haven't begun
+            // broadcasting information directly into their brains). Totally
+            // unacceptable. No, the correct and proper thing to do would be to
+            // release a retroactive definitive edition DLC for $99 with the very
+            // welcome addition of shorter day periods and a complementary
+            // 'developer commentary' mode created by digging up the long-decayed
+            // skeletons of the Veloren team, measuring various attributes of their
+            // jawlines, and using them to recreate their voices. But how to go about
+            // this Herculean task? This code is jibberish! The last of the core Rust
+            // dev team died exactly 337,194 years ago! Rust is now a long-forgotten
+            // dialect of the ancient ones, lost to the sands of time. Ashes to ashes,
+            // dust to dust. When all hope is lost, one particularly intrepid
+            // post-human hominid exployed by the 'Veloren Revival Corp' (no doubt we
+            // still won't have gotted rid of this blasted 'capitalism' thing by then)
+            // might notice, after years of searching, a particularly curious
+            // inscription within the code. The letters `D`, `A`, `Y`. Curious! She
+            // consults the post-human hominid scholars of the old. Care to empathise
+            // with her shock when she discovers that these symbols, as alien as they
+            // may seem, correspond exactly to the word `ⓕя𝐢ᵇᵇ𝔩Ｅ`, the word for
+            // 'day' in the post-human hominid language, which is of course universal.
+            // Imagine also her surprise when, after much further translating, she
+            // finds a comment predicting her very existence and her struggle to
+            // decode this great mystery. Rejoyce! The Veloren Revival Corp. may now
+            // persist with their great Ultimate Edition DLC because the day period
+            // might now be changed because they have found the constant that controls
+            // it! Everybody was henceforth happy until the end of time.
+            //
+            // This one's for you, xMac ;)
+            const DAY: u64 = 86400;
             let current_time = NaiveTime::from_num_seconds_from_midnight_opt(
                 // Wraps around back to 0s if it exceeds 24 hours (24 hours = 86400s)
-                (time_in_seconds as u64 % 86400) as u32,
+                (time_in_seconds as u64 % DAY) as u32,
                 0,
             );
             let msg = match current_time {
@@ -460,16 +509,19 @@ fn handle_time(
         },
     };
 
-    server.state.ecs_mut().write_resource::<TimeOfDay>().0 =
-        new_time.num_seconds_from_midnight() as f64;
+    server.state.ecs_mut().write_resource::<TimeOfDay>().0 = new_time;
 
-    server.notify_client(
-        client,
-        ChatType::CommandInfo.server_msg(format!(
-            "Time changed to: {}",
-            new_time.format("%H:%M").to_string()
-        )),
-    );
+    if let Some(new_time) =
+        NaiveTime::from_num_seconds_from_midnight_opt(((new_time as u64) % 86400) as u32, 0)
+    {
+        server.notify_client(
+            client,
+            ChatType::CommandInfo.server_msg(format!(
+                "Time changed to: {}",
+                new_time.format("%H:%M").to_string(),
+            )),
+        );
+    }
 }
 
 fn handle_health(
@@ -661,9 +713,10 @@ fn handle_spawn(
                             let body = body();
 
                             let map = server.state().ability_map();
-                            let loadout =
-                                LoadoutBuilder::build_loadout(body, alignment, None, false, &map)
-                                    .build();
+                            let loadout = LoadoutBuilder::build_loadout(
+                                body, alignment, None, false, &map, None,
+                            )
+                            .build();
                             drop(map);
 
                             let mut entity_base = server
diff --git a/server/src/events/entity_creation.rs b/server/src/events/entity_creation.rs
index e5cd9e7bfb..5f3a3161a4 100644
--- a/server/src/events/entity_creation.rs
+++ b/server/src/events/entity_creation.rs
@@ -6,6 +6,7 @@ use common::{
         LightEmitter, Loadout, Ori, Pos, Projectile, Scale, Stats, Vel, WaypointArea,
     },
     outcome::Outcome,
+    rtsim::RtSimEntity,
     util::Dir,
 };
 use comp::group;
@@ -50,6 +51,7 @@ pub fn handle_create_npc(
     scale: Scale,
     drop_item: Option<Item>,
     home_chunk: Option<HomeChunk>,
+    rtsim_entity: Option<RtSimEntity>,
 ) {
     let group = match alignment {
         Alignment::Wild => None,
@@ -90,6 +92,12 @@ pub fn handle_create_npc(
         entity
     };
 
+    let entity = if let Some(rtsim_entity) = rtsim_entity {
+        entity.with(rtsim_entity)
+    } else {
+        entity
+    };
+
     entity.build();
 }
 
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index 97e5f73c2e..2dfdf20f3f 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -1,6 +1,7 @@
 use crate::{
     client::Client,
     comp::{biped_large, quadruped_medium, quadruped_small, PhysicsState},
+    rtsim::RtSim,
     Server, SpawnPoint, StateExt,
 };
 use common::{
@@ -15,6 +16,7 @@ use common::{
     lottery::Lottery,
     msg::{PlayerListUpdate, ServerGeneral},
     outcome::Outcome,
+    rtsim::RtSimEntity,
     state::BlockChange,
     sync::{Uid, UidAllocator, WorldSyncExt},
     terrain::{Block, TerrainGrid},
@@ -308,7 +310,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
         }
     })();
 
-    if state
+    let should_delete = if state
         .ecs()
         .write_storage::<Client>()
         .get_mut(entity)
@@ -339,6 +341,8 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
             .ecs()
             .write_storage::<comp::CharacterState>()
             .insert(entity, comp::CharacterState::default());
+
+        false
     } else if state.ecs().read_storage::<comp::Agent>().contains(entity) {
         use specs::Builder;
 
@@ -452,10 +456,24 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
             )
         }
 
-        let _ = state
-            .delete_entity_recorded(entity)
-            .map_err(|e| error!(?e, ?entity, "Failed to delete destroyed entity"));
+        true
     } else {
+        true
+    };
+
+    if should_delete {
+        if let Some(rtsim_entity) = state
+            .ecs()
+            .read_storage::<RtSimEntity>()
+            .get(entity)
+            .copied()
+        {
+            state
+                .ecs()
+                .write_resource::<RtSim>()
+                .destroy_entity(rtsim_entity.0);
+        }
+
         let _ = state
             .delete_entity_recorded(entity)
             .map_err(|e| error!(?e, ?entity, "Failed to delete destroyed entity"));
@@ -470,6 +488,16 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
     */
 }
 
+/// Delete an entity without any special actions (this is generally used for
+/// temporarily unloading an entity when it leaves the view distance). As much
+/// as possible, this function should simply make an entity cease to exist.
+pub fn handle_delete(server: &mut Server, entity: EcsEntity) {
+    let _ = server
+        .state_mut()
+        .delete_entity_recorded(entity)
+        .map_err(|e| error!(?e, ?entity, "Failed to delete destroyed entity"));
+}
+
 pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>) {
     let state = &server.state;
     if vel.z <= -30.0 {
@@ -600,9 +628,10 @@ pub fn handle_explosion(
                                 + (fade * (color[1] as f32 * 0.3 - color[1] as f32));
                             let b = color[2] as f32
                                 + (fade * (color[2] as f32 * 0.3 - color[2] as f32));
-                            color[0] = r as u8;
-                            color[1] = g as u8;
-                            color[2] = b as u8;
+                            // Darken blocks, but not too much
+                            color[0] = (r as u8).max(30);
+                            color[1] = (g as u8).max(30);
+                            color[2] = (b as u8).max(30);
                             block_change.set(block_pos, Block::new(block.kind(), color));
                         }
                     }
@@ -617,13 +646,19 @@ pub fn handle_explosion(
                     )
                     .normalized();
 
+                    let mut ray_energy = power;
+
                     let terrain = ecs.read_resource::<TerrainGrid>();
                     let _ = terrain
                         .ray(pos, pos + dir * power)
                         // TODO: Faster RNG
-                        .until(|block| block.is_liquid() || rand::random::<f32>() < 0.05)
+                        .until(|block: &Block| {
+                            let stop = block.is_liquid() || block.explode_power().is_none() || ray_energy <= 0.0;
+                            ray_energy -= block.explode_power().unwrap_or(0.0) + rand::random::<f32>() * 0.1;
+                            stop
+                        })
                         .for_each(|block: &Block, pos| {
-                            if block.is_explodable() {
+                            if block.explode_power().is_some() {
                                 block_change.set(pos, block.into_vacant());
                             }
                         })
diff --git a/server/src/events/mod.rs b/server/src/events/mod.rs
index a4707a971e..0b12d9560a 100644
--- a/server/src/events/mod.rs
+++ b/server/src/events/mod.rs
@@ -8,8 +8,8 @@ use entity_creation::{
     handle_loaded_character_data, handle_shockwave, handle_shoot,
 };
 use entity_manipulation::{
-    handle_buff, handle_damage, handle_destroy, handle_energy_change, handle_explosion,
-    handle_knockback, handle_land_on_ground, handle_level_up, handle_respawn,
+    handle_buff, handle_damage, handle_delete, handle_destroy, handle_energy_change,
+    handle_explosion, handle_knockback, handle_land_on_ground, handle_level_up, handle_respawn,
 };
 use group_manip::handle_group;
 use interaction::{handle_lantern, handle_mount, handle_possess, handle_unmount};
@@ -83,6 +83,7 @@ impl Server {
                     handle_knockback(&self, entity, impulse)
                 },
                 ServerEvent::Damage { entity, change } => handle_damage(&self, entity, change),
+                ServerEvent::Delete(entity) => handle_delete(self, entity),
                 ServerEvent::Destroy { entity, cause } => handle_destroy(self, entity, cause),
                 ServerEvent::InventoryManip(entity, manip) => handle_inventory(self, entity, manip),
                 ServerEvent::GroupManip(entity, manip) => handle_group(self, entity, manip),
@@ -117,9 +118,20 @@ impl Server {
                     scale,
                     home_chunk,
                     drop_item,
+                    rtsim_entity,
                 } => handle_create_npc(
-                    self, pos, stats, health, loadout, body, agent, alignment, scale, drop_item,
+                    self,
+                    pos,
+                    stats,
+                    health,
+                    loadout,
+                    body,
+                    agent,
+                    alignment,
+                    scale,
+                    drop_item,
                     home_chunk,
+                    rtsim_entity,
                 ),
                 ServerEvent::CreateWaypoint(pos) => handle_create_waypoint(self, pos),
                 ServerEvent::ClientDisconnect(entity) => {
diff --git a/server/src/lib.rs b/server/src/lib.rs
index b310a36f72..0e7d529931 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -18,6 +18,7 @@ pub mod login_provider;
 pub mod metrics;
 pub mod persistence;
 pub mod presence;
+pub mod rtsim;
 pub mod settings;
 pub mod state_ext;
 pub mod sys;
@@ -41,6 +42,7 @@ use crate::{
     data_dir::DataDir,
     login_provider::LoginProvider,
     presence::{Presence, RegionSubscription},
+    rtsim::RtSim,
     state_ext::StateExt,
     sys::sentinel::{DeletedEntities, TrackedComps},
 };
@@ -54,6 +56,7 @@ use common::{
     },
     outcome::Outcome,
     recipe::default_recipe_book,
+    rtsim::RtSimEntity,
     state::{State, TimeOfDay},
     sync::WorldSyncExt,
     terrain::TerrainChunkSize,
@@ -80,7 +83,6 @@ use uvth::{ThreadPool, ThreadPoolBuilder};
 use vek::*;
 #[cfg(feature = "worldgen")]
 use world::{
-    civ::SiteKind,
     sim::{FileOpts, WorldOpts, DEFAULT_WORLD_MAP},
     IndexOwned, World,
 };
@@ -253,6 +255,7 @@ impl Server {
             horizons: [(vec![0], vec![0]), (vec![0], vec![0])],
             sea_level: 0.0,
             alt: vec![30],
+            sites: Vec::new(),
         };
 
         #[cfg(feature = "worldgen")]
@@ -269,7 +272,7 @@ impl Server {
             let spawn_chunk = world
                 .civs()
                 .sites()
-                .filter(|site| matches!(site.kind, SiteKind::Settlement))
+                .filter(|site| matches!(site.kind, world::civ::SiteKind::Settlement))
                 .map(|site| site.center)
                 .min_by_key(|site_pos| site_pos.distance_squared(center_chunk))
                 .unwrap_or(center_chunk);
@@ -320,6 +323,11 @@ impl Server {
         // set the spawn point we calculated above
         state.ecs_mut().insert(SpawnPoint(spawn_point));
 
+        // Insert the world into the ECS (todo: Maybe not an Arc?)
+        let world = Arc::new(world);
+        state.ecs_mut().insert(Arc::clone(&world));
+        state.ecs_mut().insert(index.clone());
+
         // Set starting time for the server.
         state.ecs_mut().write_resource::<TimeOfDay>().0 = settings.start_time;
 
@@ -353,9 +361,12 @@ impl Server {
         block_on(network.listen(ProtocolAddr::Tcp(settings.gameserver_address)))?;
         let connection_handler = ConnectionHandler::new(network);
 
+        // Initiate real-time world simulation
+        rtsim::init(&mut state, &world);
+
         let this = Self {
             state,
-            world: Arc::new(world),
+            world,
             index,
             map,
 
@@ -488,7 +499,14 @@ impl Server {
         // 4) Tick the server's LocalState.
         // 5) Fetch any generated `TerrainChunk`s and insert them into the terrain.
         // in sys/terrain.rs
-        self.state.tick(dt, sys::add_server_systems, false);
+        self.state.tick(
+            dt,
+            |dispatcher_builder| {
+                sys::add_server_systems(dispatcher_builder);
+                rtsim::add_server_systems(dispatcher_builder);
+            },
+            false,
+        );
 
         let before_handle_events = Instant::now();
 
@@ -540,6 +558,20 @@ impl Server {
         };
 
         for entity in to_delete {
+            // Assimilate entities that are part of the real-time world simulation
+            if let Some(rtsim_entity) = self
+                .state
+                .ecs()
+                .read_storage::<RtSimEntity>()
+                .get(entity)
+                .copied()
+            {
+                self.state
+                    .ecs()
+                    .write_resource::<RtSim>()
+                    .assimilate_entity(rtsim_entity.0);
+            }
+
             if let Err(e) = self.state.delete_entity_recorded(entity) {
                 error!(?e, "Failed to delete agent outside the terrain");
             }
diff --git a/server/src/rtsim/chunks.rs b/server/src/rtsim/chunks.rs
new file mode 100644
index 0000000000..481c8cab71
--- /dev/null
+++ b/server/src/rtsim/chunks.rs
@@ -0,0 +1,34 @@
+use super::*;
+use ::world::util::Grid;
+
+pub struct Chunks {
+    chunks: Grid<Chunk>,
+    pub chunks_to_load: Vec<Vec2<i32>>,
+    pub chunks_to_unload: Vec<Vec2<i32>>,
+}
+
+impl Chunks {
+    pub fn new(size: Vec2<u32>) -> Self {
+        Chunks {
+            chunks: Grid::populate_from(size.map(|e| e as i32), |_| Chunk { is_loaded: false }),
+            chunks_to_load: Vec::new(),
+            chunks_to_unload: Vec::new(),
+        }
+    }
+
+    pub fn chunk(&self, key: Vec2<i32>) -> Option<&Chunk> { self.chunks.get(key) }
+
+    pub fn size(&self) -> Vec2<u32> { self.chunks.size().map(|e| e as u32) }
+
+    pub fn chunk_mut(&mut self, key: Vec2<i32>) -> Option<&mut Chunk> { self.chunks.get_mut(key) }
+
+    pub fn chunk_at(&self, pos: Vec2<f32>) -> Option<&Chunk> {
+        self.chunks.get(pos.map2(TerrainChunk::RECT_SIZE, |e, sz| {
+            (e.floor() as i32).div_euclid(sz as i32)
+        }))
+    }
+}
+
+pub struct Chunk {
+    pub is_loaded: bool,
+}
diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs
new file mode 100644
index 0000000000..4ce43e54e3
--- /dev/null
+++ b/server/src/rtsim/entity.rs
@@ -0,0 +1,160 @@
+use super::*;
+use common::{comp::item::tool::AbilityMap, store::Id, terrain::TerrainGrid, LoadoutBuilder};
+use world::{
+    civ::{Site, Track},
+    util::RandomPerm,
+    World,
+};
+
+pub struct Entity {
+    pub is_loaded: bool,
+    pub pos: Vec3<f32>,
+    pub seed: u32,
+    pub last_tick: u64,
+    pub controller: RtSimController,
+
+    pub brain: Brain,
+}
+
+const PERM_SPECIES: u32 = 0;
+const PERM_BODY: u32 = 1;
+const PERM_LOADOUT: u32 = 2;
+const PERM_LEVEL: u32 = 3;
+
+impl Entity {
+    pub fn rng(&self, perm: u32) -> impl Rng { RandomPerm::new(self.seed + perm) }
+
+    pub fn get_body(&self) -> comp::Body {
+        let species = *(&comp::humanoid::ALL_SPECIES)
+            .choose(&mut self.rng(PERM_SPECIES))
+            .unwrap();
+        comp::humanoid::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
+    }
+
+    pub fn get_level(&self) -> u32 {
+        (self.rng(PERM_LEVEL).gen::<f32>().powf(2.0) * 15.0).ceil() as u32
+    }
+
+    pub fn get_loadout(&self, ability_map: &AbilityMap) -> comp::Loadout {
+        let mut rng = self.rng(PERM_LOADOUT);
+        let main_tool = comp::Item::new_from_asset_expect(
+            (&[
+                "common.items.weapons.sword.wood_sword",
+                "common.items.weapons.sword.starter_sword",
+                "common.items.weapons.sword.short_sword_0",
+                "common.items.weapons.bow.starter_bow",
+                "common.items.weapons.bow.leafy_longbow-0",
+            ])
+                .choose(&mut rng)
+                .unwrap(),
+        );
+
+        let back = match rng.gen_range(0, 5) {
+            0 => Some(comp::Item::new_from_asset_expect(
+                "common.items.armor.back.leather_adventurer",
+            )),
+            1 => Some(comp::Item::new_from_asset_expect(
+                "common.items.npc_armor.back.backpack_0",
+            )),
+            2 => Some(comp::Item::new_from_asset_expect(
+                "common.items.npc_armor.back.backpack_blue_0",
+            )),
+            3 => Some(comp::Item::new_from_asset_expect(
+                "common.items.npc_armor.back.leather_blue_0",
+            )),
+            _ => None,
+        };
+
+        let lantern = match rng.gen_range(0, 3) {
+            0 => Some(comp::Item::new_from_asset_expect(
+                "common.items.lantern.black_0",
+            )),
+            1 => Some(comp::Item::new_from_asset_expect(
+                "common.items.lantern.blue_0",
+            )),
+            _ => Some(comp::Item::new_from_asset_expect(
+                "common.items.lantern.red_0",
+            )),
+        };
+
+        let chest = Some(comp::Item::new_from_asset_expect(
+            "common.items.npc_armor.chest.leather_blue_0",
+        ));
+        let pants = Some(comp::Item::new_from_asset_expect(
+            "common.items.npc_armor.pants.leather_blue_0",
+        ));
+        let shoulder = Some(comp::Item::new_from_asset_expect(
+            "common.items.armor.shoulder.leather_0",
+        ));
+
+        LoadoutBuilder::build_loadout(
+            self.get_body(),
+            comp::Alignment::Npc,
+            Some(main_tool),
+            false,
+            ability_map,
+            None,
+        )
+        .back(back)
+        .lantern(lantern)
+        .chest(chest)
+        .pants(pants)
+        .shoulder(shoulder)
+        .build()
+    }
+
+    pub fn tick(&mut self, terrain: &TerrainGrid, world: &World) {
+        let tgt_site = self.brain.tgt.or_else(|| {
+            world
+                .civs()
+                .sites
+                .iter()
+                .filter(|_| thread_rng().gen_range(0i32, 4) == 0)
+                .min_by_key(|(_, site)| {
+                    let wpos = site.center * TerrainChunk::RECT_SIZE.map(|e| e as i32);
+                    let dist = wpos.map(|e| e as f32).distance(self.pos.xy()) as u32;
+                    dist + if dist < 96 { 100_000 } else { 0 }
+                })
+                .map(|(id, _)| id)
+        });
+        self.brain.tgt = tgt_site;
+
+        tgt_site.map(|tgt_site| {
+            let site = &world.civs().sites[tgt_site];
+
+            let wpos = site.center * TerrainChunk::RECT_SIZE.map(|e| e as i32);
+            let dist = wpos.map(|e| e as f32).distance(self.pos.xy()) as u32;
+
+            if dist < 64 {
+                self.brain.tgt = None;
+            }
+
+            let travel_to = self.pos.xy()
+                + Vec3::from(
+                    (wpos.map(|e| e as f32 + 0.5) - self.pos.xy())
+                        .try_normalized()
+                        .unwrap_or_else(Vec2::zero),
+                ) * 64.0;
+            let travel_to_alt = world
+                .sim()
+                .get_alt_approx(travel_to.map(|e| e as i32))
+                .unwrap_or(0.0) as i32;
+            let travel_to = terrain
+                .find_space(Vec3::new(
+                    travel_to.x as i32,
+                    travel_to.y as i32,
+                    travel_to_alt,
+                ))
+                .map(|e| e as f32)
+                + Vec3::new(0.5, 0.5, 0.0);
+            self.controller.travel_to = Some(travel_to);
+            self.controller.speed_factor = 0.70;
+        });
+    }
+}
+
+#[derive(Default)]
+pub struct Brain {
+    tgt: Option<Id<Site>>,
+    track: Option<(Track, usize)>,
+}
diff --git a/server/src/rtsim/load_chunks.rs b/server/src/rtsim/load_chunks.rs
new file mode 100644
index 0000000000..756b4c3f79
--- /dev/null
+++ b/server/src/rtsim/load_chunks.rs
@@ -0,0 +1,15 @@
+use super::*;
+use common::event::{EventBus, ServerEvent};
+use specs::{Read, System, WriteExpect};
+
+pub struct Sys;
+impl<'a> System<'a> for Sys {
+    #[allow(clippy::type_complexity)]
+    type SystemData = (Read<'a, EventBus<ServerEvent>>, WriteExpect<'a, RtSim>);
+
+    fn run(&mut self, (_server_event_bus, mut rtsim): Self::SystemData) {
+        for _chunk in std::mem::take(&mut rtsim.chunks.chunks_to_load) {
+            // TODO
+        }
+    }
+}
diff --git a/server/src/rtsim/mod.rs b/server/src/rtsim/mod.rs
new file mode 100644
index 0000000000..0e9665f99e
--- /dev/null
+++ b/server/src/rtsim/mod.rs
@@ -0,0 +1,109 @@
+#![allow(dead_code)] // TODO: Remove this when rtsim is fleshed out
+
+mod chunks;
+mod entity;
+mod load_chunks;
+mod tick;
+mod unload_chunks;
+
+use self::{chunks::Chunks, entity::Entity};
+use common::{
+    comp,
+    rtsim::{RtSimController, RtSimEntity, RtSimId},
+    state::State,
+    terrain::TerrainChunk,
+    vol::RectRasterableVol,
+};
+use rand::prelude::*;
+use slab::Slab;
+use specs::{DispatcherBuilder, WorldExt};
+use vek::*;
+
+pub struct RtSim {
+    tick: u64,
+    chunks: Chunks,
+    entities: Slab<Entity>,
+}
+
+impl RtSim {
+    pub fn new(world_chunk_size: Vec2<u32>) -> Self {
+        Self {
+            tick: 0,
+            chunks: Chunks::new(world_chunk_size),
+            entities: Slab::new(),
+        }
+    }
+
+    pub fn hook_load_chunk(&mut self, key: Vec2<i32>) {
+        if let Some(chunk) = self.chunks.chunk_mut(key) {
+            if !chunk.is_loaded {
+                chunk.is_loaded = true;
+                self.chunks.chunks_to_load.push(key);
+            }
+        }
+    }
+
+    pub fn hook_unload_chunk(&mut self, key: Vec2<i32>) {
+        if let Some(chunk) = self.chunks.chunk_mut(key) {
+            if chunk.is_loaded {
+                chunk.is_loaded = false;
+                self.chunks.chunks_to_unload.push(key);
+            }
+        }
+    }
+
+    pub fn assimilate_entity(&mut self, entity: RtSimId) {
+        // tracing::info!("Assimilated rtsim entity {}", entity);
+        self.entities.get_mut(entity).map(|e| e.is_loaded = false);
+    }
+
+    pub fn reify_entity(&mut self, entity: RtSimId) {
+        // tracing::info!("Reified rtsim entity {}", entity);
+        self.entities.get_mut(entity).map(|e| e.is_loaded = true);
+    }
+
+    pub fn update_entity(&mut self, entity: RtSimId, pos: Vec3<f32>) {
+        self.entities.get_mut(entity).map(|e| e.pos = pos);
+    }
+
+    pub fn destroy_entity(&mut self, entity: RtSimId) {
+        // tracing::info!("Destroyed rtsim entity {}", entity);
+        self.entities.remove(entity);
+    }
+}
+
+const LOAD_CHUNK_SYS: &str = "rtsim_load_chunk_sys";
+const UNLOAD_CHUNK_SYS: &str = "rtsim_unload_chunk_sys";
+const TICK_SYS: &str = "rtsim_tick_sys";
+
+pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
+    dispatch_builder.add(unload_chunks::Sys, UNLOAD_CHUNK_SYS, &[]);
+    dispatch_builder.add(load_chunks::Sys, LOAD_CHUNK_SYS, &[UNLOAD_CHUNK_SYS]);
+    dispatch_builder.add(tick::Sys, TICK_SYS, &[LOAD_CHUNK_SYS, UNLOAD_CHUNK_SYS]);
+}
+
+pub fn init(state: &mut State, world: &world::World) {
+    let mut rtsim = RtSim::new(world.sim().get_size());
+
+    for _ in 0..2500 {
+        let pos = rtsim
+            .chunks
+            .size()
+            .map2(TerrainChunk::RECT_SIZE, |sz, chunk_sz| {
+                thread_rng().gen_range(0, sz * chunk_sz) as i32
+            });
+
+        rtsim.entities.insert(Entity {
+            is_loaded: false,
+            pos: Vec3::from(pos.map(|e| e as f32)),
+            seed: thread_rng().gen(),
+            controller: RtSimController::default(),
+            last_tick: 0,
+            brain: Default::default(),
+        });
+    }
+
+    state.ecs_mut().insert(rtsim);
+    state.ecs_mut().register::<RtSimEntity>();
+    tracing::info!("Initiated real-time world simulation");
+}
diff --git a/server/src/rtsim/tick.rs b/server/src/rtsim/tick.rs
new file mode 100644
index 0000000000..5a830de70c
--- /dev/null
+++ b/server/src/rtsim/tick.rs
@@ -0,0 +1,123 @@
+#![allow(dead_code)] // TODO: Remove this when rtsim is fleshed out
+
+use super::*;
+use common::{
+    comp,
+    event::{EventBus, ServerEvent},
+    state::DeltaTime,
+    terrain::TerrainGrid,
+};
+use specs::{Join, Read, ReadExpect, ReadStorage, System, WriteExpect, WriteStorage};
+use std::sync::Arc;
+
+const ENTITY_TICK_PERIOD: u64 = 30;
+
+pub struct Sys;
+impl<'a> System<'a> for Sys {
+    #[allow(clippy::type_complexity)]
+    type SystemData = (
+        Read<'a, DeltaTime>,
+        Read<'a, EventBus<ServerEvent>>,
+        WriteExpect<'a, RtSim>,
+        ReadExpect<'a, TerrainGrid>,
+        ReadExpect<'a, Arc<world::World>>,
+        ReadExpect<'a, world::IndexOwned>,
+        ReadStorage<'a, comp::Pos>,
+        ReadStorage<'a, RtSimEntity>,
+        WriteStorage<'a, comp::Agent>,
+        ReadExpect<'a, comp::item::tool::AbilityMap>,
+    );
+
+    fn run(
+        &mut self,
+        (
+            dt,
+            server_event_bus,
+            mut rtsim,
+            terrain,
+            world,
+            _index,
+            positions,
+            rtsim_entities,
+            mut agents,
+            ability_map,
+        ): Self::SystemData,
+    ) {
+        let rtsim = &mut *rtsim;
+        rtsim.tick += 1;
+
+        // Update rtsim entities
+        // TODO: don't update all of them each tick
+        let mut to_reify = Vec::new();
+        for (id, entity) in rtsim.entities.iter_mut() {
+            if entity.is_loaded {
+                // No load-specific behaviour yet
+            } else if rtsim
+                .chunks
+                .chunk_at(entity.pos.xy())
+                .map(|c| c.is_loaded)
+                .unwrap_or(false)
+            {
+                to_reify.push(id);
+            } else {
+                // Simulate behaviour
+                if let Some(travel_to) = entity.controller.travel_to {
+                    // Move towards target at approximate character speed
+                    entity.pos += Vec3::from(
+                        (travel_to.xy() - entity.pos.xy())
+                            .try_normalized()
+                            .unwrap_or_else(Vec2::zero)
+                            * entity.get_body().max_speed_approx()
+                            * entity.controller.speed_factor,
+                    ) * dt.0;
+                }
+
+                if let Some(alt) = world
+                    .sim()
+                    .get_alt_approx(entity.pos.xy().map(|e| e.floor() as i32))
+                {
+                    entity.pos.z = alt;
+                }
+            }
+
+            // Tick entity AI
+            if entity.last_tick + ENTITY_TICK_PERIOD <= rtsim.tick {
+                entity.tick(&terrain, &world);
+                entity.last_tick = rtsim.tick;
+            }
+        }
+
+        let mut server_emitter = server_event_bus.emitter();
+        for id in to_reify {
+            rtsim.reify_entity(id);
+            let entity = &rtsim.entities[id];
+            let spawn_pos = terrain
+                .find_space(entity.pos.map(|e| e.floor() as i32))
+                .map(|e| e as f32)
+                + Vec3::new(0.5, 0.5, 0.0);
+            let body = entity.get_body();
+            server_emitter.emit(ServerEvent::CreateNpc {
+                pos: comp::Pos(spawn_pos),
+                stats: comp::Stats::new("Traveller".to_string(), body)
+                    .with_level(entity.get_level()),
+                health: comp::Health::new(body, 10),
+                loadout: entity.get_loadout(&ability_map),
+                body,
+                agent: Some(comp::Agent::new(None, true, &body)),
+                alignment: comp::Alignment::Npc,
+                scale: comp::Scale(1.0),
+                drop_item: None,
+                home_chunk: None,
+                rtsim_entity: Some(RtSimEntity(id)),
+            });
+        }
+
+        // Update rtsim with real entity data
+        for (pos, rtsim_entity, agent) in (&positions, &rtsim_entities, &mut agents).join() {
+            rtsim.entities.get_mut(rtsim_entity.0).map(|entity| {
+                entity.pos = pos.0;
+                agent.rtsim_controller = entity.controller.clone();
+            });
+        }
+    }
+}
diff --git a/server/src/rtsim/unload_chunks.rs b/server/src/rtsim/unload_chunks.rs
new file mode 100644
index 0000000000..1de4eb144b
--- /dev/null
+++ b/server/src/rtsim/unload_chunks.rs
@@ -0,0 +1,38 @@
+use super::*;
+use common::{
+    comp::Pos,
+    event::{EventBus, ServerEvent},
+    terrain::TerrainGrid,
+};
+use specs::{Entities, Read, ReadExpect, ReadStorage, System, WriteExpect};
+
+pub struct Sys;
+impl<'a> System<'a> for Sys {
+    #[allow(clippy::type_complexity)]
+    type SystemData = (
+        Read<'a, EventBus<ServerEvent>>,
+        WriteExpect<'a, RtSim>,
+        ReadExpect<'a, TerrainGrid>,
+        Entities<'a>,
+        ReadStorage<'a, RtSimEntity>,
+        ReadStorage<'a, Pos>,
+    );
+
+    fn run(
+        &mut self,
+        (
+            _server_event_bus,
+            mut rtsim,
+            _terrain_grid,
+            _entities,
+            _rtsim_entities,
+            _positions,
+        ): Self::SystemData,
+    ) {
+        let chunks = std::mem::take(&mut rtsim.chunks.chunks_to_unload);
+
+        for _chunk in chunks {
+            // TODO
+        }
+    }
+}
diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs
index 4cb75e0244..4cd170dcb5 100644
--- a/server/src/sys/terrain.rs
+++ b/server/src/sys/terrain.rs
@@ -1,5 +1,7 @@
 use super::SysTimer;
-use crate::{chunk_generator::ChunkGenerator, client::Client, presence::Presence, Tick};
+use crate::{
+    chunk_generator::ChunkGenerator, client::Client, presence::Presence, rtsim::RtSim, Tick,
+};
 use common::{
     comp::{self, bird_medium, item::tool::AbilityMap, Alignment, Pos},
     event::{EventBus, ServerEvent},
@@ -32,6 +34,7 @@ impl<'a> System<'a> for Sys {
         WriteExpect<'a, ChunkGenerator>,
         WriteExpect<'a, TerrainGrid>,
         Write<'a, TerrainChanges>,
+        WriteExpect<'a, RtSim>,
         ReadStorage<'a, Pos>,
         ReadStorage<'a, Presence>,
         ReadStorage<'a, Client>,
@@ -47,6 +50,7 @@ impl<'a> System<'a> for Sys {
             mut chunk_generator,
             mut terrain,
             mut terrain_changes,
+            mut rtsim,
             positions,
             presences,
             clients,
@@ -100,10 +104,20 @@ impl<'a> System<'a> for Sys {
                 terrain_changes.modified_chunks.insert(key);
             } else {
                 terrain_changes.new_chunks.insert(key);
+                rtsim.hook_load_chunk(key);
             }
 
             // Handle chunk supplement
             for entity in supplement.entities {
+                // Check this because it's a common source of weird bugs
+                assert!(
+                    terrain
+                        .pos_key(entity.pos.map(|e| e.floor() as i32))
+                        .map2(key, |e, tgt| (e - tgt).abs() <= 1)
+                        .reduce_and(),
+                    "Chunk spawned entity that wasn't nearby",
+                );
+
                 if entity.is_waypoint {
                     server_emitter.emit(ServerEvent::CreateWaypoint(entity.pos));
                     continue;
@@ -144,12 +158,15 @@ impl<'a> System<'a> for Sys {
                     scale = 2.0 + rand::random::<f32>();
                 }
 
+                let config = entity.config;
+
                 let loadout = LoadoutBuilder::build_loadout(
                     body,
                     alignment,
                     main_tool,
                     entity.is_giant,
                     &map,
+                    config,
                 )
                 .build();
 
@@ -180,7 +197,7 @@ impl<'a> System<'a> for Sys {
                     health,
                     loadout,
                     agent: if entity.has_agency {
-                        Some(comp::Agent::new(entity.pos, can_speak, &body))
+                        Some(comp::Agent::new(Some(entity.pos), can_speak, &body))
                     } else {
                         None
                     },
@@ -189,6 +206,7 @@ impl<'a> System<'a> for Sys {
                     scale: comp::Scale(scale),
                     home_chunk: Some(comp::HomeChunk(key)),
                     drop_item: entity.loot_drop,
+                    rtsim_entity: None,
                 })
             }
         }
@@ -217,10 +235,12 @@ impl<'a> System<'a> for Sys {
                     chunks_to_remove.push(chunk_key);
                 }
             });
+
         for key in chunks_to_remove {
             // TODO: code duplication for chunk insertion between here and state.rs
             if terrain.remove(key).is_some() {
                 terrain_changes.removed_chunks.insert(key);
+                rtsim.hook_unload_chunk(key);
             }
 
             chunk_generator.cancel_if_pending(key);
diff --git a/tools/src/main.rs b/tools/src/main.rs
index 62995f9e24..4252a16206 100644
--- a/tools/src/main.rs
+++ b/tools/src/main.rs
@@ -43,7 +43,7 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
 
 fn weapon_stats() -> Result<(), Box<dyn Error>> {
     let mut wtr = csv::Writer::from_path("weaponstats.csv")?;
-    wtr.write_record(&["Path", "Kind", "Name", "Power", "Equip Time (ms)"])?;
+    wtr.write_record(&["Path", "Kind", "Name", "Power", "Speed", "Equip Time (ms)"])?;
 
     for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*")
         .expect("Failed to iterate over item folders!")
@@ -51,6 +51,7 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
         match item.kind() {
             comp::item::ItemKind::Tool(tool) => {
                 let power = tool.base_power().to_string();
+                let speed = tool.base_speed().to_string();
                 let equip_time = tool.equip_time().subsec_millis().to_string();
                 let kind = get_tool_kind(&tool.kind);
 
@@ -59,6 +60,7 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
                     &kind,
                     item.name(),
                     &power,
+                    &speed,
                     &equip_time,
                 ])?;
             },
diff --git a/voxygen/benches/meshing_benchmark.rs b/voxygen/benches/meshing_benchmark.rs
index b0cd004443..642a61ddab 100644
--- a/voxygen/benches/meshing_benchmark.rs
+++ b/voxygen/benches/meshing_benchmark.rs
@@ -5,7 +5,7 @@ use common::{
 use criterion::{black_box, criterion_group, criterion_main, Benchmark, Criterion};
 use std::sync::Arc;
 use vek::*;
-use veloren_voxygen::mesh::Meshable;
+use veloren_voxygen::{mesh::Meshable, scene::terrain::BlocksOfInterest};
 use world::{sim, World};
 
 const CENTER: Vec2<i32> = Vec2 { x: 512, y: 512 };
@@ -133,7 +133,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             c.bench(
                 "meshing",
                 Benchmark::new(&format!("Terrain mesh {}, {}", x, y), move |b| {
-                    b.iter(|| volume.generate_mesh(black_box((range, Vec2::new(8192, 8192)))))
+                    b.iter(|| volume.generate_mesh(black_box((range, Vec2::new(8192, 8192), &BlocksOfInterest::default()))))
                 })
                 // Lower sample size to save time
                 .sample_size(15),
diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs
index 48a42cd860..fe9f525e2e 100644
--- a/voxygen/src/hud/img_ids.rs
+++ b/voxygen/src/hud/img_ids.rs
@@ -153,6 +153,8 @@ image_ids! {
         skillbar_frame: "voxygen.element.skillbar.frame",
         m1_ico: "voxygen.element.icons.m1",
         m2_ico: "voxygen.element.icons.m2",
+        m_scroll_ico: "voxygen.element.icons.m_scroll",
+        m_move_ico: "voxygen.element.icons.m_move",
 
         // Other Icons/Art
         skull: "voxygen.element.icons.skull",
@@ -193,6 +195,21 @@ image_ids! {
         mmap_minus: "voxygen.element.buttons.min_plus.mmap_button-min",
         mmap_minus_hover: "voxygen.element.buttons.min_plus.mmap_button-min_hover",
         mmap_minus_press: "voxygen.element.buttons.min_plus.mmap_button-min_press",
+        map_dif_0: "voxygen.element.map.dif_0",
+        map_dif_1: "voxygen.element.map.dif_1",
+        map_dif_2: "voxygen.element.map.dif_2",
+        map_dif_3: "voxygen.element.map.dif_3",
+        map_dif_4: "voxygen.element.map.dif_4",
+        map_dif_5: "voxygen.element.map.dif_5",
+        mmap_site_town: "voxygen.element.map.town",
+        mmap_site_town_hover: "voxygen.element.map.town_hover",
+        mmap_site_town_bg: "voxygen.element.map.town_bg",
+        mmap_site_dungeon: "voxygen.element.map.dungeon",
+        mmap_site_dungeon_hover: "voxygen.element.map.dungeon_hover",
+        mmap_site_dungeon_bg: "voxygen.element.map.dungeon_bg",
+        mmap_site_castle: "voxygen.element.map.castle",
+        mmap_site_castle_hover: "voxygen.element.map.castle_hover",
+        mmap_site_castle_bg: "voxygen.element.map.castle_bg",
 
         // Window Parts
         window_3: "voxygen.element.frames.window_3",
diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs
index 046ca31e29..8ea0fd4944 100644
--- a/voxygen/src/hud/map.rs
+++ b/voxygen/src/hud/map.rs
@@ -1,21 +1,25 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
-    Show, TEXT_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
+    QUALITY_COMMON, QUALITY_DEBUG, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE,
+    TEXT_COLOR, TEXT_GRAY_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
 };
 use crate::{
     i18n::Localization,
-    ui::{fonts::Fonts, img_ids, ImageSlider},
+    ui::{fonts::Fonts, img_ids, ImageFrame, Tooltip, TooltipManager, Tooltipable},
     GlobalState,
 };
 use client::{self, Client};
-use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize};
+use common::{comp, msg::world_msg::SiteKind, terrain::TerrainChunkSize, vol::RectVolSize};
 use conrod_core::{
     color, position,
     widget::{self, Button, Image, Rectangle, Text},
-    widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
+    widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
 };
 use specs::WorldExt;
 use vek::*;
+
+use inline_tweak::*;
+
 widget_ids! {
     struct Ids {
         frame,
@@ -31,27 +35,52 @@ widget_ids! {
         map_title,
         qlog_title,
         zoom_slider,
+        mmap_site_icons[],
+        site_difs[],
+        map_settings_align,
+        show_towns_img,
+        show_towns_box,
+        show_towns_text,
+        show_castles_img,
+        show_castles_box,
+        show_castles_text,
+        show_dungeons_img,
+        show_dungeons_box,
+        show_dungeons_text,
+        show_difficulty_img,
+        show_difficulty_box,
+        show_difficulty_text,
+        recenter_button,
+        drag_txt,
+        drag_ico,
+        zoom_txt,
+        zoom_ico,
+
     }
 }
 
+#[cfg(target_os = "windows")]
+const PLATFORM_FACTOR: f64 = 1.0;
+#[cfg(not(target_os = "windows"))]
+const PLATFORM_FACTOR: f64 = -1.0;
+
 #[derive(WidgetCommon)]
 pub struct Map<'a> {
-    _show: &'a Show,
     client: &'a Client,
     world_map: &'a (img_ids::Rotations, Vec2<u32>),
     imgs: &'a Imgs,
-    rot_imgs: &'a ImgsRot,
     fonts: &'a Fonts,
     #[conrod(common_builder)]
     common: widget::CommonBuilder,
     _pulse: f32,
     localized_strings: &'a Localization,
     global_state: &'a GlobalState,
+    rot_imgs: &'a ImgsRot,
+    tooltip_manager: &'a mut TooltipManager,
 }
 impl<'a> Map<'a> {
     #[allow(clippy::too_many_arguments)] // TODO: Pending review in #587
     pub fn new(
-        show: &'a Show,
         client: &'a Client,
         imgs: &'a Imgs,
         rot_imgs: &'a ImgsRot,
@@ -60,9 +89,9 @@ impl<'a> Map<'a> {
         pulse: f32,
         localized_strings: &'a Localization,
         global_state: &'a GlobalState,
+        tooltip_manager: &'a mut TooltipManager,
     ) -> Self {
         Self {
-            _show: show,
             imgs,
             rot_imgs,
             world_map,
@@ -72,6 +101,7 @@ impl<'a> Map<'a> {
             _pulse: pulse,
             localized_strings,
             global_state,
+            tooltip_manager,
         }
     }
 }
@@ -82,6 +112,11 @@ pub struct State {
 
 pub enum Event {
     MapZoom(f64),
+    MapDrag(Vec2<f64>),
+    ShowDifficulties(bool),
+    ShowTowns(bool),
+    ShowCastles(bool),
+    ShowDungeons(bool),
     Close,
 }
 
@@ -103,23 +138,46 @@ impl<'a> Widget for Map<'a> {
     fn update(self, args: widget::UpdateArgs<Self>) -> Self::Event {
         let widget::UpdateArgs { state, ui, .. } = args;
         let zoom = self.global_state.settings.gameplay.map_zoom * 0.8;
+        let show_difficulty = self.global_state.settings.gameplay.map_show_difficulty;
+        let show_towns = self.global_state.settings.gameplay.map_show_towns;
+        let show_dungeons = self.global_state.settings.gameplay.map_show_dungeons;
+        let show_castles = self.global_state.settings.gameplay.map_show_castles;
         let mut events = Vec::new();
+        let i18n = &self.localized_strings;
+        // Tooltips
+        let site_tooltip = Tooltip::new({
+            // Edge images [t, b, r, l]
+            // Corner images [tr, tl, br, bl]
+            let edge = &self.rot_imgs.tt_side;
+            let corner = &self.rot_imgs.tt_corner;
+            ImageFrame::new(
+                [edge.cw180, edge.none, edge.cw270, edge.cw90],
+                [corner.none, corner.cw270, corner.cw90, corner.cw180],
+                Color::Rgba(0.08, 0.07, 0.04, 1.0),
+                5.0,
+            )
+        })
+        .title_font_size(self.fonts.cyri.scale(15))
+        .parent(ui.window)
+        .desc_font_size(self.fonts.cyri.scale(12))
+        .font_id(self.fonts.cyri.conrod_id)
+        .desc_text_color(TEXT_COLOR);
         // Frame
         Image::new(self.imgs.map_bg)
-            .w_h(1052.0, 886.0)
+            .w_h(1202.0, 886.0)
             .mid_top_with_margin_on(ui.window, 5.0)
             .color(Some(UI_MAIN))
             .set(state.ids.bg, ui);
 
         Image::new(self.imgs.map_frame)
-            .w_h(1052.0, 886.0)
+            .w_h(1202.0, 886.0)
             .middle_of(state.ids.bg)
             .color(Some(UI_HIGHLIGHT_0))
             .set(state.ids.frame, ui);
 
         // Map Content Alignment
         Rectangle::fill_with([814.0, 834.0], color::TRANSPARENT)
-            .top_right_with_margins_on(state.ids.frame, 46.0, 2.0)
+            .top_left_with_margins_on(state.ids.frame, 46.0, tweak!(240.0))
             .set(state.ids.map_align, ui);
 
         // Questlog Content Alignment
@@ -134,7 +192,7 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.icon, ui);
 
         // Map Title
-        Text::new(self.localized_strings.get("hud.map.map_title"))
+        Text::new(i18n.get("hud.map.map_title"))
             .mid_top_with_margin_on(state.ids.frame, 3.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(29))
@@ -142,25 +200,13 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.map_title, ui);
 
         // Questlog Title
-        Text::new(self.localized_strings.get("hud.map.qlog_title"))
+        Text::new(i18n.get("hud.map.qlog_title"))
             .mid_top_with_margin_on(state.ids.qlog_align, 6.0)
             .font_id(self.fonts.cyri.conrod_id)
             .font_size(self.fonts.cyri.scale(21))
             .color(TEXT_COLOR)
             .set(state.ids.qlog_title, ui);
 
-        // X-Button
-        if Button::image(self.imgs.close_button)
-            .w_h(24.0, 25.0)
-            .hover_image(self.imgs.close_btn_hover)
-            .press_image(self.imgs.close_btn_press)
-            .top_right_with_margins_on(state.ids.frame, 0.0, 0.0)
-            .set(state.ids.close, ui)
-            .was_clicked()
-        {
-            events.push(Event::Close);
-        }
-
         // Location Name
         /*match self.client.current_chunk() {
             Some(chunk) => Text::new(chunk.meta().name())
@@ -184,7 +230,6 @@ impl<'a> Widget for Map<'a> {
             .set(state.ids.grid, ui);
         // Map Image
         let (world_map, worldsize) = self.world_map;
-        let worldsize = worldsize.map2(TerrainChunkSize::RECT_SIZE, |e, f| e as f64 * f as f64);
 
         // Coordinates
         let player_pos = self
@@ -194,25 +239,53 @@ impl<'a> Widget for Map<'a> {
             .read_storage::<comp::Pos>()
             .get(self.client.entity())
             .map_or(Vec3::zero(), |pos| pos.0);
-        let max_zoom = (worldsize / TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
-            .reduce_partial_max()/*.min(f64::MAX)*/;
+
+        let max_zoom = worldsize
+            .reduce_partial_max() as f64/*.min(f64::MAX)*/;
+
+        let map_size = Vec2::new(760.0, 760.0);
+
         let w_src = max_zoom / zoom;
         let h_src = max_zoom / zoom;
+        // Handle dragging
+        let drag = self.global_state.settings.gameplay.map_drag;
+        let dragged: Vec2<f64> = ui
+            .widget_input(state.ids.grid)
+            .drags()
+            .left()
+            .map(|drag| Vec2::<f64>::from(drag.delta_xy))
+            .sum();
+        // Drag represents offset of view from the player_pos in chunk coords
+        let drag_new = drag + dragged / map_size / zoom * max_zoom;
+        events.push(Event::MapDrag(drag_new));
+
         let rect_src = position::Rect::from_xy_dim(
             [
-                player_pos.x as f64 / TerrainChunkSize::RECT_SIZE.x as f64,
-                (worldsize.y - player_pos.y as f64) / TerrainChunkSize::RECT_SIZE.y as f64,
+                (player_pos.x as f64 / TerrainChunkSize::RECT_SIZE.x as f64) - drag.x,
+                (worldsize.y as f64 - (player_pos.y as f64 / TerrainChunkSize::RECT_SIZE.y as f64))
+                    + drag.y,
             ],
             [w_src, h_src],
         );
+        // X-Button
+        if Button::image(self.imgs.close_button)
+            .w_h(24.0, 25.0)
+            .hover_image(self.imgs.close_btn_hover)
+            .press_image(self.imgs.close_btn_press)
+            .top_right_with_margins_on(state.ids.frame, 0.0, 0.0)
+            .set(state.ids.close, ui)
+            .was_clicked()
+        {
+            events.push(Event::Close);
+        }
         Image::new(world_map.none)
             .mid_top_with_margin_on(state.ids.map_align, 10.0)
-            .w_h(760.0, 760.0)
+            .w_h(map_size.x, map_size.y)
             .parent(state.ids.bg)
             .source_rectangle(rect_src)
             .set(state.ids.grid, ui);
 
-        if let Some(new_val) = ImageSlider::discrete(
+        /*if let Some(new_val) = ImageSlider::discrete(
             self.global_state.settings.gameplay.map_zoom as i32,
             1,
             30,
@@ -227,7 +300,336 @@ impl<'a> Widget for Map<'a> {
         .set(state.ids.zoom_slider, ui)
         {
             events.push(Event::MapZoom(new_val as f64));
+        }*/
+        // Handle zooming with the mousewheel
+        let scrolled: f64 = ui
+            .widget_input(state.ids.grid)
+            .scrolls()
+            .map(|scroll| scroll.y)
+            .sum();
+        let new_zoom_lvl = (self.global_state.settings.gameplay.map_zoom
+            * (scrolled * 0.05 * PLATFORM_FACTOR).exp2())
+        .clamped(0.75, max_zoom / 64.0);
+        events.push(Event::MapZoom(new_zoom_lvl as f64));
+        // Icon settings
+        // Alignment
+        Rectangle::fill_with([150.0, 200.0], color::TRANSPARENT)
+            .top_right_with_margins_on(state.ids.frame, 55.0, 10.0)
+            .set(state.ids.map_settings_align, ui);
+        // Checkboxes
+        // Show difficulties
+        Image::new(self.imgs.map_dif_5)
+            .top_left_with_margins_on(state.ids.map_settings_align, 5.0, 5.0)
+            .w_h(20.0, 20.0)
+            .set(state.ids.show_difficulty_img, ui);
+        if Button::image(if show_difficulty {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox
+        })
+        .w_h(18.0, 18.0)
+        .hover_image(if show_difficulty {
+            self.imgs.checkbox_checked_mo
+        } else {
+            self.imgs.checkbox_mo
+        })
+        .press_image(if show_difficulty {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox_press
+        })
+        .right_from(state.ids.show_difficulty_img, 10.0)
+        .set(state.ids.show_difficulty_box, ui)
+        .was_clicked()
+        {
+            events.push(Event::ShowDifficulties(!show_difficulty));
         }
+        Text::new(i18n.get("hud.map.difficulty"))
+            .right_from(state.ids.show_difficulty_box, 10.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.show_difficulty_box)
+            .color(TEXT_COLOR)
+            .set(state.ids.show_difficulty_text, ui);
+        // Towns
+        Image::new(self.imgs.mmap_site_town)
+            .down_from(state.ids.show_difficulty_img, 10.0)
+            .w_h(20.0, 20.0)
+            .set(state.ids.show_towns_img, ui);
+        if Button::image(if show_towns {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox
+        })
+        .w_h(18.0, 18.0)
+        .hover_image(if show_towns {
+            self.imgs.checkbox_checked_mo
+        } else {
+            self.imgs.checkbox_mo
+        })
+        .press_image(if show_towns {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox_press
+        })
+        .right_from(state.ids.show_towns_img, 10.0)
+        .set(state.ids.show_towns_box, ui)
+        .was_clicked()
+        {
+            events.push(Event::ShowTowns(!show_towns));
+        }
+        Text::new(i18n.get("hud.map.towns"))
+            .right_from(state.ids.show_towns_box, 10.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.show_towns_box)
+            .color(TEXT_COLOR)
+            .set(state.ids.show_towns_text, ui);
+        // Castles
+        Image::new(self.imgs.mmap_site_castle)
+            .down_from(state.ids.show_towns_img, 10.0)
+            .w_h(20.0, 20.0)
+            .set(state.ids.show_castles_img, ui);
+        if Button::image(if show_castles {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox
+        })
+        .w_h(18.0, 18.0)
+        .hover_image(if show_castles {
+            self.imgs.checkbox_checked_mo
+        } else {
+            self.imgs.checkbox_mo
+        })
+        .press_image(if show_castles {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox_press
+        })
+        .right_from(state.ids.show_castles_img, 10.0)
+        .set(state.ids.show_castles_box, ui)
+        .was_clicked()
+        {
+            events.push(Event::ShowCastles(!show_castles));
+        }
+        Text::new(i18n.get("hud.map.castles"))
+            .right_from(state.ids.show_castles_box, 10.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.show_castles_box)
+            .color(TEXT_COLOR)
+            .set(state.ids.show_castles_text, ui);
+        // Dungeons
+        Image::new(self.imgs.mmap_site_dungeon)
+            .down_from(state.ids.show_castles_img, 10.0)
+            .w_h(20.0, 20.0)
+            .set(state.ids.show_dungeons_img, ui);
+        if Button::image(if show_dungeons {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox
+        })
+        .w_h(18.0, 18.0)
+        .hover_image(if show_dungeons {
+            self.imgs.checkbox_checked_mo
+        } else {
+            self.imgs.checkbox_mo
+        })
+        .press_image(if show_dungeons {
+            self.imgs.checkbox_checked
+        } else {
+            self.imgs.checkbox_press
+        })
+        .right_from(state.ids.show_dungeons_img, 10.0)
+        .set(state.ids.show_dungeons_box, ui)
+        .was_clicked()
+        {
+            events.push(Event::ShowDungeons(!show_dungeons));
+        }
+        Text::new(i18n.get("hud.map.dungeons"))
+            .right_from(state.ids.show_dungeons_box, 10.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.show_dungeons_box)
+            .color(TEXT_COLOR)
+            .set(state.ids.show_dungeons_text, ui);
+        // Map icons
+        if state.ids.mmap_site_icons.len() < self.client.sites().len() {
+            state.update(|state| {
+                state
+                    .ids
+                    .mmap_site_icons
+                    .resize(self.client.sites().len(), &mut ui.widget_id_generator())
+            });
+        }
+        if state.ids.site_difs.len() < self.client.sites().len() {
+            state.update(|state| {
+                state
+                    .ids
+                    .site_difs
+                    .resize(self.client.sites().len(), &mut ui.widget_id_generator())
+            });
+        }
+        for (i, site) in self.client.sites().iter().enumerate() {
+            // Site pos in world coordinates relative to the player
+            let rwpos = site.wpos.map(|e| e as f32) - player_pos;
+            // Convert to chunk coordinates
+            let rcpos = rwpos.map2(TerrainChunkSize::RECT_SIZE, |e, sz| e / sz as f32)
+                // Add map dragging
+                + drag.map(|e| e as f32);
+            // Convert to fractional coordinates relative to the worldsize
+            let rfpos = rcpos / max_zoom as f32;
+            // Convert to relative pixel coordinates from the center of the map
+            // Accounting for zooming
+            let rpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32);
+
+            if rpos
+                .map2(map_size, |e, sz| e.abs() > sz as f32 / 2.0)
+                .reduce_or()
+            {
+                continue;
+            }
+            let title = site.name.as_deref().unwrap_or_else(|| match &site.kind {
+                SiteKind::Town => i18n.get("hud.map.town"),
+                SiteKind::Dungeon { .. } => i18n.get("hud.map.dungeon"),
+                SiteKind::Castle => i18n.get("hud.map.castle"),
+            });
+            let (difficulty, desc) = match &site.kind {
+                SiteKind::Town => (0, i18n.get("hud.map.town").to_string()),
+                SiteKind::Dungeon { difficulty } => (
+                    *difficulty,
+                    i18n.get("hud.map.difficulty_dungeon")
+                        .replace("{difficulty}", difficulty.to_string().as_str()),
+                ),
+                SiteKind::Castle => (0, i18n.get("hud.map.castle").to_string()),
+            };
+            let site_btn = Button::image(match &site.kind {
+                SiteKind::Town => {
+                    if show_towns {
+                        self.imgs.mmap_site_town
+                    } else {
+                        self.imgs.nothing
+                    }
+                },
+                SiteKind::Dungeon { .. } => {
+                    if show_dungeons {
+                        self.imgs.mmap_site_dungeon
+                    } else {
+                        self.imgs.nothing
+                    }
+                },
+                SiteKind::Castle => {
+                    if show_castles {
+                        self.imgs.mmap_site_castle
+                    } else {
+                        self.imgs.nothing
+                    }
+                },
+            })
+            .x_y_position_relative_to(
+                state.ids.grid,
+                position::Relative::Scalar(rpos.x as f64),
+                position::Relative::Scalar(rpos.y as f64),
+            )
+            .w_h(20.0 * 1.2, 20.0 * 1.2)
+            .hover_image(match &site.kind {
+                SiteKind::Town => self.imgs.mmap_site_town_hover,
+                SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_hover,
+                SiteKind::Castle => self.imgs.mmap_site_castle_hover,
+            })
+            .image_color(UI_HIGHLIGHT_0)
+            .with_tooltip(
+                self.tooltip_manager,
+                title,
+                &desc,
+                &site_tooltip,
+                match &site.kind {
+                    SiteKind::Town => TEXT_COLOR,
+                    SiteKind::Castle => TEXT_COLOR,
+                    SiteKind::Dungeon { .. } => match difficulty {
+                        0 => QUALITY_LOW,
+                        1 => QUALITY_COMMON,
+                        2 => QUALITY_MODERATE,
+                        3 => QUALITY_HIGH,
+                        4 => QUALITY_EPIC,
+                        5 => QUALITY_DEBUG,
+                        _ => TEXT_COLOR,
+                    },
+                },
+            );
+            // Only display sites that are toggled on
+            match &site.kind {
+                SiteKind::Town => {
+                    if show_towns {
+                        site_btn.set(state.ids.mmap_site_icons[i], ui);
+                    }
+                },
+                SiteKind::Dungeon { .. } => {
+                    if show_dungeons {
+                        site_btn.set(state.ids.mmap_site_icons[i], ui);
+                    }
+                },
+                SiteKind::Castle => {
+                    if show_castles {
+                        site_btn.set(state.ids.mmap_site_icons[i], ui);
+                    }
+                },
+            }
+
+            // Difficulty from 0-6
+            // 0 = towns and places without a difficulty level
+            if show_difficulty {
+                let size = 1.8; // Size factor for difficulty indicators
+                let dif_img = Image::new(match difficulty {
+                    0 => self.imgs.map_dif_0,
+                    1 => self.imgs.map_dif_1,
+                    2 => self.imgs.map_dif_2,
+                    3 => self.imgs.map_dif_3,
+                    4 => self.imgs.map_dif_4,
+                    5 => self.imgs.map_dif_5,
+                    _ => self.imgs.nothing,
+                })
+                .mid_top_with_margin_on(state.ids.mmap_site_icons[i], match difficulty {
+                    5 => -12.0 * size,
+                    _ => -4.0 * size,
+                })
+                .w(match difficulty {
+                    5 => 12.0 * size,
+                    _ => 4.0 * size * difficulty as f64,
+                })
+                .h(match difficulty {
+                    5 => 12.0 * size,
+                    _ => 4.0 * size,
+                })
+                .color(Some(match difficulty {
+                    0 => QUALITY_LOW,
+                    1 => QUALITY_COMMON,
+                    2 => QUALITY_MODERATE,
+                    3 => QUALITY_HIGH,
+                    4 => QUALITY_EPIC,
+                    5 => QUALITY_DEBUG,
+                    _ => TEXT_COLOR,
+                }));
+                match &site.kind {
+                    SiteKind::Town => {
+                        if show_towns {
+                            dif_img.set(state.ids.site_difs[i], ui)
+                        }
+                    },
+                    SiteKind::Dungeon { .. } => {
+                        if show_dungeons {
+                            dif_img.set(state.ids.site_difs[i], ui)
+                        }
+                    },
+                    SiteKind::Castle => {
+                        if show_castles {
+                            dif_img.set(state.ids.site_difs[i], ui)
+                        }
+                    },
+                }
+            }
+        }
+
         // Cursor pos relative to playerpos and widget size
         // Cursor stops moving on an axis as soon as it's position exceeds the maximum
         // // size of the widget
@@ -236,15 +638,101 @@ impl<'a> Widget for Map<'a> {
             (e as f64 / sz).clamped(0.0, 1.0)
         });*/
         //let xy = rel * 760.0;
-        let scale = 0.6;
-        let arrow_sz = Vec2::new(32.0, 37.0) * scale;
-        Image::new(self.rot_imgs.indicator_mmap_small.target_north)
-            .middle_of(state.ids.grid)
-            .w_h(arrow_sz.x, arrow_sz.y)
+
+        // Offset from map center due to dragging
+        let rcpos = drag.map(|e| e as f32);
+        // Convert to fractional coordinates relative to the worldsize
+        let rfpos = rcpos / max_zoom as f32;
+        // Convert to relative pixel coordinates from the center of the map
+        // Accounting for zooming
+        let rpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32);
+        // Don't show if outside or near the edge of the map
+        let arrow_sz = {
+            let scale = 0.6f64;
+            Vec2::new(32.0, 37.0) * scale
+        };
+        // Hide if icon could go off of the edge of the map
+        let arrow_mag = arrow_sz.map(|e| e as f32 / 2.0).magnitude();
+        if !rpos
+            .map2(map_size, |e, sz| e.abs() + arrow_mag > sz as f32 / 2.0)
+            .reduce_or()
+        {
+            Image::new(self.rot_imgs.indicator_mmap_small.target_north)
+                .x_y_position_relative_to(
+                    state.ids.grid,
+                    position::Relative::Scalar(rpos.x as f64),
+                    position::Relative::Scalar(rpos.y as f64),
+                )
+                .w_h(arrow_sz.x, arrow_sz.y)
+                .color(Some(UI_HIGHLIGHT_0))
+                .set(state.ids.indicator, ui);
+        }
+
+        // Info about controls
+        let icon_size = Vec2::new(tweak!(25.6), tweak!(28.8));
+        let recenter: bool;
+        if drag.x != 0.0 || drag.y != 0.0 {
+            recenter = true
+        } else {
+            recenter = false
+        };
+        if Button::image(self.imgs.button)
+            .w_h(92.0, icon_size.y)
+            .mid_bottom_with_margin_on(state.ids.grid, tweak!(-36.0))
+            .hover_image(if recenter {
+                self.imgs.button_hover
+            } else {
+                self.imgs.button
+            })
+            .press_image(if recenter {
+                self.imgs.button_press
+            } else {
+                self.imgs.button
+            })
+            .label(i18n.get("hud.map.recenter"))
+            .label_y(conrod_core::position::Relative::Scalar(1.0))
+            .label_color(if recenter {
+                TEXT_COLOR
+            } else {
+                TEXT_GRAY_COLOR
+            })
+            .image_color(if recenter {
+                TEXT_COLOR
+            } else {
+                TEXT_GRAY_COLOR
+            })
+            .label_font_size(self.fonts.cyri.scale(12))
+            .label_font_id(self.fonts.cyri.conrod_id)
+            .set(state.ids.recenter_button, ui)
+            .was_clicked()
+        {
+            events.push(Event::MapDrag(Vec2::zero()));
+        };
+
+        Image::new(self.imgs.m_move_ico)
+            .bottom_left_with_margins_on(state.ids.grid, tweak!(-36.0), 0.0)
+            .w_h(icon_size.x, icon_size.y)
             .color(Some(UI_HIGHLIGHT_0))
-            .floating(true)
-            .parent(ui.window)
-            .set(state.ids.indicator, ui);
+            .set(state.ids.drag_ico, ui);
+        Text::new(i18n.get("hud.map.drag"))
+            .right_from(state.ids.drag_ico, tweak!(5.0))
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.grid)
+            .color(TEXT_COLOR)
+            .set(state.ids.drag_txt, ui);
+        Image::new(self.imgs.m_scroll_ico)
+            .right_from(state.ids.drag_txt, tweak!(5.0))
+            .w_h(icon_size.x, icon_size.y)
+            .color(Some(UI_HIGHLIGHT_0))
+            .set(state.ids.zoom_ico, ui);
+        Text::new(i18n.get("hud.map.zoom"))
+            .right_from(state.ids.zoom_ico, tweak!(5.0))
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .graphics_for(state.ids.grid)
+            .color(TEXT_COLOR)
+            .set(state.ids.zoom_txt, ui);
 
         events
     }
diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs
index d897fa3074..9d53a08e6b 100644
--- a/voxygen/src/hud/minimap.rs
+++ b/voxygen/src/hud/minimap.rs
@@ -1,15 +1,17 @@
 use super::{
     img_ids::{Imgs, ImgsRot},
-    Show, TEXT_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
+    Show, QUALITY_COMMON, QUALITY_DEBUG, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE,
+    TEXT_COLOR, UI_HIGHLIGHT_0, UI_MAIN,
 };
 use crate::ui::{fonts::Fonts, img_ids};
 use client::{self, Client};
-use common::{comp, terrain::TerrainChunkSize, vol::RectVolSize};
+use common::{comp, msg::world_msg::SiteKind, terrain::TerrainChunkSize, vol::RectVolSize};
 use conrod_core::{
     color, position,
     widget::{self, Button, Image, Rectangle, Text},
     widget_ids, Color, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
 };
+
 use specs::WorldExt;
 use vek::*;
 
@@ -28,6 +30,8 @@ widget_ids! {
         mmap_east,
         mmap_south,
         mmap_west,
+        mmap_site_icons_bgs[],
+        mmap_site_icons[],
     }
 }
 
@@ -121,9 +125,8 @@ impl<'a> Widget for MiniMap<'a> {
                 .mid_top_with_margin_on(state.ids.mmap_frame_2, 18.0 * SCALE)
                 .set(state.ids.mmap_frame_bg, ui);
 
-            // Map size
+            // Map size in chunk coords
             let (world_map, worldsize) = self.world_map;
-            let worldsize = worldsize.map2(TerrainChunkSize::RECT_SIZE, |e, f| e as f64 * f as f64);
 
             // Zoom Buttons
 
@@ -133,8 +136,8 @@ impl<'a> Widget for MiniMap<'a> {
             // TODO: Either prevent zooming all the way in, *or* see if we can interpolate
             // somehow if you zoom in too far.  Or both.
             let min_zoom = 1.0;
-            let max_zoom = (worldsize / TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
-                .reduce_partial_max()/*.min(f64::MAX)*/;
+            let max_zoom = worldsize
+                .reduce_partial_max() as f64/*.min(f64::MAX)*/;
 
             // NOTE: Not sure if a button can be clicked while disabled, but we still double
             // check for both kinds of zoom to make sure that not only was the
@@ -197,29 +200,103 @@ impl<'a> Widget for MiniMap<'a> {
             let rect_src = position::Rect::from_xy_dim(
                 [
                     player_pos.x as f64 / TerrainChunkSize::RECT_SIZE.x as f64,
-                    (worldsize.y - player_pos.y as f64) / TerrainChunkSize::RECT_SIZE.y as f64,
+                    worldsize.y as f64
+                        - (player_pos.y as f64 / TerrainChunkSize::RECT_SIZE.y as f64),
                 ],
                 [w_src, h_src],
             );
 
-            let map_size = Vec2::new(170.0, 170.0);
+            let map_size = Vec2::new(170.0 * SCALE, 170.0 * SCALE);
 
             // Map Image
             Image::new(world_map.source_north)
                 .middle_of(state.ids.mmap_frame_bg)
-                .w_h(map_size.x * SCALE, map_size.y * SCALE)
+                .w_h(map_size.x, map_size.y)
                 .parent(state.ids.mmap_frame_bg)
                 .source_rectangle(rect_src)
                 .set(state.ids.grid, ui);
 
+            // Map icons
+            if state.ids.mmap_site_icons.len() < self.client.sites().len() {
+                state.update(|state| {
+                    state
+                        .ids
+                        .mmap_site_icons
+                        .resize(self.client.sites().len(), &mut ui.widget_id_generator())
+                });
+            }
+            if state.ids.mmap_site_icons_bgs.len() < self.client.sites().len() {
+                state.update(|state| {
+                    state
+                        .ids
+                        .mmap_site_icons_bgs
+                        .resize(self.client.sites().len(), &mut ui.widget_id_generator())
+                });
+            }
+            for (i, site) in self.client.sites().iter().enumerate() {
+                // Site pos in world coordinates relative to the player
+                let rwpos = site.wpos.map(|e| e as f32) - player_pos;
+                // Convert to chunk coordinates
+                let rcpos = rwpos.map2(TerrainChunkSize::RECT_SIZE, |e, sz| e / sz as f32);
+                // Convert to fractional coordinates relative to the worldsize
+                let rfpos = rcpos / max_zoom as f32;
+                // Convert to unrotated pixel coordinates from the player location on the map
+                // (the center)
+                // Accounting for zooming
+                let rpixpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32);
+                let rpos = Vec2::unit_x().rotated_z(self.ori.x) * rpixpos.x
+                    + Vec2::unit_y().rotated_z(self.ori.x) * rpixpos.y;
+
+                if rpos
+                    .map2(map_size, |e, sz| e.abs() > sz as f32 / 2.0)
+                    .reduce_or()
+                {
+                    continue;
+                }
+
+                Image::new(match &site.kind {
+                    SiteKind::Town => self.imgs.mmap_site_town_bg,
+                    SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_bg,
+                    SiteKind::Castle => self.imgs.mmap_site_castle_bg,
+                })
+                .x_y_position_relative_to(
+                    state.ids.grid,
+                    position::Relative::Scalar(rpos.x as f64),
+                    position::Relative::Scalar(rpos.y as f64),
+                )
+                .w_h(20.0, 20.0)
+                .color(Some(match &site.kind {
+                    SiteKind::Town => Color::Rgba(1.0, 1.0, 1.0, 0.0),
+                    SiteKind::Castle => Color::Rgba(1.0, 1.0, 1.0, 0.0),
+                    SiteKind::Dungeon { difficulty } => match difficulty {
+                        0 => QUALITY_LOW,
+                        1 => QUALITY_COMMON,
+                        2 => QUALITY_MODERATE,
+                        3 => QUALITY_HIGH,
+                        4 => QUALITY_EPIC,
+                        5 => QUALITY_DEBUG,
+                        _ => Color::Rgba(1.0, 1.0, 1.0, 0.0),
+                    },
+                }))
+                .parent(state.ids.grid)
+                .set(state.ids.mmap_site_icons_bgs[i], ui);
+                Image::new(match &site.kind {
+                    SiteKind::Town => self.imgs.mmap_site_town,
+                    SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon,
+                    SiteKind::Castle => self.imgs.mmap_site_castle,
+                })
+                .middle_of(state.ids.mmap_site_icons_bgs[i])
+                .w_h(20.0, 20.0)
+                .color(Some(UI_HIGHLIGHT_0))
+                .set(state.ids.mmap_site_icons[i], ui);
+            }
+
             // Indicator
             let ind_scale = 0.4;
             Image::new(self.rot_imgs.indicator_mmap_small.none)
                 .middle_of(state.ids.grid)
                 .w_h(32.0 * ind_scale, 37.0 * ind_scale)
                 .color(Some(UI_HIGHLIGHT_0))
-                .floating(true)
-                .parent(ui.window)
                 .set(state.ids.indicator, ui);
 
             // Compass directions
@@ -232,9 +309,8 @@ impl<'a> Widget for MiniMap<'a> {
             for (dir, id, name, bold) in dirs.iter() {
                 let cardinal_dir = Vec2::unit_x().rotated_z(self.ori.x as f64) * dir.x
                     + Vec2::unit_y().rotated_z(self.ori.x as f64) * dir.y;
-                let clamped = (cardinal_dir * 3.0)
-                    / (cardinal_dir * 3.0).map(|e| e.abs()).reduce_partial_max();
-                let pos = clamped * (map_size * 0.73 - 10.0);
+                let clamped = cardinal_dir / cardinal_dir.map(|e| e.abs()).reduce_partial_max();
+                let pos = clamped * (map_size / 2.0 - 10.0);
                 Text::new(name)
                     .x_y_position_relative_to(
                         state.ids.grid,
@@ -248,7 +324,6 @@ impl<'a> Widget for MiniMap<'a> {
                     } else {
                         TEXT_COLOR
                     })
-                    .floating(true)
                     .parent(ui.window)
                     .set(*id, ui);
             }
@@ -287,13 +362,25 @@ impl<'a> Widget for MiniMap<'a> {
         // TODO: Subregion name display
 
         // Title
+
         match self.client.current_chunk() {
-            Some(chunk) => Text::new(chunk.meta().name())
-                .mid_top_with_margin_on(state.ids.mmap_frame, 2.0)
-                .font_size(self.fonts.cyri.scale(18))
-                .font_id(self.fonts.cyri.conrod_id)
-                .color(TEXT_COLOR)
-                .set(state.ids.mmap_location, ui),
+            Some(chunk) => {
+                // Count characters in the name to avoid clipping with the name display
+                let name_len = chunk.meta().name().chars().count();
+                Text::new(chunk.meta().name())
+                    .mid_top_with_margin_on(state.ids.mmap_frame, match name_len {
+                        15..=30 => 4.0,
+                        _ => 2.0,
+                    })
+                    .font_size(self.fonts.cyri.scale(match name_len {
+                        0..=15 => 18,
+                        16..=30 => 14,
+                        _ => 14,
+                    }))
+                    .font_id(self.fonts.cyri.conrod_id)
+                    .color(TEXT_COLOR)
+                    .set(state.ids.mmap_location, ui)
+            },
             None => Text::new(" ")
                 .mid_top_with_margin_on(state.ids.mmap_frame, 0.0)
                 .font_size(self.fonts.cyri.scale(18))
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index e0d74a5ba3..c513fa3ccf 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -48,10 +48,7 @@ use crate::{
     hud::img_ids::ImgsRot,
     i18n::{i18n_asset_key, LanguageMetadata, Localization},
     render::{Consts, Globals, RenderMode, Renderer},
-    scene::{
-        camera::{self, Camera},
-        lod,
-    },
+    scene::camera::{self, Camera},
     ui::{fonts::Fonts, img_ids::Rotations, slot, Graphic, Ingameable, ScaleMode, Ui},
     window::{Event as WinEvent, FullScreenSettings, GameInput},
     GlobalState,
@@ -68,6 +65,7 @@ use common::{
     span,
     sync::Uid,
     terrain::TerrainChunk,
+    util::srgba_to_linear,
     vol::RectRasterableVol,
 };
 use conrod_core::{
@@ -75,6 +73,7 @@ use conrod_core::{
     widget::{self, Button, Image, Text},
     widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
 };
+use inline_tweak::*;
 use specs::{Join, WorldExt};
 use std::{
     collections::{HashMap, VecDeque},
@@ -323,8 +322,14 @@ pub enum Event {
     ChangeMaxFPS(u32),
     ChangeFOV(u16),
     ChangeGamma(f32),
+    ChangeExposure(f32),
     ChangeAmbiance(f32),
     MapZoom(f64),
+    MapDrag(Vec2<f64>),
+    MapShowDifficulty(bool),
+    MapShowTowns(bool),
+    MapShowDungeons(bool),
+    MapShowCastles(bool),
     AdjustWindowSize([u16; 2]),
     ChangeFullscreenMode(FullScreenSettings),
     ToggleParticlesEnabled(bool),
@@ -639,8 +644,7 @@ impl Hud {
         let ids = Ids::new(ui.id_generator());
         // NOTE: Use a border the same color as the LOD ocean color (but with a
         // translucent alpha since UI have transparency and LOD doesn't).
-        let mut water_color = lod::water_color();
-        water_color.a = 0.5;
+        let water_color = srgba_to_linear(Rgba::new(0.0, tweak!(0.18), tweak!(0.37), tweak!(1.0)));
         // Load world map
         let world_map = (
             ui.add_graphic_with_rotations(Graphic::Image(
@@ -2152,6 +2156,9 @@ impl Hud {
                     settings_window::Event::AdjustGamma(new_gamma) => {
                         events.push(Event::ChangeGamma(new_gamma));
                     },
+                    settings_window::Event::AdjustExposure(new_exposure) => {
+                        events.push(Event::ChangeExposure(new_exposure));
+                    },
                     settings_window::Event::AdjustAmbiance(new_ambiance) => {
                         events.push(Event::ChangeAmbiance(new_ambiance));
                     },
@@ -2242,7 +2249,6 @@ impl Hud {
         // Map
         if self.show.map {
             for event in Map::new(
-                &self.show,
                 client,
                 &self.imgs,
                 &self.rot_imgs,
@@ -2251,6 +2257,7 @@ impl Hud {
                 self.pulse,
                 &self.i18n,
                 &global_state,
+                tooltip_manager,
             )
             .set(self.ids.map, ui_widgets)
             {
@@ -2260,11 +2267,32 @@ impl Hud {
                         self.show.want_grab = true;
                         self.force_ungrab = false;
                     },
+                    map::Event::ShowDifficulties(map_show_difficulties) => {
+                        events.push(Event::MapShowDifficulty(map_show_difficulties));
+                    },
+                    map::Event::ShowTowns(map_show_towns) => {
+                        events.push(Event::MapShowTowns(map_show_towns));
+                    },
+                    map::Event::ShowCastles(map_show_castles) => {
+                        events.push(Event::MapShowCastles(map_show_castles));
+                    },
+                    map::Event::ShowDungeons(map_show_dungeons) => {
+                        events.push(Event::MapShowDungeons(map_show_dungeons));
+                    },
                     map::Event::MapZoom(map_zoom) => {
                         events.push(Event::MapZoom(map_zoom));
                     },
+                    map::Event::MapDrag(map_drag) => {
+                        events.push(Event::MapDrag(map_drag));
+                    },
                 }
             }
+        } else {
+            // Reset the map position when it's not showing
+            let drag = &global_state.settings.gameplay.map_drag;
+            if drag.x != 0.0 || drag.y != 0.0 {
+                events.push(Event::MapDrag(Vec2::zero()))
+            }
         }
 
         if self.show.esc_menu {
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index 506b0f1aa8..96b539b98b 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -124,6 +124,9 @@ widget_ids! {
         gamma_slider,
         gamma_text,
         gamma_value,
+        exposure_slider,
+        exposure_text,
+        exposure_value,
         ambiance_slider,
         ambiance_text,
         ambiance_value,
@@ -284,6 +287,7 @@ pub enum Event {
     AdjustFOV(u16),
     AdjustLodDetail(u32),
     AdjustGamma(f32),
+    AdjustExposure(f32),
     AdjustAmbiance(f32),
     AdjustWindowSize([u16; 2]),
     ChangeFullscreenMode(FullScreenSettings),
@@ -1900,6 +1904,41 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .color(TEXT_COLOR)
                 .set(state.ids.gamma_value, ui);
 
+            // Exposure
+            if let Some(new_val) = ImageSlider::discrete(
+                (self.global_state.settings.graphics.exposure * 16.0) as i32,
+                0,
+                32,
+                self.imgs.slider_indicator,
+                self.imgs.slider,
+            )
+            .w_h(104.0, 22.0)
+            .right_from(state.ids.gamma_slider, 50.0)
+            .track_breadth(12.0)
+            .slider_length(10.0)
+            .pad_track((5.0, 5.0))
+            .set(state.ids.exposure_slider, ui)
+            {
+                events.push(Event::AdjustExposure(new_val as f32 / 16.0));
+            }
+
+            Text::new(&self.localized_strings.get("hud.settings.exposure"))
+                .up_from(state.ids.exposure_slider, 8.0)
+                .font_size(self.fonts.cyri.scale(14))
+                .font_id(self.fonts.cyri.conrod_id)
+                .color(TEXT_COLOR)
+                .set(state.ids.exposure_text, ui);
+
+            Text::new(&format!(
+                "{:.2}",
+                self.global_state.settings.graphics.exposure
+            ))
+            .right_from(state.ids.exposure_slider, 8.0)
+            .font_size(self.fonts.cyri.scale(14))
+            .font_id(self.fonts.cyri.conrod_id)
+            .color(TEXT_COLOR)
+            .set(state.ids.exposure_value, ui);
+
             //Ambiance Brightness
             // 320.0 = maximum brightness in shaders
             let min_ambiance = 10.0;
@@ -1912,7 +1951,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 self.imgs.slider,
             )
             .w_h(104.0, 22.0)
-            .right_from(state.ids.gamma_slider, 50.0)
+            .right_from(state.ids.exposure_slider, 50.0)
             .track_breadth(12.0)
             .slider_length(10.0)
             .pad_track((5.0, 5.0))
@@ -2125,6 +2164,7 @@ impl<'a> Widget for SettingsWindow<'a> {
                 CloudMode::Low,
                 CloudMode::Medium,
                 CloudMode::High,
+                CloudMode::Ultra,
             ];
             let mode_label_list = [
                 &self.localized_strings.get("common.none"),
@@ -2140,6 +2180,9 @@ impl<'a> Widget for SettingsWindow<'a> {
                 &self
                     .localized_strings
                     .get("hud.settings.cloud_rendering_mode.high"),
+                &self
+                    .localized_strings
+                    .get("hud.settings.cloud_rendering_mode.ultra"),
             ];
 
             // Get which cloud rendering mode is currently active
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index eb25e93c2e..43e6424076 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -152,6 +152,7 @@ impl PlayState for CharSelectionState {
                     thread_pool: client.thread_pool(),
                     body: humanoid_body,
                     gamma: global_state.settings.graphics.gamma,
+                    exposure: global_state.settings.graphics.exposure,
                     ambiance: global_state.settings.graphics.ambiance,
                     mouse_smoothing: global_state.settings.gameplay.smooth_pan_enable,
                     figure_lod_render_distance: global_state
diff --git a/voxygen/src/mesh/greedy.rs b/voxygen/src/mesh/greedy.rs
index 13e70b639c..ebbaed7c93 100644
--- a/voxygen/src/mesh/greedy.rs
+++ b/voxygen/src/mesh/greedy.rs
@@ -11,7 +11,7 @@ type TodoRect = (
     Vec3<i32>,
 );
 
-pub struct GreedyConfig<D, FL, FC, FO, FS, FP> {
+pub struct GreedyConfig<D, FL, FG, FC, FO, FS, FP> {
     pub data: D,
     /// The minimum position to mesh, in the coordinate system used
     /// for queries against the volume.
@@ -36,6 +36,9 @@ pub struct GreedyConfig<D, FL, FC, FO, FS, FP> {
     /// Given a position, return the lighting information for the voxel at that
     /// position.
     pub get_light: FL,
+    /// Given a position, return the glow information for the voxel at that
+    /// position (i.e: additional non-sun light).
+    pub get_glow: FG,
     /// Given a position, return the color information for the voxel at that
     /// position.
     pub get_color: FC,
@@ -140,11 +143,12 @@ impl<'a> GreedyMesh<'a> {
     /// Returns an estimate of the bounds of the current meshed model.
     ///
     /// For more information on the config parameter, see [GreedyConfig].
-    pub fn push<M: PartialEq, D: 'a, FL, FC, FO, FS, FP>(
+    pub fn push<M: PartialEq, D: 'a, FL, FG, FC, FO, FS, FP>(
         &mut self,
-        config: GreedyConfig<D, FL, FC, FO, FS, FP>,
+        config: GreedyConfig<D, FL, FG, FC, FO, FS, FP>,
     ) where
         FL: for<'r> FnMut(&'r mut D, Vec3<i32>) -> f32 + 'a,
+        FG: for<'r> FnMut(&'r mut D, Vec3<i32>) -> f32 + 'a,
         FC: for<'r> FnMut(&'r mut D, Vec3<i32>) -> Rgb<u8> + 'a,
         FO: for<'r> FnMut(&'r mut D, Vec3<i32>) -> bool + 'a,
         FS: for<'r> FnMut(&'r mut D, Vec3<i32>, Vec3<i32>, Vec2<Vec3<i32>>) -> Option<(bool, M)>,
@@ -173,7 +177,7 @@ impl<'a> GreedyMesh<'a> {
         span!(_guard, "finalize", "GreedyMesh::finalize");
         let cur_size = self.col_lights_size;
         let col_lights = vec![
-            TerrainVertex::make_col_light(254, Rgb::broadcast(254));
+            TerrainVertex::make_col_light(254, 0, Rgb::broadcast(254));
             usize::from(cur_size.x) * usize::from(cur_size.y)
         ];
         let mut col_lights_info = (col_lights, cur_size);
@@ -186,7 +190,7 @@ impl<'a> GreedyMesh<'a> {
     pub fn max_size(&self) -> guillotiere::Size { self.max_size }
 }
 
-fn greedy_mesh<'a, M: PartialEq, D: 'a, FL, FC, FO, FS, FP>(
+fn greedy_mesh<'a, M: PartialEq, D: 'a, FL, FG, FC, FO, FS, FP>(
     atlas: &mut guillotiere::SimpleAtlasAllocator,
     col_lights_size: &mut Vec2<u16>,
     max_size: guillotiere::Size,
@@ -196,14 +200,16 @@ fn greedy_mesh<'a, M: PartialEq, D: 'a, FL, FC, FO, FS, FP>(
         greedy_size,
         greedy_size_cross,
         get_light,
+        get_glow,
         get_color,
         get_opacity,
         mut should_draw,
         mut push_quad,
-    }: GreedyConfig<D, FL, FC, FO, FS, FP>,
+    }: GreedyConfig<D, FL, FG, FC, FO, FS, FP>,
 ) -> Box<SuspendedMesh<'a>>
 where
     FL: for<'r> FnMut(&'r mut D, Vec3<i32>) -> f32 + 'a,
+    FG: for<'r> FnMut(&'r mut D, Vec3<i32>) -> f32 + 'a,
     FC: for<'r> FnMut(&'r mut D, Vec3<i32>) -> Rgb<u8> + 'a,
     FO: for<'r> FnMut(&'r mut D, Vec3<i32>) -> bool + 'a,
     FS: for<'r> FnMut(&'r mut D, Vec3<i32>, Vec3<i32>, Vec2<Vec3<i32>>) -> Option<(bool, M)>,
@@ -356,6 +362,7 @@ where
             todo_rects,
             draw_delta,
             get_light,
+            get_glow,
             get_color,
             get_opacity,
             TerrainVertex::make_col_light,
@@ -511,9 +518,10 @@ fn draw_col_lights<D>(
     todo_rects: Vec<TodoRect>,
     draw_delta: Vec3<i32>,
     mut get_light: impl FnMut(&mut D, Vec3<i32>) -> f32,
+    mut get_glow: impl FnMut(&mut D, Vec3<i32>) -> f32,
     mut get_color: impl FnMut(&mut D, Vec3<i32>) -> Rgb<u8>,
     mut get_opacity: impl FnMut(&mut D, Vec3<i32>) -> bool,
-    mut make_col_light: impl FnMut(u8, Rgb<u8>) -> <<ColLightFmt as gfx::format::Formatted>::Surface as gfx::format::SurfaceTyped>::DataType,
+    mut make_col_light: impl FnMut(u8, u8, Rgb<u8>) -> <<ColLightFmt as gfx::format::Formatted>::Surface as gfx::format::SurfaceTyped>::DataType,
 ) {
     todo_rects.into_iter().for_each(|(pos, uv, rect, delta)| {
         // NOTE: Conversions are safe because width, height, and offset must be
@@ -578,9 +586,19 @@ fn draw_col_lights<D>(
                                 0.0
                             }
                     ) / 4.0;
+                    let glowiness = (get_glow(data, light_pos)
+                        + get_glow(data, light_pos - uv.x)
+                        + get_glow(data, light_pos - uv.y)
+                        + if direct_u_opacity || direct_v_opacity {
+                            get_glow(data, light_pos - uv.x - uv.y)
+                        } else {
+                            0.0
+                        })
+                        / 4.0;
                     let col = get_color(data, pos);
-                    let light = (darkness * 255.0) as u8;
-                    *col_light = make_col_light(light, col);
+                    let light = (darkness * 31.5) as u8;
+                    let glow = (glowiness * 31.5) as u8;
+                    *col_light = make_col_light(light, glow, col);
                 });
         });
     });
diff --git a/voxygen/src/mesh/segment.rs b/voxygen/src/mesh/segment.rs
index 3f64ef4edb..b240aaf756 100644
--- a/voxygen/src/mesh/segment.rs
+++ b/voxygen/src/mesh/segment.rs
@@ -77,6 +77,7 @@ where
                 0.0
             }
         };
+        let get_glow = |_vol: &mut V, _pos: Vec3<i32>| 0.0;
         let get_color = |vol: &mut V, pos: Vec3<i32>| {
             vol.get(pos)
                 .ok()
@@ -100,6 +101,7 @@ where
             greedy_size,
             greedy_size_cross,
             get_light,
+            get_glow,
             get_color,
             get_opacity,
             should_draw,
@@ -159,9 +161,10 @@ where
                 && lower_bound.z <= upper_bound.z
         );
         let greedy_size = upper_bound - lower_bound + 1;
+        // TODO: Should this be 16, 16, 64?
         assert!(
-            greedy_size.x <= 16 && greedy_size.y <= 16 && greedy_size.z <= 64,
-            "Sprite size out of bounds: {:?} ≤ (15, 15, 63)",
+            greedy_size.x <= 32 && greedy_size.y <= 32 && greedy_size.z <= 64,
+            "Sprite size out of bounds: {:?} ≤ (31, 31, 63)",
             greedy_size - 1
         );
         // NOTE: Cast to usize is safe because of previous check, since all values fit
@@ -178,6 +181,7 @@ where
                 0.0
             }
         };
+        let get_glow = |_vol: &mut V, _pos: Vec3<i32>| 0.0;
         let get_color = |vol: &mut V, pos: Vec3<i32>| {
             vol.get(pos)
                 .ok()
@@ -200,6 +204,7 @@ where
             greedy_size,
             greedy_size_cross,
             get_light,
+            get_glow,
             get_color,
             get_opacity,
             should_draw,
@@ -272,6 +277,7 @@ where
                 0.0
             }
         };
+        let get_glow = |_vol: &mut V, _pos: Vec3<i32>| 0.0;
         let get_color = |vol: &mut V, pos: Vec3<i32>| {
             vol.get(pos)
                 .ok()
@@ -294,6 +300,7 @@ where
             greedy_size,
             greedy_size_cross,
             get_light,
+            get_glow,
             get_color,
             get_opacity,
             should_draw,
diff --git a/voxygen/src/mesh/terrain.rs b/voxygen/src/mesh/terrain.rs
index 1256a52fa1..e40c7f4aa4 100644
--- a/voxygen/src/mesh/terrain.rs
+++ b/voxygen/src/mesh/terrain.rs
@@ -4,6 +4,7 @@ use crate::{
         MeshGen, Meshable,
     },
     render::{self, ColLightInfo, FluidPipeline, Mesh, ShadowPipeline, TerrainPipeline},
+    scene::terrain::BlocksOfInterest,
 };
 use common::{
     span,
@@ -30,13 +31,16 @@ enum FaceKind {
 }
 
 const SUNLIGHT: u8 = 24;
-const _MAX_LIGHT_DIST: i32 = SUNLIGHT as i32;
+const MAX_LIGHT_DIST: i32 = SUNLIGHT as i32;
 
 fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
+    is_sunlight: bool,
+    // When above bounds
+    default_light: u8,
     bounds: Aabb<i32>,
     vol: &VolGrid2d<V>,
     lit_blocks: impl Iterator<Item = (Vec3<i32>, u8)>,
-) -> impl FnMut(Vec3<i32>) -> f32 + '_ {
+) -> impl Fn(Vec3<i32>) -> f32 + 'static + Send + Sync {
     span!(_guard, "calc_light");
     const UNKNOWN: u8 = 255;
     const OPAQUE: u8 = 254;
@@ -51,38 +55,40 @@ fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
     let mut light_map = vec![UNKNOWN; outer.size().product() as usize];
     let lm_idx = {
         let (w, h, _) = outer.clone().size().into_tuple();
-        move |x, y, z| (z * h * w + x * h + y) as usize
+        move |x, y, z| (w * h * z + h * x + y) as usize
     };
     // Light propagation queue
     let mut prop_que = lit_blocks
         .map(|(pos, light)| {
             let rpos = pos - outer.min;
-            light_map[lm_idx(rpos.x, rpos.y, rpos.z)] = light;
+            light_map[lm_idx(rpos.x, rpos.y, rpos.z)] = light.min(SUNLIGHT); // Brightest light
             (rpos.x as u8, rpos.y as u8, rpos.z as u16)
         })
         .collect::<VecDeque<_>>();
     // Start sun rays
-    for x in 0..outer.size().w {
-        for y in 0..outer.size().h {
-            let z = outer.size().d - 1;
-            let is_air = vol_cached
-                .get(outer.min + Vec3::new(x, y, z))
-                .ok()
-                .map_or(false, |b| b.is_air());
-
-            light_map[lm_idx(x, y, z)] = if is_air {
-                if vol_cached
-                    .get(outer.min + Vec3::new(x, y, z - 1))
+    if is_sunlight {
+        for x in 0..outer.size().w {
+            for y in 0..outer.size().h {
+                let z = outer.size().d - 1;
+                let is_air = vol_cached
+                    .get(outer.min + Vec3::new(x, y, z))
                     .ok()
-                    .map_or(false, |b| b.is_air())
-                {
-                    light_map[lm_idx(x, y, z - 1)] = SUNLIGHT;
-                    prop_que.push_back((x as u8, y as u8, z as u16));
-                }
-                SUNLIGHT
-            } else {
-                OPAQUE
-            };
+                    .map_or(false, |b| b.is_air());
+
+                light_map[lm_idx(x, y, z)] = if is_air {
+                    if vol_cached
+                        .get(outer.min + Vec3::new(x, y, z - 1))
+                        .ok()
+                        .map_or(false, |b| b.is_air())
+                    {
+                        light_map[lm_idx(x, y, z - 1)] = SUNLIGHT;
+                        prop_que.push_back((x as u8, y as u8, z as u16));
+                    }
+                    SUNLIGHT
+                } else {
+                    OPAQUE
+                };
+            }
         }
     }
 
@@ -123,7 +129,7 @@ fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
         let light = light_map[lm_idx(pos.x, pos.y, pos.z)];
 
         // If ray propagate downwards at full strength
-        if light == SUNLIGHT {
+        if is_sunlight && light == SUNLIGHT {
             // Down is special cased and we know up is a ray
             // Special cased ray propagation
             let pos = Vec3::new(pos.x, pos.y, pos.z - 1);
@@ -202,23 +208,57 @@ fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
         }
     }
 
+    let min_bounds = Aabb {
+        min: bounds.min - 1,
+        max: bounds.max + 1,
+    };
+
+    // Minimise light map to reduce duplication. We can now discard light info
+    // for blocks outside of the chunk borders.
+    let mut light_map2 = vec![UNKNOWN; min_bounds.size().product() as usize];
+    let lm_idx2 = {
+        let (w, h, _) = min_bounds.clone().size().into_tuple();
+        move |x, y, z| (w * h * z + h * x + y) as usize
+    };
+    for x in 0..min_bounds.size().w {
+        for y in 0..min_bounds.size().h {
+            for z in 0..min_bounds.size().d {
+                let off = min_bounds.min - outer.min;
+                light_map2[lm_idx2(x, y, z)] = light_map[lm_idx(x + off.x, y + off.y, z + off.z)];
+            }
+        }
+    }
+
+    drop(light_map);
+
     move |wpos| {
-        let pos = wpos - outer.min;
-        light_map
-            .get(lm_idx(pos.x, pos.y, pos.z))
-            .filter(|l| **l != OPAQUE && **l != UNKNOWN)
-            .map(|l| *l as f32 / SUNLIGHT as f32)
-            .unwrap_or(0.0)
+        let pos = wpos - min_bounds.min;
+        let l = light_map2
+            .get(lm_idx2(pos.x, pos.y, pos.z))
+            .copied()
+            .unwrap_or(default_light);
+
+        if l != OPAQUE && l != UNKNOWN {
+            l as f32 / SUNLIGHT as f32
+        } else {
+            0.0
+        }
     }
 }
 
-impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
+impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug + 'static>
     Meshable<TerrainPipeline, FluidPipeline> for &'a VolGrid2d<V>
 {
     type Pipeline = TerrainPipeline;
-    type Result = (Aabb<f32>, ColLightInfo);
+    #[allow(clippy::type_complexity)]
+    type Result = (
+        Aabb<f32>,
+        ColLightInfo,
+        Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
+        Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
+    );
     type ShadowPipeline = ShadowPipeline;
-    type Supplement = (Aabb<i32>, Vec2<u16>);
+    type Supplement = (Aabb<i32>, Vec2<u16>, &'a BlocksOfInterest);
     type TranslucentPipeline = FluidPipeline;
 
     #[allow(clippy::collapsible_if)]
@@ -229,21 +269,42 @@ impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
 
     fn generate_mesh(
         self,
-        (range, max_texture_size): Self::Supplement,
+        (range, max_texture_size, _boi): Self::Supplement,
     ) -> MeshGen<TerrainPipeline, FluidPipeline, Self> {
         span!(
             _guard,
             "generate_mesh",
             "<&VolGrid2d as Meshable<_, _>>::generate_mesh"
         );
+
         // Find blocks that should glow
-        // FIXME: Replace with real lit blocks when we actually have blocks that glow.
-        let lit_blocks = core::iter::empty();
+        // TODO: Search neighbouring chunks too!
+        // let glow_blocks = boi.lights
+        //     .iter()
+        //     .map(|(pos, glow)| (*pos + range.min.xy(), *glow));
         /*  DefaultVolIterator::new(self, range.min - MAX_LIGHT_DIST, range.max + MAX_LIGHT_DIST)
         .filter_map(|(pos, block)| block.get_glow().map(|glow| (pos, glow))); */
 
-        // Calculate chunk lighting
-        let mut light = calc_light(range, self, lit_blocks);
+        let mut glow_blocks = Vec::new();
+
+        // TODO: This expensive, use BlocksOfInterest instead
+        let mut volume = self.cached();
+        for x in -MAX_LIGHT_DIST..range.size().w + MAX_LIGHT_DIST {
+            for y in -MAX_LIGHT_DIST..range.size().h + MAX_LIGHT_DIST {
+                for z in -1..range.size().d + 1 {
+                    let wpos = range.min + Vec3::new(x, y, z);
+                    volume
+                        .get(wpos)
+                        .ok()
+                        .and_then(|b| b.get_glow())
+                        .map(|glow| glow_blocks.push((wpos, glow)));
+                }
+            }
+        }
+
+        // Calculate chunk lighting (sunlight defaults to 1.0, glow to 0.0)
+        let light = calc_light(true, SUNLIGHT, range, self, core::iter::empty());
+        let glow = calc_light(false, 0, range, self, glow_blocks.into_iter());
 
         let mut opaque_limits = None::<Limits>;
         let mut fluid_limits = None::<Limits>;
@@ -265,8 +326,9 @@ impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
                 for x in 0..range.size().w {
                     for y in 0..range.size().h {
                         for z in -1..range.size().d + 1 {
+                            let wpos = range.min + Vec3::new(x, y, z);
                             let block = volume
-                                .get(range.min + Vec3::new(x, y, z))
+                                .get(wpos)
                                 .map(|b| *b)
                                 // TODO: Replace with None or some other more reasonable value,
                                 // since it's not clear this will work properly with liquid.
@@ -342,6 +404,7 @@ impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
         let draw_delta = Vec3::new(1, 1, z_start);
 
         let get_light = |_: &mut (), pos: Vec3<i32>| light(pos + range.min);
+        let get_glow = |_: &mut (), pos: Vec3<i32>| glow(pos + range.min);
         let get_color =
             |_: &mut (), pos: Vec3<i32>| flat_get(pos).get_color().unwrap_or(Rgb::zero());
         let get_opacity = |_: &mut (), pos: Vec3<i32>| !flat_get(pos).is_opaque();
@@ -365,6 +428,7 @@ impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
             greedy_size,
             greedy_size_cross,
             get_light,
+            get_glow,
             get_color,
             get_opacity,
             should_draw,
@@ -405,7 +469,12 @@ impl<'a, V: RectRasterableVol<Vox = Block> + ReadVol + Debug>
             opaque_mesh,
             fluid_mesh,
             Mesh::new(),
-            (bounds, (col_lights, col_lights_size)),
+            (
+                bounds,
+                (col_lights, col_lights_size),
+                Box::new(light),
+                Box::new(glow),
+            ),
         )
     }
 }
diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs
index 0c69b2cd86..245734d67c 100644
--- a/voxygen/src/render/mod.rs
+++ b/voxygen/src/render/mod.rs
@@ -110,45 +110,27 @@ impl Default for AaMode {
 /// Cloud modes
 #[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
 pub enum CloudMode {
-    /// No clouds.  On computers that can't handle loops well, have performance
-    /// issues in fragment shaders in general, or just have large
-    /// resolutions, this can be a *very* impactful performance difference.
-    /// Part of that is because of inefficiencies in how we implement
-    /// regular clouds.  It is still not all that cheap on low-end machines, due
-    /// to many calculations being performed that use relatively expensive
-    /// functions, and at some point I'd like to both optimize the regular
-    /// sky shader further and create an even cheaper option.
+    /// No clouds. As cheap as it gets.
     None,
-    /// Volumetric clouds.  This option can be *very* expensive on low-end
-    /// machines, to the point of making the game unusable, for several
-    /// reasons:
-    ///
-    /// - The volumetric clouds use raymarching, which will cause catastrophic
-    ///   performance degradation on GPUs without good support for loops.  There
-    ///   is an attempt to minimize the impact of this using a z-range check,
-    ///   but on some low-end GPUs (such as some integrated graphics cards) this
-    ///   test doesn't appear to be able to be predicted well at shader
-    ///   invocation time.
-    /// - The cloud computations themselves are fairly involved, further
-    ///   degrading performance.
-    /// - Although the sky shader is always drawn at the outer edges of the
-    ///   skybox, the clouds themselves are supposed to be positioned much
-    ///   lower, which means the depth check for the skybox incorrectly cuts off
-    ///   clouds in some places.  To compensate for these cases (e.g. where
-    ///   terrain is occluded by clouds from above, and the camera is above the
-    ///   clouds), we currently branch to see if we need to render the clouds in
-    ///   *every* fragment shader.  For machines that can't optimize the check,
-    ///   this is absurdly expensive, so we should look at alternatives in the
-    ///   future that player better with the GPU.
+    /// Clouds, but barely. Ideally, any machine should be able to handle this
+    /// just fine.
     Minimal,
+    /// Enough visual detail to be pleasing, but generally using poor-but-cheap
+    /// approximations to derive parameters
     Low,
-    High,
-    #[serde(other)]
+    /// More detail. Enough to look good in most cases. For those that value
+    /// looks but also high framerates.
     Medium,
+    /// High, but with extra compute power thrown at it to smooth out subtle
+    /// imperfections
+    Ultra,
+    /// Lots of detail with good-but-costly derivation of parameters.
+    #[serde(other)]
+    High,
 }
 
 impl Default for CloudMode {
-    fn default() -> Self { CloudMode::Medium }
+    fn default() -> Self { CloudMode::High }
 }
 
 /// Fluid modes
diff --git a/voxygen/src/render/pipelines/figure.rs b/voxygen/src/render/pipelines/figure.rs
index 74bb1b7a79..662a44953f 100644
--- a/voxygen/src/render/pipelines/figure.rs
+++ b/voxygen/src/render/pipelines/figure.rs
@@ -13,6 +13,7 @@ gfx_defines! {
     constant Locals {
         model_mat: [[f32; 4]; 4] = "model_mat",
         highlight_col: [f32; 4] = "highlight_col",
+        model_light: [f32; 4] = "model_light",
         atlas_offs: [i32; 4] = "atlas_offs",
         model_pos: [f32; 3] = "model_pos",
         flags: u32 = "flags",
@@ -54,19 +55,22 @@ gfx_defines! {
 impl Locals {
     pub fn new(
         model_mat: anim::vek::Mat4<f32>,
-        col: Rgba<f32>,
+        col: Rgb<f32>,
         pos: anim::vek::Vec3<f32>,
         atlas_offs: Vec2<i32>,
         is_player: bool,
+        light: f32,
+        glow: f32,
     ) -> Self {
         let mut flags = 0;
         flags |= is_player as u32;
 
         Self {
             model_mat: model_mat.into_col_arrays(),
-            highlight_col: col.into_array(),
+            highlight_col: [col.r, col.g, col.b, 1.0],
             model_pos: pos.into_array(),
             atlas_offs: Vec4::from(atlas_offs).into_array(),
+            model_light: [light, glow, 1.0, 1.0],
             flags,
         }
     }
@@ -76,10 +80,12 @@ impl Default for Locals {
     fn default() -> Self {
         Self::new(
             anim::vek::Mat4::identity(),
-            Rgba::broadcast(1.0),
+            Rgb::broadcast(1.0),
             anim::vek::Vec3::default(),
             Vec2::default(),
             false,
+            1.0,
+            0.0,
         )
     }
 }
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index 28bf1954b4..9338250bab 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -46,7 +46,7 @@ gfx_defines! {
         shadow_proj_factors: [f32; 4] = "shadow_proj_factors",
         medium: [u32; 4] = "medium",
         select_pos: [i32; 4] = "select_pos",
-        gamma: [f32; 4] = "gamma",
+        gamma_exposure: [f32; 4] = "gamma_exposure",
         ambiance: f32 = "ambiance",
         cam_mode: u32 = "cam_mode",
         sprite_render_distance: f32 = "sprite_render_distance",
@@ -84,6 +84,7 @@ impl Globals {
         medium: BlockKind,
         select_pos: Option<Vec3<i32>>,
         gamma: f32,
+        exposure: f32,
         ambiance: f32,
         cam_mode: CameraMode,
         sprite_render_distance: f32,
@@ -124,7 +125,7 @@ impl Globals {
                 .map(|sp| Vec4::from(sp) + Vec4::unit_w())
                 .unwrap_or(Vec4::zero())
                 .into_array(),
-            gamma: [gamma; 4],
+            gamma_exposure: [gamma, exposure, 0.0, 0.0],
             ambiance,
             cam_mode: cam_mode as u32,
             sprite_render_distance,
@@ -168,6 +169,7 @@ impl Default for Globals {
             None,
             1.0,
             1.0,
+            1.0,
             CameraMode::ThirdPerson,
             250.0,
         )
diff --git a/voxygen/src/render/pipelines/particle.rs b/voxygen/src/render/pipelines/particle.rs
index e7ccd64ae3..86c3d56bc2 100644
--- a/voxygen/src/render/pipelines/particle.rs
+++ b/voxygen/src/render/pipelines/particle.rs
@@ -71,7 +71,7 @@ gfx_defines! {
         light_shadows: gfx::ConstantBuffer<shadow::Locals> = "u_light_shadows",
 
         tgt_color: gfx::BlendTarget<TgtColorFmt> = ("tgt_color", ColorMask::all(), gfx::preset::blend::ALPHA),
-        tgt_depth_stencil: gfx::DepthTarget<TgtDepthStencilFmt> = gfx::preset::depth::LESS_EQUAL_TEST,
+        tgt_depth_stencil: gfx::DepthTarget<TgtDepthStencilFmt> = gfx::preset::depth::LESS_EQUAL_WRITE,
         // tgt_depth_stencil: gfx::DepthStencilTarget<TgtDepthStencilFmt> = (gfx::preset::depth::LESS_EQUAL_WRITE,Stencil::new(Comparison::Always,0xff,(StencilOp::Keep,StencilOp::Keep,StencilOp::Keep))),
     }
 }
@@ -113,6 +113,7 @@ pub enum ParticleMode {
     EnergyNature = 14,
     FlameThrower = 15,
     FireShockwave = 16,
+    FireBowl = 17,
 }
 
 impl ParticleMode {
diff --git a/voxygen/src/render/pipelines/sprite.rs b/voxygen/src/render/pipelines/sprite.rs
index 9ac8ed369f..bd95f84b21 100644
--- a/voxygen/src/render/pipelines/sprite.rs
+++ b/voxygen/src/render/pipelines/sprite.rs
@@ -39,6 +39,7 @@ gfx_defines! {
         inst_mat1: [f32; 4] = "inst_mat1",
         inst_mat2: [f32; 4] = "inst_mat2",
         inst_mat3: [f32; 4] = "inst_mat3",
+        inst_light: [f32; 4] = "inst_light",
         inst_wind_sway: f32 = "inst_wind_sway",
     }
 
@@ -114,7 +115,14 @@ impl Vertex {
 }
 
 impl Instance {
-    pub fn new(mat: Mat4<f32>, wind_sway: f32, pos: Vec3<i32>, ori_bits: u8) -> Self {
+    pub fn new(
+        mat: Mat4<f32>,
+        wind_sway: f32,
+        pos: Vec3<i32>,
+        ori_bits: u8,
+        light: f32,
+        glow: f32,
+    ) -> Self {
         const EXTRA_NEG_Z: i32 = 32768;
 
         let mat_arr = mat.into_col_arrays();
@@ -127,13 +135,14 @@ impl Instance {
             inst_mat1: mat_arr[1],
             inst_mat2: mat_arr[2],
             inst_mat3: mat_arr[3],
+            inst_light: [light, glow, 1.0, 1.0],
             inst_wind_sway: wind_sway,
         }
     }
 }
 
 impl Default for Instance {
-    fn default() -> Self { Self::new(Mat4::identity(), 0.0, Vec3::zero(), 0) }
+    fn default() -> Self { Self::new(Mat4::identity(), 0.0, Vec3::zero(), 0, 1.0, 0.0) }
 }
 
 impl Default for Locals {
diff --git a/voxygen/src/render/pipelines/terrain.rs b/voxygen/src/render/pipelines/terrain.rs
index f02e9032f2..0dbf62f43f 100644
--- a/voxygen/src/render/pipelines/terrain.rs
+++ b/voxygen/src/render/pipelines/terrain.rs
@@ -99,11 +99,39 @@ impl Vertex {
     }
 
     pub fn make_col_light(
+        // 0 to 31
         light: u8,
+        // 0 to 31
+        glow: u8,
         col: Rgb<u8>,
     ) -> <<ColLightFmt as gfx::format::Formatted>::Surface as gfx::format::SurfaceTyped>::DataType
     {
-        [col.r, col.g, col.b, light]
+        //[col.r, col.g, col.b, light]
+        // It would be nice for this to be cleaner, but we want to squeeze 5 fields into
+        // 4. We can do this because both `light` and `glow` go from 0 to 31,
+        // meaning that they can both fit into 5 bits. If we steal a bit from
+        // red and blue each (not green, human eyes are more sensitive to
+        // changes in green) then we get just enough to expand the nibbles of
+        // the alpha field enough to fit both `light` and `glow`.
+        //
+        // However, we now have a problem. In the shader code with use hardware
+        // filtering to get at the `light` and `glow` attributes (but not
+        // colour, that remains constant across a block). How do we resolve this
+        // if we're twiddling bits? The answer is to very carefully manipulate
+        // the bit pattern such that the fields we want to filter (`light` and
+        // `glow`) always sit as the higher bits of the fields. Then, we can do
+        // some modulation magic to extract them from the filtering unharmed and use
+        // unfiltered texture access (i.e: `texelFetch`) to access the colours, plus a
+        // little bit-fiddling.
+        //
+        // TODO: This isn't currently working (no idea why). See `srgb.glsl` for current
+        // impl that intead does manual bit-twiddling and filtering.
+        [
+            (light.min(31) << 3) | ((col.r & 0b1110) >> 1),
+            (glow.min(31) << 3) | ((col.r & 0b1110) >> 1),
+            (col.r & 0b11110000) | (col.b >> 4),
+            col.g, // Green is lucky, it remains unscathed
+        ]
     }
 }
 
diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index d669343aca..fbd3d71a6c 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -33,7 +33,9 @@ use tracing::{error, warn};
 use vek::*;
 
 /// Represents the format of the pre-processed color target.
-pub type TgtColorFmt = gfx::format::Srgba8;
+// TODO: `(gfx::format::R11_G11_B10, gfx::format::Float)` would be better in
+// theory, but it doesn't seem to work
+pub type TgtColorFmt = gfx::format::Rgba16F;
 /// Represents the format of the pre-processed depth and stencil target.
 pub type TgtDepthStencilFmt = gfx::format::Depth;
 
@@ -66,7 +68,7 @@ pub type LodAltFmt = (gfx::format::R16_G16, gfx::format::Unorm);
 pub type LodColorFmt = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb);
 
 /// Represents the format of greedy meshed color-light textures.
-pub type ColLightFmt = (gfx::format::R8_G8_B8_A8, gfx::format::Srgb);
+pub type ColLightFmt = (gfx::format::R8_G8_B8_A8, gfx::format::Unorm);
 
 /// A handle to a shadow depth target.
 pub type ShadowDepthStencilView =
@@ -284,7 +286,7 @@ impl Renderer {
         let noise_tex = Texture::new(
             &mut factory,
             &DynamicImage::load_expect("voxygen.texture.noise"),
-            Some(gfx::texture::FilterMethod::Bilinear),
+            Some(gfx::texture::FilterMethod::Trilinear),
             Some(gfx::texture::WrapMode::Tile),
             None,
         )?;
@@ -993,13 +995,18 @@ impl Renderer {
     }
 
     /// Update a texture with the provided offset, size, and data.
-    pub fn update_texture(
+    pub fn update_texture<T: gfx::format::Formatted>(
         &mut self,
-        texture: &Texture,
+        texture: &Texture<T>,
         offset: [u16; 2],
         size: [u16; 2],
-        data: &[[u8; 4]],
-    ) -> Result<(), RenderError> {
+        data: &[<<T as gfx::format::Formatted>::Surface as gfx::format::SurfaceTyped>::DataType],
+    ) -> Result<(), RenderError>
+    where
+        <T as gfx::format::Formatted>::Surface: gfx::format::TextureSurface,
+        <T as gfx::format::Formatted>::Channel: gfx::format::TextureChannel,
+        <<T as gfx::format::Formatted>::Surface as gfx::format::SurfaceTyped>::DataType: Copy,
+    {
         texture.update(&mut self.encoder, offset, size, data)
     }
 
@@ -1829,6 +1836,7 @@ fn create_pipelines(
             CloudMode::Low => "CLOUD_MODE_LOW",
             CloudMode::Medium => "CLOUD_MODE_MEDIUM",
             CloudMode::High => "CLOUD_MODE_HIGH",
+            CloudMode::Ultra => "CLOUD_MODE_ULTRA",
         },
         match mode.lighting {
             LightingMode::Ashikhmin => "LIGHTING_ALGORITHM_ASHIKHMIN",
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index aae6b08720..1c90887e15 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -12,7 +12,9 @@ use crate::{
     },
     scene::{
         camera::{Camera, CameraMode, Dependents},
-        math, LodData, SceneData,
+        math,
+        terrain::Terrain,
+        LodData, SceneData,
     },
 };
 use anim::{
@@ -47,7 +49,7 @@ use specs::{Entity as EcsEntity, Join, LazyUpdate, WorldExt};
 use treeculler::{BVol, BoundingSphere};
 use vek::*;
 
-const DAMAGE_FADE_COEFFICIENT: f64 = 5.0;
+const DAMAGE_FADE_COEFFICIENT: f64 = 15.0;
 const MOVING_THRESHOLD: f32 = 0.7;
 const MOVING_THRESHOLD_SQR: f32 = MOVING_THRESHOLD * MOVING_THRESHOLD;
 
@@ -455,6 +457,7 @@ impl FigureMgr {
         // Visible chunk data.
         visible_psr_bounds: math::Aabr<f32>,
         camera: &Camera,
+        terrain: Option<&Terrain>,
     ) -> anim::vek::Aabb<f32> {
         span!(_guard, "maintain", "FigureManager::maintain");
         let state = scene_data.state;
@@ -665,7 +668,7 @@ impl FigureMgr {
             let col = health
                 .map(|h| {
                     vek::Rgba::broadcast(1.0)
-                        + vek::Rgba::new(2.0, 2.0, 2., 0.00).map(|c| {
+                        + vek::Rgba::new(10.0, 10.0, 10.0, 0.0).map(|c| {
                             (c / (1.0 + DAMAGE_FADE_COEFFICIENT * h.last_change.0)) as f32
                         })
                 })
@@ -1329,6 +1332,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::QuadrupedSmall(body) => {
@@ -1439,6 +1443,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::QuadrupedMedium(body) => {
@@ -1560,6 +1565,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::QuadrupedLow(body) => {
@@ -1668,6 +1674,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::BirdMedium(body) => {
@@ -1773,6 +1780,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::FishMedium(body) => {
@@ -1859,6 +1867,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::Dragon(body) => {
@@ -1941,6 +1950,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::Theropod(body) => {
@@ -2025,6 +2035,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::BirdSmall(body) => {
@@ -2111,6 +2122,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::FishSmall(body) => {
@@ -2197,6 +2209,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::BipedLarge(body) => {
@@ -2603,6 +2616,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::Golem(body) => {
@@ -2707,6 +2721,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
                 Body::Object(body) => {
@@ -2740,6 +2755,7 @@ impl FigureMgr {
                         is_player,
                         camera,
                         &mut update_buf,
+                        terrain,
                     );
                 },
             }
@@ -3328,6 +3344,8 @@ pub struct FigureStateMeta {
     visible: bool,
     last_pos: Option<anim::vek::Vec3<f32>>,
     avg_vel: anim::vek::Vec3<f32>,
+    last_light: f32,
+    last_glow: f32,
 }
 
 impl FigureStateMeta {
@@ -3372,6 +3390,8 @@ impl<S: Skeleton> FigureState<S> {
                 can_shadow_sun: false,
                 last_pos: None,
                 avg_vel: anim::vek::Vec3::zero(),
+                last_light: 1.0,
+                last_glow: 0.0,
             },
             skeleton,
         }
@@ -3393,6 +3413,7 @@ impl<S: Skeleton> FigureState<S> {
         is_player: bool,
         _camera: &Camera,
         buf: &mut [anim::FigureBoneData; anim::MAX_BONE_COUNT],
+        terrain: Option<&Terrain>,
     ) {
         // NOTE: As long as update() always gets called after get_or_create_model(), and
         // visibility is not set again until after the model is rendered, we
@@ -3429,12 +3450,56 @@ impl<S: Skeleton> FigureState<S> {
             * anim::vek::Mat4::scaling_3d(anim::vek::Vec3::from(0.8 * scale));
 
         let atlas_offs = model.allocation.rectangle.min;
+
+        let (light, glow) = terrain
+            .map(|t| {
+                // Sample the location a little above to avoid clipping into terrain
+                // TODO: Try to make this faster? It might be fine though
+                let wpos = Vec3::from(pos.into_array()) + Vec3::unit_z();
+
+                let wposi = wpos.map(|e: f32| e.floor() as i32);
+
+                // TODO: Fix this up enough to make it work
+                /*
+                let sample = |off| {
+                    let off = off * wpos.map(|e| (e.fract() - 0.5).signum() as i32);
+                    Vec2::new(t.light_at_wpos(wposi + off), t.glow_at_wpos(wposi + off))
+                };
+
+                let s_000 = sample(Vec3::new(0, 0, 0));
+                let s_100 = sample(Vec3::new(1, 0, 0));
+                let s_010 = sample(Vec3::new(0, 1, 0));
+                let s_110 = sample(Vec3::new(1, 1, 0));
+                let s_001 = sample(Vec3::new(0, 0, 1));
+                let s_101 = sample(Vec3::new(1, 0, 1));
+                let s_011 = sample(Vec3::new(0, 1, 1));
+                let s_111 = sample(Vec3::new(1, 1, 1));
+                let s_00 = Lerp::lerp(s_000, s_001, (wpos.z.fract() - 0.5).abs() * 2.0);
+                let s_10 = Lerp::lerp(s_100, s_101, (wpos.z.fract() - 0.5).abs() * 2.0);
+                let s_01 = Lerp::lerp(s_010, s_011, (wpos.z.fract() - 0.5).abs() * 2.0);
+                let s_11 = Lerp::lerp(s_110, s_111, (wpos.z.fract() - 0.5).abs() * 2.0);
+                let s_0 = Lerp::lerp(s_00, s_01, (wpos.y.fract() - 0.5).abs() * 2.0);
+                let s_1 = Lerp::lerp(s_10, s_11, (wpos.y.fract() - 0.5).abs() * 2.0);
+                let s = Lerp::lerp(s_10, s_11, (wpos.x.fract() - 0.5).abs() * 2.0);
+                */
+
+                Vec2::new(t.light_at_wpos(wposi), t.glow_at_wpos(wposi)).into_tuple()
+            })
+            .unwrap_or((1.0, 0.0));
+        // Fade between light and glow levels
+        // TODO: Making this temporal rather than spatial is a bit dumb but it's a very
+        // subtle difference
+        self.last_light = vek::Lerp::lerp(self.last_light, light, 16.0 * dt);
+        self.last_glow = vek::Lerp::lerp(self.last_glow, glow, 16.0 * dt);
+
         let locals = FigureLocals::new(
             mat,
-            col,
+            col.rgb(),
             pos,
             vek::Vec2::new(atlas_offs.x, atlas_offs.y),
             is_player,
+            self.last_light,
+            self.last_glow,
         );
         renderer.update_consts(&mut self.locals, &[locals]).unwrap();
 
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 63b7d25289..4b3e569b64 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -115,6 +115,7 @@ pub struct SceneData<'a> {
     pub tick: u64,
     pub thread_pool: &'a uvth::ThreadPool,
     pub gamma: f32,
+    pub exposure: f32,
     pub ambiance: f32,
     pub mouse_smoothing: bool,
     pub sprite_render_distance: f32,
@@ -534,9 +535,15 @@ impl Scene {
         let loaded_distance =
             (0.98 * self.loaded_distance + 0.02 * scene_data.loaded_distance).max(0.01);
 
-        // Update light constants
+        // Reset lights ready for the next tick
         let lights = &mut self.light_data;
         lights.clear();
+
+        // Maintain the particles.
+        self.particle_mgr
+            .maintain(renderer, &scene_data, &self.terrain, lights);
+
+        // Update light constants
         lights.extend(
             (
                 &scene_data.state.ecs().read_storage::<comp::Pos>(),
@@ -659,6 +666,7 @@ impl Scene {
                     .unwrap_or(BlockKind::Air),
                 self.select_pos.map(|e| e - focus_off.map(|e| e as i32)),
                 scene_data.gamma,
+                scene_data.exposure,
                 scene_data.ambiance,
                 self.camera.get_mode(),
                 scene_data.sprite_render_distance as f32 - 20.0,
@@ -691,9 +699,13 @@ impl Scene {
         );
 
         // Maintain the figures.
-        let _figure_bounds =
-            self.figure_mgr
-                .maintain(renderer, scene_data, visible_psr_bounds, &self.camera);
+        let _figure_bounds = self.figure_mgr.maintain(
+            renderer,
+            scene_data,
+            visible_psr_bounds,
+            &self.camera,
+            Some(&self.terrain),
+        );
 
         let sun_dir = scene_data.get_sun_dir();
         let is_daylight = sun_dir.z < 0.0;
@@ -987,10 +999,6 @@ impl Scene {
         // Remove unused figures.
         self.figure_mgr.clean(scene_data.tick);
 
-        // Maintain the particles.
-        self.particle_mgr
-            .maintain(renderer, &scene_data, &self.terrain);
-
         // Maintain audio
         self.sfx_mgr.maintain(
             audio,
diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs
index 215b1d17e5..b703007bda 100644
--- a/voxygen/src/scene/particle.rs
+++ b/voxygen/src/scene/particle.rs
@@ -2,7 +2,7 @@ use super::{terrain::BlocksOfInterest, SceneData, Terrain};
 use crate::{
     mesh::{greedy::GreedyMesh, Meshable},
     render::{
-        pipelines::particle::ParticleMode, GlobalModel, Instances, LodData, Model,
+        pipelines::particle::ParticleMode, GlobalModel, Instances, Light, LodData, Model,
         ParticleInstance, ParticlePipeline, Renderer,
     },
 };
@@ -72,7 +72,9 @@ impl ParticleMgr {
                                     time,
                                     ParticleMode::EnergyNature,
                                     *pos + Vec3::<f32>::zero()
-                                        .map(|_| rng.gen_range(-radius, radius)),
+                                        .map(|_| rng.gen_range(-1.0, 1.0))
+                                        .normalized()
+                                        * *radius,
                                 )
                             },
                         );
@@ -85,7 +87,9 @@ impl ParticleMgr {
                                     time,
                                     ParticleMode::CampfireFire,
                                     *pos + Vec3::<f32>::zero()
-                                        .map(|_| rng.gen_range(-radius, radius)),
+                                        .map(|_| rng.gen_range(-1.0, 1.0))
+                                        .normalized()
+                                        * *radius,
                                 )
                             },
                         );
@@ -117,7 +121,10 @@ impl ParticleMgr {
                                 Duration::from_secs(4),
                                 time,
                                 ParticleMode::CampfireSmoke,
-                                *pos + Vec2::<f32>::zero().map(|_| rng.gen_range(-radius, radius)),
+                                *pos + Vec3::<f32>::zero()
+                                    .map(|_| rng.gen_range(-1.0, 1.0))
+                                    .normalized()
+                                    * *radius,
                             )
                         },
                     );
@@ -133,6 +140,7 @@ impl ParticleMgr {
         renderer: &mut Renderer,
         scene_data: &SceneData,
         terrain: &Terrain<TerrainChunk>,
+        lights: &mut Vec<Light>,
     ) {
         span!(_guard, "maintain", "ParticleMgr::maintain");
         if scene_data.particles_enabled {
@@ -146,7 +154,7 @@ impl ParticleMgr {
             // add new Particle
             self.maintain_body_particles(scene_data);
             self.maintain_boost_particles(scene_data);
-            self.maintain_beam_particles(scene_data);
+            self.maintain_beam_particles(scene_data, lights);
             self.maintain_block_particles(scene_data, terrain);
             self.maintain_shockwave_particles(scene_data);
         } else {
@@ -355,7 +363,7 @@ impl ParticleMgr {
         }
     }
 
-    fn maintain_beam_particles(&mut self, scene_data: &SceneData) {
+    fn maintain_beam_particles(&mut self, scene_data: &SceneData, lights: &mut Vec<Light>) {
         let state = scene_data.state;
         let ecs = state.ecs();
         let time = state.get_time();
@@ -371,6 +379,8 @@ impl ParticleMgr {
                 let particle_ori = b.particle_ori.unwrap_or(*ori.vec());
                 if b.stage_section == StageSection::Cast {
                     if b.static_data.base_hps > 0 {
+                        // Emit a light when using healing
+                        lights.push(Light::new(pos.0 + b.offset, Rgb::new(0.1, 1.0, 0.15), 1.0));
                         for i in 0..self.scheduler.heartbeats(Duration::from_millis(1)) {
                             self.particles.push(Particle::new_beam(
                                 b.static_data.beam_duration,
@@ -384,6 +394,12 @@ impl ParticleMgr {
                         let mut rng = thread_rng();
                         let (from, to) = (Vec3::<f32>::unit_z(), particle_ori);
                         let m = Mat3::<f32>::rotation_from_to_3d(from, to);
+                        // Emit a light when using flames
+                        lights.push(Light::new(
+                            pos.0 + b.offset,
+                            Rgb::new(1.0, 0.25, 0.05).map(|e| e * rng.gen_range(0.8, 1.2)),
+                            2.0,
+                        ));
                         self.particles.resize_with(
                             self.particles.len()
                                 + 2 * usize::from(
@@ -460,7 +476,7 @@ impl ParticleMgr {
                 cond: |_| true,
             },
             BlockParticles {
-                blocks: |boi| &boi.embers,
+                blocks: |boi| &boi.fires,
                 range: 2,
                 rate: 20.0,
                 lifetime: 0.25,
@@ -468,7 +484,15 @@ impl ParticleMgr {
                 cond: |_| true,
             },
             BlockParticles {
-                blocks: |boi| &boi.embers,
+                blocks: |boi| &boi.fire_bowls,
+                range: 2,
+                rate: 20.0,
+                lifetime: 0.25,
+                mode: ParticleMode::FireBowl,
+                cond: |_| true,
+            },
+            BlockParticles {
+                blocks: |boi| &boi.smokers,
                 range: 8,
                 rate: 3.0,
                 lifetime: 40.0,
diff --git a/voxygen/src/scene/simple.rs b/voxygen/src/scene/simple.rs
index aff2f577c8..30381a2beb 100644
--- a/voxygen/src/scene/simple.rs
+++ b/voxygen/src/scene/simple.rs
@@ -95,6 +95,7 @@ pub struct SceneData<'a> {
     pub thread_pool: &'a uvth::ThreadPool,
     pub body: Option<humanoid::Body>,
     pub gamma: f32,
+    pub exposure: f32,
     pub ambiance: f32,
     pub figure_lod_render_distance: f32,
     pub mouse_smoothing: bool,
@@ -186,6 +187,7 @@ impl Scene {
                     false,
                     &camera,
                     &mut buf,
+                    None,
                 );
                 (model, state)
             }),
@@ -259,7 +261,7 @@ impl Scene {
         } = self.camera.dependents();
         const VD: f32 = 115.0; // View Distance
 
-        const TIME: f64 = 9.0 * 60.0 * 60.0;
+        const TIME: f64 = 8.6 * 60.0 * 60.0;
         const SHADOW_NEAR: f32 = 1.0;
         const SHADOW_FAR: f32 = 25.0;
 
@@ -281,6 +283,7 @@ impl Scene {
             BlockKind::Air,
             None,
             scene_data.gamma,
+            scene_data.exposure,
             scene_data.ambiance,
             self.camera.get_mode(),
             250.0,
@@ -351,6 +354,7 @@ impl Scene {
                 false,
                 &self.camera,
                 &mut buf,
+                None,
             );
         }
     }
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index bb15f1862a..ab504881f6 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -36,11 +36,23 @@ use vek::*;
 
 const SPRITE_SCALE: Vec3<f32> = Vec3::new(1.0 / 11.0, 1.0 / 11.0, 1.0 / 11.0);
 
-#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
-enum Visibility {
-    OutOfRange = 0,
-    InRange = 1,
-    Visible = 2,
+#[derive(Clone, Copy, Debug)]
+struct Visibility {
+    in_range: bool,
+    in_frustum: bool,
+}
+
+impl Visibility {
+    /// Should the chunk actually get rendered?
+    fn is_visible(&self) -> bool {
+        // Currently, we don't take into account in_range to allow all chunks to do
+        // pop-in. This isn't really a problem because we no longer have VD mist
+        // or anything like that. Also, we don't load chunks outside of the VD
+        // anyway so this literally just controls which chunks get actually
+        // rendered.
+        /* self.in_range && */
+        self.in_frustum
+    }
 }
 
 pub struct TerrainChunkData {
@@ -49,6 +61,8 @@ pub struct TerrainChunkData {
     opaque_model: Model<TerrainPipeline>,
     fluid_model: Option<Model<FluidPipeline>>,
     col_lights: guillotiere::AllocId,
+    light_map: Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
+    glow_map: Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
     sprite_instances: HashMap<(SpriteKind, usize), Instances<SpriteInstance>>,
     locals: Consts<TerrainLocals>,
     pub blocks_of_interest: BlocksOfInterest,
@@ -75,6 +89,8 @@ struct MeshWorkerResponse {
     opaque_mesh: Mesh<TerrainPipeline>,
     fluid_mesh: Mesh<FluidPipeline>,
     col_lights_info: ColLightInfo,
+    light_map: Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
+    glow_map: Box<dyn Fn(Vec3<i32>) -> f32 + Send + Sync>,
     sprite_instances: HashMap<(SpriteKind, usize), Vec<SpriteInstance>>,
     started_tick: u64,
     blocks_of_interest: BlocksOfInterest,
@@ -114,7 +130,7 @@ type SpriteSpec = sprite::sprite_kind::PureCases<Option<SpriteConfig<String>>>;
 /// Function executed by worker threads dedicated to chunk meshing.
 #[allow(clippy::or_fun_call)] // TODO: Pending review in #587
 
-fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug>(
+fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug + 'static>(
     pos: Vec2<i32>,
     z_bounds: (f32, f32),
     started_tick: u64,
@@ -126,8 +142,13 @@ fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug>(
     sprite_config: &SpriteSpec,
 ) -> MeshWorkerResponse {
     span!(_guard, "mesh_worker");
-    let (opaque_mesh, fluid_mesh, _shadow_mesh, (bounds, col_lights_info)) =
-        volume.generate_mesh((range, Vec2::new(max_texture_size, max_texture_size)));
+    let blocks_of_interest = BlocksOfInterest::from_chunk(&chunk);
+    let (opaque_mesh, fluid_mesh, _shadow_mesh, (bounds, col_lights_info, light_map, glow_map)) =
+        volume.generate_mesh((
+            range,
+            Vec2::new(max_texture_size, max_texture_size),
+            &blocks_of_interest,
+        ));
     MeshWorkerResponse {
         pos,
         z_bounds: (bounds.min.z, bounds.max.z),
@@ -177,6 +198,8 @@ fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug>(
                                 cfg.wind_sway,
                                 rel_pos,
                                 ori,
+                                light_map(wpos),
+                                glow_map(wpos),
                             );
 
                             instances.entry(key).or_insert(Vec::new()).push(instance);
@@ -187,7 +210,9 @@ fn mesh_worker<V: BaseVol<Vox = Block> + RectRasterableVol + ReadVol + Debug>(
 
             instances
         },
-        blocks_of_interest: BlocksOfInterest::from_chunk(&chunk),
+        light_map,
+        glow_map,
+        blocks_of_interest,
         started_tick,
     }
 }
@@ -200,7 +225,7 @@ struct SpriteData {
     offset: Vec3<f32>,
 }
 
-pub struct Terrain<V: RectRasterableVol> {
+pub struct Terrain<V: RectRasterableVol = TerrainChunk> {
     atlas: AtlasAllocator,
     sprite_config: Arc<SpriteSpec>,
     chunks: HashMap<Vec2<i32>, TerrainChunkData>,
@@ -236,9 +261,7 @@ pub struct Terrain<V: RectRasterableVol> {
 }
 
 impl TerrainChunkData {
-    pub fn can_shadow_sun(&self) -> bool {
-        self.visible == Visibility::Visible || self.can_shadow_sun
-    }
+    pub fn can_shadow_sun(&self) -> bool { self.visible.is_visible() || self.can_shadow_sun }
 }
 
 impl<V: RectRasterableVol> Terrain<V> {
@@ -291,7 +314,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                                  }| Vec3::new(x, y, z),
                             )
                             .unwrap_or(zero);
-                        let max_model_size = Vec3::new(15.0, 15.0, 63.0);
+                        let max_model_size = Vec3::new(31.0, 31.0, 63.0);
                         let model_scale = max_model_size.map2(model_size, |max_sz: f32, cur_sz| {
                             let scale = max_sz / max_sz.max(cur_sz as f32);
                             if scale < 1.0 && (cur_sz as f32 * scale).ceil() > max_sz {
@@ -451,6 +474,28 @@ impl<V: RectRasterableVol> Terrain<V> {
         }
     }
 
+    /// Find the light level (sunlight) at the given world position.
+    pub fn light_at_wpos(&self, wpos: Vec3<i32>) -> f32 {
+        let chunk_pos = Vec2::from(wpos).map2(TerrainChunk::RECT_SIZE, |e: i32, sz| {
+            e.div_euclid(sz as i32)
+        });
+        self.chunks
+            .get(&chunk_pos)
+            .map(|c| (c.light_map)(wpos))
+            .unwrap_or(1.0)
+    }
+
+    /// Find the glow level (light from lamps) at the given world position.
+    pub fn glow_at_wpos(&self, wpos: Vec3<i32>) -> f32 {
+        let chunk_pos = Vec2::from(wpos).map2(TerrainChunk::RECT_SIZE, |e: i32, sz| {
+            e.div_euclid(sz as i32)
+        });
+        self.chunks
+            .get(&chunk_pos)
+            .map(|c| (c.glow_map)(wpos))
+            .unwrap_or(0.0)
+    }
+
     /// Maintain terrain data. To be called once per tick.
     #[allow(clippy::for_loops_over_fallibles)] // TODO: Pending review in #587
     #[allow(clippy::len_zero)] // TODO: Pending review in #587
@@ -721,6 +766,8 @@ impl<V: RectRasterableVol> Terrain<V> {
                             None
                         },
                         col_lights: allocation.id,
+                        light_map: response.light_map,
+                        glow_map: response.glow_map,
                         sprite_instances: response
                             .sprite_instances
                             .into_iter()
@@ -751,7 +798,10 @@ impl<V: RectRasterableVol> Terrain<V> {
                                 load_time,
                             }])
                             .expect("Failed to upload chunk locals to the GPU!"),
-                        visible: Visibility::OutOfRange,
+                        visible: Visibility {
+                            in_range: false,
+                            in_frustum: false,
+                        },
                         can_shadow_point: false,
                         can_shadow_sun: false,
                         blocks_of_interest: response.blocks_of_interest,
@@ -793,10 +843,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             let distance_2 = Vec2::<f32>::from(focus_pos).distance_squared(nearest_in_chunk);
             let in_range = distance_2 < loaded_distance.powf(2.0);
 
-            if !in_range {
-                chunk.visible = Visibility::OutOfRange;
-                continue;
-            }
+            chunk.visible.in_range = in_range;
 
             // Ensure the chunk is within the view frustum
             let chunk_min = [chunk_pos.x, chunk_pos.y, chunk.z_bounds.0];
@@ -810,11 +857,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                 .coherent_test_against_frustum(&frustum, chunk.frustum_last_plane_index);
 
             chunk.frustum_last_plane_index = last_plane_index;
-            chunk.visible = if in_frustum {
-                Visibility::Visible
-            } else {
-                Visibility::InRange
-            };
+            chunk.visible.in_frustum = in_frustum;
             let chunk_box = Aabb {
                 min: Vec3::from(chunk_min),
                 max: Vec3::from(chunk_max),
@@ -910,7 +953,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                 // NOTE: We deliberately avoid doing this computation for chunks we already know
                 // are visible, since by definition they'll always intersect the visible view
                 // frustum.
-                .filter(|chunk| chunk.1.visible <= Visibility::InRange)
+                .filter(|chunk| !chunk.1.visible.in_frustum)
                 .for_each(|(&pos, chunk)| {
                     chunk.can_shadow_sun = can_shadow_sun(pos, chunk);
                 });
@@ -958,7 +1001,7 @@ impl<V: RectRasterableVol> Terrain<V> {
     pub fn visible_chunk_count(&self) -> usize {
         self.chunks
             .iter()
-            .filter(|(_, c)| c.visible == Visibility::Visible)
+            .filter(|(_, c)| c.visible.is_visible())
             .count()
     }
 
@@ -1046,7 +1089,7 @@ impl<V: RectRasterableVol> Terrain<V> {
             .take(self.chunks.len());
 
         for (_, chunk) in chunk_iter {
-            if chunk.visible == Visibility::Visible {
+            if chunk.visible.is_visible() {
                 renderer.render_terrain_chunk(
                     &chunk.opaque_model,
                     &self.col_lights,
@@ -1086,7 +1129,7 @@ impl<V: RectRasterableVol> Terrain<V> {
         let chunk_size = V::RECT_SIZE.map(|e| e as f32);
         let chunk_mag = (chunk_size * (f32::consts::SQRT_2 * 0.5)).magnitude_squared();
         for (pos, chunk) in chunk_iter.clone() {
-            if chunk.visible == Visibility::Visible {
+            if chunk.visible.is_visible() {
                 let sprite_low_detail_distance = sprite_render_distance * 0.75;
                 let sprite_mid_detail_distance = sprite_render_distance * 0.5;
                 let sprite_hid_detail_distance = sprite_render_distance * 0.35;
@@ -1146,7 +1189,7 @@ impl<V: RectRasterableVol> Terrain<V> {
         // Translucent
         chunk_iter
             .clone()
-            .filter(|(_, chunk)| chunk.visible == Visibility::Visible)
+            .filter(|(_, chunk)| chunk.visible.is_visible())
             .filter_map(|(_, chunk)| {
                 chunk
                     .fluid_model
diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs
index ca7ef1b4f9..0e97f5c3f8 100644
--- a/voxygen/src/scene/terrain/watcher.rs
+++ b/voxygen/src/scene/terrain/watcher.rs
@@ -6,17 +6,21 @@ use common::{
 use rand::prelude::*;
 use vek::*;
 
+#[derive(Default)]
 pub struct BlocksOfInterest {
     pub leaves: Vec<Vec3<i32>>,
     pub grass: Vec<Vec3<i32>>,
     pub river: Vec<Vec3<i32>>,
-    pub embers: Vec<Vec3<i32>>,
+    pub fires: Vec<Vec3<i32>>,
+    pub smokers: Vec<Vec3<i32>>,
     pub beehives: Vec<Vec3<i32>>,
     pub reeds: Vec<Vec3<i32>>,
     pub flowers: Vec<Vec3<i32>>,
+    pub fire_bowls: Vec<Vec3<i32>>,
     // Note: these are only needed for chunks within the iteraction range so this is a potential
     // area for optimization
     pub interactables: Vec<Vec3<i32>>,
+    pub lights: Vec<(Vec3<i32>, u8)>,
 }
 
 impl BlocksOfInterest {
@@ -25,11 +29,14 @@ impl BlocksOfInterest {
         let mut leaves = Vec::new();
         let mut grass = Vec::new();
         let mut river = Vec::new();
-        let mut embers = Vec::new();
+        let mut fires = Vec::new();
+        let mut smokers = Vec::new();
         let mut beehives = Vec::new();
         let mut reeds = Vec::new();
         let mut flowers = Vec::new();
         let mut interactables = Vec::new();
+        let mut lights = Vec::new();
+        let mut fire_bowls = Vec::new();
 
         chunk
             .vol_iter(
@@ -58,7 +65,17 @@ impl BlocksOfInterest {
                         }
                     },
                     _ => match block.get_sprite() {
-                        Some(SpriteKind::Ember) => embers.push(pos),
+                        Some(SpriteKind::Ember) => {
+                            fires.push(pos);
+                            smokers.push(pos);
+                        },
+                        // Offset positions to account for block height.
+                        // TODO: Is this a good idea?
+                        Some(SpriteKind::StreetLamp) => fire_bowls.push(pos + Vec3::unit_z() * 2),
+                        Some(SpriteKind::FireBowlGround) => fire_bowls.push(pos + Vec3::unit_z()),
+                        Some(SpriteKind::StreetLampTall) => {
+                            fire_bowls.push(pos + Vec3::unit_z() * 4)
+                        },
                         Some(SpriteKind::Beehive) => beehives.push(pos),
                         Some(SpriteKind::Reed) => reeds.push(pos),
                         Some(SpriteKind::PinkFlower) => flowers.push(pos),
@@ -73,17 +90,23 @@ impl BlocksOfInterest {
                 if block.is_collectible() {
                     interactables.push(pos);
                 }
+                if let Some(glow) = block.get_glow() {
+                    lights.push((pos, glow));
+                }
             });
 
         Self {
             leaves,
             grass,
             river,
-            embers,
+            fires,
+            smokers,
             beehives,
             reeds,
             flowers,
             interactables,
+            lights,
+            fire_bowls,
         }
     }
 }
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 43f5e88e06..a22d6ec32c 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -964,10 +964,34 @@ impl PlayState for SessionState {
                         global_state.settings.gameplay.map_zoom = map_zoom;
                         global_state.settings.save_to_file_warn();
                     },
+                    HudEvent::MapDrag(map_drag) => {
+                        global_state.settings.gameplay.map_drag = map_drag;
+                        global_state.settings.save_to_file_warn();
+                    },
+                    HudEvent::MapShowDifficulty(map_show_difficulty) => {
+                        global_state.settings.gameplay.map_show_difficulty = map_show_difficulty;
+                        global_state.settings.save_to_file_warn();
+                    },
+                    HudEvent::MapShowTowns(map_show_towns) => {
+                        global_state.settings.gameplay.map_show_towns = map_show_towns;
+                        global_state.settings.save_to_file_warn();
+                    },
+                    HudEvent::MapShowDungeons(map_show_dungeons) => {
+                        global_state.settings.gameplay.map_show_dungeons = map_show_dungeons;
+                        global_state.settings.save_to_file_warn();
+                    },
+                    HudEvent::MapShowCastles(map_show_castles) => {
+                        global_state.settings.gameplay.map_show_castles = map_show_castles;
+                        global_state.settings.save_to_file_warn();
+                    },
                     HudEvent::ChangeGamma(new_gamma) => {
                         global_state.settings.graphics.gamma = new_gamma;
                         global_state.settings.save_to_file_warn();
                     },
+                    HudEvent::ChangeExposure(new_exposure) => {
+                        global_state.settings.graphics.exposure = new_exposure;
+                        global_state.settings.save_to_file_warn();
+                    },
                     HudEvent::ChangeAmbiance(new_ambiance) => {
                         global_state.settings.graphics.ambiance = new_ambiance;
                         global_state.settings.save_to_file_warn();
@@ -1061,6 +1085,7 @@ impl PlayState for SessionState {
                     tick: client.get_tick(),
                     thread_pool: client.thread_pool(),
                     gamma: global_state.settings.graphics.gamma,
+                    exposure: global_state.settings.graphics.exposure,
                     ambiance: global_state.settings.graphics.ambiance,
                     mouse_smoothing: global_state.settings.gameplay.smooth_pan_enable,
                     sprite_render_distance: global_state.settings.graphics.sprite_render_distance
@@ -1127,6 +1152,7 @@ impl PlayState for SessionState {
                 tick: client.get_tick(),
                 thread_pool: client.thread_pool(),
                 gamma: settings.graphics.gamma,
+                exposure: settings.graphics.exposure,
                 ambiance: settings.graphics.ambiance,
                 mouse_smoothing: settings.gameplay.smooth_pan_enable,
                 sprite_render_distance: settings.graphics.sprite_render_distance as f32,
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index 77bcea53ab..1ad981073a 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -10,8 +10,8 @@ use hashbrown::{HashMap, HashSet};
 use serde::{Deserialize, Serialize};
 use std::{fs, path::PathBuf};
 use tracing::warn;
+use vek::*;
 use winit::event::{MouseButton, VirtualKeyCode};
-
 // ControlSetting-like struct used by Serde, to handle not serializing/building
 // post-deserializing the inverse_keybindings hashmap
 #[derive(Serialize, Deserialize)]
@@ -516,6 +516,11 @@ pub struct GameplaySettings {
     pub auto_walk_behavior: PressBehavior,
     pub stop_auto_walk_on_input: bool,
     pub map_zoom: f64,
+    pub map_drag: Vec2<f64>,
+    pub map_show_difficulty: bool,
+    pub map_show_towns: bool,
+    pub map_show_dungeons: bool,
+    pub map_show_castles: bool,
     pub loading_tips: bool,
 }
 
@@ -546,7 +551,12 @@ impl Default for GameplaySettings {
             free_look_behavior: PressBehavior::Toggle,
             auto_walk_behavior: PressBehavior::Toggle,
             stop_auto_walk_on_input: true,
-            map_zoom: 4.0,
+            map_zoom: 10.0,
+            map_drag: Vec2 { x: 0.0, y: 0.0 },
+            map_show_difficulty: true,
+            map_show_towns: true,
+            map_show_dungeons: true,
+            map_show_castles: true,
             loading_tips: true,
         }
     }
@@ -620,6 +630,7 @@ pub struct GraphicsSettings {
     pub max_fps: u32,
     pub fov: u16,
     pub gamma: f32,
+    pub exposure: f32,
     pub ambiance: f32,
     pub render_mode: RenderMode,
     pub window_size: [u16; 2],
@@ -631,17 +642,18 @@ impl Default for GraphicsSettings {
     fn default() -> Self {
         Self {
             view_distance: 10,
-            sprite_render_distance: 150,
+            sprite_render_distance: 100,
             particles_enabled: true,
-            figure_lod_render_distance: 250,
+            figure_lod_render_distance: 300,
             max_fps: 60,
-            fov: 50,
+            fov: 70,
             gamma: 1.0,
-            ambiance: 20.0,
+            exposure: 1.0,
+            ambiance: 0.0,
             render_mode: RenderMode::default(),
             window_size: [1920, 1080],
             fullscreen: FullScreenSettings::default(),
-            lod_detail: 300,
+            lod_detail: 250,
         }
     }
 }
diff --git a/world/src/all.rs b/world/src/all.rs
index d3a37c27dc..2a28bc84c1 100644
--- a/world/src/all.rs
+++ b/world/src/all.rs
@@ -6,4 +6,5 @@ pub enum ForestKind {
     Pine,
     Birch,
     Mangrove,
+    Swamp,
 }
diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs
index b3977419d1..5d4103c64b 100644
--- a/world/src/block/mod.rs
+++ b/world/src/block/mod.rs
@@ -209,8 +209,8 @@ pub fn block_from_structure(
 ) -> Option<Block> {
     let field = RandomField::new(structure_seed);
 
-    let lerp = ((field.get(Vec3::from(structure_pos)).rem_euclid(256)) as f32 / 255.0) * 0.85
-        + ((field.get(pos + std::i32::MAX / 2).rem_euclid(256)) as f32 / 255.0) * 0.15;
+    let lerp = ((field.get(Vec3::from(structure_pos)).rem_euclid(256)) as f32 / 255.0) * 0.8
+        + ((field.get(pos + std::i32::MAX / 2).rem_euclid(256)) as f32 / 255.0) * 0.2;
 
     match sblock {
         StructureBlock::None => None,
@@ -244,7 +244,7 @@ pub fn block_from_structure(
         },
         StructureBlock::Chest => {
             if structure_seed % 10 < 7 {
-                None
+                Some(Block::empty())
             } else {
                 Some(with_sprite(SpriteKind::Chest))
             }
diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs
index af33cfef87..4ef8c81ca9 100644
--- a/world/src/civ/mod.rs
+++ b/world/src/civ/mod.rs
@@ -41,21 +41,21 @@ const fn initial_civ_count(map_size_lg: MapSizeLg) -> u32 {
 #[allow(clippy::type_complexity)] // TODO: Pending review in #587
 #[derive(Default)]
 pub struct Civs {
-    civs: Store<Civ>,
-    places: Store<Place>,
+    pub civs: Store<Civ>,
+    pub places: Store<Place>,
 
-    tracks: Store<Track>,
+    pub tracks: Store<Track>,
     /// We use this hasher (FxHasher64) because
     /// (1) we don't care about DDOS attacks (ruling out SipHash);
     /// (2) we care about determinism across computers (ruling out AAHash);
     /// (3) we have 8-byte keys (for which FxHash is fastest).
-    track_map: HashMap<
+    pub track_map: HashMap<
         Id<Site>,
         HashMap<Id<Site>, Id<Track>, BuildHasherDefault<FxHasher64>>,
         BuildHasherDefault<FxHasher64>,
     >,
 
-    sites: Store<Site>,
+    pub sites: Store<Site>,
 }
 
 // Change this to get rid of particularly horrid seeds
@@ -108,6 +108,7 @@ impl Civs {
                     kind,
                     center: loc,
                     place,
+                    site_tmp: None,
 
                     population: 0.0,
 
@@ -189,7 +190,7 @@ impl Civs {
 
         // Place sites in world
         let mut cnt = 0;
-        for sim_site in this.sites.values() {
+        for sim_site in this.sites.values_mut() {
             cnt += 1;
             let wpos = sim_site
                 .center
@@ -209,6 +210,7 @@ impl Civs {
                     WorldSite::castle(Castle::generate(wpos, Some(ctx.sim), &mut rng))
                 },
             });
+            sim_site.site_tmp = Some(site);
             let site_ref = &index.sites[site];
 
             let radius_chunks =
@@ -371,6 +373,7 @@ impl Civs {
             let loc = find_site_loc(ctx, None, 1)?;
             self.establish_site(ctx, loc, |place| Site {
                 kind: SiteKind::Settlement,
+                site_tmp: None,
                 center: loc,
                 place,
 
@@ -473,7 +476,7 @@ impl Civs {
         let site = self.sites.insert(site_fn(place));
 
         // Find neighbors
-        const MAX_NEIGHBOR_DISTANCE: f32 = 500.0;
+        const MAX_NEIGHBOR_DISTANCE: f32 = 2000.0;
         let mut nearby = self
             .sites
             .iter()
@@ -610,6 +613,7 @@ fn find_path(
     a: Vec2<i32>,
     b: Vec2<i32>,
 ) -> Option<(Path<Vec2<i32>>, f32)> {
+    const MAX_PATH_ITERS: usize = 100_000;
     let sim = &ctx.sim;
     let heuristic = move |l: &Vec2<i32>| (l.distance_squared(b) as f32).sqrt();
     let neighbors = |l: &Vec2<i32>| {
@@ -627,13 +631,13 @@ fn find_path(
     // (2) we care about determinism across computers (ruling out AAHash);
     // (3) we have 8-byte keys (for which FxHash is fastest).
     let mut astar = Astar::new(
-        20000,
+        MAX_PATH_ITERS,
         a,
         heuristic,
         BuildHasherDefault::<FxHasher64>::default(),
     );
     astar
-        .poll(20000, heuristic, neighbors, transition, satisfied)
+        .poll(MAX_PATH_ITERS, heuristic, neighbors, transition, satisfied)
         .into_path()
         .and_then(|path| astar.get_cheapest_cost().map(|cost| (path, cost)))
 }
@@ -796,6 +800,8 @@ pub struct Track {
 #[derive(Debug)]
 pub struct Site {
     pub kind: SiteKind,
+    // TODO: Remove this field when overhauling
+    pub site_tmp: Option<Id<crate::site::Site>>,
     pub center: Vec2<i32>,
     pub place: Id<Place>,
 
diff --git a/world/src/column/mod.rs b/world/src/column/mod.rs
index dcfc90f88a..c22d0f8409 100644
--- a/world/src/column/mod.rs
+++ b/world/src/column/mod.rs
@@ -93,6 +93,7 @@ impl<'a> Sampler<'a> for ColumnGen<'a> {
                 let neighbor_chunk = sim.get(neighbor_pos)?;
                 Some((neighbor_pos, neighbor_chunk, &neighbor_chunk.river))
             });
+
         let lake_width = (TerrainChunkSize::RECT_SIZE.x as f64 * (2.0f64.sqrt())) + 12.0;
         let neighbor_river_data = neighbor_river_data.map(|(posj, chunkj, river)| {
             let kind = match river.river_kind {
@@ -747,10 +748,17 @@ impl<'a> Sampler<'a> for ColumnGen<'a> {
             .powf(3.0)
             .add(1.0)
             .mul(0.5);
+        let marble_mid = (sim.gen_ctx.hill_nz.get((wposf3d.div(12.0)).into_array()) as f32)
+            .mul(0.75)
+            .add(1.0)
+            .mul(0.5);
+        //.add(marble_small.sub(0.5).mul(0.25));
         let marble = (sim.gen_ctx.hill_nz.get((wposf3d.div(48.0)).into_array()) as f32)
             .mul(0.75)
             .add(1.0)
-            .mul(0.5)
+            .mul(0.5);
+        let marble_mixed = marble
+            .add(marble_mid.sub(0.5).mul(0.5))
             .add(marble_small.sub(0.5).mul(0.25));
 
         // Colours
@@ -793,20 +801,27 @@ impl<'a> Sampler<'a> for ColumnGen<'a> {
         let grass_high = grass_high.into();
         let tropical_high = tropical_high.into();
 
-        let dirt = Lerp::lerp(dirt_low, dirt_high, marble);
-        let tundra = Lerp::lerp(snow, snow_high, 0.4 + marble * 0.6);
-        let dead_tundra = Lerp::lerp(warm_stone, warm_stone_high, marble);
-        let cliff = Rgb::lerp(cold_stone, hot_stone, marble);
+        let dirt = Lerp::lerp(dirt_low, dirt_high, marble_mixed);
+        let tundra = Lerp::lerp(snow, snow_high, 0.4 + marble_mixed * 0.6);
+        let dead_tundra = Lerp::lerp(warm_stone, warm_stone_high, marble_mixed);
+        let cliff = Rgb::lerp(cold_stone, hot_stone, marble_mixed);
 
         let grass = Rgb::lerp(
             cold_grass,
             warm_grass,
-            marble.sub(0.5).add(1.0.sub(humidity).mul(0.5)).powf(1.5),
+            marble_mixed
+                .sub(0.5)
+                .add(1.0.sub(humidity).mul(0.5))
+                .powf(1.5),
         );
-        let snow_moss = Rgb::lerp(snow_moss.into(), cold_grass, 0.4 + marble.powf(1.5) * 0.6);
-        let moss = Rgb::lerp(dark_grass, cold_grass, marble.powf(1.5));
-        let rainforest = Rgb::lerp(wet_grass, warm_grass, marble.powf(1.5));
-        let sand = Rgb::lerp(beach_sand, desert_sand, marble);
+        let snow_moss = Rgb::lerp(
+            snow_moss.into(),
+            cold_grass,
+            0.4 + marble_mixed.powf(1.5) * 0.6,
+        );
+        let moss = Rgb::lerp(dark_grass, cold_grass, marble_mixed.powf(1.5));
+        let rainforest = Rgb::lerp(wet_grass, warm_grass, marble_mixed.powf(1.5));
+        let sand = Rgb::lerp(beach_sand, desert_sand, marble_mixed);
 
         let tropical = Rgb::lerp(
             Rgb::lerp(
@@ -819,7 +834,7 @@ impl<'a> Sampler<'a> for ColumnGen<'a> {
                     .powf(0.667),
             ),
             tropical_high,
-            marble.powf(1.5).sub(0.5).mul(4.0),
+            marble_mixed.powf(1.5).sub(0.5).mul(4.0),
         );
 
         // For below desert humidity, we are always sand or rock, depending on altitude
@@ -945,9 +960,11 @@ impl<'a> Sampler<'a> for ColumnGen<'a> {
         let snow_cover = temp
             .sub(CONFIG.snow_temp)
             .max(-humidity.sub(CONFIG.desert_hum))
-            .mul(16.0)
-            .add((marble_small - 0.5) * 0.5);
-        let (alt, ground, sub_surface_color, snow_cover) = if snow_cover <= 0.5 && alt > water_level
+            .mul(4.0)
+            .add(((marble - 0.5) / 0.5) * 0.5)
+            .add(((marble_mid - 0.5) / 0.5) * 0.25)
+            .add(((marble_small - 0.5) / 0.5) * 0.175);
+        let (alt, ground, sub_surface_color, snow_cover) = if snow_cover <= 0.0 && alt > water_level
         {
             // Allow snow cover.
             (
diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index 8a47d0fee9..6634c02302 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -1,6 +1,7 @@
-use crate::{column::ColumnSample, sim::SimChunk, util::RandomField, Canvas, CONFIG};
+use crate::{column::ColumnSample, sim::SimChunk, Canvas, CONFIG};
 use common::terrain::SpriteKind;
 use noise::NoiseFn;
+use rand::prelude::*;
 use std::f32;
 use vek::*;
 
@@ -10,7 +11,7 @@ fn close(x: f32, tgt: f32, falloff: f32) -> f32 {
 
 const MUSH_FACT: f32 = 1.0e-4; // To balance everything around the mushroom spawning rate
 const DEPTH_WATER_NORM: f32 = 15.0; // Water depth at which regular underwater sprites start spawning
-pub fn apply_scatter_to(canvas: &mut Canvas) {
+pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
     use SpriteKind::*;
     #[allow(clippy::type_complexity)]
     // TODO: Add back all sprites we had before
@@ -195,76 +196,40 @@ pub fn apply_scatter_to(canvas: &mut Canvas) {
         // Desert Plants
         (DeadBush, false, |c, _| {
             (
-                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 15.0,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 7.5,
                 None,
             )
         }),
         (LargeCactus, false, |c, _| {
             (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                    * 0.1,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
                 None,
             )
         }),
-        /*(BarrelCactus, false, |c, col| {
+        (RoundCactus, false, |c, _| {
             (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                    * 0.1,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
                 None,
             )
         }),
-        (RoundCactus, false, |c, col| {
+        (ShortCactus, false, |c, _| {
             (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                * 0.1,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
                 None,
             )
         }),
-        (ShortCactus, false, |c, col| {
+        (MedFlatCactus, false, |c, _| {
             (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                * 0.1,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
                 None,
             )
         }),
-        (MedFlatCactus, false, |c, col| {
+        (ShortFlatCactus, false, |c, _| {
             (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                * 0.1,
+                close(c.temp, 1.0, 0.95).min(close(c.humidity, 0.0, 0.3)) * MUSH_FACT * 0.3,
                 None,
             )
         }),
-        (ShortFlatCactus, false, |c, col| {
-            (
-                close(c.temp, CONFIG.desert_temp + 0.2, 0.3).min(close(
-                    c.humidity,
-                    CONFIG.desert_hum,
-                    0.2,
-                )) * MUSH_FACT
-                * 0.1,
-                None,
-            )
-        }),*/
         (Reed, false, |c, col| {
             (
                 close(c.humidity, CONFIG.jungle_hum, 0.7)
@@ -353,7 +318,7 @@ pub fn apply_scatter_to(canvas: &mut Canvas) {
                     .unwrap_or(true);
                 if density > 0.0
                     && is_patch
-                    && RandomField::new(i as u32).chance(Vec3::new(wpos2d.x, wpos2d.y, 0), density)
+                    && rng.gen::<f32>() < density //RandomField::new(i as u32).chance(Vec3::new(wpos2d.x, wpos2d.y, 0), density)
                     && underwater == *is_underwater
                 {
                     Some(*kind)
diff --git a/world/src/layer/tree.rs b/world/src/layer/tree.rs
index 9228646ba2..18c392a158 100644
--- a/world/src/layer/tree.rs
+++ b/world/src/layer/tree.rs
@@ -24,12 +24,14 @@ lazy_static! {
     pub static ref MANGROVE_TREES: Vec<Arc<Structure>> = Structure::load_group("mangrove_trees");
     pub static ref QUIRKY: Vec<Arc<Structure>> = Structure::load_group("quirky");
     pub static ref QUIRKY_DRY: Vec<Arc<Structure>> = Structure::load_group("quirky_dry");
+    pub static ref SWAMP_TREES: Vec<Arc<Structure>> = Structure::load_group("swamp_trees");
 }
 
 static MODEL_RAND: RandomPerm = RandomPerm::new(0xDB21C052);
 static UNIT_CHOOSER: UnitChooser = UnitChooser::new(0x700F4EC7);
 static QUIRKY_RAND: RandomPerm = RandomPerm::new(0xA634460F);
 
+#[allow(clippy::if_same_then_else)]
 pub fn apply_trees_to(canvas: &mut Canvas) {
     struct Tree {
         pos: Vec3<i32>,
@@ -48,20 +50,27 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
             let tree = if let Some(tree) = tree_cache.entry(tree_wpos).or_insert_with(|| {
                 let col = ColumnGen::new(info.land()).get((tree_wpos, info.index()))?;
 
-                // Ensure that it's valid to place a tree here
-                if ((seed.wrapping_mul(13)) & 0xFF) as f32 / 256.0 > col.tree_density
-                    || col.alt < col.water_level
-                    || col.spawn_rate < 0.5
+                let is_quirky = QUIRKY_RAND.chance(seed, 1.0 / 500.0);
+
+                // Ensure that it's valid to place a *thing* here
+                if col.alt < col.water_level
+                    || col.spawn_rate < 0.9
                     || col.water_dist.map(|d| d < 8.0).unwrap_or(false)
                     || col.path.map(|(d, _, _, _)| d < 12.0).unwrap_or(false)
                 {
                     return None;
                 }
 
+                // Ensure that it's valid to place a tree here
+                if !is_quirky && ((seed.wrapping_mul(13)) & 0xFF) as f32 / 256.0 > col.tree_density
+                {
+                    return None;
+                }
+
                 Some(Tree {
                     pos: Vec3::new(tree_wpos.x, tree_wpos.y, col.alt as i32),
                     model: {
-                        let models: &'static [_] = if QUIRKY_RAND.get(seed) % 512 == 17 {
+                        let models: &'static [_] = if is_quirky {
                             if col.temp > CONFIG.desert_temp {
                                 &QUIRKY_DRY
                             } else {
@@ -69,14 +78,19 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
                             }
                         } else {
                             match col.forest_kind {
-                                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.chance(seed + 1, 1.0 / 16.0) => {
+                                    &OAK_STUMPS
+                                },
+                                ForestKind::Oak if QUIRKY_RAND.chance(seed + 2, 1.0 / 20.0) => {
+                                    &FRUIT_TREES
+                                },
                                 ForestKind::Palm => &PALMS,
                                 ForestKind::Savannah => &ACACIAS,
                                 ForestKind::Oak => &OAKS,
                                 ForestKind::Pine => &PINES,
                                 ForestKind::Birch => &BIRCHES,
                                 ForestKind::Mangrove => &MANGROVE_TREES,
+                                ForestKind::Swamp => &SWAMP_TREES,
                             }
                         };
                         Arc::clone(
diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs
index d5552cfbe1..203843c840 100644
--- a/world/src/layer/wildlife.rs
+++ b/world/src/layer/wildlife.rs
@@ -666,7 +666,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
                 )| {
                     let density = get_density(chunk, col_sample);
                     if density > 0.0
-                        && dynamic_rng.gen::<f32>() < density
+                        && dynamic_rng.gen::<f32>() < density * col_sample.spawn_rate
                         && underwater == *is_underwater
                         && col_sample.gradient < Some(1.3)
                     {
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 172c6f3f1d..a3c4cf7ca1 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -20,7 +20,7 @@ mod column;
 pub mod config;
 pub mod index;
 pub mod layer;
-pub mod rtsim;
+pub mod pathfinding;
 pub mod sim;
 pub mod sim2;
 pub mod site;
@@ -42,7 +42,7 @@ use crate::{
 };
 use common::{
     generation::{ChunkSupplement, EntityInfo},
-    msg::WorldMapMsg,
+    msg::{world_msg, WorldMapMsg},
     terrain::{Block, BlockKind, SpriteKind, TerrainChunk, TerrainChunkMeta, TerrainChunkSize},
     vol::{ReadVol, RectVolSize, WriteVol},
 };
@@ -91,7 +91,33 @@ impl World {
         // TODO
     }
 
-    pub fn get_map_data(&self, index: IndexRef) -> WorldMapMsg { self.sim.get_map(index) }
+    pub fn get_map_data(&self, index: IndexRef) -> WorldMapMsg {
+        WorldMapMsg {
+            sites: self
+                .civs()
+                .sites
+                .iter()
+                .map(|(_, site)| {
+                    world_msg::SiteInfo {
+                        name: site.site_tmp.map(|id| index.sites[id].name().to_string()),
+                        // TODO: Probably unify these, at some point
+                        kind: match &site.kind {
+                            civ::SiteKind::Settlement => world_msg::SiteKind::Town,
+                            civ::SiteKind::Dungeon => world_msg::SiteKind::Dungeon {
+                                difficulty: match site.site_tmp.map(|id| &index.sites[id].kind) {
+                                    Some(site::SiteKind::Dungeon(d)) => d.difficulty(),
+                                    _ => 0,
+                                },
+                            },
+                            civ::SiteKind::Castle => world_msg::SiteKind::Castle,
+                        },
+                        wpos: site.center * TerrainChunkSize::RECT_SIZE.map(|e| e as i32),
+                    }
+                })
+                .collect(),
+            ..self.sim.get_map(index)
+        }
+    }
 
     pub fn sample_columns(
         &self,
@@ -113,6 +139,7 @@ impl World {
         let mut sampler = self.sample_blocks();
 
         let chunk_wpos2d = chunk_pos * TerrainChunkSize::RECT_SIZE.map(|e| e as i32);
+        let chunk_center_wpos2d = chunk_wpos2d + TerrainChunkSize::RECT_SIZE.map(|e| e as i32 / 2);
         let grid_border = 4;
         let zcache_grid = Grid::populate_from(
             TerrainChunkSize::RECT_SIZE.map(|e| e as i32) + grid_border * 2,
@@ -155,7 +182,21 @@ impl World {
         };
 
         let meta = TerrainChunkMeta::new(
-            sim_chunk.get_name(&self.sim),
+            sim_chunk
+                .sites
+                .iter()
+                .filter(|id| {
+                    index.sites[**id]
+                        .get_origin()
+                        .distance_squared(chunk_center_wpos2d) as f32
+                        <= index.sites[**id].radius().powf(2.0)
+                })
+                .min_by_key(|id| {
+                    index.sites[**id]
+                        .get_origin()
+                        .distance_squared(chunk_center_wpos2d)
+                })
+                .map(|id| index.sites[*id].name().to_string()),
             sim_chunk.get_biome(),
             sim_chunk.alt,
             sim_chunk.tree_density,
@@ -220,7 +261,7 @@ impl World {
         };
 
         layer::apply_trees_to(&mut canvas);
-        layer::apply_scatter_to(&mut canvas);
+        layer::apply_scatter_to(&mut canvas, &mut dynamic_rng);
         layer::apply_caves_to(&mut canvas);
         layer::apply_paths_to(&mut canvas);
 
diff --git a/world/src/pathfinding.rs b/world/src/pathfinding.rs
new file mode 100644
index 0000000000..300973e778
--- /dev/null
+++ b/world/src/pathfinding.rs
@@ -0,0 +1,37 @@
+use crate::sim::WorldSim;
+use common::path::Path;
+//use hashbrown::hash_map::DefaultHashBuilder;
+use vek::*;
+
+#[allow(dead_code)]
+pub struct SearchCfg {
+    // 0.0 = no discount, 1.0 = free travel
+    path_discount: f32,
+    // Cost per metre altitude change per metre horizontal
+    // 0.0 = no cost, 1.0 = same cost vertical as horizontal
+    gradient_aversion: f32,
+}
+
+#[allow(dead_code)]
+pub struct Searcher<'a> {
+    land: &'a WorldSim,
+    pub cfg: SearchCfg,
+}
+
+#[allow(dead_code)]
+impl<'a> Searcher<'a> {
+    /// Attempt to find a path between two chunks on the map.
+    pub fn search(self, _a: Vec2<i32>, _b: Vec2<i32>) -> Option<Path<i32>> {
+        // TODO: implement this function
+
+        //let heuristic = |pos: &Vec2<i32>| (pos - b).map(|e| e as f32).magnitude();
+        // Astar::new(
+        //     100_000,
+        //     a,
+        //     heuristc,
+        //     DefaultHashBuilder::default(),
+        // );
+
+        None
+    }
+}
diff --git a/world/src/rtsim/mod.rs b/world/src/rtsim/mod.rs
deleted file mode 100644
index 8b13789179..0000000000
--- a/world/src/rtsim/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/world/src/sim/map.rs b/world/src/sim/map.rs
index 02254e01a1..b7be863e60 100644
--- a/world/src/sim/map.rs
+++ b/world/src/sim/map.rs
@@ -103,7 +103,7 @@ pub fn sample_pos(
         spline_derivative,
         is_path,
         is_cave,
-        near_site,
+        _near_site,
     ) = sampler
         .get(pos)
         .map(|sample| {
@@ -247,9 +247,9 @@ pub fn sample_pos(
         ),
     };
     // TODO: Make principled.
-    let rgb = if near_site {
+    let rgb = /*if near_site {
         Rgb::new(0x57, 0x39, 0x33)
-    } else if is_path {
+    } else*/ if is_path {
         Rgb::new(0x37, 0x29, 0x23)
     } else if is_cave {
         Rgb::new(0x37, 0x37, 0x37)
diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs
index 67905b01c9..a6b9f1f93b 100644
--- a/world/src/sim/mod.rs
+++ b/world/src/sim/mod.rs
@@ -1501,6 +1501,7 @@ impl WorldSim {
             rgba: v,
             alt: alts,
             horizons,
+            sites: Vec::new(), // Will be substituted later
         }
     }
 
@@ -2061,12 +2062,13 @@ impl SimChunk {
 
         // We also correlate temperature negatively with altitude and absolute latitude,
         // using different weighting than we use for humidity.
-        const TEMP_WEIGHTS: [f32; 2] = [/* 1.5, */ 1.0, 2.0];
+        const TEMP_WEIGHTS: [f32; 3] = [/* 1.5, */ 1.0, 2.0, 1.0];
         let temp = cdf_irwin_hall(
             &TEMP_WEIGHTS,
             [
                 temp_uniform,
                 1.0 - alt_uniform, /* 1.0 - abs_lat_uniform*/
+                (gen_ctx.rock_nz.get((wposf.div(50000.0)).into_array()) as f32 * 2.5 + 1.0) * 0.5,
             ],
         )
         // Convert to [-1, 1]
@@ -2170,18 +2172,36 @@ impl SimChunk {
             // ...but is ultimately limited by available sunlight (and our tree generation system)
             .min(1.0);
 
-        // Sand dunes (formed over a short period of time)
+        // Add geologically short timescale undulation to the world for various reasons
         let alt = alt
+            // Don't add undulation to rivers, mainly because this could accidentally result in rivers flowing uphill
             + if river.near_water() {
                 0.0
             } else {
+                // Sand dunes (formed over a short period of time, so we don't care about erosion sim)
                 let warp = Vec2::new(
-                    gen_ctx.turb_x_nz.get(wposf.div(256.0).into_array()) as f32,
-                    gen_ctx.turb_y_nz.get(wposf.div(256.0).into_array()) as f32,
-                ) * 192.0;
-                let dune_nz = (wposf.map(|e| e as f32) + warp).sum().div(100.0).sin() * 0.5 + 0.5;
-                let dune_scale = 16.0;
-                dune_nz * dune_scale * (temp - 0.75).clamped(0.0, 0.25) * 4.0
+                    gen_ctx.turb_x_nz.get(wposf.div(350.0).into_array()) as f32,
+                    gen_ctx.turb_y_nz.get(wposf.div(350.0).into_array()) as f32,
+                ) * 200.0;
+                const DUNE_SCALE: f32 = 24.0;
+                const DUNE_LEN: f32 = 96.0;
+                const DUNE_DIR: Vec2<f32> = Vec2::new(1.0, 1.0);
+                let dune_dist = (wposf.map(|e| e as f32) + warp)
+                    .div(DUNE_LEN)
+                    .mul(DUNE_DIR.normalized())
+                    .sum();
+                let dune_nz = 0.5 - dune_dist.sin().abs() + 0.5 * (dune_dist + 0.5).sin().abs();
+                let dune = dune_nz * DUNE_SCALE * (temp - 0.75).clamped(0.0, 0.25) * 4.0;
+
+                // Trees bind to soil and their roots result in small accumulating undulations over geologically short
+                // periods of time. Forest floors are generally significantly bumpier than that of deforested areas.
+                // This is particularly pronounced in high-humidity areas.
+                let soil_nz = gen_ctx.hill_nz.get(wposf.div(96.0).into_array()) as f32;
+                let soil_nz = (soil_nz + 1.0) * 0.5;
+                const SOIL_SCALE: f32 = 16.0;
+                let soil = soil_nz * SOIL_SCALE * tree_density.powf(0.5) * humidity.powf(0.5);
+
+                dune + soil
             };
 
         Self {
@@ -2213,12 +2233,12 @@ impl SimChunk {
                     (
                         ForestKind::Palm,
                         (CONFIG.desert_hum, 1.5),
-                        (CONFIG.tropical_temp, 1.5),
+                        ((CONFIG.tropical_temp + CONFIG.desert_temp) / 2.0, 1.25),
                         (1.0, 2.0),
                     ),
                     (
                         ForestKind::Savannah,
-                        (CONFIG.desert_hum, 2.0),
+                        (0.0, 1.5),
                         (CONFIG.tropical_temp, 1.5),
                         (0.0, 1.0),
                     ),
@@ -2246,6 +2266,12 @@ impl SimChunk {
                         (CONFIG.temperate_temp, 1.5),
                         (0.0, 1.0),
                     ),
+                    (
+                        ForestKind::Swamp,
+                        ((CONFIG.forest_hum + CONFIG.jungle_hum) / 2.0, 2.0),
+                        ((CONFIG.temperate_temp + CONFIG.snow_temp) / 2.0, 2.0),
+                        (1.0, 2.5),
+                    ),
                 ];
 
                 candidates
@@ -2287,19 +2313,6 @@ impl SimChunk {
 
     pub fn get_base_z(&self) -> f32 { self.alt - self.chaos * 50.0 - 16.0 }
 
-    pub fn get_name(&self, _world: &WorldSim) -> Option<String> {
-        // TODO
-        None
-
-        /*
-        if let Some(loc) = &self.location {
-            Some(world.locations[loc.loc_idx].name().to_string())
-        } else {
-            None
-        }
-        */
-    }
-
     pub fn get_biome(&self) -> BiomeKind {
         if self.alt < CONFIG.sea_level {
             BiomeKind::Ocean
diff --git a/world/src/site/castle/mod.rs b/world/src/site/castle/mod.rs
index 1532fdf1ea..ef88e150c9 100644
--- a/world/src/site/castle/mod.rs
+++ b/world/src/site/castle/mod.rs
@@ -2,9 +2,12 @@ use super::SpawnRules;
 use crate::{
     column::ColumnSample,
     sim::WorldSim,
-    site::settlement::building::{
-        archetype::keep::{Attr, FlagColor, Keep as KeepArchetype, StoneColor},
-        Archetype, Ori,
+    site::{
+        namegen::NameGen,
+        settlement::building::{
+            archetype::keep::{Attr, FlagColor, Keep as KeepArchetype, StoneColor},
+            Archetype, Ori,
+        },
     },
     IndexRef,
 };
@@ -32,6 +35,7 @@ struct Tower {
 }
 
 pub struct Castle {
+    name: String,
     origin: Vec2<i32>,
     //seed: u32,
     radius: i32,
@@ -64,6 +68,17 @@ impl Castle {
         let radius = 150;
 
         let this = Self {
+            name: {
+                let name = NameGen::location(ctx.rng).generate();
+                match ctx.rng.gen_range(0, 6) {
+                    0 => format!("Fort {}", name),
+                    1 => format!("{} Citadel", name),
+                    2 => format!("{} Castle", name),
+                    3 => format!("{} Stronghold", name),
+                    4 => format!("{} Fortress", name),
+                    _ => format!("{} Keep", name),
+                }
+            },
             origin: wpos,
             // alt: ctx
             //     .sim
@@ -141,6 +156,8 @@ impl Castle {
         this
     }
 
+    pub fn name(&self) -> &str { &self.name }
+
     pub fn contains_point(&self, wpos: Vec2<i32>) -> bool {
         let lpos = wpos - self.origin;
         for i in 0..self.towers.len() {
@@ -160,7 +177,7 @@ impl Castle {
 
     pub fn get_origin(&self) -> Vec2<i32> { self.origin }
 
-    pub fn radius(&self) -> f32 { 1200.0 }
+    pub fn radius(&self) -> f32 { 200.0 }
 
     #[allow(clippy::needless_update)] // TODO: Pending review in #587
     pub fn spawn_rules(&self, wpos: Vec2<i32>) -> SpawnRules {
diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index e81c241545..10231c77f2 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -3,7 +3,7 @@ use crate::{
     block::block_from_structure,
     column::ColumnSample,
     sim::WorldSim,
-    site::BlockMask,
+    site::{namegen::NameGen, BlockMask},
     util::{attempt, Grid, RandomField, Sampler, CARDINALS, DIRS},
     IndexRef,
 };
@@ -26,12 +26,14 @@ use std::sync::Arc;
 use vek::*;
 
 pub struct Dungeon {
+    name: String,
     origin: Vec2<i32>,
     alt: i32,
     seed: u32,
     #[allow(dead_code)]
     noise: RandomField,
     floors: Vec<Floor>,
+    difficulty: u32,
 }
 
 pub struct GenCtx<'a, R: Rng> {
@@ -46,13 +48,23 @@ pub struct Colors {
 
 const ALT_OFFSET: i32 = -2;
 
-const LEVELS: usize = 5;
-
 impl Dungeon {
     #[allow(clippy::let_and_return)] // TODO: Pending review in #587
     pub fn generate(wpos: Vec2<i32>, sim: Option<&WorldSim>, rng: &mut impl Rng) -> Self {
         let mut ctx = GenCtx { sim, rng };
+        let difficulty = ctx.rng.gen_range(0, 6);
+        let floors = 3 + difficulty / 2;
         let this = Self {
+            name: {
+                let name = NameGen::location(ctx.rng).generate();
+                match ctx.rng.gen_range(0, 5) {
+                    0 => format!("{} Dungeon", name),
+                    1 => format!("{} Lair", name),
+                    2 => format!("{} Crib", name),
+                    3 => format!("{} Catacombs", name),
+                    _ => format!("{} Pit", name),
+                }
+            },
             origin: wpos - TILE_SIZE / 2,
             alt: ctx
                 .sim
@@ -61,21 +73,25 @@ impl Dungeon {
                 + 6,
             seed: ctx.rng.gen(),
             noise: RandomField::new(ctx.rng.gen()),
-            floors: (0..LEVELS)
+            floors: (0..floors)
                 .scan(Vec2::zero(), |stair_tile, level| {
-                    let (floor, st) = Floor::generate(&mut ctx, *stair_tile, level as i32);
+                    let (floor, st) =
+                        Floor::generate(&mut ctx, *stair_tile, level as i32, difficulty);
                     *stair_tile = st;
                     Some(floor)
                 })
                 .collect(),
+            difficulty,
         };
 
         this
     }
 
+    pub fn name(&self) -> &str { &self.name }
+
     pub fn get_origin(&self) -> Vec2<i32> { self.origin }
 
-    pub fn radius(&self) -> f32 { 1200.0 }
+    pub fn radius(&self) -> f32 { 200.0 }
 
     #[allow(clippy::needless_update)] // TODO: Pending review in #587
     pub fn spawn_rules(&self, wpos: Vec2<i32>) -> SpawnRules {
@@ -85,6 +101,8 @@ impl Dungeon {
         }
     }
 
+    pub fn difficulty(&self) -> u32 { self.difficulty }
+
     pub fn apply_to<'a>(
         &'a self,
         index: IndexRef,
@@ -175,6 +193,15 @@ impl Dungeon {
             max: rpos + TerrainChunkSize::RECT_SIZE.map(|e| e as i32),
         };
 
+        // Add waypoint
+        let pos = self.origin.map2(FLOOR_SIZE, |e, sz| e + sz as i32 / 2);
+        if area.contains_point(pos - self.origin) {
+            supplement.add_entity(
+                EntityInfo::at(Vec3::new(pos.x as f32, pos.y as f32, self.alt as f32) + 0.5)
+                    .into_waypoint(),
+            );
+        }
+
         let mut z = self.alt + ALT_OFFSET;
         for floor in &self.floors {
             z -= floor.total_depth();
@@ -216,6 +243,7 @@ pub struct Room {
     area: Rect<i32, i32>,
     height: i32,
     pillars: Option<i32>, // Pillars with the given separation
+    difficulty: u32,
 }
 
 struct Floor {
@@ -227,6 +255,7 @@ struct Floor {
     #[allow(dead_code)]
     stair_tile: Vec2<i32>,
     final_level: bool,
+    difficulty: u32,
 }
 
 const FLOOR_SIZE: Vec2<i32> = Vec2::new(18, 18);
@@ -236,8 +265,12 @@ impl Floor {
         ctx: &mut GenCtx<impl Rng>,
         stair_tile: Vec2<i32>,
         level: i32,
+        difficulty: u32,
     ) -> (Self, Vec2<i32>) {
-        let final_level = level == LEVELS as i32 - 1;
+        let floors = 3 + difficulty / 2;
+        let final_level = level == floors as i32 - 1;
+        let width = (2 + difficulty / 2).min(4);
+        let height = (15 + difficulty * 3).min(30);
 
         let new_stair_tile = if final_level {
             Vec2::zero()
@@ -260,6 +293,7 @@ impl Floor {
             hollow_depth: 30,
             stair_tile: new_stair_tile - tile_offset,
             final_level,
+            difficulty,
         };
 
         const STAIR_ROOM_HEIGHT: i32 = 13;
@@ -273,6 +307,7 @@ impl Floor {
             area: Rect::from((stair_tile - tile_offset - 1, Extent2::broadcast(3))),
             height: STAIR_ROOM_HEIGHT,
             pillars: None,
+            difficulty,
         });
         this.tiles
             .set(stair_tile - tile_offset, Tile::UpStair(upstair_room));
@@ -281,12 +316,16 @@ impl Floor {
             this.create_room(Room {
                 seed: ctx.rng.gen(),
                 loot_density: 0.0,
-                enemy_density: Some(0.001), // Minions!
+                enemy_density: Some((0.0002 * difficulty as f32).min(0.001)), // Minions!
                 miniboss: false,
                 boss: true,
-                area: Rect::from((new_stair_tile - tile_offset - 4, Extent2::broadcast(9))),
-                height: 30,
+                area: Rect::from((
+                    new_stair_tile - tile_offset - 4,
+                    Extent2::broadcast(width as i32 * 2 + 1),
+                )),
+                height: height as i32,
                 pillars: Some(2),
+                difficulty,
             });
         } else {
             // Create downstairs room
@@ -299,6 +338,7 @@ impl Floor {
                 area: Rect::from((new_stair_tile - tile_offset - 1, Extent2::broadcast(3))),
                 height: STAIR_ROOM_HEIGHT,
                 pillars: None,
+                difficulty,
             });
             this.tiles.set(
                 new_stair_tile - tile_offset,
@@ -368,6 +408,7 @@ impl Floor {
                     area,
                     height: ctx.rng.gen_range(15, 20),
                     pillars: Some(4),
+                    difficulty: self.difficulty,
                 }),
                 _ => self.create_room(Room {
                     seed: ctx.rng.gen(),
@@ -382,6 +423,7 @@ impl Floor {
                     } else {
                         None
                     },
+                    difficulty: self.difficulty,
                 }),
             };
         }
@@ -441,6 +483,8 @@ impl Floor {
         origin: Vec3<i32>,
         supplement: &mut ChunkSupplement,
     ) {
+        /*
+        // Add stair waypoint
         let stair_rcenter =
             Vec3::from((self.stair_tile + self.tile_offset).map(|e| e * TILE_SIZE + TILE_SIZE / 2));
 
@@ -454,11 +498,12 @@ impl Floor {
                 * (TILE_SIZE as f32 / 2.0 - 4.0);
             if !self.final_level {
                 supplement.add_entity(
-                    EntityInfo::at((origin + stair_rcenter).map(|e| e as f32) + Vec3::from(offs))
-                        .into_waypoint(),
+                    EntityInfo::at((origin + stair_rcenter).map(|e| e as f32)
+            + Vec3::from(offs))             .into_waypoint(),
                 );
             }
         }
+        */
 
         for x in area.min.x..area.max.x {
             for y in area.min.y..area.max.y {
@@ -489,13 +534,60 @@ impl Floor {
                         && !tile_is_pillar
                     {
                         // Bad
-                        let chosen =
-                            Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 5) {
-                                0 => "common.loot_tables.loot_table_humanoids",
-                                1 => "common.loot_tables.loot_table_armor_misc",
-                                _ => "common.loot_tables.loot_table_cultists",
-                            });
+                        let chosen = match room.difficulty {
+                            0 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 4) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_cloth",
+                                    _ => "common.loot_tables.loot_table_weapon_common",
+                                })
+                            },
+                            1 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 4) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_light",
+                                    _ => "common.loot_tables.loot_table_weapon_uncommon",
+                                })
+                            },
+                            2 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 4) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_heavy",
+                                    _ => "common.loot_tables.loot_table_weapon_rare",
+                                })
+                            },
+                            3 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 10) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_heavy",
+                                    2 => "common.loot_tables.loot_table_weapon_rare",
+                                    _ => "common.loot_tables.loot_table_cultists",
+                                })
+                            },
+                            4 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 6) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_misc",
+                                    2 => "common.loot_tables.loot_table_weapon_rare",
+                                    _ => "common.loot_tables.loot_table_cultists",
+                                })
+                            },
+                            5 => {
+                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 5) {
+                                    0 => "common.loot_tables.loot_table_humanoids",
+                                    1 => "common.loot_tables.loot_table_armor_misc",
+                                    2 => "common.loot_tables.loot_table_weapon_rare",
+                                    _ => "common.loot_tables.loot_table_cultists",
+                                })
+                            },
+                            _ => Lottery::<String>::load_expect(
+                                "common.loot_tables.loot_table_armor_misc",
+                            ),
+                        };
                         let chosen = chosen.choose();
+                        //let is_giant =
+                        // RandomField::new(room.seed.wrapping_add(1)).chance(Vec3::from(tile_pos),
+                        // 0.2) && !room.boss;
                         let entity = EntityInfo::at(
                             tile_wcenter.map(|e| e as f32)
                             // Randomly displace them a little
@@ -503,20 +595,114 @@ impl Floor {
                                 .map(|e| (RandomField::new(room.seed.wrapping_add(10 + e)).get(Vec3::from(tile_pos)) % 32) as i32 - 16)
                                 .map(|e| e as f32 / 16.0),
                         )
-                        .do_if(RandomField::new(room.seed.wrapping_add(1)).chance(Vec3::from(tile_pos), 0.2) && !room.boss, |e| e.into_giant())
-                        .with_alignment(comp::Alignment::Enemy)
+                        //.do_if(is_giant, |e| e.into_giant())
                         .with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
-                        .with_name("Cultist Acolyte")
+                        .with_alignment(comp::Alignment::Enemy)
+                        .with_config(common::loadout_builder::LoadoutConfig::CultistAcolyte)
                         .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
-                        .with_main_tool(comp::Item::new_from_asset_expect(match dynamic_rng.gen_range(0, 6) {
-                            0 => "common.items.npc_weapons.axe.malachite_axe-0",
-                            1 => "common.items.npc_weapons.sword.cultist_purp_2h-0",
-                            2 => "common.items.npc_weapons.sword.cultist_purp_2h-0",
-                            3 => "common.items.npc_weapons.hammer.cultist_purp_2h-0",
-                            4 => "common.items.npc_weapons.staff.cultist_staff",
-                            _ => "common.items.npc_weapons.bow.horn_longbow-0",
-                        }));
-
+                        .with_level(dynamic_rng.gen_range(
+                            (room.difficulty as f32).powf(1.25) + 3.0,
+                            (room.difficulty as f32).powf(1.5) + 4.0,
+                        ).round() as u32);
+                        let entity = match room.difficulty {
+                            0 => entity
+                                .with_name("Outcast")
+                                .with_config(common::loadout_builder::LoadoutConfig::Outcast)
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_main_tool(comp::Item::new_from_asset_expect(
+                                    match dynamic_rng.gen_range(0, 6) {
+                                        0 => "common.items.weapons.axe.starter_axe",
+                                        1 => "common.items.weapons.sword.starter_sword",
+                                        2 => "common.items.weapons.sword.starter_sword",
+                                        3 => "common.items.weapons.hammer.starter_hammer",
+                                        4 => "common.items.weapons.staff.starter_staff",
+                                        _ => "common.items.weapons.bow.starter_bow",
+                                    },
+                                )),
+                            1 => entity
+                                .with_name("Highwayman")
+                                .with_config(common::loadout_builder::LoadoutConfig::Highwayman)
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_main_tool(comp::Item::new_from_asset_expect(
+                                    match dynamic_rng.gen_range(0, 6) {
+                                        0 => "common.items.weapons.axe.worn_iron_axe-0",
+                                        1 => "common.items.weapons.sword.zweihander_sword_0",
+                                        2 => "common.items.weapons.sword.zweihander_sword_0",
+                                        3 => "common.items.weapons.hammer.worn_iron_hammer-0",
+                                        4 => "common.items.weapons.staff.bone_staff",
+                                        _ => "common.items.weapons.bow.wood_shortbow-1",
+                                    },
+                                )),
+                            2 => entity
+                                .with_name("Bandit")
+                                .with_config(common::loadout_builder::LoadoutConfig::Bandit)
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_main_tool(comp::Item::new_from_asset_expect(
+                                    match dynamic_rng.gen_range(0, 6) {
+                                        0 => "common.items.weapons.axe.bronze_axe-0",
+                                        1 => "common.items.weapons.sword.greatsword_2h_simple-0",
+                                        2 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                        3 => "common.items.weapons.hammer.bronze_hammer-0",
+                                        4 => "common.items.weapons.staff.bone_staff",
+                                        _ => "common.items.weapons.bow.wood_longbow-0",
+                                    },
+                                )),
+                            3 => entity
+                                .with_name("Cultist Novice")
+                                .with_config(common::loadout_builder::LoadoutConfig::CultistNovice)
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_main_tool(comp::Item::new_from_asset_expect(
+                                    match dynamic_rng.gen_range(0, 6) {
+                                        0 => "common.items.weapons.axe.steel_axe-0",
+                                        1 => "common.items.weapons.sword.long_2h_orn-0",
+                                        2 => "common.items.weapons.sword.long_2h_orn-0",
+                                        3 => "common.items.weapons.hammer.cobalt_hammer-0",
+                                        4 => "common.items.weapons.staff.amethyst_staff",
+                                        _ => "common.items.weapons.bow.horn_longbow-0",
+                                    },
+                                )),
+                            4 => entity
+                                .with_name("Cultist Acolyte")
+                                .with_config(common::loadout_builder::LoadoutConfig::CultistAcolyte)
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_main_tool(comp::Item::new_from_asset_expect(
+                                    match dynamic_rng.gen_range(0, 6) {
+                                        0 => "common.items.weapons.axe.malachite_axe-0",
+                                        1 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                        2 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                        3 => "common.items.weapons.hammer.cultist_purp_2h-0",
+                                        4 => "common.items.weapons.staff.cultist_staff",
+                                        _ => "common.items.weapons.bow.horn_longbow-0",
+                                    },
+                                )),
+                            5 => match dynamic_rng.gen_range(0, 6) {
+                                0 => entity
+                                    .with_name("Cultist Warlock")
+                                    .with_config(common::loadout_builder::LoadoutConfig::Warlock)
+                                    .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                    .with_main_tool(comp::Item::new_from_asset_expect(
+                                        "common.items.npc_weapons.staff.cultist_staff",
+                                    )),
+                                _ => entity
+                                    .with_name("Cultist Warlord")
+                                    .with_config(common::loadout_builder::LoadoutConfig::Warlord)
+                                    .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                    .with_main_tool(comp::Item::new_from_asset_expect(
+                                        match dynamic_rng.gen_range(0, 5) {
+                                            0 => "common.items.weapons.axe.malachite_axe-0",
+                                            1 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                            2 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                            3 => "common.items.weapons.hammer.cultist_purp_2h-0",
+                                            _ => "common.items.weapons.bow.horn_longbow-0",
+                                        },
+                                    )),
+                            },
+                            _ => entity.with_name("Humanoid").with_main_tool(
+                                comp::Item::new_from_asset_expect(
+                                    "common.items.weapons.bow.horn_longbow-0",
+                                ),
+                            ),
+                        };
                         supplement.add_entity(entity);
                     }
 
@@ -535,21 +721,171 @@ impl Floor {
                             boss_spawn_tile + if boss_tile_is_pillar { 1 } else { 0 };
 
                         if tile_pos == boss_spawn_tile && tile_wcenter.xy() == wpos2d {
-                            let chosen = Lottery::<String>::load_expect(
-                                "common.loot_tables.loot_table_boss_cultist-leader",
-                            );
+                            let chosen = match room.difficulty {
+                                0 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_weapon_uncommon",
+                                ),
+                                1 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_weapon_uncommon",
+                                ),
+                                2 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_armor_heavy",
+                                ),
+                                3 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_weapon_rare",
+                                ),
+                                4 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                ),
+                                5 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                ),
+                                _ => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_armor_misc",
+                                ),
+                            };
                             let chosen = chosen.choose();
-                            let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                                .with_level(dynamic_rng.gen_range(1, 5))
-                                .with_alignment(comp::Alignment::Enemy)
-                                .with_body(comp::Body::Golem(comp::golem::Body::random_with(
-                                    dynamic_rng,
-                                    &comp::golem::Species::StoneGolem,
-                                )))
-                                .with_name("Stonework Defender".to_string())
-                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen));
+                            let entity = match room.difficulty {
+                                0 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Humanoid(
+                                            comp::humanoid::Body::random(),
+                                        ))
+                                        .with_name("Outcast Leader".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                        .with_config(
+                                            common::loadout_builder::LoadoutConfig::Outcast,
+                                        )
+                                        .with_scale(2.0)
+                                        .with_main_tool(comp::Item::new_from_asset_expect(
+                                            match dynamic_rng.gen_range(0, 6) {
+                                                0 => "common.items.weapons.axe.worn_iron_axe-0",
+                                                1 => {
+                                                    "common.items.weapons.sword.zweihander_sword_0"
+                                                },
+                                                2 => {
+                                                    "common.items.weapons.sword.zweihander_sword_0"
+                                                },
+                                                3 => {
+                                                    "common.items.weapons.hammer.worn_iron_hammer-0"
+                                                },
+                                                4 => "common.items.weapons.staff.bone_staff",
+                                                _ => "common.items.weapons.bow.wood_shortbow-1",
+                                            },
+                                        )),
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Tarasque,
+                                            ),
+                                        ))
+                                        .with_name("Tarasque".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                1 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Theropod(
+                                            comp::theropod::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::theropod::Species::Odonto,
+                                            ),
+                                        ))
+                                        .with_name("Odonto".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                2 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Humanoid(
+                                            comp::humanoid::Body::random()
+                                        ))
+                                        .with_name("Bandit Captain".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                        .with_config(common::loadout_builder::LoadoutConfig::Bandit)
+                                        .with_scale(2.0)
+                                        .with_main_tool(comp::Item::new_from_asset_expect(
+                                            match dynamic_rng.gen_range(0, 6) {
+                                                0 => "common.items.weapons.axe.steel_axe-0",
+                                                1 => "common.items.weapons.sword.long_2h_orn-0",
+                                                2 => "common.items.weapons.sword.long_2h_orn-0",
+                                                3 => "common.items.weapons.hammer.cobalt_hammer-0",
+                                                4 => "common.items.weapons.staff.amethyst_staff",
+                                                _ => "common.items.weapons.bow.horn_longbow-0",
+                                            },
+                                        ),);
+                                    2
+                                ],
+                                3 => {
+                                    vec![ EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                .with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
+                                .with_name("Cultist Acolyte".to_string())
+                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                .with_config(common::loadout_builder::LoadoutConfig::CultistAcolyte)
+                                .with_scale(2.0)
+                                .with_main_tool(
+                                    comp::Item::new_from_asset_expect(
+                                        match dynamic_rng.gen_range(0, 6) {
+                                            0 => "common.items.weapons.axe.malachite_axe-0",
+                                            1 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                            2 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                            3 => "common.items.weapons.hammer.cultist_purp_2h-0",
+                                            4 => "common.items.weapons.staff.cultist_staff",
+                                            _ => "common.items.weapons.bow.horn_longbow-0",
+                                        },
+                                    ),
+                                )
+                                ; 2]
+                                },
+                                4 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Golem(
+                                            comp::golem::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::golem::Species::StoneGolem,
+                                            ),
+                                        ))
+                                        .with_name("Stonework Defender".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                5 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::BipedLarge(
+                                            comp::biped_large::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::biped_large::Species::Mindflayer,
+                                            ),
+                                        ))
+                                        .with_name("Mindflayer".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                _ => {
+                                    vec![EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body(
+                                        comp::Body::QuadrupedSmall(
+                                            comp::quadruped_small::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_small::Species::Sheep,
+                                            ),
+                                        ),
+                                    )]
+                                },
+                            };
 
-                            supplement.add_entity(entity);
+                            for entity in entity {
+                                supplement.add_entity(
+                                    entity
+                                        .with_level(
+                                            dynamic_rng
+                                                .gen_range(
+                                                    (room.difficulty as f32).powf(1.25) + 3.0,
+                                                    (room.difficulty as f32).powf(1.5) + 4.0,
+                                                )
+                                                .round()
+                                                as u32
+                                                * 5,
+                                        )
+                                        .with_alignment(comp::Alignment::Enemy),
+                                );
+                            }
                         }
                     }
                     if room.miniboss {
@@ -567,26 +903,159 @@ impl Floor {
                             miniboss_spawn_tile + if miniboss_tile_is_pillar { 1 } else { 0 };
 
                         if tile_pos == miniboss_spawn_tile && tile_wcenter.xy() == wpos2d {
-                            let chosen =
-                                Lottery::<String>::load_expect(match dynamic_rng.gen_range(0, 5) {
-                                    0 => "common.loot_tables.loot_table_humanoids",
-                                    1 => "common.loot_tables.loot_table_armor_misc",
-                                    _ => "common.loot_tables.loot_table_cultists",
-                                });
+                            let chosen = match room.difficulty {
+                                0 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_animal_parts",
+                                ),
+                                1 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_animal_parts",
+                                ),
+                                2 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_animal_parts",
+                                ),
+                                3 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_weapon_rare",
+                                ),
+                                4 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_weapon_rare",
+                                ),
+                                5 => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                ),
+                                _ => Lottery::<String>::load_expect(
+                                    "common.loot_tables.loot_table_armor_misc",
+                                ),
+                            };
                             let chosen = chosen.choose();
-                            let entity = EntityInfo::at(tile_wcenter.map(|e| e as f32))
-                                .with_level(1)
-                                .with_alignment(comp::Alignment::Enemy)
-                                .with_body(comp::Body::BipedLarge(
-                                    comp::biped_large::Body::random_with(
-                                        dynamic_rng,
-                                        &comp::biped_large::Species::Mindflayer,
-                                    ),
-                                ))
-                                .with_name("Mindflayer")
-                                .with_loot_drop(comp::Item::new_from_asset_expect(chosen));
+                            let entity = match room.difficulty {
+                                0 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Bonerattler,
+                                            ),
+                                        ))
+                                        .with_name("Bonerattler".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                1 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Bonerattler,
+                                            )
+                                        ))
+                                        .with_name("Bonerattler".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(
+                                            chosen
+                                        ));
+                                    3
+                                ],
+                                2 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Tarasque,
+                                            ),
+                                        ))
+                                        .with_name("Tarasque".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                3 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Humanoid(
+                                            comp::humanoid::Body::random(),
+                                        ))
+                                        .with_name("Animal Trainer".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
+                                        .with_config(
+                                            common::loadout_builder::LoadoutConfig::CultistAcolyte,
+                                        )
+                                        .with_scale(2.0)
+                                        .with_main_tool(comp::Item::new_from_asset_expect(
+                                            match dynamic_rng.gen_range(0, 6) {
+                                                0 => "common.items.weapons.axe.malachite_axe-0",
+                                                1 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                                2 => "common.items.weapons.sword.cultist_purp_2h-0",
+                                                3 => {
+                                                    "common.items.weapons.hammer.cultist_purp_2h-0"
+                                                },
+                                                4 => "common.items.weapons.staff.cultist_staff",
+                                                _ => "common.items.weapons.bow.horn_longbow-0",
+                                            },
+                                        )),
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Wolf,
+                                            ),
+                                        ))
+                                        .with_name("Tamed Wolf".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::QuadrupedMedium(
+                                            comp::quadruped_medium::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_medium::Species::Wolf,
+                                            ),
+                                        ))
+                                        .with_name("Tamed Wolf".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                4 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::BipedLarge(
+                                            comp::biped_large::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::biped_large::Species::Dullahan,
+                                            ),
+                                        ))
+                                        .with_name("Dullahan Guard".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                5 => vec![
+                                    EntityInfo::at(tile_wcenter.map(|e| e as f32))
+                                        .with_body(comp::Body::Golem(
+                                            comp::golem::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::golem::Species::StoneGolem,
+                                            ),
+                                        ))
+                                        .with_name("Stonework Defender".to_string())
+                                        .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
+                                ],
+                                _ => {
+                                    vec![EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body(
+                                        comp::Body::QuadrupedSmall(
+                                            comp::quadruped_small::Body::random_with(
+                                                dynamic_rng,
+                                                &comp::quadruped_small::Species::Sheep,
+                                            ),
+                                        ),
+                                    )]
+                                },
+                            };
 
-                            supplement.add_entity(entity);
+                            for entity in entity {
+                                supplement.add_entity(
+                                    entity
+                                        .with_level(
+                                            dynamic_rng
+                                                .gen_range(
+                                                    (room.difficulty as f32).powf(1.25) + 3.0,
+                                                    (room.difficulty as f32).powf(1.5) + 4.0,
+                                                )
+                                                .round()
+                                                as u32
+                                                * 5,
+                                        )
+                                        .with_alignment(comp::Alignment::Enemy),
+                                );
+                            }
                         }
                     }
                 }
@@ -661,14 +1130,15 @@ impl Floor {
         let tunnel_dist =
             1.0 - (dist_to_wall - wall_thickness).max(0.0) / (TILE_SIZE as f32 - wall_thickness);
 
-        let floor_sprite = if RandomField::new(7331).chance(Vec3::from(pos), 0.00005) {
+        let floor_sprite = if RandomField::new(7331).chance(Vec3::from(pos), 0.001) {
             BlockMask::new(
                 with_sprite(
-                    match (RandomField::new(1337).get(Vec3::from(pos)) / 2) % 20 {
+                    match (RandomField::new(1337).get(Vec3::from(pos)) / 2) % 30 {
                         0 => SpriteKind::Apple,
                         1 => SpriteKind::VeloriteFrag,
                         2 => SpriteKind::Velorite,
                         3..=8 => SpriteKind::Mushroom,
+                        9..=15 => SpriteKind::FireBowlGround,
                         _ => SpriteKind::ShortGrass,
                     },
                 ),
diff --git a/world/src/site/mod.rs b/world/src/site/mod.rs
index 8988132afe..cbe82647c3 100644
--- a/world/src/site/mod.rs
+++ b/world/src/site/mod.rs
@@ -2,6 +2,7 @@ mod block_mask;
 mod castle;
 mod dungeon;
 pub mod economy;
+mod namegen;
 mod settlement;
 
 // Reexports
@@ -92,6 +93,14 @@ impl Site {
         }
     }
 
+    pub fn name(&self) -> &str {
+        match &self.kind {
+            SiteKind::Settlement(s) => s.name(),
+            SiteKind::Dungeon(d) => d.name(),
+            SiteKind::Castle(c) => c.name(),
+        }
+    }
+
     pub fn apply_to<'a>(
         &'a self,
         index: IndexRef,
diff --git a/world/src/site/namegen.rs b/world/src/site/namegen.rs
new file mode 100644
index 0000000000..e1dc6488f4
--- /dev/null
+++ b/world/src/site/namegen.rs
@@ -0,0 +1,52 @@
+use rand::prelude::*;
+
+pub struct NameGen<'a, R: Rng> {
+    // 2..
+    pub approx_syllables: usize,
+
+    rng: &'a mut R,
+}
+
+impl<'a, R: Rng> NameGen<'a, R> {
+    pub fn location(rng: &'a mut R) -> Self {
+        Self {
+            approx_syllables: rng.gen_range(1, 4),
+            rng,
+        }
+    }
+
+    pub fn generate(self) -> String {
+        let cons = vec![
+            "d", "f", "ph", "r", "st", "t", "s", "p", "sh", "th", "br", "tr", "m", "k", "st", "w",
+            "y", "cr", "fr", "dr", "pl", "wr", "sn", "g", "qu", "l",
+        ];
+        let mut start = cons.clone();
+        start.extend(vec![
+            "cr", "thr", "str", "br", "iv", "est", "ost", "ing", "kr", "in", "on", "tr", "tw",
+            "wh", "eld", "ar", "or", "ear", "irr", "mi", "en", "ed", "et", "ow", "fr", "shr", "wr",
+            "gr", "pr",
+        ]);
+        let mut middle = cons.clone();
+        middle.extend(vec!["tt"]);
+        let vowel = vec!["o", "e", "a", "i", "u", "au", "ee", "ow", "ay", "ey", "oe"];
+        let end = vec![
+            "et", "ige", "age", "ist", "en", "on", "og", "end", "ind", "ock", "een", "edge", "ist",
+            "ed", "est", "eed", "ast", "olt", "ey", "ean", "ead", "onk", "ink", "eon", "er", "ow",
+            "ot", "in", "on", "id", "ir", "or", "in", "ig", "en",
+        ];
+
+        let mut name = String::new();
+
+        name += start.choose(self.rng).unwrap();
+        for _ in 0..self.approx_syllables.saturating_sub(2) {
+            name += vowel.choose(self.rng).unwrap();
+            name += middle.choose(self.rng).unwrap();
+        }
+        name += end.choose(self.rng).unwrap();
+
+        name.chars()
+            .enumerate()
+            .map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
+            .collect()
+    }
+}
diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs
index 7142469469..edc7c192cd 100644
--- a/world/src/site/settlement/mod.rs
+++ b/world/src/site/settlement/mod.rs
@@ -9,6 +9,7 @@ use super::SpawnRules;
 use crate::{
     column::ColumnSample,
     sim::WorldSim,
+    site::namegen::NameGen,
     util::{RandomField, Sampler, StructureGen2d},
     IndexRef,
 };
@@ -139,6 +140,7 @@ impl Structure {
 }
 
 pub struct Settlement {
+    name: String,
     seed: u32,
     origin: Vec2<i32>,
     land: Land,
@@ -162,6 +164,7 @@ impl Settlement {
     pub fn generate(wpos: Vec2<i32>, sim: Option<&WorldSim>, rng: &mut impl Rng) -> Self {
         let mut ctx = GenCtx { sim, rng };
         let mut this = Self {
+            name: NameGen::location(ctx.rng).generate(),
             seed: ctx.rng.gen(),
             origin: wpos,
             land: Land::new(ctx.rng),
@@ -185,6 +188,8 @@ impl Settlement {
         this
     }
 
+    pub fn name(&self) -> &str { &self.name }
+
     pub fn get_origin(&self) -> Vec2<i32> { self.origin }
 
     /// Designate hazardous terrain based on world data
@@ -529,7 +534,7 @@ impl Settlement {
         }
     }
 
-    pub fn radius(&self) -> f32 { 1200.0 }
+    pub fn radius(&self) -> f32 { 400.0 }
 
     #[allow(clippy::needless_update)] // TODO: Pending review in #587
     pub fn spawn_rules(&self, wpos: Vec2<i32>) -> SpawnRules {
@@ -627,15 +632,15 @@ impl Settlement {
                                     .rotated_z(f32::consts::PI / 2.0)
                                     .normalized();
                                 let is_lamp = if path_dir.x.abs() > path_dir.y.abs() {
-                                    wpos2d.x as f32 % 30.0 / path_dir.dot(Vec2::unit_y()).abs()
+                                    wpos2d.x as f32 % 15.0 / path_dir.dot(Vec2::unit_y()).abs()
                                         <= 1.0
                                 } else {
-                                    (wpos2d.y as f32 + 10.0) % 30.0
+                                    (wpos2d.y as f32 + 10.0) % 15.0
                                         / path_dir.dot(Vec2::unit_x()).abs()
                                         <= 1.0
                                 };
                                 if (col_sample.path.map(|(dist, _, _, _)| dist > 6.0 && dist < 7.0).unwrap_or(false) && is_lamp) //roll(0, 50) == 0)
-                                    || (roll(0, 2000) == 0 && col_sample.path.map(|(dist, _, _, _)| dist > 20.0).unwrap_or(true))
+                                    || (roll(0, 750) == 0 && col_sample.path.map(|(dist, _, _, _)| dist > 20.0).unwrap_or(true))
                                 {
                                     surface_sprite = Some(SpriteKind::StreetLamp);
                                 }
@@ -910,9 +915,20 @@ impl Settlement {
                         } else {
                             comp::Alignment::Tame
                         })
+                        .do_if(!is_dummy, |e| e.with_automatic_name())
+                        .do_if(is_dummy, |e| e.with_name("Training Dummy"))
                         .do_if(is_human && dynamic_rng.gen(), |entity| {
-                            entity.with_main_tool(Item::new_from_asset_expect(
-                                match dynamic_rng.gen_range(0, 7) {
+                            match dynamic_rng.gen_range(0, 5) {
+                                0 => entity
+                                    .with_main_tool(Item::new_from_asset_expect(
+                                        "common.items.weapons.sword.greatsword_2h_simple-0",
+                                    ))
+                                    .with_name("Guard")
+                                    .with_level(dynamic_rng.gen_range(10, 15))
+                                    .with_config(common::loadout_builder::LoadoutConfig::Guard),
+                                _ => entity
+                                    .with_main_tool(Item::new_from_asset_expect(
+                                        match dynamic_rng.gen_range(0, 7) {
                                     0 => "common.items.npc_weapons.tool.broom",
                                     1 => "common.items.npc_weapons.tool.hoe",
                                     2 => "common.items.npc_weapons.tool.pickaxe",
@@ -922,10 +938,10 @@ impl Settlement {
                                     _ => "common.items.npc_weapons.tool.shovel-1",
                                     //_ => "common.items.npc_weapons.bow.starter_bow", TODO: Re-Add this when we have a better way of distributing npc_weapons here
                                 },
-                            ))
-                        })
-                        .do_if(is_dummy, |e| e.with_name("Training Dummy"))
-                        .do_if(!is_dummy, |e| e.with_automatic_name());
+                                    ))
+                                    .with_config(common::loadout_builder::LoadoutConfig::Villager),
+                            }
+                        });
 
                     supplement.add_entity(entity);
                 }
diff --git a/world/src/util/random.rs b/world/src/util/random.rs
index aaf6b208e3..09c7a815cb 100644
--- a/world/src/util/random.rs
+++ b/world/src/util/random.rs
@@ -1,4 +1,5 @@
 use super::{seed_expan, Sampler};
+use rand::RngCore;
 use vek::*;
 
 #[derive(Clone, Copy)]
@@ -45,6 +46,10 @@ pub struct RandomPerm {
 
 impl RandomPerm {
     pub const fn new(seed: u32) -> Self { Self { seed } }
+
+    pub fn chance(&self, perm: u32, chance: f32) -> bool {
+        (self.get(perm) % (1 << 16)) as f32 / ((1 << 16) as f32) < chance
+    }
 }
 
 impl Sampler<'static> for RandomPerm {
@@ -55,3 +60,27 @@ impl Sampler<'static> for RandomPerm {
         seed_expan::diffuse_mult(&[self.seed, perm])
     }
 }
+
+// `RandomPerm` is not high-quality but it is at least fast and deterministic.
+impl RngCore for RandomPerm {
+    fn next_u32(&mut self) -> u32 {
+        self.seed = self.get(self.seed);
+        self.seed
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        let a = self.next_u32();
+        let b = self.next_u32();
+        (a as u64) << 32 | b as u64
+    }
+
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
+        dest.iter_mut()
+            .for_each(|b| *b = (self.next_u32() & 0xFF) as u8);
+    }
+
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
+        self.fill_bytes(dest);
+        Ok(())
+    }
+}