Add omni dependencies
Major cleanup and added Omni overlays