Make default folders consistent with the command-line defaults