Draw2D now uses 1 color variable stored as a 4 float struct
Split up Draw2D into Draw2D and RenderGL3