PreferencesWindow.xib reverted to 819fd91b9bd8a168a3ba662fd0648ad5498bdaf5
Re-apply reasonable hunks
Took another hunk that was missed during the 1st review
Merge pull request #142 from kojiishi/fix-xib-regressions

Fixes xib regressions