Change gray containers to black + more