diff --git a/game/modules/tome/class/NicerTiles.lua b/game/modules/tome/class/NicerTiles.lua
index 928984ea5189918ffc919cf58abd0febd9d4d96e..c444977e38756854c8d363893c0801ec77183855 100644
--- a/game/modules/tome/class/NicerTiles.lua
+++ b/game/modules/tome/class/NicerTiles.lua
@@ -456,6 +456,37 @@ snowy_grass = { method="borders", type="snowy_grass", forbid={grass=true, lava=t
 	water7i={add_mos={{image="terrain/grass/snowy_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
 	water9i={add_mos={{image="terrain/grass/snowy_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
 },
+dark_grass = { method="borders", type="dark_grass", forbid={grass=true, lava=true, rock=true},
+	default8={add_mos={{image="terrain/grass/dark_grass_2_%02d.png", display_y=-1}}, min=1, max=2},
+	default2={add_mos={{image="terrain/grass/dark_grass_8_%02d.png", display_y=1}}, min=1, max=2},
+	default4={add_mos={{image="terrain/grass/dark_grass_6_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={add_mos={{image="terrain/grass/dark_grass_4_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={add_mos={{image="terrain/grass/dark_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	default3={add_mos={{image="terrain/grass/dark_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	default7={add_mos={{image="terrain/grass/dark_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	default9={add_mos={{image="terrain/grass/dark_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	default1i={add_mos={{image="terrain/grass/dark_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
+	default3i={add_mos={{image="terrain/grass/dark_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
+	default7i={add_mos={{image="terrain/grass/dark_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
+	default9i={add_mos={{image="terrain/grass/dark_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+
+	water8={add_mos={{image="terrain/grass/dark_grass_2_%02d.png", display_y=-1}}, min=1, max=1},
+	water2={add_mos={{image="terrain/grass/dark_grass_8_%02d.png", display_y=1}}, min=1, max=1},
+	water4={add_mos={{image="terrain/grass/dark_grass_6_%02d.png", display_x=-1}}, min=1, max=1},
+	water6={add_mos={{image="terrain/grass/dark_grass_4_%02d.png", display_x=1}}, min=1, max=1},
+
+	water1={add_mos={{image="terrain/grass/dark_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3={add_mos={{image="terrain/grass/dark_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7={add_mos={{image="terrain/grass/dark_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9={add_mos={{image="terrain/grass/dark_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	water1i={add_mos={{image="terrain/grass/dark_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3i={add_mos={{image="terrain/grass/dark_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7i={add_mos={{image="terrain/grass/dark_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9i={add_mos={{image="terrain/grass/dark_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+},
 grass_wm = { method="borders", type="grass", forbid={lava=true, rock=true},
 	default8={add_mos={{image="terrain/grass_worldmap/grass_2_%02d.png", display_y=-1}}, min=1, max=2},
 	default2={add_mos={{image="terrain/grass_worldmap/grass_8_%02d.png", display_y=1}}, min=1, max=2},
diff --git a/game/modules/tome/data/gfx/shockbolt/attachements.lua b/game/modules/tome/data/gfx/shockbolt/attachements.lua
index 4e2461b68f1a8dd61820a779cd38e10370d0f168..c7af7fe28d57cae0284f3ac56357f54a702494f5 100644
--- a/game/modules/tome/data/gfx/shockbolt/attachements.lua
+++ b/game/modules/tome/data/gfx/shockbolt/attachements.lua
@@ -2,95 +2,95 @@ tiles={} dolls={}
 
 tiles["npc/humanoid_shalore_elven_guard.png"] = { base=64,
 	feet = {x=33, y=61},
+	back = {x=32, y=15},
 	belly = {x=32, y=28},
 	hand1 = {x=13, y=31},
-	back = {x=32, y=15},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_player_default.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=21, y=35},
-	hand2 = {x=44, y=36},
-	back = {x=32, y=14},
-	belly = {x=33, y=28},
-	head = {x=32, y=5},
+tiles["npc/humanoid_human_gladiator.png"] = { base=64,
+	feet = {x=35, y=58},
+	hand1 = {x=13, y=35},
+	hand2 = {x=53, y=36},
+	back = {x=34, y=19},
+	belly = {x=35, y=31},
+	head = {x=32, y=7},
 }
 tiles["npc/humanoid_human_high_gladiator.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=8, y=13},
 	hand2 = {x=55, y=33},
-	belly = {x=33, y=30},
 	back = {x=34, y=17},
+	belly = {x=33, y=30},
 	head = {x=30, y=7},
 }
 tiles["npc/humanoid_shalore_elvala_guard.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=30},
-	back = {x=31, y=15},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_naga_slasul.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=11, y=30},
 	hand2 = {x=46, y=-2},
-	back = {x=23, y=3},
 	belly = {x=23, y=14},
+	back = {x=23, y=3},
 	head = {x=24, y=-12},
 }
 tiles["npc/humanoid_human_human_citizen.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=11, y=13},
 	hand2 = {x=47, y=30},
-	belly = {x=36, y=28},
 	back = {x=36, y=16},
+	belly = {x=36, y=28},
 	head = {x=36, y=5},
 }
 tiles["npc/humanoid_yeek_yeek_psionic.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=31, y=38},
 	hand2 = {x=33, y=38},
-	back = {x=32, y=23},
 	belly = {x=32, y=34},
+	back = {x=32, y=23},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_orc_vor__grand_geomancer_of_the_pride.png"] = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=4, y=34},
 	hand2 = {x=58, y=39},
-	back = {x=33, y=20},
 	belly = {x=32, y=35},
+	back = {x=33, y=20},
 	head = {x=34, y=9},
 }
 tiles["npc/humanoid_human_ziguranth_wyrmic.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=51, y=34},
-	back = {x=32, y=16},
 	belly = {x=33, y=30},
+	back = {x=32, y=16},
 	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_elven_warrior.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=14},
 	belly = {x=31, y=26},
 	hand1 = {x=13, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_shalore_elandar.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=13, y=26},
 	hand2 = {x=50, y=-12},
-	back = {x=30, y=8},
 	belly = {x=33, y=22},
+	back = {x=30, y=8},
 	head = {x=29, y=-2},
 }
 tiles["npc/humanoid_human_high_sun_paladin_rodmour.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=35},
 	hand2 = {x=48, y=36},
-	belly = {x=32, y=29},
 	back = {x=32, y=15},
+	belly = {x=32, y=29},
 	head = {x=32, y=3},
 }
 dolls.race_runic_golem = dolls.race_runic_golem or {}
@@ -98,32 +98,32 @@ dolls.race_runic_golem.all = { base=64,
 	feet = {x=54, y=43},
 	hand1 = {x=29, y=18},
 	hand2 = {x=22, y=28},
-	back = {x=28, y=48},
 	belly = {x=43, y=49},
+	back = {x=28, y=48},
 	head = {x=39, y=29},
 }
 tiles["npc/humanoid_human_assassin_lord.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=10, y=10},
 	hand2 = {x=56, y=34},
-	belly = {x=32, y=28},
 	back = {x=31, y=16},
+	belly = {x=32, y=28},
 	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_rogue.png"] = { base=64,
 	feet = {x=36, y=58},
 	hand1 = {x=8, y=36},
 	hand2 = {x=55, y=29},
-	back = {x=30, y=21},
 	belly = {x=30, y=31},
+	back = {x=30, y=21},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_dwarf_norgan.png"] = { base=64,
 	feet = {x=41, y=57},
 	hand1 = {x=15, y=40},
 	hand2 = {x=47, y=19},
-	belly = {x=35, y=37},
 	back = {x=32, y=23},
+	belly = {x=35, y=37},
 	head = {x=27, y=8},
 }
 dolls.race_human = dolls.race_human or {}
@@ -131,64 +131,64 @@ dolls.race_human.male = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=48, y=34},
-	back = {x=32, y=15},
 	belly = {x=32, y=28},
+	back = {x=32, y=15},
 	head = {x=30, y=3},
 }
 tiles["npc/humanoid_yaech_murgol__the_yaech_lord.png"] = { base=64,
 	feet = {x=56, y=58},
 	hand1 = {x=7, y=28},
 	hand2 = {x=20, y=32},
-	back = {x=38, y=31},
 	belly = {x=38, y=39},
+	back = {x=38, y=31},
 	head = {x=32, y=16},
 }
-tiles["npc/humanoid_human_the_possessed.png"] = { base=64,
-	feet = {x=30, y=62},
-	hand1 = {x=9, y=17},
-	hand2 = {x=47, y=37},
-	back = {x=33, y=17},
-	belly = {x=33, y=35},
-	head = {x=33, y=4},
+tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=16, y=43},
+	hand2 = {x=45, y=39},
+	back = {x=30, y=22},
+	belly = {x=31, y=34},
+	head = {x=30, y=7},
 }
-tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
-	feet = {x=39, y=59},
-	hand1 = {x=15, y=42},
-	hand2 = {x=47, y=10},
-	belly = {x=32, y=38},
-	back = {x=31, y=27},
-	head = {x=28, y=14},
+tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=8, y=28},
+	hand2 = {x=54, y=43},
+	back = {x=33, y=24},
+	belly = {x=36, y=36},
+	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_mindworm.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=21, y=36},
 	hand2 = {x=44, y=35},
-	back = {x=31, y=13},
 	belly = {x=32, y=30},
+	back = {x=31, y=13},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_shalore_grand_corruptor.png"] = { base=64,
 	feet = {x=25, y=61},
 	hand1 = {x=11, y=34},
 	hand2 = {x=53, y=17},
-	back = {x=28, y=19},
 	belly = {x=28, y=31},
+	back = {x=28, y=19},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=37},
-	hand2 = {x=45, y=36},
-	belly = {x=31, y=31},
-	back = {x=30, y=15},
-	head = {x=29, y=4},
+tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=15, y=36},
+	hand2 = {x=46, y=36},
+	belly = {x=30, y=33},
+	back = {x=30, y=17},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_human_slave_combatant.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=18, y=37},
 	hand2 = {x=47, y=32},
-	back = {x=30, y=17},
 	belly = {x=31, y=29},
+	back = {x=30, y=17},
 	head = {x=29, y=6},
 }
 dolls.race_elf = dolls.race_elf or {}
@@ -196,62 +196,62 @@ dolls.race_elf.male = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=19, y=32},
 	hand2 = {x=44, y=34},
-	back = {x=32, y=15},
 	belly = {x=33, y=27},
+	back = {x=32, y=15},
 	head = {x=30, y=4},
 }
 tiles["npc/humanoid_male_sluttymaid.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=21},
-	back = {x=35, y=11},
 	belly = {x=35, y=24},
+	back = {x=35, y=11},
 	head = {x=35, y=0},
 }
 tiles["npc/humanoid_elf_limmir_the_jeweler.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=11, y=37},
 	hand2 = {x=49, y=9},
-	belly = {x=31, y=30},
 	back = {x=31, y=19},
+	belly = {x=31, y=30},
 	head = {x=32, y=4},
 }
 tiles["npc/canine_warg.png"] = { base=64,
 	feet = {x=15, y=18},
 	hand1 = {x=48, y=22},
 	hand2 = {x=46, y=48},
-	back = {x=26, y=51},
 	belly = {x=12, y=32},
+	back = {x=26, y=51},
 	head = {x=33, y=13},
 }
 tiles["npc/humanoid_human_cryomancer.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=22, y=6},
 	hand2 = {x=44, y=32},
-	belly = {x=36, y=28},
 	back = {x=35, y=16},
+	belly = {x=36, y=28},
 	head = {x=34, y=5},
 }
 tiles["npc/acid_ant.png"] = { base=64,
 	feet = {x=36, y=57},
 	back = {x=45, y=37},
 	hand2 = {x=51, y=17},
-	belly = {x=11, y=33},
 	hand1 = {x=32, y=22},
+	belly = {x=11, y=33},
 	head = {x=15, y=13},
 }
 tiles["npc/humanoid_shalore_elven_corruptor.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=12, y=17},
 	hand2 = {x=48, y=34},
-	back = {x=31, y=20},
 	belly = {x=31, y=33},
+	back = {x=31, y=20},
 	head = {x=31, y=10},
 }
 tiles["npc/humanoid_human_townsfolk_village_idiot01_64.png"] = { base=64,
-	belly = {x=37, y=34},
-	feet = {x=35, y=58},
 	back = {x=33, y=24},
+	feet = {x=35, y=58},
+	belly = {x=37, y=34},
 	head = {x=32, y=8},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -259,16 +259,16 @@ dolls.race_halfling.female = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=12, y=38},
 	hand2 = {x=50, y=40},
-	belly = {x=34, y=36},
 	back = {x=32, y=24},
+	belly = {x=34, y=36},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_elf_elven_sun_mage.png"] = { base=64,
 	feet = {x=35, y=62},
 	hand1 = {x=13, y=28},
 	hand2 = {x=50, y=37},
-	belly = {x=34, y=35},
 	back = {x=32, y=16},
+	belly = {x=34, y=35},
 	head = {x=31, y=4},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -276,25 +276,25 @@ dolls.race_halfling.male = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=50, y=39},
-	belly = {x=33, y=36},
 	back = {x=32, y=25},
+	belly = {x=33, y=36},
 	head = {x=32, y=14},
 }
-tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
-	feet = {x=34, y=60},
-	hand1 = {x=15, y=32},
-	hand2 = {x=53, y=37},
-	back = {x=31, y=21},
-	belly = {x=31, y=31},
-	head = {x=27, y=9},
+tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
+	feet = {x=35, y=57},
+	hand1 = {x=16, y=39},
+	hand2 = {x=52, y=39},
+	belly = {x=33, y=30},
+	back = {x=33, y=19},
+	head = {x=32, y=7},
 }
 dolls.race_ghoul = dolls.race_ghoul or {}
 dolls.race_ghoul.all = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=20, y=37},
 	hand2 = {x=48, y=38},
-	back = {x=34, y=20},
 	belly = {x=33, y=38},
+	back = {x=34, y=20},
 	head = {x=33, y=8},
 }
 tiles["npc/animal_feline_snow_cat.png"] = { base=64,
@@ -304,47 +304,47 @@ tiles["npc/humanoid_human_master_alchemist.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=7, y=18},
 	hand2 = {x=57, y=35},
-	back = {x=34, y=18},
 	belly = {x=37, y=28},
+	back = {x=34, y=18},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=7},
-	hand2 = {x=58, y=30},
-	back = {x=35, y=17},
-	belly = {x=34, y=27},
-	head = {x=33, y=5},
+tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=11, y=20},
+	hand2 = {x=44, y=38},
+	back = {x=29, y=18},
+	belly = {x=31, y=31},
+	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=12, y=30},
-	hand2 = {x=49, y=36},
-	belly = {x=28, y=28},
-	back = {x=28, y=19},
-	head = {x=24, y=9},
+tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=17, y=37},
+	hand2 = {x=44, y=37},
+	belly = {x=33, y=31},
+	back = {x=32, y=17},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_elven_elite_warrior.png"] = { base=64,
 	feet = {x=33, y=62},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=32},
-	back = {x=31, y=15},
 	head = {x=32, y=6},
 }
-tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=4, y=30},
-	hand2 = {x=40, y=3},
-	back = {x=33, y=20},
-	belly = {x=42, y=29},
-	head = {x=24, y=11},
+tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=7},
+	hand2 = {x=58, y=30},
+	belly = {x=34, y=27},
+	back = {x=35, y=17},
+	head = {x=33, y=5},
 }
 tiles["npc/humanoid_yaech_slaver.png"] = { base=64,
 	feet = {x=46, y=58},
 	hand1 = {x=16, y=28},
 	hand2 = {x=51, y=10},
-	back = {x=37, y=25},
 	belly = {x=38, y=34},
+	back = {x=37, y=25},
 	head = {x=28, y=17},
 }
 dolls.race_human = dolls.race_human or {}
@@ -352,33 +352,33 @@ dolls.race_human.female = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=33},
 	hand2 = {x=46, y=33},
-	belly = {x=34, y=28},
 	back = {x=33, y=16},
+	belly = {x=34, y=28},
 	head = {x=32, y=3},
 }
-tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=6, y=34},
-	hand2 = {x=57, y=31},
-	back = {x=28, y=20},
-	belly = {x=29, y=32},
-	head = {x=27, y=8},
+tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=4, y=-4},
+	hand2 = {x=58, y=2},
+	belly = {x=30, y=-3},
+	back = {x=32, y=-40},
+	head = {x=33, y=-55},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=17, y=42},
-	hand2 = {x=50, y=44},
-	back = {x=32, y=24},
-	belly = {x=33, y=36},
-	head = {x=31, y=12},
+tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=10, y=20},
+	hand2 = {x=23, y=35},
+	belly = {x=32, y=35},
+	back = {x=30, y=21},
+	head = {x=31, y=11},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
 dolls.race_dwarf.male = { base=64,
 	feet = {x=34, y=61},
 	back = {x=32, y=25},
 	hand2 = {x=55, y=39},
-	belly = {x=34, y=34},
 	hand1 = {x=10, y=39},
+	belly = {x=34, y=34},
 	head = {x=32, y=10},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
@@ -386,8 +386,8 @@ dolls.race_dwarf.female = { base=64,
 	feet = {x=33, y=59},
 	back = {x=33, y=25},
 	hand2 = {x=55, y=39},
-	belly = {x=33, y=37},
 	hand1 = {x=9, y=39},
+	belly = {x=33, y=37},
 	head = {x=33, y=9},
 }
 dolls.race_skeleton = dolls.race_skeleton or {}
@@ -395,8 +395,8 @@ dolls.race_skeleton.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=15, y=33},
 	hand2 = {x=47, y=34},
-	belly = {x=32, y=26},
 	back = {x=31, y=16},
+	belly = {x=32, y=26},
 	head = {x=30, y=4},
 }
 dolls.race_yeek = dolls.race_yeek or {}
@@ -404,1240 +404,1240 @@ dolls.race_yeek.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=16, y=39},
 	hand2 = {x=46, y=40},
-	belly = {x=32, y=36},
 	back = {x=31, y=26},
+	belly = {x=32, y=36},
 	head = {x=31, y=12},
 }
-tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=5, y=14},
-	hand2 = {x=57, y=30},
-	back = {x=29, y=17},
-	belly = {x=36, y=31},
-	head = {x=23, y=7},
+tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=11, y=36},
+	hand2 = {x=57, y=37},
+	belly = {x=34, y=32},
+	back = {x=33, y=17},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_aluin_the_fallen.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=18, y=36},
 	hand2 = {x=41, y=38},
-	belly = {x=29, y=29},
 	back = {x=29, y=18},
+	belly = {x=29, y=29},
 	head = {x=28, y=5},
 }
-tiles["npc/humanoid_human_tempest.png"] = { base=64,
-	feet = {x=26, y=59},
-	hand1 = {x=19, y=31},
-	hand2 = {x=41, y=6},
-	back = {x=27, y=16},
-	belly = {x=26, y=30},
-	head = {x=28, y=4},
+tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
+	feet = {x=30, y=61},
+	hand1 = {x=10, y=22},
+	hand2 = {x=23, y=36},
+	belly = {x=31, y=36},
+	back = {x=31, y=22},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
-	feet = {x=36, y=62},
-	hand1 = {x=9, y=39},
-	hand2 = {x=58, y=36},
-	back = {x=29, y=21},
-	belly = {x=34, y=34},
-	head = {x=25, y=9},
+tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=7, y=8},
+	hand2 = {x=57, y=39},
+	belly = {x=31, y=34},
+	back = {x=35, y=20},
+	head = {x=39, y=10},
 }
 tiles["npc/humanoid_human_linaniil_supreme_archmage.png"] = { base=64,
 	feet = {x=38, y=60},
 	hand1 = {x=10, y=7},
 	hand2 = {x=49, y=29},
-	belly = {x=37, y=19},
 	back = {x=35, y=1},
+	belly = {x=37, y=19},
 	head = {x=31, y=-13},
 }
 tiles["npc/humanoid_elf_elven_archer.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=32},
-	belly = {x=32, y=28},
 	back = {x=32, y=15},
+	belly = {x=32, y=28},
 	head = {x=32, y=5},
 }
-tiles["npc/humanoid_human_trickster.png"] = { base=64,
-	feet = {x=36, y=60},
-	back = {x=35, y=17},
-	hand2 = {x=5, y=32},
-	belly = {x=37, y=29},
-	head = {x=30, y=6},
-}
-tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=4, y=39},
-	hand2 = {x=59, y=32},
-	back = {x=29, y=18},
-	belly = {x=30, y=30},
-	head = {x=28, y=8},
-}
-tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
-	feet = {x=37, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=48, y=33},
-	belly = {x=36, y=29},
-	back = {x=34, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
+	feet = {x=31, y=58},
+	hand1 = {x=13, y=38},
+	hand2 = {x=48, y=41},
+	back = {x=30, y=22},
+	belly = {x=31, y=33},
+	head = {x=30, y=8},
 }
-tiles["npc/humanoid_shalore_elven_cultist.png"] = { base=64,
+tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
 	feet = {x=29, y=60},
-	hand1 = {x=8, y=9},
-	hand2 = {x=52, y=9},
+	hand1 = {x=10, y=38},
+	hand2 = {x=58, y=17},
+	belly = {x=31, y=30},
+	back = {x=32, y=19},
+	head = {x=37, y=8},
+}
+tiles["npc/humanoid_human_spectator02.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=18, y=37},
+	hand2 = {x=41, y=37},
+	belly = {x=31, y=30},
 	back = {x=30, y=16},
-	belly = {x=31, y=28},
-	head = {x=31, y=6},
+	head = {x=30, y=5},
 }
-tiles["npc/humanoid_human_spectator03.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=38},
-	hand2 = {x=44, y=38},
-	back = {x=30, y=19},
-	belly = {x=30, y=30},
-	head = {x=30, y=4},
+tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
+	feet = {x=26, y=61},
+	hand1 = {x=17, y=3},
+	hand2 = {x=38, y=35},
+	back = {x=27, y=22},
+	belly = {x=27, y=29},
+	head = {x=29, y=13},
 }
-tiles["npc/humanoid_orc_orc_archer.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=20, y=29},
-	hand2 = {x=56, y=30},
-	back = {x=30, y=20},
-	belly = {x=31, y=34},
-	head = {x=31, y=10},
+tiles["npc/humanoid_human_necromancer.png"] = { base=64,
+	feet = {x=27, y=61},
+	hand1 = {x=18, y=16},
+	hand2 = {x=40, y=41},
+	belly = {x=32, y=32},
+	back = {x=34, y=17},
+	head = {x=36, y=3},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
-	feet = {x=30, y=61},
-	hand1 = {x=10, y=22},
-	hand2 = {x=23, y=36},
-	back = {x=31, y=22},
-	belly = {x=31, y=36},
-	head = {x=30, y=13},
+tiles["npc/humanoid_orc_orc_mother.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=10, y=37},
+	hand2 = {x=53, y=35},
+	belly = {x=30, y=31},
+	back = {x=30, y=9},
+	head = {x=28, y=-6},
+}
+tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
+	feet = {x=33, y=57},
+	hand1 = {x=11, y=28},
+	hand2 = {x=53, y=38},
+	belly = {x=33, y=33},
+	back = {x=33, y=20},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_halfling_sm_halfling.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=10, y=14},
 	hand2 = {x=52, y=11},
-	belly = {x=30, y=35},
 	back = {x=30, y=23},
+	belly = {x=30, y=35},
 	head = {x=31, y=7},
 }
-tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
-	feet = {x=39, y=60},
-	hand1 = {x=16, y=40},
-	hand2 = {x=58, y=36},
-	back = {x=33, y=21},
-	belly = {x=36, y=32},
-	head = {x=30, y=13},
+tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=11, y=37},
+	hand2 = {x=53, y=29},
+	belly = {x=31, y=33},
+	back = {x=29, y=16},
+	head = {x=29, y=4},
 }
-tiles["npc/humanoid_human_reaver.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=8, y=37},
-	hand2 = {x=52, y=31},
-	back = {x=29, y=17},
-	belly = {x=29, y=29},
-	head = {x=28, y=6},
+tiles["npc/humanoid_human_bandit.png"] = { base=64,
+	feet = {x=39, y=56},
+	hand1 = {x=8, y=40},
+	hand2 = {x=51, y=26},
+	back = {x=30, y=16},
+	belly = {x=33, y=28},
+	head = {x=29, y=5},
 }
 tiles["npc/humanoid_elf_star_crusader.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=11, y=30},
 	hand2 = {x=51, y=33},
-	belly = {x=34, y=30},
 	back = {x=34, y=17},
+	belly = {x=34, y=30},
 	head = {x=34, y=4},
 }
 tiles["npc/humanoid_elf_high_chronomancer_zemekkys.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=11, y=36},
 	hand2 = {x=51, y=38},
-	belly = {x=32, y=29},
 	back = {x=32, y=19},
+	belly = {x=32, y=29},
 	head = {x=30, y=6},
 }
 tiles["npc/humanoid_yaech_yaech_psion.png"] = { base=64,
 	feet = {x=5, y=58},
 	hand1 = {x=55, y=27},
 	hand2 = {x=42, y=32},
-	back = {x=23, y=31},
 	belly = {x=25, y=40},
+	back = {x=23, y=31},
 	head = {x=33, y=15},
 }
 tiles["npc/humanoid_orc_orc_corruptor.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=15, y=39},
 	hand2 = {x=51, y=37},
-	back = {x=31, y=17},
 	belly = {x=34, y=36},
+	back = {x=31, y=17},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_halfling_halfling_gardener.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=17, y=36},
 	hand2 = {x=48, y=38},
-	belly = {x=31, y=32},
 	back = {x=31, y=22},
+	belly = {x=31, y=32},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
-	feet = {x=36, y=59},
-	hand1 = {x=9, y=34},
-	hand2 = {x=46, y=34},
-	belly = {x=30, y=29},
-	back = {x=29, y=18},
-	head = {x=28, y=7},
+tiles["npc/humanoid_human_argoniel.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=9, y=2},
+	hand2 = {x=57, y=9},
+	back = {x=32, y=10},
+	belly = {x=32, y=22},
+	head = {x=32, y=-3},
 }
 tiles["npc/humanoid_orc_fiery_orc_wyrmic.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=20},
 	hand2 = {x=57, y=36},
-	back = {x=30, y=21},
 	belly = {x=32, y=31},
+	back = {x=30, y=21},
 	head = {x=25, y=9},
 }
 tiles["npc/humanoid_orc_ukruk_the_fierce.png"] = { base=64,
 	feet = {x=34, y=60},
+	back = {x=28, y=17},
 	belly = {x=29, y=33},
 	hand1 = {x=10, y=38},
-	back = {x=28, y=17},
 	head = {x=25, y=8},
 }
-tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=24, y=17},
-	hand2 = {x=38, y=19},
-	back = {x=33, y=15},
-	belly = {x=33, y=26},
-	head = {x=32, y=4},
-}
-tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=14, y=10},
-	hand2 = {x=52, y=40},
-	back = {x=32, y=19},
-	belly = {x=35, y=32},
-	head = {x=30, y=8},
+tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
+	feet = {x=35, y=61},
+	hand1 = {x=8, y=38},
+	hand2 = {x=57, y=35},
+	belly = {x=34, y=34},
+	back = {x=29, y=20},
+	head = {x=25, y=9},
 }
-tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=18, y=37},
-	hand2 = {x=42, y=37},
+tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
+	feet = {x=31, y=55},
+	hand1 = {x=8, y=36},
+	hand2 = {x=48, y=35},
 	belly = {x=30, y=32},
-	back = {x=30, y=17},
-	head = {x=30, y=6},
+	back = {x=29, y=24},
+	head = {x=25, y=12},
 }
-tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=17, y=37},
-	hand2 = {x=44, y=37},
-	back = {x=32, y=17},
-	belly = {x=33, y=31},
-	head = {x=32, y=4},
+tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=14, y=31},
+	hand2 = {x=58, y=33},
+	belly = {x=38, y=26},
+	back = {x=38, y=15},
+	head = {x=35, y=3},
 }
-tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=19, y=7},
-	hand2 = {x=41, y=32},
+tiles["npc/humanoid_human_spectator.png"] = { base=64,
+	feet = {x=37, y=59},
+	back = {x=35, y=17},
+	belly = {x=36, y=29},
+	hand1 = {x=50, y=37},
+	head = {x=34, y=5},
+}
+tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=19, y=35},
+	hand2 = {x=49, y=35},
+	belly = {x=33, y=29},
 	back = {x=32, y=17},
-	belly = {x=34, y=29},
-	head = {x=32, y=4},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_dwarf_dwarven_guard.png"] = { base=64,
 	feet = {x=30, y=59},
 	hand1 = {x=13, y=40},
 	hand2 = {x=40, y=22},
-	back = {x=29, y=23},
 	belly = {x=29, y=36},
+	back = {x=29, y=23},
 	head = {x=28, y=6},
 }
-tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
-	feet = {x=30, y=61},
-	back = {x=32, y=19},
-	hand2 = {x=58, y=17},
-	belly = {x=32, y=33},
-	hand1 = {x=9, y=36},
-	head = {x=36, y=11},
+tiles["npc/humanoid_human_human_guard.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=19, y=29},
+	hand2 = {x=46, y=25},
+	back = {x=30, y=17},
+	belly = {x=31, y=30},
+	head = {x=28, y=5},
 }
 tiles["npc/humanoid_yaech_yaech_mindslayer.png"] = { base=64,
 	feet = {x=58, y=58},
 	hand1 = {x=7, y=28},
 	hand2 = {x=21, y=32},
-	back = {x=37, y=31},
 	belly = {x=39, y=40},
+	back = {x=37, y=31},
 	head = {x=28, y=19},
 }
 tiles["npc/humanoid_human_townsfolk_meanlooking_mercenary01_64.png"] = { base=64,
 	feet = {x=35, y=58},
+	back = {x=36, y=19},
 	belly = {x=36, y=30},
 	hand1 = {x=8, y=29},
-	back = {x=36, y=19},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=14, y=31},
-	hand2 = {x=58, y=33},
-	back = {x=38, y=15},
-	belly = {x=38, y=26},
-	head = {x=35, y=3},
+tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=4, y=39},
+	hand2 = {x=59, y=32},
+	belly = {x=30, y=30},
+	back = {x=29, y=18},
+	head = {x=28, y=8},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
-	feet = {x=31, y=61},
-	hand1 = {x=12, y=22},
-	hand2 = {x=24, y=35},
-	back = {x=30, y=21},
-	belly = {x=32, y=34},
-	head = {x=30, y=12},
+tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
+	feet = {x=34, y=60},
+	hand1 = {x=15, y=32},
+	hand2 = {x=53, y=37},
+	belly = {x=31, y=31},
+	back = {x=31, y=21},
+	head = {x=27, y=9},
 }
 tiles["npc/humanoid_shalore_shalore_rune_master.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=17, y=34},
 	hand2 = {x=48, y=34},
-	back = {x=32, y=14},
 	belly = {x=33, y=30},
+	back = {x=32, y=14},
 	head = {x=32, y=4},
 }
-tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=18, y=38},
-	hand2 = {x=52, y=31},
-	back = {x=33, y=18},
-	belly = {x=33, y=30},
-	head = {x=32, y=8},
+tiles["npc/humanoid_thalore_thalore_wilder.png"] = { base=64,
+	feet = {x=27, y=59},
+	hand1 = {x=11, y=31},
+	hand2 = {x=44, y=30},
+	belly = {x=28, y=23},
+	back = {x=29, y=11},
+	head = {x=29, y=-1},
 }
 tiles["npc/humanoid_orc_rak_shor_cultist.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=5, y=39},
 	hand2 = {x=58, y=34},
-	back = {x=29, y=19},
 	belly = {x=30, y=35},
+	back = {x=29, y=19},
 	head = {x=29, y=8},
 }
 tiles["npc/humanoid_halfling_halfling_slinger.png"] = { base=64,
 	feet = {x=27, y=57},
 	hand1 = {x=16, y=15},
 	hand2 = {x=55, y=30},
-	belly = {x=31, y=42},
 	back = {x=33, y=32},
+	belly = {x=31, y=42},
 	head = {x=36, y=19},
 }
-tiles["npc/humanoid_human_slinger.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=50, y=36},
-	back = {x=34, y=17},
-	belly = {x=37, y=27},
-	head = {x=34, y=5},
+tiles["npc/humanoid_human_melnela.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=8},
+	hand2 = {x=58, y=30},
+	belly = {x=35, y=31},
+	back = {x=35, y=19},
+	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_human_guard.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=19, y=29},
-	hand2 = {x=46, y=25},
-	belly = {x=31, y=30},
-	back = {x=30, y=17},
-	head = {x=28, y=5},
+tiles["npc/humanoid_human_tempest.png"] = { base=64,
+	feet = {x=26, y=59},
+	hand1 = {x=19, y=31},
+	hand2 = {x=41, y=6},
+	belly = {x=26, y=30},
+	back = {x=27, y=16},
+	head = {x=28, y=4},
 }
 tiles["npc/humanoid_elf_fillarel_aldaren.png"] = { base=64,
 	feet = {x=25, y=59},
 	hand1 = {x=10, y=28},
 	hand2 = {x=49, y=7},
-	belly = {x=24, y=15},
 	back = {x=24, y=3},
+	belly = {x=24, y=15},
 	head = {x=23, y=-12},
 }
 tiles["npc/humanoid_orc_grushnak__battlemaster_of_the_pride.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=10, y=40},
 	hand2 = {x=56, y=36},
-	back = {x=30, y=18},
 	belly = {x=30, y=32},
+	back = {x=30, y=18},
 	head = {x=30, y=11},
 }
-tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
-	feet = {x=6, y=7},
-	hand1 = {x=33, y=50},
-	hand2 = {x=59, y=37},
-	back = {x=34, y=29},
-	belly = {x=23, y=29},
-	head = {x=46, y=19},
+tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
+	feet = {x=39, y=60},
+	hand1 = {x=16, y=40},
+	hand2 = {x=58, y=36},
+	belly = {x=36, y=32},
+	back = {x=33, y=21},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_human_melnela.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=8},
-	hand2 = {x=58, y=30},
-	back = {x=35, y=19},
-	belly = {x=35, y=31},
-	head = {x=33, y=6},
+tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=6, y=34},
+	hand2 = {x=57, y=31},
+	belly = {x=29, y=32},
+	back = {x=28, y=20},
+	head = {x=27, y=8},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=38},
-	back = {x=30, y=19},
-	belly = {x=33, y=32},
-	head = {x=30, y=10},
+tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=17, y=42},
+	hand2 = {x=50, y=44},
+	belly = {x=33, y=36},
+	back = {x=32, y=24},
+	head = {x=31, y=12},
 }
-tiles["npc/humanoid_human_spectator.png"] = { base=64,
-	feet = {x=37, y=59},
-	belly = {x=36, y=29},
-	hand1 = {x=50, y=37},
-	back = {x=35, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
+	feet = {x=31, y=61},
+	hand1 = {x=12, y=22},
+	hand2 = {x=24, y=35},
+	belly = {x=32, y=34},
+	back = {x=30, y=21},
+	head = {x=30, y=12},
 }
-tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=12, y=15},
-	hand2 = {x=47, y=-14},
-	back = {x=27, y=-6},
-	belly = {x=30, y=7},
-	head = {x=26, y=-17},
+tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
+	feet = {x=32, y=61},
+	back = {x=32, y=-3},
+	belly = {x=32, y=9},
+	hand1 = {x=31, y=12},
+	head = {x=34, y=-15},
 }
 tiles["npc/humanoid_yeek_yeek_summoner.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=38},
 	hand2 = {x=48, y=37},
-	back = {x=31, y=23},
 	belly = {x=32, y=36},
+	back = {x=31, y=23},
 	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_ziguranth_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=12, y=17},
 	hand2 = {x=49, y=39},
-	back = {x=34, y=15},
 	belly = {x=33, y=26},
+	back = {x=34, y=15},
 	head = {x=32, y=4},
 }
-tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
-	feet = {x=35, y=61},
-	hand1 = {x=8, y=38},
-	hand2 = {x=57, y=35},
-	back = {x=29, y=20},
-	belly = {x=34, y=34},
-	head = {x=25, y=9},
+tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
+	feet = {x=36, y=57},
+	hand1 = {x=17, y=23},
+	hand2 = {x=18, y=35},
+	belly = {x=36, y=31},
+	back = {x=32, y=18},
+	head = {x=28, y=5},
 }
-tiles["npc/humanoid_thalore_thalore_wilder.png"] = { base=64,
-	feet = {x=27, y=59},
-	hand1 = {x=11, y=31},
-	hand2 = {x=44, y=30},
-	back = {x=29, y=11},
-	belly = {x=28, y=23},
-	head = {x=29, y=-1},
+tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
+	feet = {x=30, y=61},
+	back = {x=32, y=19},
+	hand2 = {x=58, y=17},
+	hand1 = {x=9, y=36},
+	belly = {x=32, y=33},
+	head = {x=36, y=11},
 }
-tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
-	feet = {x=28, y=61},
-	hand1 = {x=6, y=30},
-	hand2 = {x=59, y=15},
-	back = {x=30, y=17},
-	belly = {x=28, y=30},
-	head = {x=40, y=5},
+tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=5, y=14},
+	hand2 = {x=57, y=30},
+	belly = {x=36, y=31},
+	back = {x=29, y=17},
+	head = {x=23, y=7},
 }
-tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=7, y=8},
-	hand2 = {x=57, y=39},
-	back = {x=35, y=20},
-	belly = {x=31, y=34},
-	head = {x=39, y=10},
+tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=19, y=7},
+	hand2 = {x=41, y=32},
+	belly = {x=34, y=29},
+	back = {x=32, y=17},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_naga_lady_zoisla_the_tidebringer.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=9, y=-28},
 	hand2 = {x=49, y=-20},
-	back = {x=30, y=-19},
 	belly = {x=30, y=-6},
+	back = {x=30, y=-19},
 	head = {x=30, y=-33},
 }
 tiles["npc/humanoid_yeek_yeek_mindslayer.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=23, y=34},
 	hand2 = {x=24, y=41},
-	back = {x=31, y=22},
 	belly = {x=30, y=37},
+	back = {x=31, y=22},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_great_gladiator.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=17, y=35},
 	hand2 = {x=47, y=32},
-	belly = {x=31, y=25},
 	back = {x=29, y=11},
+	belly = {x=31, y=25},
 	head = {x=29, y=0},
 }
 tiles["npc/humanoid_orc_gorbat__supreme_wyrmic_of_the_pride.png"] = { base=64,
 	feet = {x=38, y=60},
 	hand1 = {x=18, y=14},
 	hand2 = {x=53, y=45},
-	back = {x=34, y=25},
 	belly = {x=36, y=38},
+	back = {x=34, y=25},
 	head = {x=33, y=12},
 }
 tiles["npc/humanoid_human_townsfolk_singing_happy_drunk01_64.png"] = { base=64,
 	feet = {x=36, y=58},
 	hand1 = {x=9, y=40},
 	hand2 = {x=52, y=16},
-	back = {x=27, y=21},
 	belly = {x=30, y=31},
+	back = {x=27, y=21},
 	head = {x=23, y=10},
 }
-tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=11, y=20},
-	hand2 = {x=44, y=38},
-	belly = {x=31, y=31},
-	back = {x=29, y=18},
-	head = {x=29, y=5},
+tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
+	feet = {x=36, y=62},
+	hand1 = {x=9, y=39},
+	hand2 = {x=58, y=36},
+	belly = {x=34, y=34},
+	back = {x=29, y=21},
+	head = {x=25, y=9},
 }
-tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
-	feet = {x=35, y=59},
-	belly = {x=35, y=36},
-	hand1 = {x=16, y=47},
-	back = {x=32, y=24},
-	head = {x=30, y=5},
+tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=11, y=31},
+	hand2 = {x=51, y=25},
+	belly = {x=36, y=37},
+	back = {x=35, y=25},
+	head = {x=34, y=11},
 }
 dolls.race_orc = dolls.race_orc or {}
 dolls.race_orc.all = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=13, y=37},
 	hand2 = {x=52, y=38},
-	belly = {x=33, y=34},
 	back = {x=32, y=23},
+	belly = {x=33, y=34},
 	head = {x=32, y=9},
 }
 tiles["npc/humanoid_orc_krogar.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=14, y=0},
 	hand2 = {x=53, y=13},
-	back = {x=29, y=25},
 	belly = {x=29, y=35},
+	back = {x=29, y=25},
 	head = {x=30, y=11},
 }
-tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
-	feet = {x=31, y=58},
-	hand1 = {x=13, y=38},
-	hand2 = {x=48, y=41},
-	belly = {x=31, y=33},
-	back = {x=30, y=22},
-	head = {x=30, y=8},
+tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=38},
+	belly = {x=33, y=32},
+	back = {x=30, y=19},
+	head = {x=30, y=10},
 }
-tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
-	feet = {x=32, y=61},
-	belly = {x=32, y=9},
-	hand1 = {x=31, y=12},
-	back = {x=32, y=-3},
-	head = {x=34, y=-15},
+tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=12, y=30},
+	hand2 = {x=49, y=36},
+	back = {x=28, y=19},
+	belly = {x=28, y=28},
+	head = {x=24, y=9},
 }
-tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=4, y=-4},
-	hand2 = {x=58, y=2},
-	back = {x=32, y=-40},
-	belly = {x=30, y=-3},
-	head = {x=33, y=-55},
+tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
+	feet = {x=33, y=58},
+	hand1 = {x=16, y=35},
+	hand2 = {x=47, y=36},
+	back = {x=32, y=18},
+	belly = {x=32, y=29},
+	head = {x=31, y=5},
 }
-tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
-	feet = {x=26, y=61},
-	hand1 = {x=17, y=3},
-	hand2 = {x=38, y=35},
-	belly = {x=27, y=29},
-	back = {x=27, y=22},
-	head = {x=29, y=13},
+tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=24, y=17},
+	hand2 = {x=38, y=19},
+	belly = {x=33, y=26},
+	back = {x=33, y=15},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_rhaloren_inquisitor.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=9, y=17},
 	hand2 = {x=56, y=22},
-	back = {x=30, y=14},
 	belly = {x=31, y=26},
+	back = {x=30, y=14},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_human_multihued_wyrmic.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=13, y=39},
 	hand2 = {x=49, y=38},
-	back = {x=30, y=17},
 	belly = {x=31, y=30},
+	back = {x=30, y=17},
 	head = {x=30, y=8},
 }
 tiles["npc/humanoid_human_agrimley_the_hermit.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=23, y=36},
 	hand2 = {x=54, y=22},
-	belly = {x=35, y=30},
 	back = {x=35, y=17},
+	belly = {x=35, y=30},
 	head = {x=35, y=5},
 }
 tiles["npc/humanoid_human_meranas__herald_of_angolwen.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=16, y=40},
 	hand2 = {x=52, y=39},
-	back = {x=34, y=21},
 	belly = {x=35, y=31},
+	back = {x=34, y=21},
 	head = {x=31, y=4},
 }
-tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=11, y=37},
-	hand2 = {x=53, y=29},
-	back = {x=29, y=16},
-	belly = {x=31, y=33},
-	head = {x=29, y=4},
+tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
+	feet = {x=6, y=7},
+	hand1 = {x=33, y=50},
+	hand2 = {x=59, y=37},
+	belly = {x=23, y=29},
+	back = {x=34, y=29},
+	head = {x=46, y=19},
 }
 tiles["npc/humanoid_orc_kra_tor_the_gluttonous.png"] = { base=64,
 	feet = {x=38, y=57},
 	hand1 = {x=20, y=18},
 	hand2 = {x=38, y=-2},
-	back = {x=27, y=14},
 	belly = {x=29, y=27},
+	back = {x=27, y=14},
 	head = {x=23, y=1},
 }
-tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=8, y=28},
-	hand2 = {x=54, y=43},
-	belly = {x=36, y=36},
-	back = {x=33, y=24},
-	head = {x=30, y=10},
+tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
+	feet = {x=36, y=59},
+	hand1 = {x=9, y=34},
+	hand2 = {x=46, y=34},
+	back = {x=29, y=18},
+	belly = {x=30, y=29},
+	head = {x=28, y=7},
 }
-tiles["npc/humanoid_human_necromancer.png"] = { base=64,
-	feet = {x=27, y=61},
-	hand1 = {x=18, y=16},
-	hand2 = {x=40, y=41},
-	back = {x=34, y=17},
-	belly = {x=32, y=32},
-	head = {x=36, y=3},
+tiles["npc/humanoid_human_the_possessed.png"] = { base=64,
+	feet = {x=30, y=62},
+	hand1 = {x=9, y=17},
+	hand2 = {x=47, y=37},
+	belly = {x=33, y=35},
+	back = {x=33, y=17},
+	head = {x=33, y=4},
 }
 tiles["npc/humanoid_human_townsfolk_filthy_street_urchin01_64.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=49, y=40},
-	back = {x=31, y=21},
 	belly = {x=33, y=32},
+	back = {x=31, y=21},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_orc_icy_orc_wyrmic.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=21, y=21},
 	hand2 = {x=57, y=36},
-	back = {x=32, y=20},
 	belly = {x=32, y=32},
+	back = {x=32, y=20},
 	head = {x=26, y=7},
 }
 tiles["npc/humanoid_human_urkis__the_high_tempest.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=29},
-	back = {x=33, y=9},
 	belly = {x=33, y=24},
+	back = {x=33, y=9},
 	head = {x=33, y=-4},
 }
-tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=16, y=43},
-	hand2 = {x=45, y=39},
-	belly = {x=31, y=34},
-	back = {x=30, y=22},
-	head = {x=30, y=7},
+tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
+	feet = {x=39, y=59},
+	hand1 = {x=15, y=42},
+	hand2 = {x=47, y=10},
+	back = {x=31, y=27},
+	belly = {x=32, y=38},
+	head = {x=28, y=14},
 }
-tiles["npc/humanoid_human_bandit.png"] = { base=64,
-	feet = {x=39, y=56},
-	hand1 = {x=8, y=40},
-	hand2 = {x=51, y=26},
-	belly = {x=33, y=28},
-	back = {x=30, y=16},
-	head = {x=29, y=5},
+tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=4, y=30},
+	hand2 = {x=40, y=3},
+	belly = {x=42, y=29},
+	back = {x=33, y=20},
+	head = {x=24, y=11},
 }
 tiles["npc/humanoid_yaech_blood_master.png"] = { base=64,
 	feet = {x=22, y=60},
 	hand1 = {x=6, y=17},
 	hand2 = {x=50, y=27},
-	back = {x=29, y=25},
 	belly = {x=31, y=32},
+	back = {x=29, y=25},
 	head = {x=36, y=14},
 }
 tiles["npc/humanoid_dwarf_dwarven_summoner.png"] = { base=64,
 	feet = {x=38, y=59},
 	hand1 = {x=14, y=44},
 	hand2 = {x=54, y=44},
-	back = {x=39, y=24},
 	belly = {x=39, y=41},
+	back = {x=39, y=24},
 	head = {x=39, y=7},
 }
-tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=10, y=38},
-	hand2 = {x=58, y=17},
-	back = {x=32, y=19},
-	belly = {x=31, y=30},
-	head = {x=37, y=8},
+tiles["npc/humanoid_human_trickster.png"] = { base=64,
+	feet = {x=36, y=60},
+	back = {x=35, y=17},
+	hand2 = {x=5, y=32},
+	belly = {x=37, y=29},
+	head = {x=30, y=6},
 }
 tiles["npc/humanoid_human_townsfolk_boilcovered_wretch01_64.png"] = { base=64,
 	feet = {x=35, y=58},
 	hand1 = {x=19, y=38},
 	hand2 = {x=50, y=39},
-	back = {x=34, y=21},
 	belly = {x=34, y=34},
+	back = {x=34, y=21},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
-	feet = {x=34, y=58},
-	back = {x=36, y=22},
-	hand2 = {x=51, y=36},
-	belly = {x=35, y=37},
-	hand1 = {x=20, y=37},
-	head = {x=35, y=7},
+tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=14, y=32},
+	hand2 = {x=46, y=32},
+	back = {x=31, y=17},
+	belly = {x=31, y=29},
+	head = {x=31, y=5},
 }
 tiles["npc/humanoid_orc_orc_high_cryomancer.png"] = { base=64,
 	feet = {x=36, y=60},
 	hand1 = {x=7, y=17},
 	hand2 = {x=57, y=31},
-	back = {x=33, y=22},
 	belly = {x=37, y=32},
+	back = {x=33, y=22},
 	head = {x=26, y=8},
 }
-tiles["npc/humanoid_human_hexer.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=26, y=25},
-	hand2 = {x=37, y=25},
-	belly = {x=32, y=37},
-	back = {x=31, y=16},
-	head = {x=31, y=3},
+tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
+	feet = {x=37, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=48, y=33},
+	back = {x=34, y=17},
+	belly = {x=36, y=29},
+	head = {x=34, y=5},
 }
 tiles["npc/humanoid_orc_orc_elite_berserker.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=21},
 	hand2 = {x=54, y=31},
-	back = {x=33, y=17},
 	belly = {x=30, y=32},
+	back = {x=33, y=17},
 	head = {x=33, y=7},
 }
-tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
-	feet = {x=33, y=58},
-	hand1 = {x=16, y=35},
-	hand2 = {x=47, y=36},
-	belly = {x=32, y=29},
-	back = {x=32, y=18},
-	head = {x=31, y=5},
+tiles["npc/humanoid_human_spectator03.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=38},
+	hand2 = {x=44, y=38},
+	belly = {x=30, y=30},
+	back = {x=30, y=19},
+	head = {x=30, y=4},
 }
-tiles["npc/humanoid_shalore_elven_tempest.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=11, y=9},
-	hand2 = {x=49, y=36},
-	back = {x=32, y=16},
+tiles["npc/humanoid_shalore_elven_cultist.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=8, y=9},
+	hand2 = {x=52, y=9},
 	belly = {x=31, y=28},
-	head = {x=33, y=7},
+	back = {x=30, y=16},
+	head = {x=31, y=6},
 }
 tiles["npc/humanoid_human_townsfolk_pitiful_looking_beggar01_64.png"] = { base=64,
 	feet = {x=41, y=60},
+	belly = {x=41, y=33},
 	back = {x=40, y=20},
 	hand1 = {x=25, y=32},
-	belly = {x=41, y=33},
 	head = {x=31, y=10},
 }
+tiles["npc/humanoid_shalore_elven_tempest.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=11, y=9},
+	hand2 = {x=49, y=36},
+	belly = {x=31, y=28},
+	back = {x=32, y=16},
+	head = {x=33, y=7},
+}
 tiles["npc/humanoid_dwarf_ziguranth_warrior.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=18, y=43},
 	hand2 = {x=50, y=44},
-	belly = {x=35, y=36},
 	back = {x=35, y=22},
+	belly = {x=35, y=36},
 	head = {x=35, y=7},
 }
-tiles["npc/humanoid_human_high_slinger.png"] = { base=64,
-	feet = {x=29, y=59},
-	hand1 = {x=15, y=36},
-	hand2 = {x=57, y=18},
-	belly = {x=30, y=27},
-	back = {x=31, y=15},
-	head = {x=33, y=6},
-}
-tiles["npc/humanoid_human_celia.png"] = { base=64,
-	feet = {x=28, y=59},
-	hand1 = {x=15, y=16},
-	hand2 = {x=50, y=-20},
-	belly = {x=28, y=2},
-	back = {x=29, y=-16},
-	head = {x=29, y=-33},
+tiles["npc/humanoid_human_bandit_lord.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=20, y=20},
+	hand2 = {x=38, y=21},
+	back = {x=31, y=16},
+	belly = {x=32, y=30},
+	head = {x=30, y=5},
 }
 tiles["npc/humanoid_shalore_archmage_tarelion.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=17, y=26},
 	hand2 = {x=45, y=26},
-	back = {x=31, y=0},
 	belly = {x=33, y=18},
+	back = {x=31, y=0},
 	head = {x=30, y=-11},
 }
+tiles["npc/humanoid_human_celia.png"] = { base=64,
+	feet = {x=28, y=59},
+	hand1 = {x=15, y=16},
+	hand2 = {x=50, y=-20},
+	back = {x=29, y=-16},
+	belly = {x=28, y=2},
+	head = {x=29, y=-33},
+}
 tiles["npc/humanoid_human_blood_mage.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=42},
 	hand2 = {x=51, y=18},
-	belly = {x=30, y=30},
 	back = {x=29, y=19},
+	belly = {x=30, y=30},
 	head = {x=28, y=5},
 }
-tiles["npc/humanoid_human_geomancer.png"] = { base=64,
-	feet = {x=26, y=59},
-	hand1 = {x=19, y=31},
-	hand2 = {x=42, y=6},
-	belly = {x=27, y=28},
-	back = {x=28, y=15},
-	head = {x=28, y=2},
-}
 tiles["npc/humanoid_shalore_elven_mage.png"] = { base=64,
 	feet = {x=31, y=61},
 	hand1 = {x=11, y=35},
 	hand2 = {x=50, y=39},
-	back = {x=31, y=18},
 	belly = {x=31, y=30},
+	back = {x=31, y=18},
 	head = {x=30, y=6},
 }
+tiles["npc/humanoid_human_geomancer.png"] = { base=64,
+	feet = {x=26, y=59},
+	hand1 = {x=19, y=31},
+	hand2 = {x=42, y=6},
+	back = {x=28, y=15},
+	belly = {x=27, y=28},
+	head = {x=28, y=2},
+}
 tiles["npc/humanoid_orc_orc_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=9, y=35},
 	hand2 = {x=57, y=34},
-	back = {x=28, y=18},
 	belly = {x=32, y=34},
+	back = {x=28, y=18},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_human_fallen_sun_paladin_aeryn.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=15, y=20},
 	hand2 = {x=45, y=25},
-	belly = {x=32, y=14},
 	back = {x=32, y=0},
+	belly = {x=32, y=14},
 	head = {x=31, y=-12},
 }
 tiles["npc/humanoid_yeek_yeek_commoner_07.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=48, y=36},
-	back = {x=30, y=23},
 	belly = {x=33, y=37},
+	back = {x=30, y=23},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_assassin.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=16},
 	hand2 = {x=51, y=33},
-	belly = {x=34, y=32},
 	back = {x=31, y=16},
+	belly = {x=34, y=32},
 	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_bandit_lord.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=20, y=20},
-	hand2 = {x=38, y=21},
-	belly = {x=32, y=30},
-	back = {x=31, y=16},
-	head = {x=30, y=5},
-}
 tiles["npc/humanoid_orc_warmaster_gnarg.png"] = { base=64,
 	feet = {x=40, y=60},
 	hand1 = {x=60, y=27},
 	hand2 = {x=58, y=28},
-	back = {x=32, y=18},
 	belly = {x=43, y=29},
+	back = {x=32, y=18},
 	head = {x=21, y=9},
 }
 tiles["npc/humanoid_yeek_yeek_wayist.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=14, y=34},
 	hand2 = {x=58, y=36},
-	back = {x=37, y=24},
 	belly = {x=37, y=35},
+	back = {x=37, y=24},
 	head = {x=38, y=13},
 }
+tiles["npc/humanoid_human_high_slinger.png"] = { base=64,
+	feet = {x=29, y=59},
+	hand1 = {x=15, y=36},
+	hand2 = {x=57, y=18},
+	back = {x=31, y=15},
+	belly = {x=30, y=27},
+	head = {x=33, y=6},
+}
 tiles["npc/humanoid_human_thief.png"] = { base=64,
 	feet = {x=27, y=60},
 	hand1 = {x=8, y=27},
 	hand2 = {x=43, y=30},
-	back = {x=24, y=19},
 	belly = {x=27, y=30},
+	back = {x=24, y=19},
 	head = {x=18, y=7},
 }
 tiles["npc/humanoid_shalore_mean_looking_elven_guard.png"] = { base=64,
 	feet = {x=33, y=60},
+	back = {x=31, y=14},
 	belly = {x=32, y=27},
 	hand1 = {x=14, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_human_subject_z.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=8, y=11},
 	hand2 = {x=55, y=11},
-	back = {x=31, y=15},
 	belly = {x=31, y=27},
+	back = {x=31, y=15},
 	head = {x=32, y=3},
 }
-tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
-	feet = {x=35, y=57},
-	hand1 = {x=16, y=39},
-	hand2 = {x=52, y=39},
-	back = {x=33, y=19},
-	belly = {x=33, y=30},
-	head = {x=32, y=7},
-}
-tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=10, y=20},
-	hand2 = {x=23, y=35},
-	back = {x=30, y=21},
-	belly = {x=32, y=35},
-	head = {x=31, y=11},
+tiles["npc/humanoid_human_hexer.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=26, y=25},
+	hand2 = {x=37, y=25},
+	back = {x=31, y=16},
+	belly = {x=32, y=37},
+	head = {x=31, y=3},
 }
 tiles["npc/humanoid_orc_orc_baby.png"] = { base=64,
 	feet = {x=41, y=40},
 	hand1 = {x=12, y=43},
 	hand2 = {x=30, y=44},
-	back = {x=31, y=21},
 	belly = {x=39, y=26},
+	back = {x=31, y=21},
 	head = {x=19, y=22},
 }
-tiles["npc/humanoid_human_argoniel.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=9, y=2},
-	hand2 = {x=57, y=9},
-	belly = {x=32, y=22},
-	back = {x=32, y=10},
-	head = {x=32, y=-3},
+tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=8, y=15},
+	hand2 = {x=56, y=40},
+	belly = {x=28, y=31},
+	back = {x=34, y=21},
+	head = {x=37, y=9},
 }
 tiles["npc/humanoid_human_last_hope_guard.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=45, y=28},
-	back = {x=31, y=15},
 	belly = {x=30, y=26},
+	back = {x=31, y=15},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
-	feet = {x=31, y=55},
-	hand1 = {x=8, y=36},
-	hand2 = {x=48, y=35},
-	back = {x=29, y=24},
-	belly = {x=30, y=32},
-	head = {x=25, y=12},
-}
-tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=9, y=32},
-	hand2 = {x=58, y=18},
-	back = {x=30, y=20},
-	belly = {x=28, y=33},
-	head = {x=39, y=10},
+tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=14, y=10},
+	hand2 = {x=52, y=40},
+	belly = {x=35, y=32},
+	back = {x=32, y=19},
+	head = {x=30, y=8},
 }
-tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=15, y=36},
-	hand2 = {x=46, y=36},
+tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=18, y=37},
+	hand2 = {x=42, y=37},
 	back = {x=30, y=17},
-	belly = {x=30, y=33},
-	head = {x=30, y=7},
+	belly = {x=30, y=32},
+	head = {x=30, y=6},
+}
+tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=37},
+	hand2 = {x=45, y=36},
+	back = {x=30, y=15},
+	belly = {x=31, y=31},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_dwarf_dwarven_paddlestriker.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=15, y=37},
 	hand2 = {x=57, y=33},
-	back = {x=33, y=22},
 	belly = {x=35, y=35},
+	back = {x=33, y=22},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_alchemist.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=10, y=32},
-	hand2 = {x=51, y=34},
-	belly = {x=34, y=32},
-	back = {x=33, y=19},
-	head = {x=33, y=5},
-}
-tiles["npc/humanoid_human_martyr.png"] = { base=64,
+tiles["npc/humanoid_human_tannen.png"] = { base=64,
 	feet = {x=37, y=60},
-	hand1 = {x=17, y=29},
-	hand2 = {x=46, y=31},
-	back = {x=29, y=14},
-	belly = {x=30, y=27},
-	head = {x=28, y=3},
+	hand1 = {x=10, y=16},
+	hand2 = {x=56, y=14},
+	belly = {x=35, y=28},
+	back = {x=31, y=15},
+	head = {x=29, y=4},
+}
+tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=9, y=32},
+	hand2 = {x=58, y=18},
+	belly = {x=28, y=33},
+	back = {x=30, y=20},
+	head = {x=39, y=10},
 }
 tiles["npc/humanoid_human_apprentice_mage.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=15, y=38},
 	hand2 = {x=42, y=34},
-	belly = {x=29, y=29},
 	back = {x=29, y=16},
+	belly = {x=29, y=29},
 	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
-	feet = {x=33, y=57},
-	hand1 = {x=11, y=28},
-	hand2 = {x=53, y=38},
-	back = {x=33, y=20},
-	belly = {x=33, y=33},
-	head = {x=30, y=7},
+tiles["npc/humanoid_player_default.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=21, y=35},
+	hand2 = {x=44, y=36},
+	belly = {x=33, y=28},
+	back = {x=32, y=14},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_townsfolk_aimless_looking_merchant01_64.png"] = { base=64,
 	feet = {x=37, y=58},
 	hand1 = {x=14, y=48},
 	hand2 = {x=52, y=23},
-	back = {x=31, y=24},
 	belly = {x=35, y=38},
+	back = {x=31, y=24},
 	head = {x=29, y=6},
 }
-tiles["npc/humanoid_orc_orc_mother.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=10, y=37},
-	hand2 = {x=53, y=35},
-	back = {x=30, y=9},
-	belly = {x=30, y=31},
-	head = {x=28, y=-6},
+tiles["npc/humanoid_orc_orc_archer.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=20, y=29},
+	hand2 = {x=56, y=30},
+	belly = {x=31, y=34},
+	back = {x=30, y=20},
+	head = {x=31, y=10},
 }
 tiles["npc/humanoid_dwarf_lumberjack.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=17, y=16},
 	hand2 = {x=49, y=41},
-	back = {x=34, y=27},
 	belly = {x=35, y=38},
+	back = {x=34, y=27},
 	head = {x=34, y=8},
 }
-tiles["npc/humanoid_human_spectator02.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=18, y=37},
-	hand2 = {x=41, y=37},
-	back = {x=30, y=16},
-	belly = {x=31, y=30},
-	head = {x=30, y=5},
+tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
+	feet = {x=34, y=58},
+	back = {x=36, y=22},
+	hand2 = {x=51, y=36},
+	hand1 = {x=20, y=37},
+	belly = {x=35, y=37},
+	head = {x=35, y=7},
 }
-tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
-	feet = {x=32, y=58},
-	hand1 = {x=17, y=31},
-	hand2 = {x=45, y=41},
-	belly = {x=29, y=32},
-	back = {x=29, y=21},
-	head = {x=29, y=8},
+tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=12, y=15},
+	hand2 = {x=47, y=-14},
+	belly = {x=30, y=7},
+	back = {x=27, y=-6},
+	head = {x=26, y=-17},
 }
-tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=19, y=41},
-	hand2 = {x=47, y=40},
-	back = {x=31, y=19},
-	belly = {x=31, y=33},
-	head = {x=29, y=7},
+tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
+	feet = {x=35, y=59},
+	back = {x=32, y=24},
+	belly = {x=35, y=36},
+	hand1 = {x=16, y=47},
+	head = {x=30, y=5},
 }
 tiles["npc/humanoid_human_valfred_loren.png"] = { base=64,
 	feet = {x=29, y=57},
 	hand1 = {x=19, y=36},
 	hand2 = {x=45, y=22},
-	back = {x=29, y=17},
 	belly = {x=29, y=25},
+	back = {x=29, y=17},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_elf_anorithil.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=12, y=15},
 	hand2 = {x=55, y=30},
-	belly = {x=40, y=29},
 	back = {x=38, y=18},
+	belly = {x=40, y=29},
 	head = {x=29, y=4},
 }
 tiles["npc/humanoid_orc_golbug_the_destroyer.png"] = { base=64,
 	feet = {x=29, y=58},
 	hand1 = {x=9, y=35},
 	hand2 = {x=51, y=33},
-	back = {x=30, y=12},
 	belly = {x=29, y=25},
+	back = {x=30, y=12},
 	head = {x=32, y=-1},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=36},
-	back = {x=31, y=21},
-	belly = {x=33, y=34},
-	head = {x=31, y=11},
+tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
+	feet = {x=28, y=61},
+	hand1 = {x=6, y=30},
+	hand2 = {x=59, y=15},
+	belly = {x=28, y=30},
+	back = {x=30, y=17},
+	head = {x=40, y=5},
 }
-tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=11, y=36},
-	hand2 = {x=57, y=37},
-	back = {x=33, y=17},
-	belly = {x=34, y=32},
-	head = {x=32, y=5},
+tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=7, y=39},
+	hand2 = {x=53, y=36},
+	belly = {x=30, y=32},
+	back = {x=28, y=17},
+	head = {x=29, y=6},
 }
-tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=19, y=35},
-	hand2 = {x=49, y=35},
-	back = {x=32, y=17},
-	belly = {x=33, y=29},
-	head = {x=29, y=4},
+tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=17, y=40},
+	hand2 = {x=50, y=44},
+	belly = {x=32, y=36},
+	back = {x=32, y=25},
+	head = {x=32, y=8},
 }
-tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=4, y=32},
-	hand2 = {x=60, y=39},
-	back = {x=35, y=18},
-	belly = {x=34, y=30},
-	head = {x=37, y=7},
+tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
+	feet = {x=32, y=58},
+	hand1 = {x=17, y=31},
+	hand2 = {x=45, y=41},
+	back = {x=29, y=21},
+	belly = {x=29, y=32},
+	head = {x=29, y=8},
 }
 tiles["npc/humanoid_orc_orc_grand_summoner.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=9, y=8},
 	hand2 = {x=55, y=35},
-	back = {x=34, y=18},
 	belly = {x=32, y=30},
+	back = {x=34, y=18},
 	head = {x=36, y=7},
 }
 tiles["npc/humanoid_orc_rak_shor__grand_necromancer_of_the_pride.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=6, y=39},
 	hand2 = {x=54, y=32},
-	back = {x=28, y=20},
 	belly = {x=28, y=35},
+	back = {x=28, y=20},
 	head = {x=27, y=7},
 }
-tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { base=64,
-	feet = {x=33, y=58},
-	hand1 = {x=15, y=19},
-	hand2 = {x=45, y=25},
-	belly = {x=33, y=16},
-	back = {x=32, y=1},
-	head = {x=31, y=-12},
+tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=18, y=38},
+	hand2 = {x=52, y=31},
+	belly = {x=33, y=30},
+	back = {x=33, y=18},
+	head = {x=32, y=8},
 }
 tiles["npc/humanoid_human_ben_cruthdar__the_cursed.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=17, y=33},
 	hand2 = {x=46, y=19},
-	belly = {x=30, y=32},
 	back = {x=29, y=17},
+	belly = {x=30, y=32},
 	head = {x=28, y=4},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=17, y=40},
-	hand2 = {x=50, y=44},
-	back = {x=32, y=25},
-	belly = {x=32, y=36},
-	head = {x=32, y=8},
+tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { base=64,
+	feet = {x=33, y=58},
+	hand1 = {x=15, y=19},
+	hand2 = {x=45, y=25},
+	back = {x=32, y=1},
+	belly = {x=33, y=16},
+	head = {x=31, y=-12},
 }
-tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=7, y=39},
-	hand2 = {x=53, y=36},
-	back = {x=28, y=17},
-	belly = {x=30, y=32},
-	head = {x=29, y=6},
+tiles["npc/humanoid_human_slinger.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=50, y=36},
+	belly = {x=37, y=27},
+	back = {x=34, y=17},
+	head = {x=34, y=5},
 }
 dolls.race_elf = dolls.race_elf or {}
 dolls.race_elf.female = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=33},
 	hand2 = {x=46, y=33},
-	back = {x=33, y=14},
 	belly = {x=34, y=27},
+	back = {x=33, y=14},
 	head = {x=31, y=3},
 }
 tiles["npc/humanoid_naga_naga_nereid.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=25, y=40},
 	hand2 = {x=59, y=31},
-	back = {x=37, y=17},
 	belly = {x=38, y=28},
+	back = {x=37, y=17},
 	head = {x=35, y=5},
 }
-tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
-	feet = {x=36, y=57},
-	hand1 = {x=17, y=23},
-	hand2 = {x=18, y=35},
-	back = {x=32, y=18},
-	belly = {x=36, y=31},
-	head = {x=28, y=5},
+tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=36},
+	belly = {x=33, y=34},
+	back = {x=31, y=21},
+	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_homeless_fighter.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=6, y=34},
 	hand2 = {x=57, y=34},
-	belly = {x=33, y=34},
 	back = {x=33, y=25},
+	belly = {x=33, y=34},
 	head = {x=32, y=9},
 }
-tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=11, y=31},
-	hand2 = {x=51, y=25},
-	back = {x=35, y=25},
-	belly = {x=36, y=37},
-	head = {x=34, y=11},
+tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=19, y=41},
+	hand2 = {x=47, y=40},
+	belly = {x=31, y=33},
+	back = {x=31, y=19},
+	head = {x=29, y=7},
 }
 tiles["npc/humanoid_orc_orc_berserker.png"] = { base=64,
 	feet = {x=45, y=60},
 	hand1 = {x=11, y=36},
 	hand2 = {x=40, y=17},
-	back = {x=20, y=19},
 	belly = {x=30, y=31},
+	back = {x=20, y=19},
 	head = {x=17, y=9},
 }
 tiles["npc/humanoid_yaech_yaech_diver.png"] = { base=64,
 	feet = {x=52, y=3},
 	hand1 = {x=9, y=56},
 	hand2 = {x=40, y=57},
-	back = {x=30, y=36},
 	belly = {x=39, y=31},
+	back = {x=30, y=36},
 	head = {x=16, y=39},
 }
-tiles["npc/humanoid_human_tannen.png"] = { base=64,
+tiles["npc/humanoid_human_martyr.png"] = { base=64,
 	feet = {x=37, y=60},
-	hand1 = {x=10, y=16},
-	hand2 = {x=56, y=14},
-	back = {x=31, y=15},
-	belly = {x=35, y=28},
-	head = {x=29, y=4},
+	hand1 = {x=17, y=29},
+	hand2 = {x=46, y=31},
+	belly = {x=30, y=27},
+	back = {x=29, y=14},
+	head = {x=28, y=3},
 }
 tiles["npc/humanoid_female_sluttymaid.png"] = { base=64,
 	feet = {x=31, y=59},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=20},
-	belly = {x=35, y=23},
 	back = {x=35, y=12},
+	belly = {x=35, y=23},
 	head = {x=36, y=0},
 }
 tiles["npc/humanoid_halfling_derth_guard.png"] = { base=64,
 	feet = {x=28, y=60},
 	hand1 = {x=22, y=13},
 	hand2 = {x=47, y=44},
-	belly = {x=33, y=40},
 	back = {x=34, y=31},
+	belly = {x=33, y=40},
 	head = {x=37, y=16},
 }
 tiles["npc/humanoid_orc_massok_the_dragonslayer.png"] = { base=64,
 	feet = {x=34, y=58},
 	hand1 = {x=13, y=33},
 	hand2 = {x=55, y=35},
-	back = {x=32, y=12},
 	belly = {x=33, y=28},
+	back = {x=32, y=12},
 	head = {x=29, y=-3},
 }
-tiles["npc/humanoid_human_gladiator.png"] = { base=64,
-	feet = {x=35, y=58},
-	hand1 = {x=13, y=35},
-	hand2 = {x=53, y=36},
-	belly = {x=35, y=31},
-	back = {x=34, y=19},
-	head = {x=32, y=7},
+tiles["npc/humanoid_human_reaver.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=8, y=37},
+	hand2 = {x=52, y=31},
+	belly = {x=29, y=29},
+	back = {x=29, y=17},
+	head = {x=28, y=6},
 }
-tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=14, y=32},
-	hand2 = {x=46, y=32},
-	belly = {x=31, y=29},
-	back = {x=31, y=17},
-	head = {x=31, y=5},
+tiles["npc/humanoid_human_alchemist.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=10, y=32},
+	hand2 = {x=51, y=34},
+	back = {x=33, y=19},
+	belly = {x=34, y=32},
+	head = {x=33, y=5},
 }
-tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=8, y=15},
-	hand2 = {x=56, y=40},
-	back = {x=34, y=21},
-	belly = {x=28, y=31},
-	head = {x=37, y=9},
+tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=4, y=32},
+	hand2 = {x=60, y=39},
+	belly = {x=34, y=30},
+	back = {x=35, y=18},
+	head = {x=37, y=7},
 }
 tiles["npc/humanoid_human_sun_paladin_guren.png"] = { base=64,
 	feet = {x=35, y=60},
+	back = {x=30, y=15},
 	belly = {x=31, y=29},
 	hand1 = {x=21, y=35},
-	back = {x=30, y=15},
 	head = {x=30, y=3},
 }
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png
index 60cbd5167f041a7b6a401f3d006b5ab054e368f9..d4adfce98b3d753862d7eba369830d35fffecc9e 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png
index cab86b37b3a486982b54c04c8229d317c003d7fb..ea36ad8b2ed9789e429cec21e233b4a695f16dee 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png
index 3277b95828a9c75a38a165bddf73ae787176eb67..516a19eea81500f41b1c79f3ac6e2078f73f99af 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png
index 35fc9211913aca954c2954016cdd7f434ca3b24e..a20c8a8d3284b73f0d9594fee20bab5f3def0c09 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png
index c9b972ba22b094fbbb794b4ce2d522176d5f14ce..1176c5b19799e1536f5abbe3e1c278c9a27b0455 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png
index a719577ebd34b7ec518845dc1d0643272baa8670..2762f58128b6a657f403333e43d0b527013c7c5a 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png
index 0de68136c9fd1d49f505b3a309e02a707088d2ec..c1218b49738662e0b6c73f5e0b02a2da73e21d11 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png
index d3d15c5404e34a2ca226af029c6408d2371e3137..519260390cfd8dbd7d1fc9e1104d5ce73ab5048d 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png
index 1ace94f8ab1a6c973a09c8bdb958a0afe2680882..4129e2fd49b1abf9baf9bad18da00eb86a57b652 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png
index 7bb67a2f52debe3d61563598fc7d3d570d8553be..ffea67edb3026d2e9bde6a9c9a38aa5ff00d5c28 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png
index 1b007be31068bf03d2734a4a64107a8f7ecf4ea4..8678a36c01786499547307d6a3d69e99f6df3b96 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png
index b447a08353162317aa4268ee514542de9b3b25aa..4af54b20ba738a6c683905ab9c50d9f57a6a7834 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png
index bc8684e001d3a37fd584f6b9263491c269b084ad..55392b423b37bc8817dae15b100bd03b34724ee9 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png
index 1c939c976f35240ad47917e195ed6e39b8a7c115..37591fb5a7708e6aa5a91c2b7e2097dba6f57a72 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png
index 38841d000a93dbe433f480d6061385f03de58b37..f480e8c42ead794589838f9c372f6b35fa78f8b5 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png
index d30c28a7c7a171a32391fe71e97a2cd7d3a402aa..12714cc10e086136c1782a0bc121c2a0ba5aceae 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png
index 702046eca2439028c01165c900dfa67d71cefbdd..c80f829d2e53e39f852078cde9f5c9bd6ce5c45c 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png
index 065362a4cbd716044c5ea2eea41dca8215c9f64e..80ad399ae07708375f61815cc8784cb965e033c3 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png
index 3ec3aad45946c5f80f6e946f7919ef80d2c3b564..56c58a118bc700c38a42cb8c451e3c79cf45c15c 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png
index 25ae0f8c25821af030817fff5ba7b910f264f209..80e6073248d1f5c6e120ac51f75a930f1b9160e1 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png
index a9df501d5c0f8968411ffbb881a09d91d426670e..ff5d99bb6676486fa41c022f81900ee4cb54c956 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png
index 558d8f6a5241ff85b3acfebfcc19886bfddefd4a..89a02791895612ee5fc0ac472453c9d5a80c5dd1 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png
index b1b132f286b38d2bdb32c1998dcf070dbefe00ee..a1b3a0881a411918754a4eb60c44b48ee893f4fe 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png
index ea1be430becb8478a1150e26bc66dccc436f9ef2..6647a4d5b18587d8e23df8a8ddba816861ff4398 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/talents/psionic/other.lua b/game/modules/tome/data/talents/psionic/other.lua
index d4ca28f62df320c3198db1656805b9327715a51a..e30a5ebf16214b13913867c568750cd9d8920eb0 100644
--- a/game/modules/tome/data/talents/psionic/other.lua
+++ b/game/modules/tome/data/talents/psionic/other.lua
@@ -97,6 +97,9 @@ newTalent{
 	tactical = { BUFF = 3 },
 	do_tkautoattack = function(self, t)
 		if game.zone.wilderness then return end
+		local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
+		if type(tkweapon) == "boolean" then tkweapon = nil end
+		if not tkweapon or tkweapon.type ~= "weapon" or tkweapon.subtype == "mindstar" then return end
 
 		local targnum = 1
 		if self:hasEffect(self.EFF_PSIFRENZY) then targnum = self:callTalent(self.T_FRENZIED_PSIFIGHTING, "getTargNum") end
@@ -125,10 +128,6 @@ newTalent{
 						print("[PSI ATTACK] attacking with", o.name)
 						self:attr("use_psi_combat", 1)
 						local s, h = self:attackTargetWith(a, o.combat, nil, 1)
--- MAKE IT DO STUFF
--- phys weapon => apply wil/cun conversion
--- mindstars => random grab
--- gems => +stats
 						self:attr("use_psi_combat", -1)
 						speed = math.max(speed or 0, s)
 						hit = hit or h
@@ -149,32 +148,59 @@ newTalent{
 		if not self:getInven("PSIONIC_FOCUS") then return false end
 		local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
 		if type(tkweapon) == "boolean" then tkweapon = nil end
-		if not tkweapon or tkweapon.type == "gem" or tkweapon.archery then
+		if not tkweapon or (tkweapon.type ~= "weapon" and tkweapon.type ~= "gem") then
 --			game.logPlayer(self, "You cannot do that without a telekinetically-wielded melee weapon.")
 			return false
 		end
 		return true
 	end,
 	activate = function (self, t)
-		return true
+		local tk = self:getInven("PSIONIC_FOCUS")[1]
+
+		local ret = {}
+		if tk.type == "gem" then
+			local power = (tk.material_level or 1) * 4
+			self:talentTemporaryValue(ret, "inc_stats", {
+				[self.STAT_STR] = power,
+				[self.STAT_DEX] = power,
+				[self.STAT_MAG] = power,
+				[self.STAT_WIL] = power,
+				[self.STAT_CUN] = power,
+				[self.STAT_CON] = power,
+			})
+		elseif tk.subtype == "mindstar" then
+		else
+			self:talentTemporaryValue(ret, "use_psi_combat", 1)
+		end
+		return ret
 	end,
 	deactivate =  function (self, t)
 		return true
 	end,
 	info = function(self, t)
+		local base = [[Allows you to wield a physical melee weapon, a mindstar or a gem telekinetically, gaining a special effect for each.
+		A gem will provide +4 bonus to all primary stats per tier of the gem and increases the range of some attack talents by 1 per tier.
+		A mindstar will randomly try to grab (7% chance and 1.5 range per tier of the mindstar) a far away foe and bring it to melee range.
+		A physical melee weapon will act as a semi independant entity, attacking foes nearby each turn while also replacing Strength and Dexterity with Willpower and Cunning for accuracy and damage calculations.
+
+		]]
+
+		local o = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
+		if type(o) == "boolean" then o = nil end
+		if not o then return base end
+
 		local atk = 0
 		local dam = 0
 		local apr = 0
 		local crit = 0
 		local speed = 1
-		local o = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
-		if type(o) == "boolean" then o = nil end
-		if not o then
-			return ([[Allows you to wield a weapon telekinetically, directing it with your willpower and cunning rather than crude flesh. When activated, the telekinetically-wielded weapon will attack a random melee-range target each turn.
-			The telekinetically-wielded weapon uses Willpower in place of Strength and Cunning in place of Dexterity to determine attack and damage.
-			You are not telekinetically wielding anything right now.]])
-		end
-		if o.type == "weapon" then
+		if o.type == "gem" then
+			local ml = o.material_level or 1
+			base = base..([[The telekinetically-wielded gem grants you +%d stats and +%d range.]]):format(ml * 4, ml)
+		elseif o.subtype == "mindstar" then
+			local ml = o.material_level or 1			
+			base = base..([[The telekinetically-wielded mindstar has %d%% chances to grab a foe up to %d range away.]]):format(ml * 7, math.ceil(ml * 1.5))
+		else
 			self:attr("use_psi_combat", 1)
 			atk = self:combatAttack(o.combat)
 			dam = self:combatDamage(o.combat)
@@ -182,15 +208,15 @@ newTalent{
 			crit = self:combatCrit(o.combat)
 			speed = self:combatSpeed(o.combat)
 			self:attr("use_psi_combat", -1)
+			base = base..([[The telekinetically-wielded weapon uses Willpower in place of Strength, and Cunning in place of Dexterity, to determine Accuracy and damage.
+			Combat stats:
+			Accuracy: %d
+			Damage: %d
+			APR: %d
+			Crit: %0.2f
+			Speed: %0.2f]]):
+			format(atk, dam, apr, crit, speed)
 		end
-		return ([[Allows you to wield a weapon telekinetically, directing it with your Willpower and Cunning rather than crude flesh. When activated, the telekinetically-wielded weapon will attack a random melee-range target each turn.
-		The telekinetically-wielded weapon uses Willpower in place of Strength, and Cunning in place of Dexterity, to determine Accuracy and damage.
-		Combat stats:
-		Accuracy: %d
-		Damage: %d
-		APR: %d
-		Crit: %0.2f
-		Speed: %0.2f]]):
-		format(atk, dam, apr, crit, speed)
+		return base
 	end,
 }
diff --git a/game/modules/tome/data/talents/psionic/psionic.lua b/game/modules/tome/data/talents/psionic/psionic.lua
index cd855d9c32f9d442c8b164d663549547dae4ed93..766c20bdb7ad3405e84ba56efa8c299e6e463289 100644
--- a/game/modules/tome/data/talents/psionic/psionic.lua
+++ b/game/modules/tome/data/talents/psionic/psionic.lua
@@ -155,7 +155,7 @@ function getGemLevel(self)
 	local gem_level = 0
 	if self:getInven("PSIONIC_FOCUS") then
 		local tk_item = self:getInven("PSIONIC_FOCUS")[1]
-		if tk_item and ((tk_item.type == "gem") or (tk_item.subtype == "mindstar") or tk_item.combat.is_psionic_focus == true) then
+		if tk_item and ((tk_item.type == "gem") or tk_item.combat.is_psionic_focus == true) then
 			gem_level = tk_item.material_level or 5
 		end
 	end
diff --git a/game/modules/tome/data/zones/old-forest/grids.lua b/game/modules/tome/data/zones/old-forest/grids.lua
index 37181189b83b4ded054410f9af005ce54a36a5d1..ca323c6caddbed7c145ebd1b49749aed2b29d781 100644
--- a/game/modules/tome/data/zones/old-forest/grids.lua
+++ b/game/modules/tome/data/zones/old-forest/grids.lua
@@ -21,25 +21,38 @@ load("/data/general/grids/basic.lua")
 load("/data/general/grids/forest.lua")
 load("/data/general/grids/water.lua")
 
+local grass_editer = { method="borders_def", def="dark_grass"}
+
+newEntity{
+	define_as = "GRASS",
+	type = "floor", subtype = "dark_grass",
+	name = "grass", image = "terrain/grass/dark_grass_main_01.png",
+	display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	grow = "TREE",
+	nice_tiler = { method="replace", base={"GRASS_PATCH", 100, 1, 14}},
+	nice_editer = grass_editer,
+}
+for i = 1, 14 do newEntity{ base = "GRASS", define_as = "GRASS_PATCH"..i, image = ("terrain/grass/dark_grass_main_%02d.png"):format(i) } end
+
 local treesdef = {
-	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
-	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
-	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
-	{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
-	{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
-	{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
-	{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
-	{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+	{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+	{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+	{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+	{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
 
 	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
 	{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
@@ -61,11 +74,39 @@ local treesdef = {
 	{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
 }
 
+newEntity{
+	define_as = "TREE",
+	type = "wall", subtype = "dark_grass",
+	name = "tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "GRASS",
+	nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
+newEntity{
+	define_as = "HARDTREE",
+	type = "wall", subtype = "dark_grass",
+	name = "tall thick tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	does_block_move = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	nice_tiler = { method="replace", base={"HARDTREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
 for i = 1, 30 do
-	newEntity(class:makeNewTrees({base="TREE", define_as = "TREE"..i, image = "terrain/grass.png"}, treesdef, 3))
+	newEntity(class:makeNewTrees({base="TREE", define_as = "TREE"..i, image = "terrain/grass/dark_grass_main_01.png"}, treesdef, 3))
 end
 for i = 1, 30 do
-	newEntity(class:makeNewTrees({base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass.png"}, treesdef))
+	newEntity(class:makeNewTrees({base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass/dark_grass_main_01.png"}, treesdef))
 end
 
 newEntity{
diff --git a/game/modules/tome/data/zones/old-forest/zone.lua b/game/modules/tome/data/zones/old-forest/zone.lua
index 6f4f393a7119bc4019a91d2e24b6a2bd0f2d78c3..b807f64a11c30635c6a9f7d1a7941b4e96f28b53 100644
--- a/game/modules/tome/data/zones/old-forest/zone.lua
+++ b/game/modules/tome/data/zones/old-forest/zone.lua
@@ -32,8 +32,8 @@ return {
 	all_lited = true,
 	day_night = true,
 	persistent = "zone",
-	color_shown = {0.7, 0.7, 0.7, 1},
-	color_obscure = {0.7*0.6, 0.7*0.6, 0.7*0.6, 0.6},
+	color_shown = {0.85, 0.85, 0.85, 1},
+	color_obscure = {0.85*0.6, 0.85*0.6, 0.85*0.6, 0.6},
 	ambient_music = {"Woods of Eremae.ogg", "weather/rain.ogg"},
 	min_material_level = function() return game.state:isAdvanced() and 3 or 1 end,
 	max_material_level = function() return game.state:isAdvanced() and 4 or 2 end,