Changed the colors and line-height calculation