gi windows: update

It works but too dirty... Can we maintain it?