diff --git a/crafts.lua b/crafts.lua
index 918f7997..c3a0927a 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -266,28 +266,6 @@ minetest.register_craft( {
 
 --
 
-minetest.register_craftitem("homedecor:utility_table_legs", {
-        description = "Legs for Small Utility table",
-        inventory_image = "homedecor_utility_table_legs.png",
-})
-
-minetest.register_craft( {
-        output = 'homedecor:utility_table_legs',
-        recipe = {
-                { 'default:stick', 'default:stick', 'default:stick' },
-                { 'default:stick', '', 'default:stick' },
-                { 'default:stick', '', 'default:stick' },
-        },
-})
-
-minetest.register_craft({
-        type = 'fuel',
-        recipe = 'homedecor:utility_table_legs',
-        burntime = 30,
-})
-
---
-
 minetest.register_craft( {
         output = 'homedecor:wood_table_small_round 15',
         recipe = {
@@ -623,36 +601,6 @@ minetest.register_craft({
        	burntime = 30,
 })
 
--- Table legs and stuff
-
-minetest.register_craft( {
-        output = 'homedecor:table_legs_wrought_iron 3',
-        recipe = {
-                { '', 'default:iron_lump', '' },
-                { '', 'default:iron_lump', '' },
-                { 'default:iron_lump', 'default:iron_lump', 'default:iron_lump' },
-        },
-})
-
--- 
-
-minetest.register_craft( {
-        output = 'homedecor:pole_wrought_iron 4',
-        recipe = {
-                { 'default:iron_lump', },
-                { 'default:iron_lump', },
-                { 'default:iron_lump', },
-        },
-})
-
-minetest.register_craft( {
-        output = 'homedecor:fence_wrought_iron 6',
-        recipe = {
-                { 'default:iron_lump','default:iron_lump','default:iron_lump' },
-                { 'default:iron_lump','default:iron_lump','default:iron_lump' },
-        },
-})
-
 --
 
 minetest.register_craftitem("homedecor:drawer_small", {
@@ -767,9 +715,6 @@ minetest.register_craft({
         burntime = 30,
 })
 
--- ==========================================================
--- Recipes that require materials from Calinou's Moreores mod
-
 minetest.register_craftitem("homedecor:brass_ingot", {
         description = "Brass Ingot",
         inventory_image = "homedecor_brass_ingot.png",
@@ -784,6 +729,16 @@ minetest.register_craft( {
 	},
 })
 
+-- Table legs
+
+minetest.register_craft( {
+        output = 'homedecor:table_legs_wrought_iron 3',
+        recipe = {
+                { '', 'default:iron_lump', '' },
+                { '', 'default:iron_lump', '' },
+                { 'default:iron_lump', 'default:iron_lump', 'default:iron_lump' },
+        },
+})
 
 minetest.register_craft( {
         output = 'homedecor:table_legs_brass 3',
@@ -794,6 +749,28 @@ minetest.register_craft( {
 	},
 })
 
+minetest.register_craftitem("homedecor:utility_table_legs", {
+        description = "Legs for Small Utility table",
+        inventory_image = "homedecor_utility_table_legs.png",
+})
+
+minetest.register_craft( {
+        output = 'homedecor:utility_table_legs',
+        recipe = {
+                { 'default:stick', 'default:stick', 'default:stick' },
+                { 'default:stick', '', 'default:stick' },
+                { 'default:stick', '', 'default:stick' },
+        },
+})
+
+minetest.register_craft({
+        type = 'fuel',
+        recipe = 'homedecor:utility_table_legs',
+        burntime = 30,
+})
+
+-- vertical poles/lampposts
+
 minetest.register_craft( {
         output = 'homedecor:pole_brass 4',
 	recipe = {
@@ -804,15 +781,15 @@ minetest.register_craft( {
 })
 
 minetest.register_craft( {
-        output = 'homedecor:fence_brass 6',
-	recipe = {
-		{ 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' },
-		{ 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' },
-	},
+        output = 'homedecor:pole_wrought_iron 4',
+        recipe = {
+                { 'default:iron_lump', },
+                { 'default:iron_lump', },
+                { 'default:iron_lump', },
+        },
 })
 
--- ========================================================
--- Recipes that require materials from Jeija's Mesecons mod
+-- Home electronics
 
 if ( minetest.get_modpath("mesecons") ) == nil then
 
@@ -1117,3 +1094,57 @@ minetest.register_craft({
 	}
 })
 
+-- Fences
+
+minetest.register_craft( {
+        output = 'homedecor:fence_brass 6',
+	recipe = {
+		{ 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' },
+		{ 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' },
+	},
+})
+
+minetest.register_craft( {
+        output = 'homedecor:fence_wrought_iron 6',
+        recipe = {
+                { 'default:iron_lump','default:iron_lump','default:iron_lump' },
+                { 'default:iron_lump','default:iron_lump','default:iron_lump' },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:fence_picket 6",
+        recipe = {
+                { "default:stick", "default:stick", "default:stick" },
+                { "default:stick", "", "default:stick" },
+                { "default:stick", "default:stick", "default:stick" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:fence_picket_white 6",
+        recipe = {
+                { "default:stick", "default:stick", "default:stick" },
+                { "default:stick", "unifieddyes:white_paint", "default:stick" },
+                { "default:stick", "default:stick", "default:stick" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:fence_privacy 6",
+        recipe = {
+                { "default:wood", "default:stick", "default:wood" },
+                { "default:wood", "", "default:wood" },
+                { "default:wood", "default:stick", "default:wood" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:fence_barbed_wire 6",
+        recipe = {
+                { "default:stick", "default:iron_lump", "default:stick" },
+                { "default:stick", "", "default:stick" },
+                { "default:stick", "default:iron_lump", "default:stick" }
+        },
+})
+
diff --git a/fences.lua b/fences.lua
new file mode 100644
index 00000000..11726ad5
--- /dev/null
+++ b/fences.lua
@@ -0,0 +1,100 @@
+-- This file adds fences of various types
+
+minetest.register_node("homedecor:fence_brass", {
+        description = "Brass Fence/railing",
+        drawtype = "fencelike",
+        tiles = {"homedecor_tile_brass.png"},
+        inventory_image = "homedecor_fence_brass.png",
+        wield_image = "homedecor_pole_brass.png",
+        paramtype = "light",
+        is_ground_content = true,
+        selection_box = {
+                type = "fixed",
+                fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+        },
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+})
+
+minetest.register_node("homedecor:fence_wrought_iron", {
+        description = "Wrought Iron Fence/railing",
+        drawtype = "fencelike",
+        tiles = {"homedecor_tile_wrought_iron.png"},
+        inventory_image = "homedecor_fence_wrought_iron.png",
+        wield_image = "homedecor_pole_wrought_iron.png",
+        paramtype = "light",
+        is_ground_content = true,
+        selection_box = {
+                type = "fixed",
+                fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+        },
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+})
+
+minetest.register_node("homedecor:fence_picket", {
+        description = "Unpainted Picket Fence",
+        tiles = {"homedecor_fence_picket.png"},
+        inventory_image = "homedecor_fence_picket.png",
+        wield_image = "homedecor_fence_picket.png",
+        paramtype = "light",
+        is_ground_content = true,
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+	paramtype2 = 'wallmounted',
+	selection_box = {
+		type = "wallmounted",
+	},
+})
+
+minetest.register_node("homedecor:fence_picket_white", {
+        description = "White Picket Fence",
+        tiles = {"homedecor_fence_picket_white.png"},
+        inventory_image = "homedecor_fence_picket_white.png",
+        wield_image = "homedecor_fence_picket_white.png",
+        paramtype = "light",
+        is_ground_content = true,
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+	paramtype2 = 'wallmounted',
+	selection_box = {
+		type = "wallmounted",
+	},
+})
+
+minetest.register_node("homedecor:fence_privacy", {
+        description = "Wooden Privacy Fence",
+        tiles = {"homedecor_fence_privacy.png"},
+        inventory_image = "homedecor_fence_privacy.png",
+        wield_image = "homedecor_fence_privacy.png",
+        paramtype = "light",
+        is_ground_content = true,
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+	paramtype2 = 'wallmounted',
+	selection_box = {
+		type = "wallmounted",
+	},
+})
+
+minetest.register_node("homedecor:fence_barbed_wire", {
+        description = "Barbed Wire Fence",
+        tiles = {"homedecor_fence_barbed_wire.png"},
+        inventory_image = "homedecor_fence_barbed_wire.png",
+        wield_image = "homedecor_fence_barbed_wire.png",
+        paramtype = "light",
+        is_ground_content = true,
+        groups = {snappy=3},
+        sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+	paramtype2 = 'wallmounted',
+	selection_box = {
+		type = "wallmounted",
+	},
+})
+
diff --git a/init.lua b/init.lua
index c400c0bc..7a8988f2 100644
--- a/init.lua
+++ b/init.lua
@@ -11,6 +11,7 @@
 -- License: LGPL
 --
 
+dofile(minetest.get_modpath("homedecor").."/fences.lua")
 dofile(minetest.get_modpath("homedecor").."/kitchen_cabinet.lua")
 dofile(minetest.get_modpath("homedecor").."/refrigerator.lua")
 dofile(minetest.get_modpath("homedecor").."/oven.lua")
@@ -479,70 +480,6 @@ minetest.register_node('homedecor:folding_door_oak', {
 	},
 })
 
-minetest.register_node('homedecor:dresser_mahogany_left_side', {
-	description = "Mahogany Dresser (Left Half)",
-	tiles = { 'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_front_left.png'},
-	sunlight_propagates = false,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node('homedecor:dresser_mahogany_right_side', {
-	description = "Mahogany Dresser (Right Half)",
-	tiles = { 'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_sides.png',
-			'homedecor_dresser_mahogany_front_right.png'},
-	sunlight_propagates = false,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node('homedecor:dresser_oak_left_side', {
-	description = "Oak Dresser (Left Half)",
-	tiles = { 'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_front_left.png'},
-	sunlight_propagates = false,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node('homedecor:dresser_oak_right_side', {
-	description = "Oak Dresser (Right Half)",
-	tiles = { 'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_sides.png',
-			'homedecor_dresser_oak_front_right.png'},
-	sunlight_propagates = false,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	sounds = default.node_sound_leaves_defaults(),
-})
-
 minetest.register_node('homedecor:shutter_black', {
 	description = "Wooden Shutter (Black)",
 	tiles = { 'homedecor_window_shutter_black.png' },
@@ -823,41 +760,6 @@ minetest.register_node("homedecor:pole_wrought_iron", {
 	walkable = true,
 })
 
-minetest.register_node("homedecor:fence_brass", {
-        description = "Brass Fence/railing",
-        drawtype = "fencelike",
-        tiles = {"homedecor_tile_brass.png"},
-        inventory_image = "homedecor_fence_brass.png",
-        wield_image = "homedecor_pole_brass.png",
-        paramtype = "light",
-        is_ground_content = true,
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
-        },
-        groups = {snappy=3},
-        sounds = default.node_sound_wood_defaults(),
-	walkable = true,
-})
-
-minetest.register_node("homedecor:fence_wrought_iron", {
-        description = "Wrought Iron Fence/railing",
-        drawtype = "fencelike",
-        tiles = {"homedecor_tile_wrought_iron.png"},
-        inventory_image = "homedecor_fence_wrought_iron.png",
-        wield_image = "homedecor_pole_wrought_iron.png",
-        paramtype = "light",
-        is_ground_content = true,
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
-        },
-        groups = {snappy=3},
-        sounds = default.node_sound_wood_defaults(),
-	walkable = true,
-})
-
-
 minetest.register_node('homedecor:speaker', {
 	description = "Large Stereo Speaker",
 	tiles = { 'homedecor_speaker_top.png',
diff --git a/textures/homedecor_fence_barbed_wire.png b/textures/homedecor_fence_barbed_wire.png
new file mode 100644
index 00000000..be1ff1b5
Binary files /dev/null and b/textures/homedecor_fence_barbed_wire.png differ
diff --git a/textures/homedecor_fence_picket.png b/textures/homedecor_fence_picket.png
new file mode 100644
index 00000000..b87ce73d
Binary files /dev/null and b/textures/homedecor_fence_picket.png differ
diff --git a/textures/homedecor_fence_picket_white.png b/textures/homedecor_fence_picket_white.png
new file mode 100644
index 00000000..5ffe0750
Binary files /dev/null and b/textures/homedecor_fence_picket_white.png differ
diff --git a/textures/homedecor_fence_privacy.png b/textures/homedecor_fence_privacy.png
new file mode 100644
index 00000000..ef5f235e
Binary files /dev/null and b/textures/homedecor_fence_privacy.png differ