diff --git a/assets/cubyz/blocks/basalt.zig.zon b/assets/cubyz/blocks/basalt.zig.zon
new file mode 100644
index 00000000..286b9b8a
--- /dev/null
+++ b/assets/cubyz/blocks/basalt.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt",
+}
diff --git a/assets/cubyz/blocks/basalt_bricks.zig.zon b/assets/cubyz/blocks/basalt_bricks.zig.zon
new file mode 100644
index 00000000..059bd6a1
--- /dev/null
+++ b/assets/cubyz/blocks/basalt_bricks.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt_bricks",
+}
diff --git a/assets/cubyz/blocks/basalt_tile.zig.zon b/assets/cubyz/blocks/basalt_tile.zig.zon
new file mode 100644
index 00000000..76f45bd8
--- /dev/null
+++ b/assets/cubyz/blocks/basalt_tile.zig.zon
@@ -0,0 +1,8 @@
+.{
+	.class = .stone,
+	.hardness = 25,
+	.breakingPower = 1,
+	.rotation = .stairs,
+	.model = "cubyz:cube",
+	.texture = "cubyz:basalt_tile",
+}
diff --git a/assets/cubyz/blocks/glass/uranium.zig.zon b/assets/cubyz/blocks/glass/uranium.zig.zon
index 5109cf23..d3450a34 100644
--- a/assets/cubyz/blocks/glass/uranium.zig.zon
+++ b/assets/cubyz/blocks/glass/uranium.zig.zon
@@ -7,7 +7,7 @@
 	.transparent = true,
 	.hasBackFace = true,
 	.absorbedLight = 0x4001ff,
-	.emittedLight = 0x80ff00,
+	.emittedLight = 0x214200,
 	.model = "cubyz:cube",
 	.texture = "cubyz:glass/uranium",
 }
diff --git a/assets/cubyz/blocks/lamp.zig.zon b/assets/cubyz/blocks/lamp.zig.zon
new file mode 100644
index 00000000..c9b9a210
--- /dev/null
+++ b/assets/cubyz/blocks/lamp.zig.zon
@@ -0,0 +1,11 @@
+.{
+	.class = .wood,
+	.hardness = 8,
+	.drops = .{
+		.auto,
+	},
+	.emittedLight = 0xd9cab4,
+	.texture = "cubyz:lamp",
+	.texture_top = "cubyz:lamp_top",
+	.texture_bottom = "cubyz:lamp_top",
+}
diff --git a/assets/cubyz/blocks/textures/basalt.png b/assets/cubyz/blocks/textures/basalt.png
new file mode 100644
index 00000000..9191e632
Binary files /dev/null and b/assets/cubyz/blocks/textures/basalt.png differ
diff --git a/assets/cubyz/blocks/textures/basalt_bricks.png b/assets/cubyz/blocks/textures/basalt_bricks.png
new file mode 100644
index 00000000..874efa9a
Binary files /dev/null and b/assets/cubyz/blocks/textures/basalt_bricks.png differ
diff --git a/assets/cubyz/blocks/textures/basalt_tile.png b/assets/cubyz/blocks/textures/basalt_tile.png
new file mode 100644
index 00000000..f8ca0849
Binary files /dev/null and b/assets/cubyz/blocks/textures/basalt_tile.png differ
diff --git a/assets/cubyz/blocks/textures/lamp.png b/assets/cubyz/blocks/textures/lamp.png
new file mode 100644
index 00000000..7b0c7fc7
Binary files /dev/null and b/assets/cubyz/blocks/textures/lamp.png differ
diff --git a/assets/cubyz/blocks/textures/lamp.png_emission.png b/assets/cubyz/blocks/textures/lamp.png_emission.png
new file mode 100644
index 00000000..f9af466c
Binary files /dev/null and b/assets/cubyz/blocks/textures/lamp.png_emission.png differ
diff --git a/assets/cubyz/blocks/textures/lamp_top.png b/assets/cubyz/blocks/textures/lamp_top.png
new file mode 100644
index 00000000..c1c728ca
Binary files /dev/null and b/assets/cubyz/blocks/textures/lamp_top.png differ
diff --git a/assets/cubyz/blocks/textures/lamp_top.png_emission.png b/assets/cubyz/blocks/textures/lamp_top.png_emission.png
new file mode 100644
index 00000000..e99c0df7
Binary files /dev/null and b/assets/cubyz/blocks/textures/lamp_top.png_emission.png differ
diff --git a/assets/cubyz/blocks/textures/limestone_bricks.png b/assets/cubyz/blocks/textures/limestone_bricks.png
index e46215f3..3615c1a2 100644
Binary files a/assets/cubyz/blocks/textures/limestone_bricks.png and b/assets/cubyz/blocks/textures/limestone_bricks.png differ
diff --git a/assets/cubyz/blocks/torch.zig.zon b/assets/cubyz/blocks/torch.zig.zon
index 2771de32..0e39807a 100644
--- a/assets/cubyz/blocks/torch.zig.zon
+++ b/assets/cubyz/blocks/torch.zig.zon
@@ -5,7 +5,7 @@
 		.auto,
 	},
 	.solid = false,
-	.emittedLight = 0x00a09080,
+	.emittedLight = 0xa58d73,
 	.viewThrough = true,
 	.absorbedLight = 0x010101,
 	.collide= false,
diff --git a/assets/cubyz/ui/button_hovered_outline.png b/assets/cubyz/ui/button_hovered_outline.png
index 03522b5a..429c655b 100644
Binary files a/assets/cubyz/ui/button_hovered_outline.png and b/assets/cubyz/ui/button_hovered_outline.png differ