diff --git a/Shared/World.cs b/Shared/World.cs
index e5af764..5e29725 100644
--- a/Shared/World.cs
+++ b/Shared/World.cs
@@ -12,8 +12,18 @@ namespace SemiColinGames {
     Rock,
     RockL,
     RockR,
-    Water,
-    Block
+    WaterL,
+    WaterR,
+    Block,
+    Spike,
+    Wood,
+    WoodL,
+    WoodR,
+    WoodVert,
+    FenceL,
+    Fence,
+    FencePost,
+    FenceR,
   }
 
   class TileFactory {
@@ -38,8 +48,18 @@ namespace SemiColinGames {
         { Terrain.Rock, GetTextureSource(Textures.Grassland, 3, 1) },
         { Terrain.RockL, GetTextureSource(Textures.Grassland, 1, 2) },
         { Terrain.RockR, GetTextureSource(Textures.Grassland, 5, 2) },
-        { Terrain.Water, GetTextureSource(Textures.Grassland, 9, 2) },
-        { Terrain.Block, GetTextureSource(Textures.Grassland, 6, 3) },
+        { Terrain.WaterL, GetTextureSource(Textures.Grassland, 9, 2) },
+        { Terrain.WaterR, GetTextureSource(Textures.Grassland, 10, 2) },
+        { Terrain.Block, GetTextureSource(Textures.Ruins, 2, 0) },
+        { Terrain.Spike, GetTextureSource(Textures.Grassland, 11, 8) },
+        { Terrain.Wood, GetTextureSource(Textures.Grassland, 10, 3) },
+        { Terrain.WoodL, GetTextureSource(Textures.Grassland, 9, 3) },
+        { Terrain.WoodR, GetTextureSource(Textures.Grassland, 12, 3) },
+        { Terrain.WoodVert, GetTextureSource(Textures.Grassland, 9, 5) },
+        { Terrain.FenceL, GetTextureSource(Textures.Grassland, 5, 4) },
+        { Terrain.Fence, GetTextureSource(Textures.Grassland, 6, 4) },
+        { Terrain.FencePost, GetTextureSource(Textures.Grassland, 7, 4) },
+        { Terrain.FenceR, GetTextureSource(Textures.Grassland, 8, 4) },
       };
     }
 
@@ -100,8 +120,18 @@ namespace SemiColinGames {
       { '.', Terrain.Rock },
       { '[', Terrain.RockL },
       { ']', Terrain.RockR },
-      { '~', Terrain.Water },
-      { 'X', Terrain.Block }
+      { '~', Terrain.WaterL },
+      { '`', Terrain.WaterR },
+      { 'X', Terrain.Block },
+      { '^', Terrain.Spike },
+      { '_', Terrain.Wood },
+      { '(', Terrain.WoodL },
+      { ')', Terrain.WoodR },
+      { '|', Terrain.WoodVert },
+      { 'd', Terrain.FenceL },
+      { 'f', Terrain.Fence },
+      { 'x', Terrain.FencePost },
+      { 'b', Terrain.FenceR },
     };
 
     public World(string levelSpecification) {