Update components to the latest ones

Please merge it if you don't mind, though it doesn't bring any functional differences ...