Revert black as default color and add default space