diff --git a/.gitignore b/.gitignore
index 7fe9b1b4c..21aecb4b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Texture packs
-texturepacks
+texturepacks/*
 !texturepacks/minecraft
 
 # Temporary editor files
diff --git a/mods/creative_inventory/init.lua b/mods/creative_inventory/init.lua
index 89fd4a22d..ee02d5ef5 100644
--- a/mods/creative_inventory/init.lua
+++ b/mods/creative_inventory/init.lua
@@ -28,7 +28,7 @@
 function show_creative_window(client, screen_width, screen_height, gui_scale)
 	items = {}
 	for k, v in pairs(openminer:registry():items()) do
-		if k ~= 1 then
+		if k ~= 1 and not v:has_group("group:ci_ignore") then
 			items[#items + 1] = {v:string_id()}
 		end
 	end
diff --git a/mods/default/blocks.lua b/mods/default/blocks.lua
index dfcb6ec3d..78f1788a3 100644
--- a/mods/default/blocks.lua
+++ b/mods/default/blocks.lua
@@ -121,7 +121,7 @@ mod:block {
 	tiles = "oak_planks.png",
 
 	groups = {
-		om_planks = 1
+		default_planks = 1
 	}
 }
 
@@ -288,3 +288,30 @@ mod:block {
 	inventory_image = "reeds_item.png"
 }
 
+mod:block {
+	id = "redstone_lamp_off",
+	name = "Redstone Lamp",
+	tiles = "redstone_lamp_off.png",
+
+	on_block_activated = function(pos, player, world, client, server, screen_width, screen_height, gui_scale)
+		local block = openminer:registry():get_block_from_string("default:redstone_lamp_on")
+		world:set_block(pos.x, pos.y, pos.z, block:id())
+	end
+}
+
+mod:block {
+	id = "redstone_lamp_on",
+	name = "Redstone Lamp",
+	tiles = "redstone_lamp_on.png",
+	is_light_source = true,
+
+	groups = {
+		ci_ignore = 1
+	},
+
+	on_block_activated = function(pos, player, world, client, server, screen_width, screen_height, gui_scale)
+		local block = openminer:registry():get_block_from_string("default:redstone_lamp_off")
+		world:set_block(pos.x, pos.y, pos.z, block:id())
+	end
+}
+
diff --git a/mods/default/recipes.lua b/mods/default/recipes.lua
index 66e070f64..024fc452f 100644
--- a/mods/default/recipes.lua
+++ b/mods/default/recipes.lua
@@ -513,7 +513,7 @@ mod:crafting_recipe {
 		'#'
 	},
 
-	keys = {['#'] = "group:om_planks"}
+	keys = {['#'] = "group:default_planks"}
 }
 
 -- Planks
@@ -536,7 +536,7 @@ mod:crafting_recipe {
 		"##",
 		"##"
 	},
-	keys = {["#"] = "group:om_planks"}
+	keys = {["#"] = "group:default_planks"}
 }
 
 -- Furnace
diff --git a/mods/default/textures/blocks/redstone_lamp_off.png b/mods/default/textures/blocks/redstone_lamp_off.png
new file mode 100644
index 000000000..4fabad91f
Binary files /dev/null and b/mods/default/textures/blocks/redstone_lamp_off.png differ
diff --git a/mods/default/textures/blocks/redstone_lamp_on.png b/mods/default/textures/blocks/redstone_lamp_on.png
new file mode 100644
index 000000000..3b3c9939a
Binary files /dev/null and b/mods/default/textures/blocks/redstone_lamp_on.png differ
diff --git a/texturepacks/minecraft/blocks/redstone_lamp_off.png b/texturepacks/minecraft/blocks/redstone_lamp_off.png
new file mode 100644
index 000000000..522765beb
Binary files /dev/null and b/texturepacks/minecraft/blocks/redstone_lamp_off.png differ
diff --git a/texturepacks/minecraft/blocks/redstone_lamp_on.png b/texturepacks/minecraft/blocks/redstone_lamp_on.png
new file mode 100644
index 000000000..9562ef3e2
Binary files /dev/null and b/texturepacks/minecraft/blocks/redstone_lamp_on.png differ