Replaced single_window_no_border patch with singularborders patch