diff --git a/AuroraEnvironment.h b/AuroraEnvironment.h
index 7cd2ad9..20a5a80 100644
--- a/AuroraEnvironment.h
+++ b/AuroraEnvironment.h
@@ -1,4 +1,4 @@
-/***
+/***
     Copyright (©) 2020 Reece Wilson (a/k/a "Reece").
     All rights reserved.
 
@@ -25,8 +25,6 @@
     #define AURORA_PLATFORM_KERNEL_LINUX
 #elif defined(_NTOS_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_NTOS
-#elif defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64) 
-    #define AURORA_PLATFORM_WIN32
 #elif defined(__ANDROID__) || defined(_ANDROID_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_ANDROID
 #elif defined(__linux__) || defined(_LINUX_AURORA_PREPROCESSOR)
@@ -39,25 +37,31 @@
     #define AURORA_PLATFORM_BSD
 #elif defined(_SWITCH_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_SWITCH
+#elif defined(_SWITCH2_AURORA_PREPROCESSOR)
+    #define AURORA_PLATFORM_SWITCH2
 #elif defined(_PS4_AURORA_PREPROCESSOR) || defined(__ORBIS__)
     #define AURORA_PLATFORM_PS4
 #elif defined(_PS5_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_PS5
+#elif defined(_XBOX) && !defined(_GAMING_XBOX)
+	#define AURORA_PLATFORM_XBOX_360
 #elif defined(_XBONE_AURORA_PREPROCESSOR) || defined(_XBOX_ONE)
     #define AURORA_PLATFORM_XBONE
 #elif defined(_WII_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_WII
 #elif defined(_WII_U_AURORA_PREPROCESSOR)
     #define AURORA_PLATFORM_WII_U
+#elif defined(_WINDOWS) || defined(_WIN32) || defined(_WIN64) 
+    #define AURORA_PLATFORM_WIN32
 #endif
 
-#if defined(_GAMING_XBOX)
+#if defined(_GAMING_XBOX) || defined(_XBOX)
     #define VENDOR_CONSOLE_MICROSOFT
 #elif defined(__APPLE__)
     #define VENDOR_GENERIC_APPLE
 #elif defined(AURORA_PLATFORM_PS4) || defined(AURORA_PLATFORM_PS5)
     #define VENDOR_CONSOLE_SONY
-#elif defined(AURORA_PLATFORM_SWITCH) || defined(AURORA_PLATFORM_WII)|| defined(AURORA_PLATFORM_WII_U)
+#elif defined(AURORA_PLATFORM_SWITCH) || defined(AURORA_PLATFORM_SWITCH2) || defined(AURORA_PLATFORM_WII)|| defined(AURORA_PLATFORM_WII_U)
     #define VENDOR_CONSOLE_NINTENDO
 #elif defined(AURORA_PLATFORM_NTOS) || defined(AURORA_PLATFORM_WIN32)
     #define VENDOR_GENERIC_MICROSOFT