Merge Xresources instead of replace
Use border width 1 instead of 2