diff --git a/Common.ruleset b/Common.ruleset
index 7ed3ab5c0a..774788799b 100644
--- a/Common.ruleset
+++ b/Common.ruleset
@@ -376,7 +376,7 @@
 		<Rule Id="SA1136" Action="Hidden" />
 
 		<!-- Elements should have the same indentation -->
-		<Rule Id="SA1137" Action="Hidden" />
+		<Rule Id="SA1137" Action="Error" />
 	</Rules>
 
 	<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers.OrderingRules">
diff --git a/src/BizHawk.Client.Common/Api/HttpCommunication.cs b/src/BizHawk.Client.Common/Api/HttpCommunication.cs
index 74d3d6f395..1e5604343c 100644
--- a/src/BizHawk.Client.Common/Api/HttpCommunication.cs
+++ b/src/BizHawk.Client.Common/Api/HttpCommunication.cs
@@ -11,7 +11,7 @@ namespace BizHawk.Client.Common
 	{
 		private readonly HttpClient _client = new HttpClient();
 
-        private readonly Func<byte[]> _takeScreenshotCallback;
+		private readonly Func<byte[]> _takeScreenshotCallback;
 
 		public int DefaultTimeout { get; set; } = 500;
 
diff --git a/src/BizHawk.Client.Common/lua/LuaFile.cs b/src/BizHawk.Client.Common/lua/LuaFile.cs
index 080f9328d7..4d8c3dba38 100644
--- a/src/BizHawk.Client.Common/lua/LuaFile.cs
+++ b/src/BizHawk.Client.Common/lua/LuaFile.cs
@@ -54,8 +54,7 @@
 			}
 
 			State = RunState.Disabled;
-			//if(NLua.Lua.WhichLua == "NLua")
-				Thread.GetTable("keepalives")[Thread] = null;
+			if (true /*NLua.Lua.WhichLua == "NLua"*/) Thread.GetTable("keepalives")[Thread] = null;
 			Thread = null;
 		}
 
diff --git a/src/BizHawk.Client.Common/movie/bk2/StringLogs.cs b/src/BizHawk.Client.Common/movie/bk2/StringLogs.cs
index 20ea8f7e98..bce3efc6d9 100644
--- a/src/BizHawk.Client.Common/movie/bk2/StringLogs.cs
+++ b/src/BizHawk.Client.Common/movie/bk2/StringLogs.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
 	{
 		public IStringLog Clone()
 		{
-			 var ret = new ListStringLog();
+			var ret = new ListStringLog();
 			ret.AddRange(this);
 			return ret;
 		}
diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
index 40c89bf8af..0231417195 100644
--- a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
+++ b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
@@ -387,8 +387,7 @@ namespace BizHawk.Client.EmuHawk
 			// and OSD goes on top of that
 			// TODO - things break if this isn't present (the final presentation filter gets messed up when used with prescaling)
 			// so, always include it (we'll handle this flag in the callback to do no rendering)
-			//if (includeOSD)
-				chain.AddFilter(fOSD, "osd");
+			if (true /*includeOSD*/) chain.AddFilter(fOSD, "osd");
 
 			return chain;
 		}
diff --git a/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
index a72cd0c7dd..501b72b35b 100644
--- a/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
+++ b/src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
@@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions
 				case "uzem":
 					return SystemInfo.UzeBox;
 				case "PCFX":
-						return SystemInfo.Pcfx;
+					return SystemInfo.Pcfx;
 			}
 		}
 	}
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
index ce445226ad..bf9169b8e9 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
@@ -16,8 +16,7 @@ namespace BizHawk.Client.EmuHawk
 	{
 		public Win32LuaLibraries()
 		{
-//			if (NLua.Lua.WhichLua == "NLua")
-				_lua["keepalives"] = _lua.NewTable();
+			if (true /*NLua.Lua.WhichLua == "NLua"*/) _lua["keepalives"] = _lua.NewTable();
 		}
 
 		public Win32LuaLibraries(
@@ -205,7 +204,7 @@ namespace BizHawk.Client.EmuHawk
 			var content = File.ReadAllText(file);
 			var main = lua.LoadString(content, "main");
 			lua.Push(main); // push main function on to stack for subsequent resuming
-			//if (NLua.Lua.WhichLua == "NLua")
+			if (true /*NLua.Lua.WhichLua == "NLua"*/)
 			{
 				_lua.GetTable("keepalives")[lua] = 1;
 				//this not being run is the origin of a memory leak if you restart scripts too many times
@@ -223,8 +222,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_currThread = _lua.NewThread();
 			_currThread.DoString(command);
-			//if (NLua.Lua.WhichLua == "NLua")
-				_lua.Pop();
+			if (true /*NLua.Lua.WhichLua == "NLua"*/) _lua.Pop();
 		}
 
 		public override void RunScheduledDisposes() => _lua.RunScheduledDisposes();
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 607406d7a6..8755697500 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (AskSaveChanges())
 			{
-				 var newProject = CurrentTasMovie.ConvertToSavestateAnchoredMovie(
+				var newProject = CurrentTasMovie.ConvertToSavestateAnchoredMovie(
 					Emulator.Frame, StatableEmulator.CloneSavestate());
 
 				MainForm.PauseEmulator();
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 7ea33ec9aa..07edd18c6a 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -5,7 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<NoWarn>$(NoWarn);SA1205;SA1208;SA1400</NoWarn>
+		<NoWarn>$(NoWarn);SA1137;SA1205;SA1208;SA1400</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />