My preferred solution at the moment is that they do what they are doing for Windows 8's surface UI for both touch and hybrid devices, but also continue with the strain of Windows that is targeted to mouse-and-keyboard.