diff --git a/mods/default/init.lua b/mods/default/init.lua
index 6eaed5ae5a..c23f2be1e6 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -5,7 +5,6 @@
 WATER_ALPHA = 160
 WATER_VISC = 1
 LAVA_VISC = 7
-LIGHT_MAX = 20
 
 -- Definitions made by this mod that other mods can use too
 default = {}
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index ebb439691c..90d796d210 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -326,7 +326,7 @@ minetest.register_node("default:sea_lantern", {
 	description = "Sea Lantern",
 	paramtype2 = "facedir",
 	stack_max = 64,
-	light_source = LIGHT_MAX,
+	light_source = 14,
 	drop = {
 		max_items = 1,
 		items = {
@@ -975,7 +975,7 @@ minetest.register_node("default:lava_flowing", {
 	},
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
-	light_source = LIGHT_MAX,
+	light_source = 14,
 	walkable = false,
 	pointable = false,
 	diggable = false,
@@ -1009,7 +1009,7 @@ minetest.register_node("default:lava_source", {
 		}
 	},
 	paramtype = "light",
-	light_source = LIGHT_MAX,
+	light_source = 14,
 	walkable = false,
 	pointable = false,
 	diggable = false,
@@ -1346,7 +1346,7 @@ minetest.register_node("default:furnace_active", {
 	tiles = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png",
 		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front_active.png"},
 	paramtype2 = "facedir",
-	light_source = 8,
+	light_source = 12,
 	drop = "default:furnace",
 	groups = {cracky=2, not_in_creative_inventory=1},
 	legacy_facedir_simple = true,
diff --git a/mods/default/textures/moon.png b/mods/default/textures/moon.png
new file mode 100644
index 0000000000..79afdedc43
Binary files /dev/null and b/mods/default/textures/moon.png differ
diff --git a/mods/default/textures/sun.png b/mods/default/textures/sun.png
new file mode 100644
index 0000000000..d9a5298a84
Binary files /dev/null and b/mods/default/textures/sun.png differ
diff --git a/mods/farming/mushrooms.lua b/mods/farming/mushrooms.lua
index 16ae377d87..da8c04e1f5 100644
--- a/mods/farming/mushrooms.lua
+++ b/mods/farming/mushrooms.lua
@@ -9,6 +9,7 @@ minetest.register_node("farming:mushroom_brown", {
 	walkable = false,
 	groups = {snappy=3,flammable=2,mushroom=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
+	light_source = 1,
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.15, -0.5, -0.15, 0.15, 0.015, 0.15 },
@@ -43,4 +44,4 @@ minetest.register_craft({
 	type = "shapeless",
 	output = "farming:mushroom_stew",
 	recipe = {'default:bowl', 'farming:mushroom_brown', 'farming:mushroom_red'}
-})
\ No newline at end of file
+})
diff --git a/mods/farming/pumpkin.lua b/mods/farming/pumpkin.lua
index d71a39b2ef..e6fc3142f0 100644
--- a/mods/farming/pumpkin.lua
+++ b/mods/farming/pumpkin.lua
@@ -274,7 +274,7 @@ minetest.register_node("farming:pumpkin_face_light", {
 	description = "Jack o'Lantern",
 	stack_max = 64,
 	paramtype2 = "facedir",
-	light_source = LIGHT_MAX,
+	light_source = 14,
 	tiles = {"farming_pumpkin_top.png", "farming_pumpkin_top.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", "farming_pumpkin_face_light.png"},
 	groups = {choppy=2, oddly_breakable_by_hand=2, flammable=2},
 })
diff --git a/mods/redstone/mesecons_lightstone/init.lua b/mods/redstone/mesecons_lightstone/init.lua
index 31e6085b95..dec70697db 100644
--- a/mods/redstone/mesecons_lightstone/init.lua
+++ b/mods/redstone/mesecons_lightstone/init.lua
@@ -16,7 +16,7 @@ minetest.register_node("mesecons_lightstone:lightstone_on", {
 	inventory_image = minetest.inventorycube("jeija_lightstone_gray_off.png"),
 	groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
 	drop = "node mesecons_lightstone:lightstone_off",
-	light_source = LIGHT_MAX,
+	light_source = 14,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		action_off = function (pos, node)
diff --git a/mods/redstone/mesecons_torch/init.lua b/mods/redstone/mesecons_torch/init.lua
index 46cb5f1ef8..4568669a88 100644
--- a/mods/redstone/mesecons_torch/init.lua
+++ b/mods/redstone/mesecons_torch/init.lua
@@ -77,7 +77,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
 	paramtype2 = "wallmounted",
 	selection_box = torch_selectionbox,
 	groups = {dig_immediate=3},
-	light_source = LIGHT_MAX-10,
+	light_source = 6,
 	description="Redstone Torch",
 	mesecons = {receptor = {
 		state = mesecon.state.on,