diff --git a/config/autoexec.cfg.default b/config/autoexec.cfg.default
index f654c7f3..776edf64 100644
--- a/config/autoexec.cfg.default
+++ b/config/autoexec.cfg.default
@@ -85,7 +85,9 @@ alias ffa   [ mode 2; map $arg1 ]
 alias lms   [ mode 3; map $arg1 ]
 alias pf    [ mode 6; map $arg1 ]
 alias lss   [ mode 9; map $arg1 ]
+alias insta [ mode 10; map $arg1 ]
 alias osok  [ mode 10; map $arg1 ]
+alias tosok [ mode 11; map $arg1 ]
 
 music ac.ogg
 musicvol $maxmusicvol
diff --git a/source/src/cube.h b/source/src/cube.h
index ad067ff2..7449f47b 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -199,19 +199,20 @@ enum { MCMD_KICK = 0, MCMD_BAN, MCMD_REMBANS };
 10	sniper survivor
 */
 
+#define m_lms         (gamemode==3 || gamemode==4)
 #define m_ctf	      (gamemode==5)
 #define m_pistol      (gamemode==6)
 #define m_lss		  (gamemode==9)
 #define m_osok		  (gamemode==10 || gamemode==11)
 
-#define m_noitems     (gamemode==3 || gamemode==4 || gamemode==10 || gamemode==11)
-#define m_noitemsnade (gamemode==9)
-#define m_nopistol	  (gamemode==10 || gamemode==11)
-#define m_noprimary   (m_pistol)
-#define m_noguns	  (m_lss)
-#define m_arena       (gamemode==3 || gamemode==4 || gamemode==9 || gamemode==10 || gamemode==11)
-#define m_tarena      (gamemode==4 || gamemode==11)
+#define m_noitems     (m_lms || m_osok)
+#define m_noitemsnade (m_lss)
+#define m_nopistol	  (m_osok || m_lss)
+#define m_noprimary   (m_pistol || m_lss)
+#define m_noguns	  (m_nopistol && m_noprimary)
+#define m_arena       (m_lms || m_lss || m_osok)
 #define m_teammode    (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11)
+#define m_tarena      (m_arena && m_teammode)
 #define m_botmode	  (gamemode==7 || gamemode == 8)
 
 #define isteam(a,b)   (m_teammode && strcmp(a, b)==0)
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index fcca0243..b4eabed5 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -389,9 +389,13 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
             glColor3ub(255,255,255);
             if(crosshairfx)
             {
-                if(player1->gunwait && !teammate_in_xhair) glColor3ub(128,128,128);
-                else if(player1->health<=25 || teammate_in_xhair) glColor3ub(255,0,0);
-                else if(player1->health<=50) glColor3ub(255,128,0);
+                if(teammate_in_xhair) glColor3ub(255, 0, 0);
+                else if(player1->gunwait) glColor3ub(128,128,128);
+                else if(!m_osok)
+                {
+                    if(player1->health<=25) glColor3ub(255,0,0);
+                    else if(player1->health<=50) glColor3ub(255,128,0);
+                };
             };
 			float chsize = (float)crosshairsize * (player1->gunselect==GUN_ASSAULT && player1->shots > 3 ? 1.4f : 1.0f) * (teammate_in_xhair ? 2.0f : 1.0f);
             glTexCoord2i(0, 0); glVertex2f(VIRTW/2 - chsize, VIRTH/2 - chsize);