> They also did move the Magic Keyboard and Magic Mouse to USB-C.

Only for the bundled peripherals, it seems. The Apple Store now only lists the full-size Lightning keyboard without Touch ID in white, which is even worse than before when you could get various permutations of tenkeyless, Touch ID, and black.