Okay so, since the Tsukihime Remake came with a Shiki redesign and he now looks like a palette swap of Shirou, in order to avoid confusion I now propose a modern redesign for Shirou so nobody will confuse the two characters:
Spoiler:
Any objections?