diff --git a/raws/spawns.json b/raws/spawns.json
index 7cba000..9482aba 100644
--- a/raws/spawns.json
+++ b/raws/spawns.json
@@ -58,6 +58,12 @@
     },
     {
       "name": "Longsword",
+      "weight": 2,
+      "min_depth": 3,
+      "max_depth": 100
+    },
+    {
+      "name": "Longsword +1",
       "weight": 1,
       "min_depth": 3,
       "max_depth": 100
@@ -333,13 +339,17 @@
       },
       "weight_lbs": 0.5,
       "base_value": 50.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "potion"
+      }
     },
     {
       "name": "Magic Missile Scroll",
       "renderable": {
         "glyph": ")",
-        "fg": "#00FFFF",
+        "fg": "#FFAAAA",
         "bg": "#000000",
         "order": 2
       },
@@ -351,13 +361,17 @@
       },
       "weight_lbs": 0.5,
       "base_value": 50.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "scroll"
+      }
     },
     {
       "name": "Fireball Scroll",
       "renderable": {
         "glyph": ")",
-        "fg": "#FFA500",
+        "fg": "#FFAAAA",
         "bg": "#000000",
         "order": 2
       },
@@ -370,7 +384,11 @@
       },
       "weight_lbs": 0.5,
       "base_value": 100.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "scroll"
+      }
     },
     {
       "name": "Confusion Scroll",
@@ -388,7 +406,11 @@
       },
       "weight_lbs": 0.5,
       "base_value": 75.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "scroll"
+      }
     },
     {
       "name": "Magic Mapping Scroll",
@@ -405,13 +427,17 @@
       },
       "weight_lbs": 0.5,
       "base_value": 50.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "scroll"
+      }
     },
     {
       "name": "Town Portal Scroll",
       "renderable": {
         "glyph": ")",
-        "fg": "#AAAAFF",
+        "fg": "#FFAAAA",
         "bg": "#000000",
         "order": 2
       },
@@ -422,7 +448,11 @@
       },
       "weight_lbs": 0.5,
       "base_value": 20.0,
-      "vendor_category": "alchemy"
+      "vendor_category": "alchemy",
+      "magic": {
+        "class": "common",
+        "naming": "scroll"
+      }
     },
     {
       "name": "Rations",
@@ -589,6 +619,29 @@
       "initiative_penalty": 2,
       "vendor_category": "weapon"
     },
+    {
+      "name": "Longsword +1",
+      "renderable": {
+        "glyph": "/",
+        "fg": "#FFAAFF",
+        "bg": "#000000",
+        "order": 2
+      },
+      "weapon": {
+        "range": "melee",
+        "attribute": "might",
+        "base_damage": "1d8+1",
+        "hit_bonus": 1
+      },
+      "weight_lbs": 2.0,
+      "base_value": 100.0,
+      "initiative_penalty": 1,
+      "vendor_category": "weapon",
+      "magic": {
+        "class": "common",
+        "naming": "Unidentified Longsword"
+      }
+    },
     {
       "name": "Battleaxe",
       "renderable": {