diff --git a/scorn/shops/foodshop b/scorn/shops/foodshop
index 81e2195f9..a0a830571 100644
--- a/scorn/shops/foodshop
+++ b/scorn/shops/foodshop
@@ -2,16 +2,15 @@ arch map
 name Food Shop Warehouse
 difficulty 2
 region scorn
-shopitems food:95;*:-100
+shopitems food:95;flesh:30;*:-100
 shopmax 2000
-shoprace dwarf
 width 15
 height 24
 enter_x 5
 enter_y 18
 msg
 Created:  1993-10-15 MikeeUSA
-Modified: 2012-05-08 Rick Tanner
+Modified: 2013-07-29 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -599,10 +598,6 @@ arch grass_only
 x 5
 y 2
 end
-arch light3
-x 5
-y 3
-end
 arch shop_empty
 x 5
 y 3
@@ -619,18 +614,10 @@ arch shop_empty
 x 5
 y 5
 end
-arch light4
-x 5
-y 6
-end
 arch shop_empty
 x 5
 y 6
 end
-arch light4
-x 5
-y 7
-end
 arch shop_empty
 x 5
 y 7
@@ -647,10 +634,6 @@ arch shop_empty
 x 5
 y 10
 end
-arch light4
-x 5
-y 11
-end
 arch shop_empty
 x 5
 y 11
@@ -812,15 +795,18 @@ arch shop_empty
 x 6
 y 15
 end
-arch light4
+arch sign_e
+msg
+Have food that you'd like to sell? Get a good price in our food buyback corner!
+endmsg
 x 6
-y 16
+y 15
 end
 arch shop_empty
 x 6
 y 16
 end
-arch swall_2_2_3
+arch swall_3_3
 x 6
 y 16
 end
@@ -915,39 +901,49 @@ arch shop_empty
 x 7
 y 5
 end
-arch shop_food
+arch shop_empty
 x 7
 y 6
 end
-arch shop_food
+arch light4
+x 7
+y 6
+glow_radius 8
+end
+arch shop_empty
 x 7
 y 7
 end
-arch shop_food
+arch shop_empty
 x 7
 y 8
 end
-arch shop_food
+arch shop_empty
 x 7
 y 9
 end
-arch shop_food
+arch shop_empty
 x 7
 y 10
 end
-arch shop_food
+arch shop_empty
 x 7
 y 11
 end
-arch shop_food
+arch shop_empty
 x 7
 y 12
 end
-arch shop_food
+arch shop_empty
 x 7
 y 13
 end
-arch shop_food
+arch light4
+x 7
+y 13
+glow_radius 8
+end
+arch shop_empty
 x 7
 y 14
 end
@@ -959,6 +955,10 @@ arch shop_empty
 x 7
 y 16
 end
+arch swall_1_3
+x 7
+y 16
+end
 arch shop_empty
 x 7
 y 17
@@ -967,7 +967,7 @@ arch shop_empty
 x 7
 y 18
 end
-arch shop_food
+arch shop_empty
 x 7
 y 19
 end
@@ -1054,11 +1054,11 @@ arch shop_food
 x 8
 y 14
 end
-arch shop_food
+arch shop_empty
 x 8
 y 15
 end
-arch shop_food
+arch shop_empty
 x 8
 y 16
 end
@@ -1070,7 +1070,11 @@ arch shop_empty
 x 8
 y 18
 end
-arch shop_food
+arch light4
+x 8
+y 18
+end
+arch shop_empty
 x 8
 y 19
 end
@@ -1105,10 +1109,6 @@ arch grass_only
 x 9
 y 2
 end
-arch light3
-x 9
-y 3
-end
 arch shop_empty
 x 9
 y 3
@@ -1125,196 +1125,176 @@ arch shop_empty
 x 9
 y 5
 end
+arch shop_empty
+x 9
+y 6
+end
+arch shop_empty
+x 9
+y 7
+end
+arch shop_empty
+x 9
+y 8
+end
+arch shop_empty
+x 9
+y 9
+end
+arch shop_empty
+x 9
+y 10
+end
+arch shop_empty
+x 9
+y 11
+end
+arch shop_empty
+x 9
+y 12
+end
+arch shop_empty
+x 9
+y 13
+end
+arch shop_empty
+x 9
+y 14
+end
+arch shop_empty
+x 9
+y 15
+end
+arch shop_empty
+x 9
+y 16
+end
+arch shop_empty
+x 9
+y 17
+end
+arch shop_empty
+x 9
+y 18
+end
+arch shop_empty
+x 9
+y 19
+end
+arch shop_empty
+x 9
+y 20
+end
+arch stwindow_win2
+x 9
+y 20
+end
+arch grass_only
+x 9
+y 21
+end
+arch grass_only
+x 9
+y 22
+end
+arch grass_only
+x 9
+y 23
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch grass_only
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 3
+end
+arch stwall_2_1_2
+x 10
+y 3
+end
+arch shop_food
+x 10
+y 4
+end
+arch shop_food
+x 10
+y 5
+end
+arch shop_food
+x 10
+y 6
+end
+arch shop_food
+x 10
+y 7
+end
+arch shop_food
+x 10
+y 8
+end
+arch shop_food
+x 10
+y 9
+end
+arch shop_food
+x 10
+y 10
+end
+arch shop_food
+x 10
+y 11
+end
+arch shop_food
+x 10
+y 12
+end
+arch shop_food
+x 10
+y 13
+end
+arch shop_food
+x 10
+y 14
+end
+arch shop_empty
+x 10
+y 15
+end
 arch dwarf_wiz
 name dwarf merchant
 msg
 @match *
 Food fit for a mighty dragon!
 endmsg
-x 9
-y 5
+x 10
+y 15
 randomitems none
 end
-arch light4
-x 9
-y 6
-end
 arch shop_empty
-x 9
-y 6
-end
-arch light4
-x 9
-y 7
-end
-arch shop_empty
-x 9
-y 7
-end
-arch shop_empty
-x 9
-y 8
-end
-arch shop_empty
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 10
-end
-arch light4
-x 9
-y 11
-end
-arch shop_empty
-x 9
-y 11
-end
-arch shop_empty
-x 9
-y 12
-end
-arch shop_empty
-x 9
-y 13
-end
-arch shop_empty
-x 9
-y 14
-end
-arch shop_empty
-x 9
-y 15
-end
-arch shop_empty
-x 9
-y 16
-end
-arch light4
-x 9
-y 17
-end
-arch shop_empty
-x 9
-y 17
-end
-arch light4
-x 9
-y 18
-end
-arch shop_empty
-x 9
-y 18
-end
-arch shop_food
-x 9
-y 19
-end
-arch light4
-x 9
-y 20
-end
-arch shop_empty
-x 9
-y 20
-end
-arch stwindow_win2
-x 9
-y 20
-end
-arch grass_only
-x 9
-y 21
-end
-arch grass_only
-x 9
-y 22
-end
-arch grass_only
-x 9
-y 23
-end
-arch grass_only
-x 10
-end
-arch grass_only
-x 10
-y 1
-end
-arch grass_only
-x 10
-y 2
-end
-arch shop_empty
-x 10
-y 3
-end
-arch stwall_2_1_2
-x 10
-y 3
-end
-arch shop_food
-x 10
-y 4
-end
-arch shop_food
-x 10
-y 5
-end
-arch shop_food
-x 10
-y 6
-end
-arch shop_food
-x 10
-y 7
-end
-arch shop_food
-x 10
-y 8
-end
-arch shop_food
-x 10
-y 9
-end
-arch shop_food
-x 10
-y 10
-end
-arch shop_food
-x 10
-y 11
-end
-arch shop_food
-x 10
-y 12
-end
-arch shop_food
-x 10
-y 13
-end
-arch shop_food
-x 10
-y 14
-end
-arch shop_food
-x 10
-y 15
-end
-arch shop_food
 x 10
 y 16
 end
-arch shop_food
+arch swall_1_4
+x 10
+y 16
+end
+arch shop_empty
 x 10
 y 17
 end
-arch shop_food
+arch shop_empty
 x 10
 y 18
 end
-arch shop_food
+arch shop_empty
 x 10
 y 19
 end
@@ -1389,10 +1369,6 @@ arch stwall_2_1_1
 x 11
 y 7
 end
-arch light4
-x 11
-y 8
-end
 arch shop_empty
 x 11
 y 8
@@ -1449,10 +1425,6 @@ arch stwall_2_1_1
 x 11
 y 14
 end
-arch light4
-x 11
-y 15
-end
 arch shop_empty
 x 11
 y 15
@@ -1465,6 +1437,10 @@ arch shop_empty
 x 11
 y 16
 end
+arch swall_1_3_half
+x 11
+y 16
+end
 arch stwall_2_1_1
 x 11
 y 16