Update spacing and borders, spec around Color section