Tweaked and cleaned up the shader, reduced the number of boxes for slightly better performance if multiple windows are open.
Merge remote-tracking branch 'remotes/origin/master'