diff --git a/raws/spawns.json b/raws/spawns.json
index d8900d1..1d22e10 100644
--- a/raws/spawns.json
+++ b/raws/spawns.json
@@ -13,12 +13,6 @@
       "max_depth": 100,
       "add_map_depth_to_weight": true
     },
-    {
-      "name": "Kobold",
-      "weight": 15,
-      "min_depth": 0,
-      "max_depth": 3
-    },
     {
       "name": "Health Potion",
       "weight": 7,
@@ -63,12 +57,6 @@
       "min_depth": 1,
       "max_depth": 100
     },
-    {
-      "name": "Battleaxe",
-      "weight": 1,
-      "min_depth": 2,
-      "max_depth": 100
-    },
     {
       "name": "Tower Shield",
       "weight": 1,
@@ -92,6 +80,18 @@
       "weight": 5,
       "min_depth": 0,
       "max_depth": 100
+    },
+    {
+      "name": "Battleaxe",
+      "weight": 1,
+      "min_depth": 2,
+      "max_depth": 100
+    },
+    {
+      "name": "Kobold",
+      "weight": 15,
+      "min_depth": 0,
+      "max_depth": 3
     }
   ],
   "items": [
@@ -249,60 +249,6 @@
     }
   ],
   "mobs": [
-    {
-      "name": "Orc",
-      "renderable": {
-        "glyph": "o",
-        "fg": "#FF0000",
-        "bg": "#000000",
-        "order": 1
-      },
-      "blocks_tile": true,
-      "stats": {
-        "max_hp": 16,
-        "hp": 16,
-        "defense": 1,
-        "power": 4
-      },
-      "vision_range": 8,
-      "ai": "melee"
-    },
-    {
-      "name": "Goblin",
-      "renderable": {
-        "glyph": "g",
-        "fg": "#FF0000",
-        "bg": "#000000",
-        "order": 1
-      },
-      "blocks_tile": true,
-      "stats": {
-        "max_hp": 8,
-        "hp": 8,
-        "defense": 1,
-        "power": 3
-      },
-      "vision_range": 8,
-      "ai": "melee"
-    },
-    {
-      "name": "Kobold",
-      "renderable": {
-        "glyph": "k",
-        "fg": "#FF0000",
-        "bg": "#000000",
-        "order": 1
-      },
-      "blocks_tile": true,
-      "stats": {
-        "max_hp": 4,
-        "hp": 4,
-        "defense": 0,
-        "power": 2
-      },
-      "vision_range": 4,
-      "ai": "melee"
-    },
     {
       "name": "Barkeep",
       "renderable": {
@@ -356,6 +302,204 @@
       },
       "vision_range": 4,
       "ai": "bystander"
+    },
+    {
+      "name": "Priest",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#EE82EE",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Parishioner",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#AAAAAA",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Blacksmith",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#EE82EE",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Clothier",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#EE82EE",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Alchemist",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#EE82EE",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Mom",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#FFAAAA",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Peasant",
+      "renderable": {
+        "glyph": "☺",
+        "fg": "#999999",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 4,
+      "ai": "bystander"
+    },
+    {
+      "name": "Rat",
+      "renderable": {
+        "glyph": "r",
+        "fg": "#FF0000",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 2,
+        "hp": 2,
+        "defense": 1,
+        "power": 3
+      },
+      "vision_range": 8,
+      "ai": "melee"
+    },
+    {
+      "name": "Orc",
+      "renderable": {
+        "glyph": "o",
+        "fg": "#FF0000",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 16,
+        "hp": 16,
+        "defense": 1,
+        "power": 4
+      },
+      "vision_range": 8,
+      "ai": "melee"
+    },
+    {
+      "name": "Goblin",
+      "renderable": {
+        "glyph": "g",
+        "fg": "#FF0000",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 8,
+        "hp": 8,
+        "defense": 1,
+        "power": 3
+      },
+      "vision_range": 8,
+      "ai": "melee"
+    },
+    {
+      "name": "Kobold",
+      "renderable": {
+        "glyph": "k",
+        "fg": "#FF0000",
+        "bg": "#000000",
+        "order": 1
+      },
+      "blocks_tile": true,
+      "stats": {
+        "max_hp": 4,
+        "hp": 4,
+        "defense": 0,
+        "power": 2
+      },
+      "vision_range": 4,
+      "ai": "melee"
     }
   ],
   "props": [
@@ -417,6 +561,116 @@
         "order": 2
       },
       "hidden": false
+    },
+    {
+      "name": "Candle",
+      "renderable": {
+        "glyph": "Ä",
+        "fg": "#FFA500",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Anvil",
+      "renderable": {
+        "glyph": "╔",
+        "fg": "#AAAAAA",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Water Trough",
+      "renderable": {
+        "glyph": "•",
+        "fg": "#5555FF",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Weapon Rack",
+      "renderable": {
+        "glyph": "π",
+        "fg": "#FFD700",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Armor Stand",
+      "renderable": {
+        "glyph": "⌠",
+        "fg": "#FFFFFF",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Chemistry Set",
+      "renderable": {
+        "glyph": "δ",
+        "fg": "#00FFFF",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Dead Thing",
+      "renderable": {
+        "glyph": "☻",
+        "fg": "#AA0000",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Cabinet",
+      "renderable": {
+        "glyph": "∩",
+        "fg": "#805A46",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Bed",
+      "renderable": {
+        "glyph": "8",
+        "fg": "#805A46",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Loom",
+      "renderable": {
+        "glyph": "≡",
+        "fg": "#805A46",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
+    },
+    {
+      "name": "Hide Rack",
+      "renderable": {
+        "glyph": "π",
+        "fg": "#805A46",
+        "bg": "#000000",
+        "order": 2
+      },
+      "hidden": false
     }
   ]
 }
\ No newline at end of file