Add org opml support
Clean up org settings