Following last month’s announcement that OnePlus was integrating with Oppo, effectively becoming a sub-brand of the phone manufacturer, the company announced on Friday that it’s also merging OxygenOS with Oppo’s ColorOS operating system.

Both companies’ software will remain separate and continue to serve their individual regions (OxygenOS for OnePlus phones globally, ColorOS on OnePlus and Oppo devices in China)

However, both companies will share a common codebase. The global OnePlus device will come with the newly updated OxygenOS and it is likely that all OnePlus phones currently on the market and are still running will also get a software update in the near future.