WxH defines now in Hex. Minimal changes