Merge "Make cryptkeeper background dark black"