diff --git a/game/client/c_team_train_watcher.cpp b/game/client/c_team_train_watcher.cpp
index da3fa880d..c3394768d 100644
--- a/game/client/c_team_train_watcher.cpp
+++ b/game/client/c_team_train_watcher.cpp
@@ -9,9 +9,12 @@
 #include "igameevents.h"
 #include "c_team_objectiveresource.h"
 
+#ifdef GLOWS_ENABLE
+#include "teamplayroundbased_gamerules.h"
+#endif
+
 #ifdef TF_CLIENT_DLL
 #include "tf_shareddefs.h"
-#include "teamplayroundbased_gamerules.h"
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
diff --git a/game/client/client_cstrike.vpc b/game/client/client_cstrike.vpc
index 5a9b1342f..f49aa1f75 100644
--- a/game/client/client_cstrike.vpc
+++ b/game/client/client_cstrike.vpc
@@ -14,7 +14,7 @@ $Configuration
 	$Compiler
 	{
 		$AdditionalIncludeDirectories		"$BASE;$SRCDIR\game\shared\cstrike\control,.\cstrike,.\cstrike\control,.\cstrike\VGUI,$SRCDIR\game\shared\cstrike"
-		$PreprocessorDefinitions			"$BASE;CSTRIKE_DLL;NEXT_BOT"
+		$PreprocessorDefinitions			"$BASE;CSTRIKE_DLL;NEXT_BOT;GLOWS_ENABLE"
 	}
 }
 
@@ -41,6 +41,7 @@ $Project "Client (CStrike)"
 		$File	"hud_baseachievement_tracker.h"
 		$File	"$SRCDIR\game\client\hud_vote.h"
 		$File	"$SRCDIR\game\client\hud_vote.cpp"
+		$File	"$SRCDIR\game\client\glow_outline_effect.cpp"
 		$File	"$SRCDIR\game\shared\predicted_viewmodel.cpp"
 		$File	"$SRCDIR\game\shared\predicted_viewmodel.h"
 		
diff --git a/game/client/clientmode_shared.cpp b/game/client/clientmode_shared.cpp
index fb0421204..a1259189c 100644
--- a/game/client/clientmode_shared.cpp
+++ b/game/client/clientmode_shared.cpp
@@ -66,6 +66,8 @@ extern ConVar replay_rendersetting_renderglow;
 #include "econ_item_description.h"
 #endif
 
+#include "clienteffectprecachesystem.h"
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -87,6 +89,11 @@ extern ConVar voice_modenable;
 
 extern bool IsInCommentaryMode( void );
 
+CLIENTEFFECT_REGISTER_BEGIN( PrecachePostProcessingEffectsGlow )
+CLIENTEFFECT_MATERIAL( "dev/glow_color" )
+CLIENTEFFECT_MATERIAL( "dev/halo_add_to_screen" )
+CLIENTEFFECT_REGISTER_END_CONDITIONAL( engine->GetDXSupportLevel() >= 90 )
+
 #ifdef VOICE_VOX_ENABLE
 void VoxCallback( IConVar *var, const char *oldString, float oldFloat )
 {
@@ -752,6 +759,9 @@ int ClientModeShared::HudElementKeyInput( int down, ButtonCode_t keynum, const c
 //-----------------------------------------------------------------------------
 bool ClientModeShared::DoPostScreenSpaceEffects( const CViewSetup *pSetup )
 {
+#ifdef GLOWS_ENABLE
+	g_GlowObjectManager.RenderGlowEffects( pSetup, 0 );
+#endif
 #if defined( REPLAY_ENABLED )
 	if ( engine->IsPlayingDemo() )
 	{
diff --git a/game/server/cstrike/cs_player.cpp b/game/server/cstrike/cs_player.cpp
index 9d8a0c349..ad0fb0f2a 100644
--- a/game/server/cstrike/cs_player.cpp
+++ b/game/server/cstrike/cs_player.cpp
@@ -1598,6 +1598,8 @@ void CCSPlayer::PostThink()
 		StopSound( "Player.AmbientUnderWater" );
 		SetPlayerUnderwater( false );
     }
+
+	AddGlowEffect();
 }
 
 
diff --git a/game/server/server_cstrike.vpc b/game/server/server_cstrike.vpc
index ded2f04c1..e3126e658 100644
--- a/game/server/server_cstrike.vpc
+++ b/game/server/server_cstrike.vpc
@@ -15,7 +15,7 @@ $Configuration
 	$Compiler
 	{
 		$AdditionalIncludeDirectories	"$BASE;$SRCDIR\game\shared\cstrike\control,$SRCDIR\game\shared\cstrike,.\cstrike,.\cstrike\bot,.\cstrike\bot\states,$SRCDIR\game\shared\cstrike\bot,.\cstrike\hostage,.\cstrike\control"
-		$PreprocessorDefinitions		"$BASE;BOTS;CSTRIKE_DLL;NEXT_BOT"
+		$PreprocessorDefinitions		"$BASE;BOTS;CSTRIKE_DLL;NEXT_BOT;GLOWS_ENABLE"
 	}
 
 	$Linker
diff --git a/gamedata b/gamedata
index 6c9a411b1..3cd6248ac 160000
--- a/gamedata
+++ b/gamedata
@@ -1 +1 @@
-Subproject commit 6c9a411b1e780bbaf42901753c28028ef577bbb3
+Subproject commit 3cd6248acc4b083db1653acd9dbebc351bd63368