Dark theme. Always show close button option.
Merge remote-tracking branch 'upstream/master'