Disabled window buttons now respect their style when window is not focused
Fix merge conflict