2 files changed, 824 insertions, 650 deletions

diff --git a/src/Generating/Prefabs/SandVillagePrefabs.cpp b/src/Generating/Prefabs/SandVillagePrefabs.cpp
index a062f8cd4..72881a678 100644
--- a/src/Generating/Prefabs/SandVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/SandVillagePrefabs.cpp
@@ -20,11 +20,11 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 5, ID 75, created by tonibm1999
 	{
 		// Size:
-		13, 2, 9,  // SizeX = 13, SizeY = 2, SizeZ = 9
+		13, 3, 9,  // SizeX = 13, SizeY = 3, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		12, 1, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, -1,  // MinX, MinY, MinZ
+		13, 2, 8,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
@@ -40,6 +40,19 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "aaaaaaaaaaaaa"
+		/*  1 */ "aaaaaaaaaaaaa"
+		/*  2 */ "aaaaaaaaaaaaa"
+		/*  3 */ "aaaaaaaaaaaaa"
+		/*  4 */ "aaaaaaaaaaaaa"
+		/*  5 */ "aaaaaaaaaaaaa"
+		/*  6 */ "aaaaaaaaaaaaa"
+		/*  7 */ "aaaaaaaaaaaaa"
+		/*  8 */ "aaaaaaaaaaaaa"
+
+		// Level 1
+		/* z\x*             111 */
+		/*    *   0123456789012 */
+		/*  0 */ "aaaaaaaaaaaaa"
 		/*  1 */ "abbcbbabbcbba"
 		/*  2 */ "abbcbbabbcbba"
 		/*  3 */ "abbcbbabbcbba"
@@ -49,21 +62,21 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  7 */ "abbcbbabbcbba"
 		/*  8 */ "aaaaaaaaaaaaa"
 
-		// Level 1
+		// Level 2
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "d.....d.....d"
-		/*  1 */ ".......ee.ee."
-		/*  2 */ ".......ee.ee."
-		/*  3 */ ".......ee.ee."
-		/*  4 */ ".......ee.ee."
-		/*  5 */ ".......ee.ee."
-		/*  6 */ ".......ee.ee."
-		/*  7 */ ".......ee.ee."
+		/*  1 */ ".ee.ee.ee.ee."
+		/*  2 */ ".ee.ee.ee.ee."
+		/*  3 */ ".ee.ee.ee.ee."
+		/*  4 */ ".ee.ee.ee.ee."
+		/*  5 */ ".ee.ee.ee.ee."
+		/*  6 */ ".ee.ee.ee.ee."
+		/*  7 */ ".ee.ee.ee.ee."
 		/*  8 */ "d.....d.....d",
 
 		// Connectors:
-		"-1: 6, 0, 8: 3\n"  /* Type -1, direction Z+ */,
+		"-1: 6, 1, 8: 3\n"  /* Type -1, direction Z+ */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -94,18 +107,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 6, ID 81, created by Aloe_vera
 	{
 		// Size:
-		11, 6, 7,  // SizeX = 11, SizeY = 6, SizeZ = 7
+		11, 7, 7,  // SizeX = 11, SizeY = 7, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		10, 5, 6,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		11, 6, 7,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -122,71 +135,82 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "....abc...."
-		/*  1 */ ".ddddddddd."
-		/*  2 */ ".ddddddddd."
-		/*  3 */ ".ddddddddd."
-		/*  4 */ ".ddddddddd."
-		/*  5 */ ".ddddddddd."
-		/*  6 */ "..........."
+		/*  0 */ "mmmmaaammmm"
+		/*  1 */ "maaaaaaaaam"
+		/*  2 */ "maaaaaaaaam"
+		/*  3 */ "maaaaaaaaam"
+		/*  4 */ "maaaaaaaaam"
+		/*  5 */ "maaaaaaaaam"
+		/*  6 */ "mmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "..........."
-		/*  1 */ ".ddddedddd."
-		/*  2 */ ".d.......d."
-		/*  3 */ ".d.......d."
-		/*  4 */ ".d.......d."
-		/*  5 */ ".ddddddddd."
+		/*  0 */ "....bcd...."
+		/*  1 */ ".aaaaaaaaa."
+		/*  2 */ ".aaaaaaaaa."
+		/*  3 */ ".aaaaaaaaa."
+		/*  4 */ ".aaaaaaaaa."
+		/*  5 */ ".aaaaaaaaa."
 		/*  6 */ "..........."
 
 		// Level 2
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
-		/*  1 */ ".dffdgdffd."
+		/*  1 */ ".aaaaeaaaa."
+		/*  2 */ ".a.......a."
+		/*  3 */ ".a.......a."
+		/*  4 */ ".a.......a."
+		/*  5 */ ".aaaaaaaaa."
+		/*  6 */ "..........."
+
+		// Level 3
+		/* z\x*             1 */
+		/*    *   01234567890 */
+		/*  0 */ "..........."
+		/*  1 */ ".affagaffa."
 		/*  2 */ ".f.......f."
 		/*  3 */ ".f.......f."
 		/*  4 */ ".f.......f."
-		/*  5 */ ".dffdfdffd."
+		/*  5 */ ".affafaffa."
 		/*  6 */ "..........."
 
-		// Level 3
+		// Level 4
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "bbbbbbbbbbb"
-		/*  1 */ "hdddddddddh"
-		/*  2 */ ".d..i.i..d."
-		/*  3 */ ".d.......d."
-		/*  4 */ ".d..j.j..d."
-		/*  5 */ "kdddddddddk"
+		/*  0 */ "ccccccccccc"
+		/*  1 */ "haaaaaaaaah"
+		/*  2 */ ".a..i.i..a."
+		/*  3 */ ".a.......a."
+		/*  4 */ ".a..j.j..a."
+		/*  5 */ "kaaaaaaaaak"
 		/*  6 */ "lllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
-		/*  1 */ "bbbbbbbbbbb"
-		/*  2 */ "hdddddddddh"
-		/*  3 */ ".dn.....od."
-		/*  4 */ "kdddddddddk"
+		/*  1 */ "ccccccccccc"
+		/*  2 */ "haaaaaaaaah"
+		/*  3 */ ".an.....oa."
+		/*  4 */ "kaaaaaaaaak"
 		/*  5 */ "lllllllllll"
 		/*  6 */ "..........."
 
-		// Level 5
+		// Level 6
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
 		/*  1 */ "..........."
-		/*  2 */ "bbbbbbbbbbb"
-		/*  3 */ "ddddddddddd"
+		/*  2 */ "ccccccccccc"
+		/*  3 */ "aaaaaaaaaaa"
 		/*  4 */ "lllllllllll"
 		/*  5 */ "..........."
 		/*  6 */ "...........",
 
 		// Connectors:
-		"-1: 5, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 5, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -217,18 +241,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 11, ID 115, created by xoft
 	{
 		// Size:
-		11, 7, 9,  // SizeX = 11, SizeY = 7, SizeZ = 9
+		11, 8, 9,  // SizeX = 11, SizeY = 8, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		10, 6, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		11, 7, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -243,96 +267,109 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "....abc...."
-		/*  1 */ ".ddddddddd."
-		/*  2 */ ".ddddddddd."
-		/*  3 */ ".ddddddddd."
-		/*  4 */ ".ddddddddd."
-		/*  5 */ ".ddddddddd."
-		/*  6 */ ".ddddddddd."
-		/*  7 */ ".ddddddddd."
-		/*  8 */ "..........."
+		/*  0 */ "mmmmaaammmm"
+		/*  1 */ "maaaaaaaaam"
+		/*  2 */ "maaaaaaaaam"
+		/*  3 */ "maaaaaaaaam"
+		/*  4 */ "maaaaaaaaam"
+		/*  5 */ "maaaaaaaaam"
+		/*  6 */ "maaaaaaaaam"
+		/*  7 */ "maaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "..........."
-		/*  1 */ ".ddddedddd."
-		/*  2 */ ".d.......d."
-		/*  3 */ ".d.......d."
-		/*  4 */ ".d.......d."
-		/*  5 */ ".d.......d."
-		/*  6 */ ".d.......d."
-		/*  7 */ ".ddddddddd."
+		/*  0 */ "....bcd...."
+		/*  1 */ ".aaaaaaaaa."
+		/*  2 */ ".aaaaaaaaa."
+		/*  3 */ ".aaaaaaaaa."
+		/*  4 */ ".aaaaaaaaa."
+		/*  5 */ ".aaaaaaaaa."
+		/*  6 */ ".aaaaaaaaa."
+		/*  7 */ ".aaaaaaaaa."
 		/*  8 */ "..........."
 
 		// Level 2
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
-		/*  1 */ ".dffdgdffd."
+		/*  1 */ ".aaaaeaaaa."
+		/*  2 */ ".a.......a."
+		/*  3 */ ".a.......a."
+		/*  4 */ ".a.......a."
+		/*  5 */ ".a.......a."
+		/*  6 */ ".a.......a."
+		/*  7 */ ".aaaaaaaaa."
+		/*  8 */ "..........."
+
+		// Level 3
+		/* z\x*             1 */
+		/*    *   01234567890 */
+		/*  0 */ "..........."
+		/*  1 */ ".affagaffa."
 		/*  2 */ ".f.......f."
 		/*  3 */ ".f.......f."
-		/*  4 */ ".d.......d."
+		/*  4 */ ".a.......a."
 		/*  5 */ ".f.......f."
 		/*  6 */ ".f.......f."
-		/*  7 */ ".dfffdfffd."
+		/*  7 */ ".afffafffa."
 		/*  8 */ "..........."
 
-		// Level 3
+		// Level 4
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "bbbbbbbbbbb"
-		/*  1 */ "hdddddddddh"
-		/*  2 */ ".d..i.i..d."
-		/*  3 */ ".d.......d."
-		/*  4 */ ".d.......d."
-		/*  5 */ ".d.......d."
-		/*  6 */ ".d...j...d."
-		/*  7 */ "kdddddddddk"
+		/*  0 */ "ccccccccccc"
+		/*  1 */ "haaaaaaaaah"
+		/*  2 */ ".a..i.i..a."
+		/*  3 */ ".a.......a."
+		/*  4 */ ".a.......a."
+		/*  5 */ ".a.......a."
+		/*  6 */ ".a...j...a."
+		/*  7 */ "kaaaaaaaaak"
 		/*  8 */ "lllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
-		/*  1 */ "bbbbbbbbbbb"
-		/*  2 */ "hdddddddddh"
-		/*  3 */ ".d.......d."
-		/*  4 */ ".d.......d."
-		/*  5 */ ".d.......d."
-		/*  6 */ "kdddddddddk"
+		/*  1 */ "ccccccccccc"
+		/*  2 */ "haaaaaaaaah"
+		/*  3 */ ".a.......a."
+		/*  4 */ ".a.......a."
+		/*  5 */ ".a.......a."
+		/*  6 */ "kaaaaaaaaak"
 		/*  7 */ "lllllllllll"
 		/*  8 */ "..........."
 
-		// Level 5
+		// Level 6
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
 		/*  1 */ "..........."
-		/*  2 */ "bbbbbbbbbbb"
-		/*  3 */ "hdddddddddh"
-		/*  4 */ ".d.......d."
-		/*  5 */ "kdddddddddk"
+		/*  2 */ "ccccccccccc"
+		/*  3 */ "haaaaaaaaah"
+		/*  4 */ ".a.......a."
+		/*  5 */ "kaaaaaaaaak"
 		/*  6 */ "lllllllllll"
 		/*  7 */ "..........."
 		/*  8 */ "..........."
 
-		// Level 6
+		// Level 7
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
 		/*  1 */ "..........."
 		/*  2 */ "..........."
-		/*  3 */ "bbbbbbbbbbb"
-		/*  4 */ "ddddddddddd"
+		/*  3 */ "ccccccccccc"
+		/*  4 */ "aaaaaaaaaaa"
 		/*  5 */ "lllllllllll"
 		/*  6 */ "..........."
 		/*  7 */ "..........."
 		/*  8 */ "...........",
 
 		// Connectors:
-		"-1: 5, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 5, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -363,18 +400,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 15, ID 125, created by Aloe_vera
 	{
 		// Size:
-		13, 6, 7,  // SizeX = 13, SizeY = 6, SizeZ = 7
+		13, 7, 7,  // SizeX = 13, SizeY = 7, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		12, 5, 6,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		13, 6, 7,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -389,71 +426,82 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ ".....abc....."
-		/*  1 */ ".ddddddddddd."
-		/*  2 */ ".ddddddddddd."
-		/*  3 */ ".ddddddddddd."
-		/*  4 */ ".ddddddddddd."
-		/*  5 */ ".ddddddddddd."
-		/*  6 */ "............."
+		/*  0 */ "mmmmmaaammmmm"
+		/*  1 */ "maaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaam"
+		/*  6 */ "mmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "............."
-		/*  1 */ ".dddddeddddd."
-		/*  2 */ ".d.........d."
-		/*  3 */ ".d.........d."
-		/*  4 */ ".d.........d."
-		/*  5 */ ".ddddddddddd."
+		/*  0 */ ".....bcd....."
+		/*  1 */ ".aaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaa."
 		/*  6 */ "............."
 
 		// Level 2
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
-		/*  1 */ ".dfffdgdfffd."
+		/*  1 */ ".aaaaaeaaaaa."
+		/*  2 */ ".a.........a."
+		/*  3 */ ".a.........a."
+		/*  4 */ ".a.........a."
+		/*  5 */ ".aaaaaaaaaaa."
+		/*  6 */ "............."
+
+		// Level 3
+		/* z\x*             111 */
+		/*    *   0123456789012 */
+		/*  0 */ "............."
+		/*  1 */ ".afffagafffa."
 		/*  2 */ ".f.........f."
 		/*  3 */ ".f.........f."
 		/*  4 */ ".f.........f."
-		/*  5 */ ".dffdfffdffd."
+		/*  5 */ ".affafffaffa."
 		/*  6 */ "............."
 
-		// Level 3
+		// Level 4
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "bbbbbbbbbbbbb"
-		/*  1 */ "hdddddddddddh"
-		/*  2 */ ".d...i.i...d."
-		/*  3 */ ".d.........d."
-		/*  4 */ ".d..j...j..d."
-		/*  5 */ "kdddddddddddk"
+		/*  0 */ "ccccccccccccc"
+		/*  1 */ "haaaaaaaaaaah"
+		/*  2 */ ".a...i.i...a."
+		/*  3 */ ".a.........a."
+		/*  4 */ ".a..j...j..a."
+		/*  5 */ "kaaaaaaaaaaak"
 		/*  6 */ "lllllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
-		/*  1 */ "bbbbbbbbbbbbb"
-		/*  2 */ "hdddddddddddh"
-		/*  3 */ ".d.........d."
-		/*  4 */ "kdddddddddddk"
+		/*  1 */ "ccccccccccccc"
+		/*  2 */ "haaaaaaaaaaah"
+		/*  3 */ ".a.........a."
+		/*  4 */ "kaaaaaaaaaaak"
 		/*  5 */ "lllllllllllll"
 		/*  6 */ "............."
 
-		// Level 5
+		// Level 6
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
 		/*  1 */ "............."
-		/*  2 */ "bbbbbbbbbbbbb"
-		/*  3 */ "ddddddddddddd"
+		/*  2 */ "ccccccccccccc"
+		/*  3 */ "aaaaaaaaaaaaa"
 		/*  4 */ "lllllllllllll"
 		/*  5 */ "............."
 		/*  6 */ ".............",
 
 		// Connectors:
-		"-1: 6, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 6, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -484,18 +532,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 12, ID 116, created by xoft
 	{
 		// Size:
-		13, 7, 9,  // SizeX = 13, SizeY = 7, SizeZ = 9
+		13, 8, 9,  // SizeX = 13, SizeY = 8, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		12, 6, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		13, 7, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -510,96 +558,109 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ ".....abc....."
-		/*  1 */ ".ddddddddddd."
-		/*  2 */ ".ddddddddddd."
-		/*  3 */ ".ddddddddddd."
-		/*  4 */ ".ddddddddddd."
-		/*  5 */ ".ddddddddddd."
-		/*  6 */ ".ddddddddddd."
-		/*  7 */ ".ddddddddddd."
-		/*  8 */ "............."
+		/*  0 */ "mmmmmaaammmmm"
+		/*  1 */ "maaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "............."
-		/*  1 */ ".dddddeddddd."
-		/*  2 */ ".d.........d."
-		/*  3 */ ".d.........d."
-		/*  4 */ ".d.........d."
-		/*  5 */ ".d.........d."
-		/*  6 */ ".d.........d."
-		/*  7 */ ".ddddddddddd."
+		/*  0 */ ".....bcd....."
+		/*  1 */ ".aaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaaa."
 		/*  8 */ "............."
 
 		// Level 2
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
-		/*  1 */ ".dfffdgdfffd."
+		/*  1 */ ".aaaaaeaaaaa."
+		/*  2 */ ".a.........a."
+		/*  3 */ ".a.........a."
+		/*  4 */ ".a.........a."
+		/*  5 */ ".a.........a."
+		/*  6 */ ".a.........a."
+		/*  7 */ ".aaaaaaaaaaa."
+		/*  8 */ "............."
+
+		// Level 3
+		/* z\x*             111 */
+		/*    *   0123456789012 */
+		/*  0 */ "............."
+		/*  1 */ ".afffagafffa."
 		/*  2 */ ".f.........f."
 		/*  3 */ ".f.........f."
-		/*  4 */ ".d.........d."
+		/*  4 */ ".a.........a."
 		/*  5 */ ".f.........f."
 		/*  6 */ ".f.........f."
-		/*  7 */ ".dffdffdfffd."
+		/*  7 */ ".affaffafffa."
 		/*  8 */ "............."
 
-		// Level 3
+		// Level 4
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "bbbbbbbbbbbbb"
-		/*  1 */ "hdddddddddddh"
-		/*  2 */ ".d...i.i...d."
-		/*  3 */ ".d.........d."
-		/*  4 */ ".d.........d."
-		/*  5 */ ".d.........d."
-		/*  6 */ ".d..j..j...d."
-		/*  7 */ "kdddddddddddk"
+		/*  0 */ "ccccccccccccc"
+		/*  1 */ "haaaaaaaaaaah"
+		/*  2 */ ".a...i.i...a."
+		/*  3 */ ".a.........a."
+		/*  4 */ ".a.........a."
+		/*  5 */ ".a.........a."
+		/*  6 */ ".a..j..j...a."
+		/*  7 */ "kaaaaaaaaaaak"
 		/*  8 */ "lllllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
-		/*  1 */ "bbbbbbbbbbbbb"
-		/*  2 */ "hdddddddddddh"
-		/*  3 */ ".d.........d."
-		/*  4 */ ".d.........d."
-		/*  5 */ ".d.........d."
-		/*  6 */ "kdddddddddddk"
+		/*  1 */ "ccccccccccccc"
+		/*  2 */ "haaaaaaaaaaah"
+		/*  3 */ ".a.........a."
+		/*  4 */ ".a.........a."
+		/*  5 */ ".a.........a."
+		/*  6 */ "kaaaaaaaaaaak"
 		/*  7 */ "lllllllllllll"
 		/*  8 */ "............."
 
-		// Level 5
+		// Level 6
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
 		/*  1 */ "............."
-		/*  2 */ "bbbbbbbbbbbbb"
-		/*  3 */ "hdddddddddddh"
-		/*  4 */ ".d.........d."
-		/*  5 */ "kdddddddddddk"
+		/*  2 */ "ccccccccccccc"
+		/*  3 */ "haaaaaaaaaaah"
+		/*  4 */ ".a.........a."
+		/*  5 */ "kaaaaaaaaaaak"
 		/*  6 */ "lllllllllllll"
 		/*  7 */ "............."
 		/*  8 */ "............."
 
-		// Level 6
+		// Level 7
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
 		/*  1 */ "............."
 		/*  2 */ "............."
-		/*  3 */ "bbbbbbbbbbbbb"
-		/*  4 */ "ddddddddddddd"
+		/*  3 */ "ccccccccccccc"
+		/*  4 */ "aaaaaaaaaaaaa"
 		/*  5 */ "lllllllllllll"
 		/*  6 */ "............."
 		/*  7 */ "............."
 		/*  8 */ ".............",
 
 		// Connectors:
-		"-1: 6, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 6, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -630,18 +691,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 13, ID 118, created by xoft
 	{
 		// Size:
-		15, 7, 9,  // SizeX = 15, SizeY = 7, SizeZ = 9
+		15, 8, 9,  // SizeX = 15, SizeY = 8, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		14, 6, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		15, 7, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -656,96 +717,109 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
-		/*  0 */ ".....abc......."
-		/*  1 */ ".ddddddddddddd."
-		/*  2 */ ".ddddddddddddd."
-		/*  3 */ ".ddddddddddddd."
-		/*  4 */ ".ddddddddddddd."
-		/*  5 */ ".ddddddddddddd."
-		/*  6 */ ".ddddddddddddd."
-		/*  7 */ ".ddddddddddddd."
-		/*  8 */ "..............."
+		/*  0 */ "mmmmmaaammmmmmm"
+		/*  1 */ "maaaaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
-		/*  0 */ "..............."
-		/*  1 */ ".dddddeddddddd."
-		/*  2 */ ".d...........d."
-		/*  3 */ ".d...........d."
-		/*  4 */ ".d...........d."
-		/*  5 */ ".d...........d."
-		/*  6 */ ".d...........d."
-		/*  7 */ ".ddddddddddddd."
+		/*  0 */ ".....bcd......."
+		/*  1 */ ".aaaaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaaaaa."
 		/*  8 */ "..............."
 
 		// Level 2
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
 		/*  0 */ "..............."
-		/*  1 */ ".dfffdgdffdffd."
+		/*  1 */ ".aaaaaeaaaaaaa."
+		/*  2 */ ".a...........a."
+		/*  3 */ ".a...........a."
+		/*  4 */ ".a...........a."
+		/*  5 */ ".a...........a."
+		/*  6 */ ".a...........a."
+		/*  7 */ ".aaaaaaaaaaaaa."
+		/*  8 */ "..............."
+
+		// Level 3
+		/* z\x*             11111 */
+		/*    *   012345678901234 */
+		/*  0 */ "..............."
+		/*  1 */ ".afffagaffaffa."
 		/*  2 */ ".f...........f."
 		/*  3 */ ".f...........f."
-		/*  4 */ ".d...........d."
+		/*  4 */ ".a...........a."
 		/*  5 */ ".f...........f."
 		/*  6 */ ".f...........f."
-		/*  7 */ ".dffdffdffdffd."
+		/*  7 */ ".affaffaffaffa."
 		/*  8 */ "..............."
 
-		// Level 3
+		// Level 4
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
-		/*  0 */ "bbbbbbbbbbbbbbb"
-		/*  1 */ "hdddddddddddddh"
-		/*  2 */ ".d...i.i..i..d."
-		/*  3 */ ".d...........d."
-		/*  4 */ ".d...........d."
-		/*  5 */ ".d...........d."
-		/*  6 */ ".d..j..j..j..d."
-		/*  7 */ "kdddddddddddddk"
+		/*  0 */ "ccccccccccccccc"
+		/*  1 */ "haaaaaaaaaaaaah"
+		/*  2 */ ".a...i.i..i..a."
+		/*  3 */ ".a...........a."
+		/*  4 */ ".a...........a."
+		/*  5 */ ".a...........a."
+		/*  6 */ ".a..j..j..j..a."
+		/*  7 */ "kaaaaaaaaaaaaak"
 		/*  8 */ "lllllllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
 		/*  0 */ "..............."
-		/*  1 */ "bbbbbbbbbbbbbbb"
-		/*  2 */ "hdddddddddddddh"
-		/*  3 */ ".d...........d."
-		/*  4 */ ".d...........d."
-		/*  5 */ ".d...........d."
-		/*  6 */ "kdddddddddddddk"
+		/*  1 */ "ccccccccccccccc"
+		/*  2 */ "haaaaaaaaaaaaah"
+		/*  3 */ ".a...........a."
+		/*  4 */ ".a...........a."
+		/*  5 */ ".a...........a."
+		/*  6 */ "kaaaaaaaaaaaaak"
 		/*  7 */ "lllllllllllllll"
 		/*  8 */ "..............."
 
-		// Level 5
+		// Level 6
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
 		/*  0 */ "..............."
 		/*  1 */ "..............."
-		/*  2 */ "bbbbbbbbbbbbbbb"
-		/*  3 */ "hdddddddddddddh"
-		/*  4 */ ".d...........d."
-		/*  5 */ "kdddddddddddddk"
+		/*  2 */ "ccccccccccccccc"
+		/*  3 */ "haaaaaaaaaaaaah"
+		/*  4 */ ".a...........a."
+		/*  5 */ "kaaaaaaaaaaaaak"
 		/*  6 */ "lllllllllllllll"
 		/*  7 */ "..............."
 		/*  8 */ "..............."
 
-		// Level 6
+		// Level 7
 		/* z\x*             11111 */
 		/*    *   012345678901234 */
 		/*  0 */ "..............."
 		/*  1 */ "..............."
 		/*  2 */ "..............."
-		/*  3 */ "bbbbbbbbbbbbbbb"
-		/*  4 */ "ddddddddddddddd"
+		/*  3 */ "ccccccccccccccc"
+		/*  4 */ "aaaaaaaaaaaaaaa"
 		/*  5 */ "lllllllllllllll"
 		/*  6 */ "..............."
 		/*  7 */ "..............."
 		/*  8 */ "...............",
 
 		// Connectors:
-		"-1: 6, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 6, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -776,18 +850,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 16, ID 126, created by Aloe_vera
 	{
 		// Size:
-		16, 7, 9,  // SizeX = 16, SizeY = 7, SizeZ = 9
+		16, 8, 9,  // SizeX = 16, SizeY = 8, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		15, 6, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		16, 7, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -802,96 +876,109 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
-		/*  0 */ "........abc....."
-		/*  1 */ ".dddddddddddddd."
-		/*  2 */ ".dddddddddddddd."
-		/*  3 */ ".dddddddddddddd."
-		/*  4 */ ".dddddddddddddd."
-		/*  5 */ ".dddddddddddddd."
-		/*  6 */ ".dddddddddddddd."
-		/*  7 */ ".dddddddddddddd."
-		/*  8 */ "................"
+		/*  0 */ "mmmmmmmmaaammmmm"
+		/*  1 */ "maaaaaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
-		/*  0 */ "................"
-		/*  1 */ ".ddddddddeddddd."
-		/*  2 */ ".d............d."
-		/*  3 */ ".d............d."
-		/*  4 */ ".d............d."
-		/*  5 */ ".d............d."
-		/*  6 */ ".d............d."
-		/*  7 */ ".dddddddddddddd."
+		/*  0 */ "........bcd....."
+		/*  1 */ ".aaaaaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaaaaaa."
 		/*  8 */ "................"
 
 		// Level 2
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
 		/*  0 */ "................"
-		/*  1 */ ".dffdfffdgdfffd."
+		/*  1 */ ".aaaaaaaaeaaaaa."
+		/*  2 */ ".a............a."
+		/*  3 */ ".a............a."
+		/*  4 */ ".a............a."
+		/*  5 */ ".a............a."
+		/*  6 */ ".a............a."
+		/*  7 */ ".aaaaaaaaaaaaaa."
+		/*  8 */ "................"
+
+		// Level 3
+		/* z\x*             111111 */
+		/*    *   0123456789012345 */
+		/*  0 */ "................"
+		/*  1 */ ".affafffagafffa."
 		/*  2 */ ".f............f."
 		/*  3 */ ".f............f."
-		/*  4 */ ".d............d."
+		/*  4 */ ".a............a."
 		/*  5 */ ".f............f."
 		/*  6 */ ".f............f."
-		/*  7 */ ".dffdffdfffdffd."
+		/*  7 */ ".affaffafffaffa."
 		/*  8 */ "................"
 
-		// Level 3
+		// Level 4
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
-		/*  0 */ "bbbbbbbbbbbbbbbb"
-		/*  1 */ "hddddddddddddddh"
-		/*  2 */ ".d..i...i.i...d."
-		/*  3 */ ".d............d."
-		/*  4 */ ".d............d."
-		/*  5 */ ".d............d."
-		/*  6 */ ".d..j..j...j..d."
-		/*  7 */ "kddddddddddddddk"
+		/*  0 */ "cccccccccccccccc"
+		/*  1 */ "haaaaaaaaaaaaaah"
+		/*  2 */ ".a..i...i.i...a."
+		/*  3 */ ".a............a."
+		/*  4 */ ".a............a."
+		/*  5 */ ".a............a."
+		/*  6 */ ".a..j..j...j..a."
+		/*  7 */ "kaaaaaaaaaaaaaak"
 		/*  8 */ "llllllllllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
 		/*  0 */ "................"
-		/*  1 */ "bbbbbbbbbbbbbbbb"
-		/*  2 */ "hddddddddddddddh"
-		/*  3 */ ".d............d."
-		/*  4 */ ".d............d."
-		/*  5 */ ".d............d."
-		/*  6 */ "kddddddddddddddk"
+		/*  1 */ "cccccccccccccccc"
+		/*  2 */ "haaaaaaaaaaaaaah"
+		/*  3 */ ".a............a."
+		/*  4 */ ".a............a."
+		/*  5 */ ".a............a."
+		/*  6 */ "kaaaaaaaaaaaaaak"
 		/*  7 */ "llllllllllllllll"
 		/*  8 */ "................"
 
-		// Level 5
+		// Level 6
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
 		/*  0 */ "................"
 		/*  1 */ "................"
-		/*  2 */ "bbbbbbbbbbbbbbbb"
-		/*  3 */ "hddddddddddddddh"
-		/*  4 */ ".d............d."
-		/*  5 */ "kddddddddddddddk"
+		/*  2 */ "cccccccccccccccc"
+		/*  3 */ "haaaaaaaaaaaaaah"
+		/*  4 */ ".a............a."
+		/*  5 */ "kaaaaaaaaaaaaaak"
 		/*  6 */ "llllllllllllllll"
 		/*  7 */ "................"
 		/*  8 */ "................"
 
-		// Level 6
+		// Level 7
 		/* z\x*             111111 */
 		/*    *   0123456789012345 */
 		/*  0 */ "................"
 		/*  1 */ "................"
 		/*  2 */ "................"
-		/*  3 */ "bbbbbbbbbbbbbbbb"
-		/*  4 */ "dddddddddddddddd"
+		/*  3 */ "cccccccccccccccc"
+		/*  4 */ "aaaaaaaaaaaaaaaa"
 		/*  5 */ "llllllllllllllll"
 		/*  6 */ "................"
 		/*  7 */ "................"
 		/*  8 */ "................",
 
 		// Connectors:
-		"-1: 9, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 9, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -922,18 +1009,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 8, ID 112, created by Aloe_vera
 	{
 		// Size:
-		7, 6, 7,  // SizeX = 7, SizeY = 6, SizeZ = 7
+		7, 7, 7,  // SizeX = 7, SizeY = 7, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		6, 5, 6,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		7, 6, 7,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -946,66 +1033,76 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   0123456 */
-		/*  0 */ "...abc."
-		/*  1 */ ".ddddd."
-		/*  2 */ ".ddddd."
-		/*  3 */ ".ddddd."
-		/*  4 */ ".ddddd."
-		/*  5 */ ".ddddd."
-		/*  6 */ "......."
+		/*  0 */ "mmmaaam"
+		/*  1 */ "maaaaam"
+		/*  2 */ "maaaaam"
+		/*  3 */ "maaaaam"
+		/*  4 */ "maaaaam"
+		/*  5 */ "maaaaam"
+		/*  6 */ "mmmmmmm"
 
 		// Level 1
 		/* z\x*   0123456 */
-		/*  0 */ "......."
-		/*  1 */ ".ddded."
-		/*  2 */ ".d...d."
-		/*  3 */ ".d...d."
-		/*  4 */ ".d...d."
-		/*  5 */ ".ddddd."
+		/*  0 */ "...bcd."
+		/*  1 */ ".aaaaa."
+		/*  2 */ ".aaaaa."
+		/*  3 */ ".aaaaa."
+		/*  4 */ ".aaaaa."
+		/*  5 */ ".aaaaa."
 		/*  6 */ "......."
 
 		// Level 2
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ ".dfdgd."
+		/*  1 */ ".aaaea."
+		/*  2 */ ".a...a."
+		/*  3 */ ".a...a."
+		/*  4 */ ".a...a."
+		/*  5 */ ".aaaaa."
+		/*  6 */ "......."
+
+		// Level 3
+		/* z\x*   0123456 */
+		/*  0 */ "......."
+		/*  1 */ ".afaga."
 		/*  2 */ ".f...f."
 		/*  3 */ ".f...f."
 		/*  4 */ ".f...f."
-		/*  5 */ ".dfffd."
+		/*  5 */ ".afffa."
 		/*  6 */ "......."
 
-		// Level 3
+		// Level 4
 		/* z\x*   0123456 */
-		/*  0 */ "bbbbbbb"
-		/*  1 */ "hdddddh"
-		/*  2 */ ".d.i.d."
-		/*  3 */ ".d...d."
-		/*  4 */ ".d...d."
-		/*  5 */ "jdddddj"
+		/*  0 */ "ccccccc"
+		/*  1 */ "haaaaah"
+		/*  2 */ ".a.i.a."
+		/*  3 */ ".a...a."
+		/*  4 */ ".a...a."
+		/*  5 */ "jaaaaaj"
 		/*  6 */ "kkkkkkk"
 
-		// Level 4
+		// Level 5
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ "bbbbbbb"
-		/*  2 */ "hdddddh"
-		/*  3 */ ".d...d."
-		/*  4 */ "jdddddj"
+		/*  1 */ "ccccccc"
+		/*  2 */ "haaaaah"
+		/*  3 */ ".a...a."
+		/*  4 */ "jaaaaaj"
 		/*  5 */ "kkkkkkk"
 		/*  6 */ "......."
 
-		// Level 5
+		// Level 6
 		/* z\x*   0123456 */
 		/*  0 */ "......."
 		/*  1 */ "......."
-		/*  2 */ "bbbbbbb"
-		/*  3 */ "ddddddd"
+		/*  2 */ "ccccccc"
+		/*  3 */ "aaaaaaa"
 		/*  4 */ "kkkkkkk"
 		/*  5 */ "......."
 		/*  6 */ ".......",
 
 		// Connectors:
-		"-1: 4, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 4, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1036,18 +1133,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 9, ID 113, created by xoft
 	{
 		// Size:
-		9, 6, 7,  // SizeX = 9, SizeY = 6, SizeZ = 7
+		9, 7, 7,  // SizeX = 9, SizeY = 7, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		8, 5, 6,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		9, 6, 7,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -1061,66 +1158,76 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   012345678 */
-		/*  0 */ "...abc..."
-		/*  1 */ ".ddddddd."
-		/*  2 */ ".ddddddd."
-		/*  3 */ ".ddddddd."
-		/*  4 */ ".ddddddd."
-		/*  5 */ ".ddddddd."
-		/*  6 */ "........."
+		/*  0 */ "mmmaaammm"
+		/*  1 */ "maaaaaaam"
+		/*  2 */ "maaaaaaam"
+		/*  3 */ "maaaaaaam"
+		/*  4 */ "maaaaaaam"
+		/*  5 */ "maaaaaaam"
+		/*  6 */ "mmmmmmmmm"
 
 		// Level 1
 		/* z\x*   012345678 */
-		/*  0 */ "........."
-		/*  1 */ ".dddeddd."
-		/*  2 */ ".d.....d."
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d.....d."
-		/*  5 */ ".ddddddd."
+		/*  0 */ "...bcd..."
+		/*  1 */ ".aaaaaaa."
+		/*  2 */ ".aaaaaaa."
+		/*  3 */ ".aaaaaaa."
+		/*  4 */ ".aaaaaaa."
+		/*  5 */ ".aaaaaaa."
 		/*  6 */ "........."
 
 		// Level 2
 		/* z\x*   012345678 */
 		/*  0 */ "........."
-		/*  1 */ ".dfdgdfd."
+		/*  1 */ ".aaaeaaa."
+		/*  2 */ ".a.....a."
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a.....a."
+		/*  5 */ ".aaaaaaa."
+		/*  6 */ "........."
+
+		// Level 3
+		/* z\x*   012345678 */
+		/*  0 */ "........."
+		/*  1 */ ".afagafa."
 		/*  2 */ ".f.....f."
 		/*  3 */ ".f.....f."
 		/*  4 */ ".f.....f."
-		/*  5 */ ".dffdffd."
+		/*  5 */ ".affaffa."
 		/*  6 */ "........."
 
-		// Level 3
+		// Level 4
 		/* z\x*   012345678 */
-		/*  0 */ "bbbbbbbbb"
-		/*  1 */ "hdddddddh"
-		/*  2 */ ".d.i.i.d."
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d..j..d."
-		/*  5 */ "kdddddddk"
+		/*  0 */ "ccccccccc"
+		/*  1 */ "haaaaaaah"
+		/*  2 */ ".a.i.i.a."
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a..j..a."
+		/*  5 */ "kaaaaaaak"
 		/*  6 */ "lllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*   012345678 */
 		/*  0 */ "........."
-		/*  1 */ "bbbbbbbbb"
-		/*  2 */ "hdddddddh"
-		/*  3 */ ".d.....d."
-		/*  4 */ "kdddddddk"
+		/*  1 */ "ccccccccc"
+		/*  2 */ "haaaaaaah"
+		/*  3 */ ".a.....a."
+		/*  4 */ "kaaaaaaak"
 		/*  5 */ "lllllllll"
 		/*  6 */ "........."
 
-		// Level 5
+		// Level 6
 		/* z\x*   012345678 */
 		/*  0 */ "........."
 		/*  1 */ "........."
-		/*  2 */ "bbbbbbbbb"
-		/*  3 */ "ddddddddd"
+		/*  2 */ "ccccccccc"
+		/*  3 */ "aaaaaaaaa"
 		/*  4 */ "lllllllll"
 		/*  5 */ "........."
 		/*  6 */ ".........",
 
 		// Connectors:
-		"-1: 4, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 4, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1151,18 +1258,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 10, ID 114, created by xoft
 	{
 		// Size:
-		9, 7, 9,  // SizeX = 9, SizeY = 7, SizeZ = 9
+		9, 8, 9,  // SizeX = 9, SizeY = 8, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		8, 6, 8,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		9, 7, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:102: 0\n"  /* glasspane */
 		"g: 64:12\n"  /* wooddoorblock */
@@ -1176,90 +1283,102 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   012345678 */
-		/*  0 */ "...abc..."
-		/*  1 */ ".ddddddd."
-		/*  2 */ ".ddddddd."
-		/*  3 */ ".ddddddd."
-		/*  4 */ ".ddddddd."
-		/*  5 */ ".ddddddd."
-		/*  6 */ ".ddddddd."
-		/*  7 */ ".ddddddd."
-		/*  8 */ "........."
+		/*  0 */ "mmmaaammm"
+		/*  1 */ "maaaaaaam"
+		/*  2 */ "maaaaaaam"
+		/*  3 */ "maaaaaaam"
+		/*  4 */ "maaaaaaam"
+		/*  5 */ "maaaaaaam"
+		/*  6 */ "maaaaaaam"
+		/*  7 */ "maaaaaaam"
+		/*  8 */ "mmmmmmmmm"
 
 		// Level 1
 		/* z\x*   012345678 */
-		/*  0 */ "........."
-		/*  1 */ ".dddeddd."
-		/*  2 */ ".d.....d."
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d.....d."
-		/*  5 */ ".d.....d."
-		/*  6 */ ".d.....d."
-		/*  7 */ ".ddddddd."
+		/*  0 */ "...bcd..."
+		/*  1 */ ".aaaaaaa."
+		/*  2 */ ".aaaaaaa."
+		/*  3 */ ".aaaaaaa."
+		/*  4 */ ".aaaaaaa."
+		/*  5 */ ".aaaaaaa."
+		/*  6 */ ".aaaaaaa."
+		/*  7 */ ".aaaaaaa."
 		/*  8 */ "........."
 
 		// Level 2
 		/* z\x*   012345678 */
 		/*  0 */ "........."
-		/*  1 */ ".dfdgdfd."
+		/*  1 */ ".aaaeaaa."
+		/*  2 */ ".a.....a."
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a.....a."
+		/*  5 */ ".a.....a."
+		/*  6 */ ".a.....a."
+		/*  7 */ ".aaaaaaa."
+		/*  8 */ "........."
+
+		// Level 3
+		/* z\x*   012345678 */
+		/*  0 */ "........."
+		/*  1 */ ".afagafa."
 		/*  2 */ ".f.....f."
 		/*  3 */ ".f.....f."
-		/*  4 */ ".d.....d."
+		/*  4 */ ".a.....a."
 		/*  5 */ ".f.....f."
 		/*  6 */ ".f.....f."
-		/*  7 */ ".dffdffd."
+		/*  7 */ ".affaffa."
 		/*  8 */ "........."
 
-		// Level 3
+		// Level 4
 		/* z\x*   012345678 */
-		/*  0 */ "bbbbbbbbb"
-		/*  1 */ "hdddddddh"
-		/*  2 */ ".d.i.i.d."
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d.....d."
-		/*  5 */ ".d.....d."
-		/*  6 */ ".d..j..d."
-		/*  7 */ "kdddddddk"
+		/*  0 */ "ccccccccc"
+		/*  1 */ "haaaaaaah"
+		/*  2 */ ".a.i.i.a."
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a.....a."
+		/*  5 */ ".a.....a."
+		/*  6 */ ".a..j..a."
+		/*  7 */ "kaaaaaaak"
 		/*  8 */ "lllllllll"
 
-		// Level 4
+		// Level 5
 		/* z\x*   012345678 */
 		/*  0 */ "........."
-		/*  1 */ "bbbbbbbbb"
-		/*  2 */ "hdddddddh"
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d.....d."
-		/*  5 */ ".d.....d."
-		/*  6 */ "kdddddddk"
+		/*  1 */ "ccccccccc"
+		/*  2 */ "haaaaaaah"
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a.....a."
+		/*  5 */ ".a.....a."
+		/*  6 */ "kaaaaaaak"
 		/*  7 */ "lllllllll"
 		/*  8 */ "........."
 
-		// Level 5
+		// Level 6
 		/* z\x*   012345678 */
 		/*  0 */ "........."
 		/*  1 */ "........."
-		/*  2 */ "bbbbbbbbb"
-		/*  3 */ "hdddddddh"
-		/*  4 */ ".d.....d."
-		/*  5 */ "kdddddddk"
+		/*  2 */ "ccccccccc"
+		/*  3 */ "haaaaaaah"
+		/*  4 */ ".a.....a."
+		/*  5 */ "kaaaaaaak"
 		/*  6 */ "lllllllll"
 		/*  7 */ "........."
 		/*  8 */ "........."
 
-		// Level 6
+		// Level 7
 		/* z\x*   012345678 */
 		/*  0 */ "........."
 		/*  1 */ "........."
 		/*  2 */ "........."
-		/*  3 */ "bbbbbbbbb"
-		/*  4 */ "ddddddddd"
+		/*  3 */ "ccccccccc"
+		/*  4 */ "aaaaaaaaa"
 		/*  5 */ "lllllllll"
 		/*  6 */ "........."
 		/*  7 */ "........."
 		/*  8 */ ".........",
 
 		// Connectors:
-		"-1: 4, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 4, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1290,147 +1409,164 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 14, ID 124, created by Aloe_vera
 	{
 		// Size:
-		14, 7, 12,  // SizeX = 14, SizeY = 7, SizeZ = 12
+		14, 8, 12,  // SizeX = 14, SizeY = 8, SizeZ = 12
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		13, 6, 11,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		14, 7, 12,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e:128: 3\n"  /* sandstonestairs */
-		"f: 64: 7\n"  /* wooddoorblock */
-		"g:102: 0\n"  /* glasspane */
-		"h: 64:12\n"  /* wooddoorblock */
-		"i:128: 7\n"  /* sandstonestairs */
-		"j: 50: 3\n"  /* torch */
-		"k: 50: 2\n"  /* torch */
-		"l: 50: 4\n"  /* torch */
+		"f: 64: 3\n"  /* wooddoorblock */
+		"g: 64: 1\n"  /* wooddoorblock */
+		"h:102: 0\n"  /* glasspane */
+		"i: 64: 8\n"  /* wooddoorblock */
+		"j:128: 7\n"  /* sandstonestairs */
+		"k: 50: 3\n"  /* torch */
+		"l: 50: 2\n"  /* torch */
 		"m: 19: 0\n"  /* sponge */
-		"n:128: 6\n"  /* sandstonestairs */
-		"o: 50: 1\n"  /* torch */
-		"p:128: 5\n"  /* sandstonestairs */
-		"q:128: 4\n"  /* sandstonestairs */,
+		"n: 50: 4\n"  /* torch */
+		"o:128: 6\n"  /* sandstonestairs */
+		"p: 50: 1\n"  /* torch */
+		"q:128: 5\n"  /* sandstonestairs */
+		"r:128: 4\n"  /* sandstonestairs */,
 
 		// Block data:
 		// Level 0
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ "....abc......."
-		/*  1 */ ".dddddddddddd."
-		/*  2 */ ".dddddddddddd."
-		/*  3 */ ".dddddddddddd."
-		/*  4 */ ".dddddddddddd."
-		/*  5 */ ".dddddddddddd."
-		/*  6 */ ".dddddddddddd."
-		/*  7 */ ".dddddddddddd."
-		/*  8 */ "....aeddddddd."
-		/*  9 */ "mmmmm.ddddddd."
-		/* 10 */ "mmmmm.ddddddd."
-		/* 11 */ "mmmmm........."
+		/*  0 */ "mmmmaaammmmmmm"
+		/*  1 */ "maaaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaaaam"
+		/*  8 */ "mmmmaaaaaaaaam"
+		/*  9 */ "mmmmmmaaaaaaam"
+		/* 10 */ "mmmmmmaaaaaaam"
+		/* 11 */ "mmmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ ".............."
-		/*  1 */ ".ddddfddddddd."
-		/*  2 */ ".d..........d."
-		/*  3 */ ".d..........d."
-		/*  4 */ ".d..........d."
-		/*  5 */ ".d..........d."
-		/*  6 */ ".d..........d."
-		/*  7 */ ".ddddfd.....d."
-		/*  8 */ "......d.....d."
-		/*  9 */ "mmmmm.d.....d."
-		/* 10 */ "mmmmm.ddddddd."
+		/*  0 */ "....bcd......."
+		/*  1 */ ".aaaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaaaa."
+		/*  8 */ "....beaaaaaaa."
+		/*  9 */ "mmmmm.aaaaaaa."
+		/* 10 */ "mmmmm.aaaaaaa."
 		/* 11 */ "mmmmm........."
 
 		// Level 2
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
-		/*  1 */ ".dggdhdggdggd."
-		/*  2 */ ".g..........g."
-		/*  3 */ ".g..........g."
-		/*  4 */ ".d..........d."
-		/*  5 */ ".g..........g."
-		/*  6 */ ".g..........g."
-		/*  7 */ ".dggdhd.....d."
-		/*  8 */ "......g.....g."
-		/*  9 */ "mmmmm.g.....g."
-		/* 10 */ "mmmmm.dggdggd."
+		/*  1 */ ".aaaafaaaaaaa."
+		/*  2 */ ".a..........a."
+		/*  3 */ ".a..........a."
+		/*  4 */ ".a..........a."
+		/*  5 */ ".a..........a."
+		/*  6 */ ".a..........a."
+		/*  7 */ ".aaaaga.....a."
+		/*  8 */ "......a.....a."
+		/*  9 */ "mmmmm.a.....a."
+		/* 10 */ "mmmmm.aaaaaaa."
 		/* 11 */ "mmmmm........."
 
 		// Level 3
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ "bbbbbbbbbbbbbb"
-		/*  1 */ "iddddddddddddc"
-		/*  2 */ ".d..j.j.....dc"
-		/*  3 */ ".d..........dc"
-		/*  4 */ ".d.........kdc"
-		/*  5 */ ".d..........dc"
-		/*  6 */ ".d..l.l.....dc"
-		/*  7 */ "nddddddo...kdc"
-		/*  8 */ "eeeeead.....dc"
-		/*  9 */ "mmmmmad.....dc"
-		/* 10 */ "mmmmmadddddddc"
-		/* 11 */ "mmmmmap.....qc"
+		/*  0 */ ".............."
+		/*  1 */ ".ahhaiahhahha."
+		/*  2 */ ".h..........h."
+		/*  3 */ ".h..........h."
+		/*  4 */ ".a..........a."
+		/*  5 */ ".h..........h."
+		/*  6 */ ".h..........h."
+		/*  7 */ ".ahhaia.....a."
+		/*  8 */ "......h.....h."
+		/*  9 */ "mmmmm.h.....h."
+		/* 10 */ "mmmmm.ahhahha."
+		/* 11 */ "mmmmm........."
 
 		// Level 4
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ ".............."
-		/*  1 */ "bbbbbbbbbbbbc."
-		/*  2 */ "idddddddddddc."
-		/*  3 */ ".d.........dc."
-		/*  4 */ ".d.........dc."
-		/*  5 */ ".d.........dc."
-		/*  6 */ "nddddddd...dc."
-		/*  7 */ "eeeeeead...dc."
-		/*  8 */ "......ad...dc."
-		/*  9 */ "mmmmm.ad...dc."
-		/* 10 */ "mmmmm.adddddc."
-		/* 11 */ "mmmmm.ap...qc."
+		/*  0 */ "cccccccccccccc"
+		/*  1 */ "jaaaaaaaaaaaad"
+		/*  2 */ ".a..k.k.....ad"
+		/*  3 */ ".a..........ad"
+		/*  4 */ ".a.........lad"
+		/*  5 */ ".a..........ad"
+		/*  6 */ ".a..n.n.....ad"
+		/*  7 */ "oaaaaaap...lad"
+		/*  8 */ "eeeeeba.....ad"
+		/*  9 */ "mmmmmba.....ad"
+		/* 10 */ "mmmmmbaaaaaaad"
+		/* 11 */ "mmmmmbq.....rd"
 
 		// Level 5
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
-		/*  1 */ ".............."
-		/*  2 */ "bbbbbbbbbbbb.."
-		/*  3 */ "iddddddddddc.."
-		/*  4 */ ".d........dc.."
-		/*  5 */ "ndddddddd.dc.."
-		/*  6 */ "eeeeeeeed.dc.."
-		/*  7 */ ".......ad.dc.."
-		/*  8 */ ".......ad.dc.."
-		/*  9 */ "mmmmm..ad.dc.."
-		/* 10 */ "mmmmm..adddc.."
-		/* 11 */ "mmmmm..ap.qc.."
+		/*  1 */ "ccccccccccccd."
+		/*  2 */ "jaaaaaaaaaaad."
+		/*  3 */ ".a.........ad."
+		/*  4 */ ".a.........ad."
+		/*  5 */ ".a.........ad."
+		/*  6 */ "oaaaaaaa...ad."
+		/*  7 */ "eeeeeeba...ad."
+		/*  8 */ "......ba...ad."
+		/*  9 */ "mmmmm.ba...ad."
+		/* 10 */ "mmmmm.baaaaad."
+		/* 11 */ "mmmmm.bq...rd."
 
 		// Level 6
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
 		/*  1 */ ".............."
+		/*  2 */ "cccccccccccc.."
+		/*  3 */ "jaaaaaaaaaad.."
+		/*  4 */ ".a........ad.."
+		/*  5 */ "oaaaaaaaa.ad.."
+		/*  6 */ "eeeeeeeea.ad.."
+		/*  7 */ ".......ba.ad.."
+		/*  8 */ ".......ba.ad.."
+		/*  9 */ "mmmmm..ba.ad.."
+		/* 10 */ "mmmmm..baaad.."
+		/* 11 */ "mmmmm..bq.rd.."
+
+		// Level 7
+		/* z\x*             1111 */
+		/*    *   01234567890123 */
+		/*  0 */ ".............."
+		/*  1 */ ".............."
 		/*  2 */ ".............."
-		/*  3 */ "bbbbbbbbbbb..."
-		/*  4 */ "ddddddddddc..."
-		/*  5 */ "eeeeeeeeadc..."
-		/*  6 */ "........adc..."
-		/*  7 */ "........adc..."
-		/*  8 */ "........adc..."
-		/*  9 */ "mmmmm...adc..."
-		/* 10 */ "mmmmm...adc..."
-		/* 11 */ "mmmmm...adc...",
+		/*  3 */ "ccccccccccc..."
+		/*  4 */ "aaaaaaaaaad..."
+		/*  5 */ "eeeeeeeebad..."
+		/*  6 */ "........bad..."
+		/*  7 */ "........bad..."
+		/*  8 */ "........bad..."
+		/*  9 */ "mmmmm...bad..."
+		/* 10 */ "mmmmm...bad..."
+		/* 11 */ "mmmmm...bad...",
 
 		// Connectors:
-		"-1: 5, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 5, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1461,18 +1597,18 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 7, ID 82, created by Aloe_vera
 	{
 		// Size:
-		14, 6, 12,  // SizeX = 14, SizeY = 6, SizeZ = 12
+		14, 7, 12,  // SizeX = 14, SizeY = 7, SizeZ = 12
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		13, 5, 11,  // MaxX, MaxY, MaxZ
+		-1, 0, 0,  // MinX, MinY, MinZ
+		14, 6, 12,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e:128: 3\n"  /* sandstonestairs */
 		"f: 64: 7\n"  /* wooddoorblock */
 		"g: 64: 5\n"  /* wooddoorblock */
@@ -1491,101 +1627,117 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		// Level 0
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ ".......abc...."
-		/*  1 */ ".dddddddddddd."
-		/*  2 */ ".dddddddddddd."
-		/*  3 */ ".dddddddddddd."
-		/*  4 */ ".dddddddddddd."
-		/*  5 */ ".dddddddddddd."
-		/*  6 */ "....aec.ddddd."
-		/*  7 */ "mmmmmmm.ddddd."
-		/*  8 */ "mmmmmmm.ddddd."
-		/*  9 */ "mmmmmmm.ddddd."
-		/* 10 */ "mmmmmmm.ddddd."
-		/* 11 */ "mmmmmmm......."
+		/*  0 */ "mmmmmmmaaammmm"
+		/*  1 */ "maaaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaaam"
+		/*  6 */ "mmmmaaamaaaaam"
+		/*  7 */ "mmmmmmmmaaaaam"
+		/*  8 */ "mmmmmmmmaaaaam"
+		/*  9 */ "mmmmmmmmaaaaam"
+		/* 10 */ "mmmmmmmmaaaaam"
+		/* 11 */ "mmmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ ".............."
-		/*  1 */ ".dddddddfdddd."
-		/*  2 */ ".d..........d."
-		/*  3 */ ".d..........d."
-		/*  4 */ ".d..........d."
-		/*  5 */ ".ddddgddd...d."
-		/*  6 */ "........d...d."
-		/*  7 */ "mmmmmmm.d...d."
-		/*  8 */ "mmmmmmm.d...d."
-		/*  9 */ "mmmmmmm.d...d."
-		/* 10 */ "mmmmmmm.ddddd."
-		/* 11 */ "mmmmmmm......."
+		/*  0 */ ".......bcd...."
+		/*  1 */ ".aaaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaaa."
+		/*  6 */ "....bed.aaaaa."
+		/*  7 */ "........aaaaa."
+		/*  8 */ "........aaaaa."
+		/*  9 */ "........aaaaa."
+		/* 10 */ "........aaaaa."
+		/* 11 */ ".............."
 
 		// Level 2
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
-		/*  1 */ ".dhhdhhdidhhd."
+		/*  1 */ ".aaaaaaafaaaa."
+		/*  2 */ ".a..........a."
+		/*  3 */ ".a..........a."
+		/*  4 */ ".a..........a."
+		/*  5 */ ".aaaagaaa...a."
+		/*  6 */ "........a...a."
+		/*  7 */ "........a...a."
+		/*  8 */ "........a...a."
+		/*  9 */ "........a...a."
+		/* 10 */ "........aaaaa."
+		/* 11 */ ".............."
+
+		// Level 3
+		/* z\x*             1111 */
+		/*    *   01234567890123 */
+		/*  0 */ ".............."
+		/*  1 */ ".ahhahhaiahha."
 		/*  2 */ ".h..........h."
 		/*  3 */ ".h..........h."
-		/*  4 */ ".h..........d."
-		/*  5 */ ".dhhdidhh...h."
+		/*  4 */ ".h..........a."
+		/*  5 */ ".ahhaiahh...h."
 		/*  6 */ "........h...h."
-		/*  7 */ "mmmmmmm.d...d."
-		/*  8 */ "mmmmmmm.h...h."
-		/*  9 */ "mmmmmmm.h...h."
-		/* 10 */ "mmmmmmm.dhhhd."
-		/* 11 */ "mmmmmmm......."
+		/*  7 */ "........a...a."
+		/*  8 */ "........h...h."
+		/*  9 */ "........h...h."
+		/* 10 */ "........ahhha."
+		/* 11 */ ".............."
 
-		// Level 3
+		// Level 4
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
-		/*  0 */ "bbbbbbbbbbbbbb"
-		/*  1 */ "jddddddddddddc"
-		/*  2 */ ".d.....k.k..dc"
-		/*  3 */ ".d..........dc"
-		/*  4 */ ".d..l.l.....dc"
-		/*  5 */ "ndddddddd...dc"
-		/*  6 */ "eeeeeeead...dc"
-		/*  7 */ "mmmmmmmad...dc"
-		/*  8 */ "mmmmmmmad...dc"
-		/*  9 */ "mmmmmmmad...dc"
-		/* 10 */ "mmmmmmmadddddc"
-		/* 11 */ "mmmmmmmao...pc"
+		/*  0 */ "cccccccccccccc"
+		/*  1 */ "jaaaaaaaaaaaad"
+		/*  2 */ ".a.....k.k..ad"
+		/*  3 */ ".a..........ad"
+		/*  4 */ ".a..l.l.....ad"
+		/*  5 */ "naaaaaaaa...ad"
+		/*  6 */ "eeeeeeeba...ad"
+		/*  7 */ ".......ba...ad"
+		/*  8 */ ".......ba...ad"
+		/*  9 */ ".......ba...ad"
+		/* 10 */ ".......baaaaad"
+		/* 11 */ ".......bo...pd"
 
-		// Level 4
+		// Level 5
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
-		/*  1 */ "bbbbbbbbbbbbb."
-		/*  2 */ "jdddddddddddc."
-		/*  3 */ ".dq........dc."
-		/*  4 */ "nddddddddd.dc."
-		/*  5 */ "eeeeeeeead.dc."
-		/*  6 */ "........ad.dc."
-		/*  7 */ "mmmmmmm.ad.dc."
-		/*  8 */ "mmmmmmm.ad.dc."
-		/*  9 */ "mmmmmmm.adldc."
-		/* 10 */ "mmmmmmm.adddc."
-		/* 11 */ "mmmmmmm.ao.pc."
+		/*  1 */ "ccccccccccccc."
+		/*  2 */ "jaaaaaaaaaaad."
+		/*  3 */ ".aq........ad."
+		/*  4 */ "naaaaaaaaa.ad."
+		/*  5 */ "eeeeeeeeba.ad."
+		/*  6 */ "........ba.ad."
+		/*  7 */ "........ba.ad."
+		/*  8 */ "........ba.ad."
+		/*  9 */ "........balad."
+		/* 10 */ "........baaad."
+		/* 11 */ "........bo.pd."
 
-		// Level 5
+		// Level 6
 		/* z\x*             1111 */
 		/*    *   01234567890123 */
 		/*  0 */ ".............."
 		/*  1 */ ".............."
-		/*  2 */ "bbbbbbbbbbbb.."
-		/*  3 */ "dddddddddddc.."
-		/*  4 */ "eeeeeeeeeadc.."
-		/*  5 */ ".........adc.."
-		/*  6 */ ".........adc.."
-		/*  7 */ "mmmmmmm..adc.."
-		/*  8 */ "mmmmmmm..adc.."
-		/*  9 */ "mmmmmmm..adc.."
-		/* 10 */ "mmmmmmm..adc.."
-		/* 11 */ "mmmmmmm..adc..",
+		/*  2 */ "cccccccccccc.."
+		/*  3 */ "aaaaaaaaaaad.."
+		/*  4 */ "eeeeeeeeebad.."
+		/*  5 */ ".........bad.."
+		/*  6 */ ".........bad.."
+		/*  7 */ ".........bad.."
+		/*  8 */ ".........bad.."
+		/*  9 */ ".........bad.."
+		/* 10 */ ".........bad.."
+		/* 11 */ ".........bad..",
 
 		// Connectors:
-		"-1: 8, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 8, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1616,11 +1768,11 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 17, ID 127, created by Aloe_vera
 	{
 		// Size:
-		10, 2, 7,  // SizeX = 10, SizeY = 2, SizeZ = 7
+		10, 3, 7,  // SizeX = 10, SizeY = 3, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		9, 1, 6,  // MaxX, MaxY, MaxZ
+		0, 0, -1,  // MinX, MinY, MinZ
+		10, 2, 7,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
@@ -1636,6 +1788,17 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ "aaaaaaaaaa"
+		/*  1 */ "aaaaaaaaaa"
+		/*  2 */ "aaaaaaaaaa"
+		/*  3 */ "aaaaaaaaaa"
+		/*  4 */ "aaaaaaaaaa"
+		/*  5 */ "aaaaaaaaaa"
+		/*  6 */ "aaaaaaaaaa"
+
+		// Level 1
+		/* z\x*              */
+		/*    *   0123456789 */
+		/*  0 */ "aaaaaaaaaa"
 		/*  1 */ "abbbbbbbba"
 		/*  2 */ "abbbbbbbba"
 		/*  3 */ "acccccccca"
@@ -1643,7 +1806,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  5 */ "abbbbbbbba"
 		/*  6 */ "aaaaaaaaaa"
 
-		// Level 1
+		// Level 2
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ "d........d"
@@ -1655,7 +1818,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  6 */ "d........d",
 
 		// Connectors:
-		"-1: 0, 0, 3: 4\n"  /* Type -1, direction X- */,
+		"-1: 0, 1, 3: 4\n"  /* Type -1, direction X- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1686,11 +1849,11 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 4, ID 68, created by tonibm1999
 	{
 		// Size:
-		5, 5, 6,  // SizeX = 5, SizeY = 5, SizeZ = 6
+		5, 6, 6,  // SizeX = 5, SizeY = 6, SizeZ = 6
 
 		// Hitbox (relative to bounding box):
-		0, 0, 0,  // MinX, MinY, MinZ
-		4, 4, 5,  // MaxX, MaxY, MaxZ
+		-1, 0, -1,  // MinX, MinY, MinZ
+		5, 5, 5,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
@@ -1712,10 +1875,19 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  2 */ "aaaaa"
 		/*  3 */ "aaaaa"
 		/*  4 */ "aaaaa"
-		/*  5 */ "..b.."
+		/*  5 */ "mmamm"
 
 		// Level 1
 		/* z\x*   01234 */
+		/*  0 */ "aaaaa"
+		/*  1 */ "aaaaa"
+		/*  2 */ "aaaaa"
+		/*  3 */ "aaaaa"
+		/*  4 */ "aaaaa"
+		/*  5 */ "..b.."
+
+		// Level 2
+		/* z\x*   01234 */
 		/*  0 */ "accca"
 		/*  1 */ "cdedc"
 		/*  2 */ "c.f.c"
@@ -1723,7 +1895,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  4 */ "acgca"
 		/*  5 */ "....."
 
-		// Level 2
+		// Level 3
 		/* z\x*   01234 */
 		/*  0 */ "ac.ca"
 		/*  1 */ "c...c"
@@ -1732,7 +1904,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  4 */ "achca"
 		/*  5 */ "....."
 
-		// Level 3
+		// Level 4
 		/* z\x*   01234 */
 		/*  0 */ "accca"
 		/*  1 */ "c...c"
@@ -1741,7 +1913,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  4 */ "accca"
 		/*  5 */ "....."
 
-		// Level 4
+		// Level 5
 		/* z\x*   01234 */
 		/*  0 */ ".aaa."
 		/*  1 */ "aaaaa"
@@ -1751,7 +1923,7 @@ const cPrefab::sDef g_SandVillagePrefabs[] =
 		/*  5 */ ".....",
 
 		// Connectors:
-		"-1: 2, 0, 5: 3\n"  /* Type -1, direction Z+ */,
+		"-1: 2, 1, 5: 3\n"  /* Type -1, direction Z+ */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -1800,15 +1972,17 @@ const cPrefab::sDef g_SandVillageStartingPrefabs[] =
 		"b: 24: 0\n"  /* sandstone */
 		"c:  8: 0\n"  /* water */
 		"d: 12: 0\n"  /* sand */
-		"e:118: 3\n"  /* cauldronblock */
-		"f: 85: 0\n"  /* fence */
-		"g:128: 2\n"  /* sandstonestairs */
-		"h:128: 7\n"  /* sandstonestairs */
-		"i:128: 4\n"  /* sandstonestairs */
-		"j:128: 5\n"  /* sandstonestairs */
-		"k:128: 6\n"  /* sandstonestairs */
-		"l:128: 3\n"  /* sandstonestairs */
-		"m: 19: 0\n"  /* sponge */,
+		"e:  4: 0\n"  /* cobblestone */
+		"f: 13: 0\n"  /* gravel */
+		"g:118: 3\n"  /* cauldronblock */
+		"h: 85: 0\n"  /* fence */
+		"i:128: 2\n"  /* sandstonestairs */
+		"j:128: 7\n"  /* sandstonestairs */
+		"k:128: 4\n"  /* sandstonestairs */
+		"l:128: 5\n"  /* sandstonestairs */
+		"m: 19: 0\n"  /* sponge */
+		"n:128: 6\n"  /* sandstonestairs */
+		"o:128: 3\n"  /* sandstonestairs */,
 
 		// Block data:
 		// Level 0
@@ -1873,30 +2047,30 @@ const cPrefab::sDef g_SandVillageStartingPrefabs[] =
 
 		// Level 6
 		/* z\x*   0123456 */
-		/*  0 */ "ddddddd"
+		/*  0 */ "ddeeedd"
 		/*  1 */ "dbbbbbd"
-		/*  2 */ "dbcccbd"
-		/*  3 */ "dbcccbd"
-		/*  4 */ "dbcccbd"
+		/*  2 */ "ebcccbe"
+		/*  3 */ "ebcccbe"
+		/*  4 */ "ebcccbe"
 		/*  5 */ "dbbbbbd"
-		/*  6 */ "ddddddd"
+		/*  6 */ "ddeeedd"
 
 		// Level 7
 		/* z\x*   0123456 */
-		/*  0 */ "ddbbbdd"
+		/*  0 */ "ddfffdd"
 		/*  1 */ "dbbbbbd"
-		/*  2 */ "bbcccbb"
-		/*  3 */ "bbcccbb"
-		/*  4 */ "bbcccbb"
+		/*  2 */ "fbcccbf"
+		/*  3 */ "fbcccbf"
+		/*  4 */ "fbcccbf"
 		/*  5 */ "dbbbbbd"
-		/*  6 */ "ddbbbdd"
+		/*  6 */ "ddfffdd"
 
 		// Level 8
 		/* z\x*   0123456 */
 		/*  0 */ "......."
 		/*  1 */ ".bbbbb."
 		/*  2 */ ".b...b."
-		/*  3 */ ".b.e.b."
+		/*  3 */ ".b.g.b."
 		/*  4 */ ".b...b."
 		/*  5 */ ".bbbbb."
 		/*  6 */ "......."
@@ -1904,50 +2078,50 @@ const cPrefab::sDef g_SandVillageStartingPrefabs[] =
 		// Level 9
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ ".f...f."
+		/*  1 */ ".h...h."
 		/*  2 */ "......."
-		/*  3 */ "...f..."
+		/*  3 */ "...h..."
 		/*  4 */ "......."
-		/*  5 */ ".f...f."
+		/*  5 */ ".h...h."
 		/*  6 */ "......."
 
 		// Level 10
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ ".f...f."
+		/*  1 */ ".h...h."
 		/*  2 */ "......."
-		/*  3 */ "...f..."
+		/*  3 */ "...h..."
 		/*  4 */ "......."
-		/*  5 */ ".f...f."
+		/*  5 */ ".h...h."
 		/*  6 */ "......."
 
 		// Level 11
 		/* z\x*   0123456 */
-		/*  0 */ "ggggggg"
-		/*  1 */ "hbhhhbh"
-		/*  2 */ ".i...j."
-		/*  3 */ ".i.f.j."
-		/*  4 */ ".i...j."
-		/*  5 */ "kbkkkbk"
-		/*  6 */ "lllllll"
+		/*  0 */ "iiiiiii"
+		/*  1 */ "jbjjjbj"
+		/*  2 */ ".k...l."
+		/*  3 */ ".k.h.l."
+		/*  4 */ ".k...l."
+		/*  5 */ "nbnnnbn"
+		/*  6 */ "ooooooo"
 
 		// Level 12
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ "ggggggg"
-		/*  2 */ "hb...bh"
-		/*  3 */ ".b.f.b."
-		/*  4 */ "kb...bk"
-		/*  5 */ "lllllll"
+		/*  1 */ "iiiiiii"
+		/*  2 */ "jb...bj"
+		/*  3 */ ".b.h.b."
+		/*  4 */ "nb...bn"
+		/*  5 */ "ooooooo"
 		/*  6 */ "......."
 
 		// Level 13
 		/* z\x*   0123456 */
 		/*  0 */ "......."
 		/*  1 */ "......."
-		/*  2 */ "ggggggg"
+		/*  2 */ "iiiiiii"
 		/*  3 */ "bbbbbbb"
-		/*  4 */ "lllllll"
+		/*  4 */ "ooooooo"
 		/*  5 */ "......."
 		/*  6 */ ".......",
 
diff --git a/src/Generating/Prefabs/UnderwaterBasePrefabs.cpp b/src/Generating/Prefabs/UnderwaterBasePrefabs.cpp
index 39748a223..691d8aa9d 100644
--- a/src/Generating/Prefabs/UnderwaterBasePrefabs.cpp
+++ b/src/Generating/Prefabs/UnderwaterBasePrefabs.cpp
@@ -366,7 +366,7 @@ const cPrefab::sDef g_UnderwaterBasePrefabs[] =
 		true,
 
 		// DefaultWeight:
-		100,
+		200,
 
 		// DepthWeight:
 		"",