Update with latest changes (esp qt category move)