Blender now supports multilayered matcaps. These are matcaps with a separate diffuse and specular pass.
I think you can just commit this type of thing directly.
But this seems to missing the explanation of why multilayer matcaps are useful, which is that only the diffuse layer is affected by material/texture/random color.
Don't use "we". Instead write something like "Two kinds of image files are supported"