diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index c5bd8758b5..4a483df691 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -22,6 +22,16 @@
 #include "GameConstantsAndTypes.h"
 #include "Font.h"
 
+/* XXX:
+ * We need some kind of font modifier string for metrics.  For example,
+ * "valign=top;spacing = x+5,y+2"
+ *
+ * Better, we could go all the way, drop all of the actor-specific font aliases,
+ * and do "font=header2;valign=top;...".
+ *
+ * However, let's wait until Pango support is in, so we can figure out how to
+ * integrate font selection at the same time.
+ */
 /*
  * Forward planning:
  *
diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index b04fb97a59..4e70226629 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -47,7 +47,7 @@ static int			g_iFramesRenderedSinceLastCheck,
 
 PWSWAPINTERVALEXTPROC GLExt::wglSwapIntervalEXT;
 
-const GLenum RageVertexFormat = GL_T2F_C4UB_V3F;
+const GLenum RageVertexFormat = GL_T2F_C4F_N3F_V3F;
 
 void GetGLExtensions(set<string> &ext)
 {