diff --git a/premake5.lua b/premake5.lua
index 52670306d..d03ac8857 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -69,9 +69,12 @@ filter("platforms:Windows")
   -- Ignores complaints about empty obj files:
   linkoptions({"/ignore:4006", "/ignore:4221"})
   -- Enable multiprocessor compiles (requires Minimal Rebuild to be disabled).
-  buildoptions({"/MP"})
+  buildoptions({
+    "/MP",              -- Multiprocessor compilation.
+    "/wd4100",          -- Unreferenced parameters are ok.
+  })
   flags({
-    "NoMinimalRebuild",
+    "NoMinimalRebuild", -- Required for /MP above.
   })
   defines({
     "_CRT_NONSTDC_NO_DEPRECATE",
diff --git a/src/xenia/ui/gl/gl4_elemental_renderer.cc b/src/xenia/ui/gl/gl4_elemental_renderer.cc
index 7eba88d45..551010943 100644
--- a/src/xenia/ui/gl/gl4_elemental_renderer.cc
+++ b/src/xenia/ui/gl/gl4_elemental_renderer.cc
@@ -162,7 +162,7 @@ void main() { \n\
   glEnableVertexArrayAttrib(vao_, 1);
   glVertexArrayAttribBinding(vao_, 1, 0);
   glVertexArrayAttribFormat(vao_, 1, 4, GL_UNSIGNED_BYTE, GL_TRUE,
-                            offsetof(Vertex, col));
+                            offsetof(Vertex, color));
   glEnableVertexArrayAttrib(vao_, 2);
   glVertexArrayAttribBinding(vao_, 2, 0);
   glVertexArrayAttribFormat(vao_, 2, 2, GL_FLOAT, GL_FALSE,
diff --git a/third_party/elemental-forms b/third_party/elemental-forms
index 1f7de4d3c..187fb988e 160000
--- a/third_party/elemental-forms
+++ b/third_party/elemental-forms
@@ -1 +1 @@
-Subproject commit 1f7de4d3c4cbbae1d8cff5a713b4f75dd3088ec4
+Subproject commit 187fb988e015576f840d47f6722b094d1d8cd7e8
diff --git a/xb.bat b/xb.bat
index 9907a3831..7b9120048 100644
--- a/xb.bat
+++ b/xb.bat
@@ -671,6 +671,15 @@ IF %ALL% NEQ 1 (
     )
   )
   POPD
+  PUSHD third_party\elemental-forms\src
+  FOR /R %%G in (*.cc *.c *.h *.inl) DO (
+    ECHO ^> clang-format %%G
+    CMD /C %CLANG_FORMAT% -i -style=file %%G
+    IF !ERRORLEVEL! NEQ 0 (
+      SET ANY_ERRORS=1
+    )
+  )
+  POPD
 )
 IF %ANY_ERRORS% NEQ 0 (
   ECHO.