diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index ded7ebc9b98..74f60a3a729 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -7,10 +7,12 @@
 	icon = 'icons/obj/power.dmi'
 	icon_state = "light1"
 	anchored = 1.0
+	use_power = 1
+	idle_power_usage = 10
+	power_channel = LIGHT
 	var/on = 1
 	var/area/area = null
 	var/otherarea = null
-	//	luminosity = 1
 
 /obj/machinery/light_switch/New()
 	..()
@@ -31,8 +33,12 @@
 /obj/machinery/light_switch/proc/updateicon()
 	if(stat & NOPOWER)
 		icon_state = "light-p"
+		set_light(0)
+		layer = OBJ_LAYER
 	else
 		icon_state = "light[on]"
+		set_light(2, 1.5, on ? "#82FF4C" : "#F86060")
+		layer = LIGHTING_LAYER+0.1
 
 /obj/machinery/light_switch/examine(mob/user)
 	if(..(user, 1))