fix colors and borders