Updating template based on w32 retro thread

Ian Pedowitzrequested to merge
ipedowitz-main-patch-15395 into main

Assigning some tasks to @s_awezec for w33 and w34, will assign back to me after

Merge request reports