This
So basically yes, but, maybe no if somthing doesn't fit perfectly, but they work together, so can't say for sure if it'll ever happen (which I don't hope, because the comic is Mathmatical). Which means; so far it is all canon.
That may have been the single most confusing sentence I've ever created