Add some props remove overlays that don't exist