Fix colors and branch info