diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 377473093d..734dd33cbe 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -432,7 +432,7 @@
 			if(istype(usr, /mob/living/silicon/robot))
 				usr:toggle_module(3)
 
-		if("Allow Walking")
+		if("Allow Walking" || "Disallow Walking")
 			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
 				return
 			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
@@ -441,16 +441,7 @@
 			usr.client.AllowTargetMove()
 			gun_click_time = world.time
 
-		if("Disallow Walking")
-			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
-				return
-			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
-				usr << "You need your gun in your active hand to do that!"
-				return
-			usr.client.AllowTargetMove()
-			gun_click_time = world.time
-
-		if("Allow Running")
+		if("Allow Running" || "Disallow Running")
 			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
 				return
 			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
@@ -459,26 +450,7 @@
 			usr.client.AllowTargetRun()
 			gun_click_time = world.time
 
-		if("Disallow Running")
-			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
-				return
-			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
-				usr << "You need your gun in your active hand to do that!"
-				return
-			usr.client.AllowTargetRun()
-			gun_click_time = world.time
-
-		if("Allow Item Use")
-			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
-				return
-			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
-				usr << "You need your gun in your active hand to do that!"
-				return
-			usr.client.AllowTargetClick()
-			gun_click_time = world.time
-
-
-		if("Disallow Item Use")
+		if("Allow Item Use" || "Disallow Item Use")
 			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
 				return
 			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
@@ -490,16 +462,7 @@
 		if("Toggle Gun Mode")
 			usr.client.ToggleGunMode()
 
-		if("Allow Radio Use")
-			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
-				return
-			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
-				usr << "You need your gun in your active hand to do that!"
-				return
-			usr.client.AllowTargetRadio()
-			gun_click_time = world.time
-
-		if("Disallow Radio Use")
+		if("Allow Radio Use" || "Disallow Radio Use")
 			if(gun_click_time > world.time - 30)	//give them 3 seconds between mode changes.
 				return
 			if(!istype(usr.get_active_hand(),/obj/item/weapon/gun))
diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index d8bcde56a9..1136f83227 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -14,7 +14,7 @@
 	set category = "Object"
 	if(aim_targets)
 		stop_aim()
-		usr.visible_message("\blue \The [usr] lowers \the [src]...")
+		usr.visible_message("<span class='notice'> \The [usr] lowers \the [src]...</span>")
 
 //Clicking gun will still lower aim for guns that don't overwrite this
 /obj/item/weapon/gun/attack_self()
@@ -70,9 +70,9 @@
 				if(L)
 					L.NotTargeted(src)
 			del(aim_targets)
-			usr.visible_message("\red <b>[usr] turns \the [src] on [M]!</b>")
+			usr.visible_message("<span class='danger'><b>[usr] turns \the [src] on [M]!</b></span>")
 		else
-			usr.visible_message("\red <b>[usr] aims \a [src] at [M]!</b>")
+			usr.visible_message("<span class='danger'><b>[usr] aims \a [src] at [M]!</b></span>")
 		M.Targeted(src)
 
 //HE MOVED, SHOOT HIM!
@@ -86,7 +86,7 @@
 
 	//reflex firing is disabled when help intent is set
 	if (M.a_intent == I_HELP)
-		M << "\red You refrain from firing your [src] as your intent is set to help."
+		M << "<span class='danger'>You refrain from firing your [src] as your intent is set to help.</span>"
 		return
 
 	M.last_move_intent = world.time
@@ -95,7 +95,7 @@
 		if(firing_check == 1)
 			Fire(T,usr, reflex = 1)
 	else if(!told_cant_shoot)
-		M << "\red They can't be hit from here!"
+		M << "<span class='danger'>They can't be hit from here!</span>"
 		told_cant_shoot = 1
 		spawn(30)
 			told_cant_shoot = 0
@@ -172,10 +172,10 @@
 	if(!targeted_by) targeted_by = list()
 	targeted_by += I
 	I.lock_time = world.time + 20 //Target has 2 second to realize they're targeted and stop (or target the opponent).
-	src << "((\red <b>Your character is being targeted. They have 2 seconds to stop any click or move actions.</b> \black While targeted, they may \
+	src << "((<span class='danger'><b>Your character is being targeted. They have 2 seconds to stop any click or move actions.</b></span> While targeted, they may \
 	drag and drop items in or into the map, speak, and click on interface buttons. Clicking on the map objects (floors and walls are fine), their items \
-	 (other than a weapon to de-target), or moving will result in being fired upon. \red The aggressor may also fire manually, \
-	 so try not to get on their bad side.\black ))"
+	 (other than a weapon to de-target), moving, or talking into a radio will result in being fired upon. <span class='danger'>The aggressor may also fire manually, \
+	 so try not to get on their bad side.</span>))"
 
 	if(targeted_by.len == 1)
 		spawn(0)
@@ -196,7 +196,7 @@
 			I.lower_aim()
 			return
 		if(m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0)
-			src << "\red Your move intent is now set to walk, as your targeter permits it."  //Self explanitory.
+			src << "<span class='danger'>Your move intent is now set to walk, as your targeter permits it.</span>"  //Self explanitory.
 			set_m_intent("walk")
 
 		//Processing the aiming. Should be probably in separate object with process() but lasy.
@@ -323,10 +323,10 @@
 				if(target_can_move)
 					M << "Your character may now <b>walk</b> at the discretion of their targeter."
 					if(!target_can_run)
-						M << "\red Your move intent is now set to walk, as your targeter permits it."
+						M << "<span class='danger'>Your move intent is now set to walk, as your targeter permits it.</span>"
 						M.set_m_intent("walk")
 				else
-					M << "\red <b>Your character will now be shot if they move.</b>"
+					M << "<span class='danger'><b>Your character will now be shot if they move.</b></span>"
 
 /mob/living/proc/set_m_intent(var/intent)
 	if (intent != "walk" && intent != "run")
@@ -359,7 +359,7 @@ client/verb/AllowTargetRun()
 				if(target_can_run)
 					M << "Your character may now <b>run</b> at the discretion of their targeter."
 				else
-					M << "\red <b>Your character will now be shot if they run.</b>"
+					M << "<span class='danger'><b>Your character will now be shot if they run.</b></span>"
 
 /client/verb/AllowTargetClick()
 	set hidden=1
@@ -383,7 +383,7 @@ client/verb/AllowTargetRun()
 				if(target_can_click)
 					M << "Your character may now <b>use items</b> at the discretion of their targeter."
 				else
-					M << "\red <b>Your character will now be shot if they use items.</b>"
+					M << "<span class='danger'><b>Your character will now be shot if they use items.</b></span>"
 
 /client/verb/AllowTargetRadio()
 	set hidden=1
@@ -406,4 +406,4 @@ client/verb/AllowTargetRun()
 				if(target_can_radio)
 					M << "Your character may now <b>use the radio</b> at the discretion of their targeter."
 				else
-					M << "\red <b>Your character will now be shot if they use the radio.</b>"
\ No newline at end of file
+					M << "<span class='danger'><b>Your character will now be shot if they use the radio.</b></span>"
\ No newline at end of file