diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm
index 48623ba2811..595248d4d52 100644
--- a/code/__DEFINES/lighting.dm
+++ b/code/__DEFINES/lighting.dm
@@ -58,9 +58,13 @@
 #define LIGHT_COLOR_ORANGE     "#FA9632" //Mostly pure orange. rgb(250, 150, 50)
 #define LIGHT_COLOR_PURPLE     "#952CF4" //Light Purple. rgb(149, 44, 244)
 
+#define LIGHT_COLOR_LIGHT_CYAN	"#40CEFF" //More-saturated cyan. rgb(64, 206, 255)
+#define LIGHT_COLOR_LAVENDER	"#9B51FF" //Less-saturated light purple. rgb(155, 81, 255)
+
 //These ones aren't a direct colour like the ones above, because nothing would fit
 #define LIGHT_COLOR_FIRE       "#FAA019" //Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25)
 #define LIGHT_COLOR_FLARE      "#FA644B" //Bright, non-saturated red. Leaning slightly towards pink for visibility. rgb(250, 100, 75)
 #define LIGHT_COLOR_SLIME_LAMP "#AFC84B" //Weird color, between yellow and green, very slimy. rgb(175, 200, 75)
 #define LIGHT_COLOR_TUNGSTEN   "#FAE1AF" //Extremely diluted yellow, close to skin color (for some reason). rgb(250, 225, 175)
 #define LIGHT_COLOR_HALOGEN    "#F0FAFA" //Barely visible cyan-ish hue, as the doctor prescribed. rgb(240, 250, 250)
+
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index ed42af2b4cb..218f56a70e3 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -21,13 +21,13 @@
 		item_color = pick(possible_colors)
 		switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons.
 			if("red")
-				light_color = "#ff0000"
+				light_color = LIGHT_COLOR_RED
 			if("green")
-				light_color = "#00ff00"
+				light_color = LIGHT_COLOR_GREEN
 			if("blue")
-				light_color = "#40ceff"
+				light_color = LIGHT_COLOR_LIGHT_CYAN
 			if("purple")
-				light_color = "#9b51ff"
+				light_color = LIGHT_COLOR_LAVENDER
 	if(active)
 		set_light(brightness_on)
 
@@ -88,9 +88,9 @@
 	. = ..()
 
 /obj/item/weapon/melee/energy/sword/process()
-	if(hacked)
-		light_color = pick("#ff0000", "#00ff00", "#40ceff", "#9b51ff")
 	if(active)
+		if(hacked)
+			light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
 		open_flame()
 	else
 		STOP_PROCESSING(SSobj, src)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index fe12f6f2f80..0b36647b986 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -269,13 +269,13 @@
 		item_color = pick(possible_colors)
 		switch(item_color)
 			if("red")
-				light_color = "#ff0000"
+				light_color = LIGHT_COLOR_RED
 			if("green")
-				light_color = "#00ff00"
+				light_color = LIGHT_COLOR_GREEN
 			if("blue")
-				light_color = "#40ceff"
+				light_color = LIGHT_COLOR_LIGHT_CYAN
 			if("purple")
-				light_color = "#9b51ff"
+				light_color = LIGHT_COLOR_LAVENDER
 
 /obj/item/weapon/twohanded/dualsaber/Destroy()
 	STOP_PROCESSING(SSobj, src)
@@ -302,9 +302,9 @@
 		INVOKE_ASYNC(src, .proc/jedi_spin, user)
 
 /obj/item/weapon/twohanded/dualsaber/proc/jedi_spin(mob/living/user)
-	for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2))
+	for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
 		user.setDir(i)
-		if(i == 8)
+		if(i == WEST)
 			user.emote("flip")
 		sleep(1)
 
@@ -349,7 +349,7 @@
 /obj/item/weapon/twohanded/dualsaber/process()
 	if(wielded)
 		if(hacked)
-			light_color = pick("#ff0000", "#00ff00", "#40ceff", "#9b51ff")
+			light_color = pick(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
 		open_flame()
 	else
 		STOP_PROCESSING(SSobj, src)