Looks like updating to 3.10 doesn't require any changes
Fixed bug with two windows of the same application, thanks @slaff66 for suggestion