Add Omni remote & track some CM externals