Colors, borders, buttons

Not many changes.