Updated with windmove-stuff