diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm
index b7c80761a95..acca1bf7593 100644
--- a/code/WorkInProgress/Mini/atmos_control.dm
+++ b/code/WorkInProgress/Mini/atmos_control.dm
@@ -39,9 +39,9 @@
 			dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
 			switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
 				if (0)
-					dat += "<font color=blue>"
+					dat += "<font color=green>"
 				if (1)
-					dat += "<font color=yellow>"
+					dat += "<font color=blue>"
 				if (2)
 					dat += "<font color=red>"
 			dat += "[alarm]</font></a><br/>"
diff --git a/code/WorkInProgress/SkyMarshal/officer_stuff.dm b/code/WorkInProgress/SkyMarshal/officer_stuff.dm
index d57106d843f..7741a9aa36a 100644
--- a/code/WorkInProgress/SkyMarshal/officer_stuff.dm
+++ b/code/WorkInProgress/SkyMarshal/officer_stuff.dm
@@ -3,13 +3,13 @@
 
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"
-	desc = "A black beret adorned with the shield&mdash;a silver kite shield with an engraved sword&mdash;of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
+	desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
 	icon_state = "centcomofficerberet"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
-	desc = "A white beret adorned with the shield&mdash;a cobalt kite shield with an engraved sword&mdash;of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
+	desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
 	icon_state = "centcomcaptain"
 	flags = FPRINT | TABLEPASS
 
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 6a48ee0f1b5..636ed6b8802 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -238,9 +238,9 @@
 		return 0
 
 	proc/get_danger_level(var/current_value, var/list/danger_levels)
-		if(current_value >= danger_levels[4] || current_value <= danger_levels[1])
+		if(current_value >= danger_levels[4] || (current_value <= danger_levels[1] && danger_levels[1] > 0))
 			return 2
-		if(current_value >= danger_levels[3] || current_value <= danger_levels[2])
+		if(current_value >= danger_levels[3] || (current_value <= danger_levels[2] && danger_levels[1] > 0))
 			return 1
 		return 0