File sync with master branch.

Also, isn't the "dark bathroom" basically a black BG?