sync with upstream, new build. added -style to avoid ui issues.