Added colors and borders