Thanks, I got that working.

It's a bit more cumbersome (and I miss out on the Launcher) and I honestly preferred it automatically adding the windows, but if I can't get it to work correctly anymore I guess it will have to do.

Thanks everyone for your help.