Geraint Thomas has agreed a new three-year deal to stay with Team Sky until 2021. The Cardiff-born rider had been linked with other teams after becoming the first Welshman to win the Tour de France in July.