Fix HTTP/HTTPS and add Atom