diff --git a/README.md b/README.md
index d1d79870a..382d6b741 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Supported platforms:
  * RaspberryPi
  * SteamLink
  * Windows (XP, Vista, 7, 8, 10)
- * WinRT (WinPhone 8.0+)
+ * UWP (Universal Windows, Xbox One)
 
 Supported compilers:
 
diff --git a/examples/common/entry/entry_p.h b/examples/common/entry/entry_p.h
index fa4792a5c..21fa614c7 100644
--- a/examples/common/entry/entry_p.h
+++ b/examples/common/entry/entry_p.h
@@ -13,7 +13,7 @@
 #include "entry.h"
 
 #ifndef ENTRY_CONFIG_USE_NOOP
-#	define ENTRY_CONFIG_USE_NOOP (BX_PLATFORM_QNX)
+#	define ENTRY_CONFIG_USE_NOOP 0
 #endif // ENTRY_CONFIG_USE_NOOP
 
 #ifndef ENTRY_CONFIG_USE_SDL
diff --git a/examples/common/entry/entry_winrt.cx b/examples/common/entry/entry_winrt.cx
index 4b3ef5a38..88368c578 100644
--- a/examples/common/entry/entry_winrt.cx
+++ b/examples/common/entry/entry_winrt.cx
@@ -24,7 +24,7 @@ using namespace Windows::Graphics::Display;
 #endif // BX_PLATFORM_WINRT
 using namespace Platform;
 
-static const char* const g_emptyArgs[] = { "" };
+static const char* const g_emptyArgs[] = { "app.exe", "--d3d12", "02" };
 static entry::WindowHandle g_defaultWindow = { 0 };
 static entry::EventQueue g_eventQueue;
 
@@ -146,7 +146,7 @@ private:
 
 	static int32_t MainThreadFunc(bx::Thread*, void*)
 	{
-		return entry::main(0, g_emptyArgs);
+		return entry::main(BX_COUNTOF(g_emptyArgs), g_emptyArgs);
 	}
 };
 
diff --git a/include/bgfx/embedded_shader.h b/include/bgfx/embedded_shader.h
index 6bffbf58c..116200ba0 100644
--- a/include/bgfx/embedded_shader.h
+++ b/include/bgfx/embedded_shader.h
@@ -34,7 +34,6 @@
 		|| BX_PLATFORM_IOS              \
 		|| BX_PLATFORM_LINUX            \
 		|| BX_PLATFORM_OSX              \
-		|| BX_PLATFORM_QNX              \
 		|| BX_PLATFORM_RPI              \
 		|| BX_PLATFORM_STEAMLINK        \
 		|| BX_PLATFORM_WINDOWS          \
diff --git a/scripts/bgfx.lua b/scripts/bgfx.lua
index c2a1f8d0a..20ace6913 100644
--- a/scripts/bgfx.lua
+++ b/scripts/bgfx.lua
@@ -127,7 +127,7 @@ function bgfxProjectBase(_kind, _defines)
 				"GLESv2",
 			}
 
-		configuration { "winphone* or winstore*" }
+		configuration { "winstore*" }
 			linkoptions {
 				"/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata
 			}
diff --git a/scripts/example-common.lua b/scripts/example-common.lua
index 579910d60..7dcac8d53 100644
--- a/scripts/example-common.lua
+++ b/scripts/example-common.lua
@@ -90,7 +90,7 @@ project ("example-common")
 			path.join(BGFX_DIR, "examples/common/**.mm"),
 		}
 
-	configuration { "winphone* or winstore* or durango"}
+	configuration { "winstore* or durango"}
 		files {
 			path.join(BGFX_DIR, "examples/common/**.cx"),
 		}
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 59632549a..78da3b6b2 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -232,7 +232,7 @@ function exampleProjectDefaults()
 			"kernelx",
 		}
 
-	configuration { "winphone* or winstore*" }
+	configuration { "winstore*" }
 		removelinks {
 			"DelayImp",
 			"gdi32",
@@ -248,15 +248,15 @@ function exampleProjectDefaults()
 		}
 
 	-- WinRT targets need their own output directories or build files stomp over each other
-	configuration { "x32", "winphone* or winstore*" }
+	configuration { "x32", "winstore*" }
 		targetdir (path.join(BGFX_BUILD_DIR, "win32_" .. _ACTION, "bin", _name))
 		objdir (path.join(BGFX_BUILD_DIR, "win32_" .. _ACTION, "obj", _name))
 
-	configuration { "x64", "winphone* or winstore*" }
+	configuration { "x64", "winstore*" }
 		targetdir (path.join(BGFX_BUILD_DIR, "win64_" .. _ACTION, "bin", _name))
 		objdir (path.join(BGFX_BUILD_DIR, "win64_" .. _ACTION, "obj", _name))
 
-	configuration { "ARM", "winphone* or winstore*" }
+	configuration { "ARM", "winstore*" }
 		targetdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "bin", _name))
 		objdir (path.join(BGFX_BUILD_DIR, "arm_" .. _ACTION, "obj", _name))
 
diff --git a/scripts/texturev.lua b/scripts/texturev.lua
index 7169bf441..c24255597 100644
--- a/scripts/texturev.lua
+++ b/scripts/texturev.lua
@@ -132,7 +132,7 @@ project ("texturev")
 			"psapi",
 		}
 
-	configuration { "winphone* or winstore*" }
+	configuration { "winstore*" }
 		removelinks {
 			"DelayImp",
 			"gdi32",
diff --git a/src/config.h b/src/config.h
index a631eeef3..6032b2c61 100644
--- a/src/config.h
+++ b/src/config.h
@@ -64,7 +64,6 @@
 					|| BX_PLATFORM_ANDROID \
 					|| BX_PLATFORM_EMSCRIPTEN \
 					|| BX_PLATFORM_IOS \
-					|| BX_PLATFORM_QNX \
 					|| BX_PLATFORM_RPI \
 					|| BX_PLATFORM_STEAMLINK \
 					|| BX_PLATFORM_NX \
diff --git a/src/renderer_gl.h b/src/renderer_gl.h
index 0e890a245..f9a6db71f 100644
--- a/src/renderer_gl.h
+++ b/src/renderer_gl.h
@@ -12,7 +12,6 @@
 			|| BX_PLATFORM_EMSCRIPTEN                     \
 			|| BX_PLATFORM_LINUX                          \
 			|| BX_PLATFORM_NX                             \
-			|| BX_PLATFORM_QNX                            \
 			|| BX_PLATFORM_RPI                            \
 			|| BX_PLATFORM_STEAMLINK                      \
 			|| BX_PLATFORM_WINDOWS                        \