diff --git a/OpenParrot/src/Functions/Games/ES3X/Tekken7.cpp b/OpenParrot/src/Functions/Games/ES3X/TER.cpp
similarity index 56%
rename from OpenParrot/src/Functions/Games/ES3X/Tekken7.cpp
rename to OpenParrot/src/Functions/Games/ES3X/TER.cpp
index 89efd6d..eec006c 100644
--- a/OpenParrot/src/Functions/Games/ES3X/Tekken7.cpp
+++ b/OpenParrot/src/Functions/Games/ES3X/TER.cpp
@@ -18,7 +18,15 @@ static InitFunction Tekken7Func([]()
 		// Skip all errors
 		injector::MakeNOP(imageBase + 0x25E791, 5);
 
-		// Force Offline mode
-		//safeJMP(imageBase + 0xACB190, ReturnFalse);
-	}, GameID::Tekken7);
+		// First Check Error
+		injector::MakeNOP(imageBase + 0x268E00, 5);
+
+		// Windowed
+		if (ToBool(config["General"]["Windowed"]))
+		{
+			// TODO: DOCUMENT PATCHES
+			injector::WriteMemory<LONGLONG>(imageBase + 0x115E757, 0xF633C1FFC1FFC933, true);
+			injector::WriteMemory<DWORD>(imageBase + 0x115E757 + 0x08, 0xC6FFC6FF, true);
+		}
+	}, GameID::TER);
 #endif
\ No newline at end of file
diff --git a/OpenParrot/src/Functions/WindowedDx8.cpp b/OpenParrot/src/Functions/WindowedDx8.cpp
index e50356a..d62060e 100644
--- a/OpenParrot/src/Functions/WindowedDx8.cpp
+++ b/OpenParrot/src/Functions/WindowedDx8.cpp
@@ -80,6 +80,8 @@ static InitFunction initFunc([]()
 {
 	if (GameDetect::currentGame == GameID::BG4)
 		return;
+	if (GameDetect::currentGame == GameID::TER)
+		return;
 	if (GameDetect::currentGame == GameID::FNFSC)
 		InitD3D8WindowHook();
 	if (ToBool(config["General"]["Windowed"]))
diff --git a/OpenParrot/src/Functions/WindowedDx9.cpp b/OpenParrot/src/Functions/WindowedDx9.cpp
index 1881093..21eef51 100644
--- a/OpenParrot/src/Functions/WindowedDx9.cpp
+++ b/OpenParrot/src/Functions/WindowedDx9.cpp
@@ -70,7 +70,7 @@ extern linb::ini config;
 
 static InitFunction initFunc([]()
 {
-	if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague)
+	if (GameDetect::currentGame == GameID::BG4 || GameDetect::currentGame == GameID::JLeague || GameDetect::currentGame == GameID::TER)
 		return;
 	if (ToBool(config["General"]["Windowed"]))
 	{
diff --git a/OpenParrot/src/Functions/WindowedDxgi.cpp b/OpenParrot/src/Functions/WindowedDxgi.cpp
index c78918a..bda673e 100644
--- a/OpenParrot/src/Functions/WindowedDxgi.cpp
+++ b/OpenParrot/src/Functions/WindowedDxgi.cpp
@@ -241,7 +241,7 @@ extern linb::ini config;
 
 static InitFunction initFunc([]()
 {
-	if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::Tekken7)
+	if (GameDetect::currentGame == GameID::PokkenTournament || GameDetect::currentGame == GameID::SchoolOfRagnarok || GameDetect::currentGame == GameID::TER)
 		return;
 	if (ToBool(config["General"]["Windowed"]))
 	{
diff --git a/OpenParrot/src/Utility/GameDetect.cpp b/OpenParrot/src/Utility/GameDetect.cpp
index 887edf8..2c09d5c 100644
--- a/OpenParrot/src/Utility/GameDetect.cpp
+++ b/OpenParrot/src/Utility/GameDetect.cpp
@@ -475,7 +475,7 @@ void GameDetect::DetectCurrentGame()
 			currentGame = GameID::Theatrhythm;
 			break;
 		case 0xdb9c3a90:
-			currentGame = GameID::Tekken7;
+			currentGame = GameID::TER;
 			break;
 #endif
 		default:
diff --git a/OpenParrot/src/Utility/GameID.h b/OpenParrot/src/Utility/GameID.h
index d276bc8..3fa6d2c 100644
--- a/OpenParrot/src/Utility/GameID.h
+++ b/OpenParrot/src/Utility/GameID.h
@@ -60,5 +60,5 @@ enum class GameID
 	GHA,
 	JLeague,
 	Theatrhythm,
-	Tekken7
+	TER
 };
\ No newline at end of file