diff --git a/crafting.txt b/crafting.txt
index 1dea7b31f..abadeeaa3 100644
--- a/crafting.txt
+++ b/crafting.txt
@@ -150,11 +150,11 @@ FireCharge     = BlazePowder, *   | Coal, *    | Gunpowder, *
 #******************************************************#
 # Weapons
 #
-WoodenSword    = Stick, 2:3, | Planks,      2:1, 2:2
-StoneSword     = Stick, 2:3, | Cobblestone, 2:1, 2:2
-GoldenSword    = Stick, 2:3, | GoldIngot,   2:1, 2:2
-IronSword      = Stick, 2:3, | IronIngot,   2:1, 2:2
-DiamondSword   = Stick, 2:3, | Diamond,     2:1, 2:2
+WoodenSword    = Stick, 2:3 | Planks,      2:1, 2:2
+StoneSword     = Stick, 2:3 | Cobblestone, 2:1, 2:2
+GoldenSword    = Stick, 2:3 | GoldIngot,   2:1, 2:2
+IronSword      = Stick, 2:3 | IronIngot,   2:1, 2:2
+DiamondSword   = Stick, 2:3 | Diamond,     2:1, 2:2
 Bow            = Stick, 2:1, 1:2, 2:3   | String, 3:1, 3:2, 3:3
 Bow            = Stick, 2:1, 3:2, 2:3   | String, 1:1, 1:2, 1:3
 Arrow, 4       = Flint, 1:1             | Stick, 1:2       | Feather, 1:3
@@ -232,7 +232,7 @@ Dispenser        = Cobblestone, 1:1, 1:2, 1:3, 2:1, 3:1, 3:2, 3:3      | Redston
 Repeater         = Stone,  1:2, 2:2, 3:2            | RedstoneTorchOn, 1:1, 3:1 | RedstoneDust, 2:1
 Piston           = Planks, 1:1, 2:1, 3:1            | RedstoneDust, 2:2         | Cobblestone, 1:2, 3:2, 1:3, 2:3, 3:3
 StickyPiston     = Piston, *         | SlimeBall, *
-Lamp             = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
+RedstoneLamp     = RedstoneDust, 2:1, 1:2, 3:2, 2:3 | Glowstone, 2:2
 
 
 
diff --git a/items.ini b/items.ini
index faaf59774..5b9012521 100644
--- a/items.ini
+++ b/items.ini
@@ -192,6 +192,8 @@ jukebox=84
 fence=85
 pumpkin=86
 netherstone=87
+netherrack=87
+hellrock=87
 slowsand=88
 soulsand=88
 lightstone=89
@@ -204,6 +206,10 @@ lockedchest=95
 trapdoor=96
 silverfishblock=97
 stonebricks=98
+stonebrick=98
+mossystonebrick=98:1
+crackedstonebrick=98:2
+chiseledstonebrick=98:3
 hugebrownmushroom=99
 hugeredmushroom=100
 ironbars=101
@@ -228,8 +234,9 @@ endportal=119
 endportalframe=120
 endstone=121
 dragonegg=122
-lampoff=123
-lampon=124
+redstonelamp=123
+redstonelampoff=123
+redstonelampon=124
 woodendoubleslab=125
 woodenslab=126
 sandstonestairs=128