I guess this is OK.
Handle reserved values explicitly and move mapping to common.h
WinGUI update after last commit.