diff --git a/baystation12.dme b/baystation12.dme
index b3615500e4d..8c8d1d0b3d6 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1410,6 +1410,7 @@
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
 #include "code\WorkInProgress\Yinadele\Supermatter.dm"
+#include "code\WorkInProgress\ZomgPonies\Colored-windows.dm"
 #include "code\WorkInProgress\ZomgPonies\karma.dm"
 #include "code\WorkInProgress\ZomgPonies\clothing\civilian.dm"
 #include "code\WorkInProgress\ZomgPonies\mobs\pony.dm"
diff --git a/code/WorkInProgress/ZomgPonies/Colored-windows.dm b/code/WorkInProgress/ZomgPonies/Colored-windows.dm
new file mode 100644
index 00000000000..978fdb2fc5b
--- /dev/null
+++ b/code/WorkInProgress/ZomgPonies/Colored-windows.dm
@@ -0,0 +1,42 @@
+var/global/wcBrig
+var/global/wcBar
+var/global/wcCommon
+
+//for all window/New and door/window/New
+/proc/color_windows(area = "common")
+	var/list/common = list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff")
+	if(!wcCommon)
+		wcCommon = pick(common)
+	return wcCommon
+
+//This func called in master-controller, replaces color in some area
+/proc/color_windows_init()
+	var/list/brig = list("#aa0808", "#7f0606", "#ff0000")
+	var/list/bar = list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff")
+
+	wcBrig = pick(brig)
+	wcBar = pick(bar)
+
+	//BRIG
+	var/wsBrigList = list(
+		/area/security/armoury,
+		/area/security/brig,
+		/area/security/detectives_office,
+		/area/security/hos,
+		/area/security/lobby,
+		/area/security/main,
+		/area/security/prison,
+		/area/security/warden
+		)
+
+	for(var/A in wsBrigList)
+		for(var/obj/structure/window/W in locate(A))
+			W.color = wcBrig
+		for(var/obj/machinery/door/window/D in locate(A))
+			D.color = wcBrig
+
+	//BAR
+	for(var/obj/structure/window/W in locate(/area/crew_quarters/bar))
+		W.color = wcBar
+	for(var/obj/machinery/door/window/D in locate(/area/crew_quarters/bar))
+		D.color = wcBar
\ No newline at end of file
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 2a3da63ef72..f3f07df9af6 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -72,6 +72,8 @@ datum/controller/game_controller/proc/setup()
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
 
+	color_windows_init()
+
 	spawn(0)
 		if(ticker)
 			ticker.pregame()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 66184774c49..8303a537cc5 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -31,6 +31,8 @@
 	if (src.req_access && src.req_access.len)
 		src.icon_state = "[src.icon_state]"
 		src.base_state = src.icon_state
+
+	color = color_windows()
 	return
 
 /obj/machinery/door/window/Del()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 28e35b5020e..dc72c5bd586 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -341,6 +341,7 @@
 	else
 		icon_state = "window"*/
 
+	color = color_windows()
 	update_nearby_tiles(need_rebuild=1)
 	update_nearby_icons()