diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 26f912d1..c475e3c3 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8) # Eric: These are rookie numbers, you need to bump those numbers up.
+cmake_minimum_required(VERSION 3.2)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 project(RBDoom3BFG)
diff --git a/neo/d3xp/Game_local.cpp b/neo/d3xp/Game_local.cpp
index 91643543..6e528ec0 100644
--- a/neo/d3xp/Game_local.cpp
+++ b/neo/d3xp/Game_local.cpp
@@ -1287,6 +1287,7 @@ void idGameLocal::PopulateEnvironmentProbes()
 	const idDict* envProbeDef = gameLocal.FindEntityDefDict( "env_probe", false );
 	if( !envProbeDef )
 	{
+		Printf( "entityDef env_probe missing in base/def/" );
 		return;
 	}
 
diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp
index 3777d5bc..a59ebb2b 100644
--- a/neo/framework/common_frame.cpp
+++ b/neo/framework/common_frame.cpp
@@ -558,7 +558,7 @@ void idCommonLocal::Frame()
 				|| ( game && game->InhibitControls() && !IsPlayingDoomClassic() ) || ImGuiTools::ReleaseMouseForTools() )
 #else
 		if( com_pause.GetInteger() || console->Active() || Dialog().IsDialogActive() || session->IsSystemUIShowing()
-				|| ( game && game->InhibitControls() ) )
+				|| ( game && game->InhibitControls() ) ||  ImGuiTools::ReleaseMouseForTools() )
 #endif
 			// RB end, DG end
 		{
diff --git a/neo/renderer/Image_files.cpp b/neo/renderer/Image_files.cpp
index 870ae380..9fba1c4d 100644
--- a/neo/renderer/Image_files.cpp
+++ b/neo/renderer/Image_files.cpp
@@ -1227,7 +1227,6 @@ retry:
 	*/
 }
 
-
 /*
 =======================
 R_LoadCubeImages
@@ -1281,6 +1280,7 @@ bool R_LoadCubeImages( const char* imgName, cubeFiles_t extensions, byte* pics[6
 		{
 			R_LoadImageProgram( fullName, &pics[i], &width, &height, &thisTime );
 		}
+
 		if( thisTime == FILE_NOT_FOUND_TIMESTAMP )
 		{
 			break;
diff --git a/neo/renderer/Image_intrinsic.cpp b/neo/renderer/Image_intrinsic.cpp
index aca556e9..ab0eac3c 100644
--- a/neo/renderer/Image_intrinsic.cpp
+++ b/neo/renderer/Image_intrinsic.cpp
@@ -956,6 +956,7 @@ static void R_CreateBrdfLutImage( idImage* image )
 
 // RB end
 
+
 /*
 ================
 idImageManager::CreateIntrinsicImages
diff --git a/neo/renderer/OpenGL/RenderBackend_GL.cpp b/neo/renderer/OpenGL/RenderBackend_GL.cpp
index fcb260f9..836771d2 100644
--- a/neo/renderer/OpenGL/RenderBackend_GL.cpp
+++ b/neo/renderer/OpenGL/RenderBackend_GL.cpp
@@ -471,6 +471,7 @@ static void R_CheckPortableExtensions()
 }
 // RB end
 
+
 idStr extensions_string;
 
 /*
diff --git a/neo/renderer/OpenGL/RenderDebug_GL.cpp b/neo/renderer/OpenGL/RenderDebug_GL.cpp
index 3ea18f27..e13ccd35 100644
--- a/neo/renderer/OpenGL/RenderDebug_GL.cpp
+++ b/neo/renderer/OpenGL/RenderDebug_GL.cpp
@@ -3118,6 +3118,7 @@ void idRenderBackend::DBG_RenderDebugTools( drawSurf_t** drawSurfs, int numDrawS
 	}
 
 	renderLog.OpenMainBlock( MRB_DRAW_DEBUG_TOOLS );
+	renderLog.OpenBlock( "Render_DebugTools", colorGreen );
 	RENDERLOG_PRINTF( "---------- RB_RenderDebugTools ----------\n" );
 
 	GL_State( GLS_DEFAULT );
@@ -3168,6 +3169,7 @@ void idRenderBackend::DBG_RenderDebugTools( drawSurf_t** drawSurfs, int numDrawS
 	DBG_ShowDebugPolygons();
 	DBG_ShowTrace( drawSurfs, numDrawSurfs );
 
+	renderLog.CloseBlock();
 	renderLog.CloseMainBlock();
 }
 
diff --git a/neo/renderer/RenderBackend.cpp b/neo/renderer/RenderBackend.cpp
index aca76fb8..87094bbe 100644
--- a/neo/renderer/RenderBackend.cpp
+++ b/neo/renderer/RenderBackend.cpp
@@ -2078,6 +2078,11 @@ void idRenderBackend::AmbientPass( const drawSurf_t* const* drawSurfs, int numDr
 		return;
 	}
 
+	if( !drawSurfs )
+	{
+		return;
+	}
+
 	// if we are just doing 2D rendering, no need to fill the depth buffer
 	if( viewDef->viewEntitys == NULL )
 	{
diff --git a/neo/renderer/RenderProgs.h b/neo/renderer/RenderProgs.h
index f6bdc335..ab20195f 100644
--- a/neo/renderer/RenderProgs.h
+++ b/neo/renderer/RenderProgs.h
@@ -329,22 +329,22 @@ public:
 	void	BindShader_TextureVertexColor()
 	{
 		BindShader_Builtin( BUILTIN_TEXTURE_VERTEXCOLOR );
-	};
+	}
 
 	void	BindShader_TextureVertexColor_sRGB()
 	{
 		BindShader_Builtin( BUILTIN_TEXTURE_VERTEXCOLOR_SRGB );
-	};
+	}
 
 	void	BindShader_TextureVertexColorSkinned()
 	{
 		BindShader_Builtin( BUILTIN_TEXTURE_VERTEXCOLOR_SKINNED );
-	};
+	}
 
 	void	BindShader_TextureTexGenVertexColor()
 	{
 		BindShader_Builtin( BUILTIN_TEXTURE_TEXGEN_VERTEXCOLOR );
-	};
+	}
 
 	void	BindShader_Interaction()
 	{
diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
index e0a7731c..0d712584 100644
--- a/neo/renderer/RenderSystem_init.cpp
+++ b/neo/renderer/RenderSystem_init.cpp
@@ -313,7 +313,6 @@ const char* skyDirection[6] = { "_forward", "_back", "_left", "_right", "_up", "
 
 
 
-
 /*
 =============================
 R_SetNewMode
diff --git a/neo/renderer/tr_frontend_guisurf.cpp b/neo/renderer/tr_frontend_guisurf.cpp
index e2b38ff2..72029ce2 100644
--- a/neo/renderer/tr_frontend_guisurf.cpp
+++ b/neo/renderer/tr_frontend_guisurf.cpp
@@ -158,18 +158,19 @@ static void R_RenderGuiSurf( idUserInterface* gui, const drawSurf_t* drawSurf )
 	float guiModelMatrix[16];
 	float modelMatrix[16];
 
-	guiModelMatrix[0 * 4 + 0] = axis[0][0] * ( 1.0f / 640.0f );
-	guiModelMatrix[1 * 4 + 0] = axis[1][0] * ( 1.0f / 480.0f );
+	guiModelMatrix[0 * 4 + 0] = axis[0][0] * ( 1.0f / SCREEN_WIDTH );
+	guiModelMatrix[1 * 4 + 0] = axis[1][0] * ( 1.0f / SCREEN_HEIGHT );
 	guiModelMatrix[2 * 4 + 0] = axis[2][0];
 	guiModelMatrix[3 * 4 + 0] = origin[0];
 
-	guiModelMatrix[0 * 4 + 1] = axis[0][1] * ( 1.0f / 640.0f );
-	guiModelMatrix[1 * 4 + 1] = axis[1][1] * ( 1.0f / 480.0f );
+	guiModelMatrix[0 * 4 + 1] = axis[0][1] * ( 1.0f / SCREEN_WIDTH );
+	guiModelMatrix[1 * 4 + 1] = axis[1][1] * ( 1.0f / SCREEN_HEIGHT );
 	guiModelMatrix[2 * 4 + 1] = axis[2][1];
 	guiModelMatrix[3 * 4 + 1] = origin[1];
 
-	guiModelMatrix[0 * 4 + 2] = axis[0][2] * ( 1.0f / 640.0f );
-	guiModelMatrix[1 * 4 + 2] = axis[1][2] * ( 1.0f / 480.0f );
+	guiModelMatrix[0 * 4 + 2] = axis[0][2] * ( 1.0f / SCREEN_WIDTH );
+	guiModelMatrix[1 * 4 + 2] = axis[1][2] * ( 1.0f / SCREEN_HEIGHT );
+
 	guiModelMatrix[2 * 4 + 2] = axis[2][2];
 	guiModelMatrix[3 * 4 + 2] = origin[2];
 
@@ -204,15 +205,14 @@ void R_AddInGameGuis( const drawSurf_t* const drawSurfs[], const int numDrawSurf
 	for( int i = 0; i < numDrawSurfs; i++ )
 	{
 		const drawSurf_t* drawSurf = drawSurfs[i];
-
-		idUserInterface*	gui = drawSurf->material->GlobalGui();
+		idUserInterface* gui = drawSurf->material->GlobalGui();
 
 		int guiNum = drawSurf->material->GetEntityGui() - 1;
 		if( guiNum >= 0 && guiNum < MAX_RENDERENTITY_GUI )
 		{
 			if( drawSurf->space->entityDef != NULL )
 			{
-				gui = drawSurf->space->entityDef->parms.gui[ guiNum ];
+				gui = drawSurf->space->entityDef->parms.gui[guiNum];
 			}
 		}
 
diff --git a/neo/renderer/tr_frontend_main.cpp b/neo/renderer/tr_frontend_main.cpp
index c3d01322..b753a295 100644
--- a/neo/renderer/tr_frontend_main.cpp
+++ b/neo/renderer/tr_frontend_main.cpp
@@ -542,7 +542,7 @@ void R_RenderView( viewDef_t* parms )
 	// RB: find closest environment probe
 	if( tr.viewDef->areaNum != -1 && !tr.viewDef->isSubview )
 	{
-		float bestDist = 900000.0f;
+		float bestDist = idMath::INFINITY;
 
 		for( viewEnvprobe_t* vProbe = tr.viewDef->viewEnvprobes; vProbe != NULL; vProbe = vProbe->next )
 		{
diff --git a/neo/sys/win32/win_glimp.cpp b/neo/sys/win32/win_glimp.cpp
index 28a991fd..42cb0875 100644
--- a/neo/sys/win32/win_glimp.cpp
+++ b/neo/sys/win32/win_glimp.cpp
@@ -1059,7 +1059,6 @@ static bool GLW_GetWindowDimensions( const glimpParms_t parms, int& x, int& y, i
 	return true;
 }
 
-
 /*
 =======================
 GLW_CreateWindow