Add -w/--windowed switch