Just seen a well presented video that shows how to convert an mbr based installation of windows to a UEFI based install without reinstalling OS and losing data.

Convert Windows 7/8/10 Installation from Legacy to UEFI Without Data Loss (Simpler Method) - YouTube

Obviously, make an image backup first.