diff --git a/index/aa/aaa.toml b/index/aa/aaa.toml
index 54d2bf33..2c59f249 100644
--- a/index/aa/aaa.toml
+++ b/index/aa/aaa.toml
@@ -1,8 +1,10 @@
 [general]
 description = "Alex's Ada Assortment (of miscellaneous utilities)"
 licenses = ["LGPL 3.0"]
-authors = ["alejandro@mosteo.com"]
+authors = ["Alejandro R. Mosteo"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
-['1.0.0']
-origin = "git+https://github.com/mosteo/aaa.git@3b263b6cb858c1ca0043674d21ae3e618c4026e2"
+['0.1']
+origin = "https://github.com/mosteo/aaa/archive/v0.1.tar.gz"
+origin-hashes = ["sha512:a9908afa198644d1b9965a7cbc3a9d39d887d1ddd1379dcda7c7b32ecc203de559dad01a5c0bc8c557ba449a343a4f0545669b725099db24014ab389eb586ff0"]
diff --git a/index/ad/adayaml.toml b/index/ad/adayaml.toml
index ce385a6e..7faf8f7b 100644
--- a/index/ad/adayaml.toml
+++ b/index/ad/adayaml.toml
@@ -3,17 +3,15 @@ description = "Experimental YAML 1.3 implementation in Ada"
 licenses = ["MIT"]
 authors = ["Felix Krause"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 website = "https://ada.yaml.io/"
 
-
-    [general.depends-on]
-    aunit = "^2017"
-
     [general.gpr-externals]
     Mode = ["debug", "release"]
 
 ['0.3']
-origin = "git+https://github.com/yaml/AdaYaml.git@2017a7c2523499c03b8d7fe06546a5a8bae6476d"
+origin = "https://github.com/yaml/AdaYaml/archive/v0.3.0.tar.gz"
+origin-hashes = ["sha512:ab19e38704e5d51a3f66da2fb9f86571ab08a6793a5d5f42ca29c3271bc754a1a845cc831d7fb24bb19c2caaf0d355ba250d0dca2959607a19936b0a91739d33"]
 project-files = ["yaml.gpr", "yaml-utils.gpr", "yaml-annotation_processor.gpr", "yaml-server.gpr"]
 executables = ["yaml-server"]
 
@@ -21,5 +19,6 @@ executables = ["yaml-server"]
     simple_components = "^4.27"
 
 ['0.2']
-origin = "git+https://github.com/yaml/AdaYaml.git@0264b03fd92eeedfe3e2713ed1da3f0d255c1727"
+origin = "https://github.com/yaml/AdaYaml/archive/v0.2.0.tar.gz"
+origin-hashes = ["sha512:b9722c24ef5f4d08973890116603fce68ad00c7a96e2cab01c7cbb6f537068877257fff5fd325efc8d29f236be4f8546ae8e75619a7a77563d339bd159d9e20b"]
 project-files = ["yaml.gpr", "yaml-utils.gpr"]
diff --git a/index/ag/agpl.toml b/index/ag/agpl.toml
index 4a4e3944..e096a12f 100644
--- a/index/ag/agpl.toml
+++ b/index/ag/agpl.toml
@@ -3,6 +3,7 @@ description = "Ada General Purpose Library with a robotics flavor"
 licenses = ["LGPL 3.0"]
 authors = ["alejandro@mosteo.com"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.depends-on]
     libgsl = "any"
@@ -14,4 +15,5 @@ maintainers = ["alejandro@mosteo.com"]
     Agpl_Include_PngIO = ["True", "False"]
 
 ['1.0.0']
-origin = "git+https://github.com/mosteo/agpl.git@00ac879f8d049171206699da39ac01f126b196e0"
+origin = "https://github.com/mosteo/agpl/archive/v1.0.0.tar.gz"
+origin-hashes = ["sha512:b5da332019cb2a2f91540bfe570f8820ce9d56e93449d1839e0f2e1c4d52d9bc759ac78826887c6da038dc23bd1f7444ac04c0518d6280ae718e6ce4f9222881"]
diff --git a/index/aj/ajunitgen.toml b/index/aj/ajunitgen.toml
index 2fc5c835..b7a33436 100644
--- a/index/aj/ajunitgen.toml
+++ b/index/aj/ajunitgen.toml
@@ -3,9 +3,11 @@ description = "Generator of JUnit-compatible XML reports"
 licenses = ["LGPL 3.0"]
 authors = ["Alejandro R. Mosteo"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.depends-on]
     xml_ez_out = "^1.6"
 
 ['1.0.0']
-origin = "git+https://github.com/mosteo/ajunitgen.git@d2d110f92b8175ace6668dfdb639ea10ece5a822"
+origin = "https://github.com/mosteo/ajunitgen/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:0d3a9b0fecbd7ca05a31ef18488f1055fc65458fd56710e33ed67ae39f25630609cad1cdd893fe00d3dfd2c8ff657a5803d5ffbf5295b70f220c535a750c2664"]
diff --git a/index/as/asis.toml b/index/as/asis.toml
index 23dc5a95..6ba5ade5 100644
--- a/index/as/asis.toml
+++ b/index/as/asis.toml
@@ -4,6 +4,7 @@ licenses = ["GPL 3.0"]
 authors = ["AdaCore"]
 website = "https://www.adacore.com/download/more"
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.depends-on]
     make = "any"
@@ -12,11 +13,11 @@ maintainers = ["alejandro@mosteo.com"]
 origin = "http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8"
 archive-name = "asis-gpl-2018-20180524-src.tar.gz"
 origin-hashes= ["sha512:e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a"]
-project-files = ["asis-gpl-2018-src/asis.gpr"]
+project-files = ["asis.gpr"]
 
     [[2018.actions]]
     type = "post-fetch"
-    command = "make setup-snames -C asis-gpl-2018-src"
+    command = "make setup-snames"
 
     [2018.available.'case(compiler)']
     gnat-community-2018 = true
@@ -26,11 +27,11 @@ project-files = ["asis-gpl-2018-src/asis.gpr"]
 origin = "http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb"
 archive-name = "asis-gpl-2017-src.tar.gz"
 origin-hashes = ["sha512:dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f"]
-project-files = ["asis-gpl-2017-src/asis.gpr"]
+project-files = ["asis.gpr"]
 
     [[2017.actions]]
     type = "post-fetch"
-    command = "make setup-snames -C asis-gpl-2017-src"
+    command = "make setup-snames"
 
     [2017.available.'case(compiler)']
     gnat-community-2018 = true
diff --git a/index/c_/c_strings.toml b/index/c_/c_strings.toml
index 53a060cb..e0764409 100644
--- a/index/c_/c_strings.toml
+++ b/index/c_/c_strings.toml
@@ -1,8 +1,10 @@
 [general]
 description = "Convenience subprograms to interact with C strings"
 licenses = ["LGPL 3.0"]
-authors = ["alejandro@mosteo.com"]
-maintainers = ["AdaCore"]
+authors = ["Alejandro R. Mosteo"]
+maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['1.0.0']
-origin = "git+https://github.com/mosteo/cstrings.git@2bd507ca150d2c58e13ae98443614a3c85330cb5"
+origin = "https://github.com/mosteo/cstrings/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:cf45f76d1f86b2389885f9235af9319130a9a5a1717000db84194fbaaa04e8b033e2cd4c173db8b922af3ee5150a1d7334f531074e215d1a911d3ffc38b85e96"]
diff --git a/index/gl/glut.toml b/index/gl/glut.toml
index 6a1b2ead..401cef32 100644
--- a/index/gl/glut.toml
+++ b/index/gl/glut.toml
@@ -2,6 +2,7 @@
 description = "OpenGL Utility Toolkit"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['2.8.1-3']
     ['2.8.1-3'.origin.'case(distribution)']
diff --git a/index/gn/gnat.toml b/index/gn/gnat.toml
index de902e32..b7ed043a 100644
--- a/index/gn/gnat.toml
+++ b/index/gn/gnat.toml
@@ -2,6 +2,7 @@
 description = "GNAT is a compiler for the Ada programming language"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 # Until we rework the native package situation, the intention here is to
 # depend on the native compiler, and not in a particular version. Hence,
diff --git a/index/gn/gnatcoll.toml b/index/gn/gnatcoll.toml
index c0007d6e..0d9a55a6 100644
--- a/index/gn/gnatcoll.toml
+++ b/index/gn/gnatcoll.toml
@@ -3,6 +3,7 @@ description = "GNAT Components Collection - Core packages"
 licenses = ["GPL 3.0"]
 authors = ["AdaCore"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 # This crate has a hidden conflict with any other gnatcoll.
 # Declaring conflicts was removed during index transition 
diff --git a/index/gt/gtkada.toml b/index/gt/gtkada.toml
index 574314ef..7b2dd7c0 100644
--- a/index/gt/gtkada.toml
+++ b/index/gt/gtkada.toml
@@ -2,6 +2,7 @@
 description = "Ada binding for the GTK+ GUI"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.depends-on]
     gnat = "any"
diff --git a/index/ha/hangman.toml b/index/ha/hangman.toml
index 177d7ade..cb268661 100644
--- a/index/ha/hangman.toml
+++ b/index/ha/hangman.toml
@@ -3,7 +3,9 @@ description = "Hangman game for the console"
 licenses = []
 authors = ["Jon Hollan, Mark Hoffman, & Brandon Ball"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 executables = ["hangmain"]
 
 ['1.0']
-origin = "git+https://github.com/alire-project/Hangman.git@a57904920b81d72621aba434bf72e0175a12624d"
+origin = "https://github.com/alire-project/Hangman/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:be628ad574b3072b2b854bf8f272c6c9d95cf9b2d88e7baa9a09754519ba6dc393b7fc7241547a9efc9705bfc77ca427a164ae8a52cfa5d739367f0bbaba7903"]
diff --git a/index/he/hello.toml b/index/he/hello.toml
index 3a67600a..9fda8103 100644
--- a/index/he/hello.toml
+++ b/index/he/hello.toml
@@ -2,15 +2,18 @@
 description = """"Hello, world!" demonstration project"""
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['1.0.1']
-origin = "git+https://github.com/alire-project/hello.git@65725c20778875eef12b61a01b437120932965f3"
+origin = "https://github.com/alire-project/hello/archive/v1.0.1.tar.gz"
+origin-hashes = ["sha512:dcc36a2f6f483fab49a73db30247cfd6b53338adb45d728827573a84894456cb65ac29e64d276f38c8c73a7574f871d1d384ef4b9a2c65d3f433501068b95ad9"]
 
     ['1.0.1'.depends-on]
     libhello = "^1.0"
 
 ['1.0.0']
-origin = "git+https://github.com/alire-project/hello.git@8cac0afddc505794ae3e5634745ce0830129d241"
+origin = "https://github.com/alire-project/hello/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:6f0b4e2cd4fd9c80f88106db6e238ea578f7d0782b98664600cbaaaebe62d0d16c4717a5b5ddf35c9a037dc993845a628b9a940b0c52e4d12c431540f01278d6"]
 
     ['1.0.0'.depends-on]
     libhello = "^1.0"
diff --git a/index/hu/hungarian.toml b/index/hu/hungarian.toml
index 02f80f69..d11c1e79 100644
--- a/index/hu/hungarian.toml
+++ b/index/hu/hungarian.toml
@@ -3,9 +3,11 @@ description = "Ada wrapper for the fast Stachniss' Hungarian solver"
 licenses = ["LGPL 3.0"]
 authors = ["alejandro@mosteo.com"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.gpr-externals]
     Build_Type = ["Debug", "Release", "No_Option", "Profile"]
 
 ['1.0.0']
-origin = "git+https://github.com/mosteo/hungarian.git@2494b4501837979a92a1de90e05c95ed7b23ce93"
+origin = "https://github.com/mosteo/hungarian/archive/v1.0.0.tar.gz"
+origin-hashes = ["sha512:f68365050bcdbaea00cae17601ddc3c2d6d5156bef038875c3594d310c756b0ac51c1b9c751b593f7ab59393eca3f109205bab9b7557a7a2b6ecfa0e1dcf3fd1"]
diff --git a/index/li/libglfw3.toml b/index/li/libglfw3.toml
index 19c34599..89c8a7ef 100644
--- a/index/li/libglfw3.toml
+++ b/index/li/libglfw3.toml
@@ -2,6 +2,7 @@
 description = "Portable library for OpenGL, window and input"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [3]
     [3.origin.'case(distribution)']
diff --git a/index/li/libgnutls.toml b/index/li/libgnutls.toml
index 5b164c6e..5ede1247 100644
--- a/index/li/libgnutls.toml
+++ b/index/li/libgnutls.toml
@@ -2,6 +2,7 @@
 description = "GNU TLS library"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['3.5.8']
     ['3.5.8'.origin.'case(distribution)']
diff --git a/index/li/libgraph_easy_perl.toml b/index/li/libgraph_easy_perl.toml
index 08e6aa94..82bcff57 100644
--- a/index/li/libgraph_easy_perl.toml
+++ b/index/li/libgraph_easy_perl.toml
@@ -2,6 +2,7 @@
 description = "Drawing of ASCII graphs"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['2.8.1-3']
     ['2.8.1-3'.origin.'case(distribution)']
diff --git a/index/li/libgsl.toml b/index/li/libgsl.toml
index 1e3600fb..ca41e3e8 100644
--- a/index/li/libgsl.toml
+++ b/index/li/libgsl.toml
@@ -2,6 +2,7 @@
 description = "The GNU Scientific Library (GSL)"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [0]
     [0.origin.'case(distribution)']
diff --git a/index/li/libhello.toml b/index/li/libhello.toml
index 01fc24e5..74bb21b1 100644
--- a/index/li/libhello.toml
+++ b/index/li/libhello.toml
@@ -2,6 +2,8 @@
 description = """"Hello, world!" demonstration project support library"""
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['1.0']
-origin = "git+https://github.com/alire-project/libhello.git@ce78e7706c9d3f97605df48d8befca5407f8d328"
+origin = "https://github.com/alire-project/libhello/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:7bc7dcfd6a080c6ec726a21ed4b11d1c0038c4b0b59f9ee9a7e160d119ea09262ef5cbecc626748258c1739763a2f97fdd4023ea573cca86edd4152e173ea886"]
diff --git a/index/li/liblua.toml b/index/li/liblua.toml
index 3a6c8ba9..3291790f 100644
--- a/index/li/liblua.toml
+++ b/index/li/liblua.toml
@@ -2,6 +2,7 @@
 description = "Development files for the Lua language"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['5.3']
     ['5.3'.origin.'case(distribution)']
diff --git a/index/li/libsdl2.toml b/index/li/libsdl2.toml
index a635357a..8e52a602 100644
--- a/index/li/libsdl2.toml
+++ b/index/li/libsdl2.toml
@@ -2,6 +2,7 @@
 description = "Simple DirectMedia Layer development files"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [2]
     [2.origin.'case(distribution)']
diff --git a/index/li/libsdl2_image.toml b/index/li/libsdl2_image.toml
index c2843851..dcce1019 100644
--- a/index/li/libsdl2_image.toml
+++ b/index/li/libsdl2_image.toml
@@ -2,6 +2,7 @@
 description = "Simple DirectMedia Layer development files - Image"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [2]
     [2.origin.'case(distribution)']
diff --git a/index/li/libsdl2_ttf.toml b/index/li/libsdl2_ttf.toml
index 351e82ec..e18e85c1 100644
--- a/index/li/libsdl2_ttf.toml
+++ b/index/li/libsdl2_ttf.toml
@@ -2,6 +2,7 @@
 description = "Simple DirectMedia Layer development files - TTF"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [2]
     [2.origin.'case(distribution)']
diff --git a/index/li/libx11.toml b/index/li/libx11.toml
index 5b6289a5..2f36d497 100644
--- a/index/li/libx11.toml
+++ b/index/li/libx11.toml
@@ -2,6 +2,7 @@
 description = "X11 client-side library"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 [2]
     [2.origin.'case(distribution)']
diff --git a/index/ma/make.toml b/index/ma/make.toml
index dc39f15d..2fbce409 100644
--- a/index/ma/make.toml
+++ b/index/ma/make.toml
@@ -1,9 +1,11 @@
 [general]
 description = "Utility for directing compilation"
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 licenses = []
 
 [0]
-    [0.origin.'case(distribution)']
-    'debian|ubuntu' = "native:make"
-    '...' = ""
+origin = "native:make"
+#    [0.origin.'case(distribution)']
+#    'debian|ubuntu' = "native:make"
+#    '...' = ""
diff --git a/index/ma/mandelbrot_ascii.toml b/index/ma/mandelbrot_ascii.toml
index e4eb343d..0b152fe5 100644
--- a/index/ma/mandelbrot_ascii.toml
+++ b/index/ma/mandelbrot_ascii.toml
@@ -2,7 +2,9 @@
 description = "Mandelbrot renderer using Unicode glyphs"
 licenses = []
 authors = ["David Given"]
-maintainers = ["Alejandro R. Mosteo"]
+maintainers = ["Alejandro R. Mosteo <alejandro@mosteo.com>"]
+maintainers-logins = ["mosteo"]
 
 [1]
-origin = "git+https://github.com/mosteo/mandelbrot_ascii.git@53efca17cdcc2d42c3a87e4344fa782fbeac906e"
+origin = "https://github.com/mosteo/mandelbrot_ascii/archive/v1.0.tar.gz"
+origin-hashes = ["sha512:974d55bd22891e95195e725846538b7a78272e7f3d60196aa495939014a3a64b63230abe854f6a7e1f549ea2855849b15bd245a9888b8a6a587b77084782bb11"]
diff --git a/index/nc/ncursesada.toml b/index/nc/ncursesada.toml
index b5b243d9..9abb7f10 100644
--- a/index/nc/ncursesada.toml
+++ b/index/nc/ncursesada.toml
@@ -3,6 +3,7 @@ description = "Ada binding to the ncurses text interface library"
 authors = ["Thomas E. Dickey", "Juergen Pfeifer", "Eugene V Melaragno",
            "Nicolas Boulenguez"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 licenses = []
 
     [general.depends-on]
diff --git a/index/op/openglada.toml b/index/op/openglada.toml
index 8188ba76..9cbc4590 100644
--- a/index/op/openglada.toml
+++ b/index/op/openglada.toml
@@ -3,7 +3,8 @@ description = "Thick Ada binding for OpenGL and GLFW"
 licenses = ["MIT"]
 authors = ["Felix Krause <contact@flyx.org>"]
 website = "http://flyx.github.io/OpenGLAda/"
-maintainers = ["AdaCore"]
+maintainers = ["Felix Krause <contact@flyx.org>"]
+maintainers-logins = ["flyx"]
 
 project-files = ["opengl.gpr", "opengl-glfw.gpr", "opengl-soil.gpr",
                  "opengl-test.gpr"]
@@ -21,7 +22,8 @@ executables = ["gl_test-opengl3", "gl_test-context", "gl_test-vbos",
     linux = { Windowing_System = "x11" }
 
 ['0.6']
-origin = "git+https://github.com/flyx/OpenGLAda.git@54a7a50cebab2cba0262c7f59b927e9ddf6e4649"
+origin = "https://github.com/flyx/OpenGLAda/archive/v0.6.tar.gz"
+origin-hashes = ["sha512:764ed2caad37a9fb0897316724bfa53f53211b96fec63508c9926418a5cfc3e111b40b2352ad797a7ea855e269b4762d8de2306e747ef52b2eed71660e06a87c"]
 
     ['0.6'.depends-on.'case(os)'.linux]
     libglfw3 = "^3"
diff --git a/index/rs/rsfile.toml b/index/rs/rsfile.toml
index 7d151a28..c2d2ebf5 100644
--- a/index/rs/rsfile.toml
+++ b/index/rs/rsfile.toml
@@ -3,8 +3,10 @@ description = "Pick a file with probability proportional to its size"
 licenses = ["GPL 3.0"]
 authors = ["alejandro@mosteo.com"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 executables = ["rsfile"]
 
 ['1.0.0']
-origin = "git+https://github.com/mosteo/rsfile.git@d1a368be007c9e4dd92cdaa9d031324121b9f4c7"
+origin = "https://github.com/mosteo/rsfile/archive/v1.0.0.tar.gz"
+origin-hashes = ["sha512:41a4d1bf04d1b06634d4c8b33a1b5ee2c9b9e3c6fd3570d306df16a5f960748efd819c72f7295f65c1ebe8e5b30df0366c5f292abffdee96835b95d311b68e2c"]
diff --git a/index/rx/rxada.toml b/index/rx/rxada.toml
index 2d7d290f..f2bf6e51 100644
--- a/index/rx/rxada.toml
+++ b/index/rx/rxada.toml
@@ -4,6 +4,7 @@ description = "RxAda port of the Rx framework"
 licenses = ["LGPL 3.0"]
 authors = ["Alejandro R. Mosteo"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 executables = ["rx-examples-basic", "rx-examples-minimal",
                "rx-examples-tests", "rx-examples-threading"]
@@ -13,4 +14,5 @@ project-files = ["rxada.gpr",
                  "rxada_examples.gpr"]
 
 ['0.1.0']
-origin = "git+https://github.com/mosteo/rxada@918a9831b9c0ab7a478442040e06032b5218021a"
+origin = "https://github.com/mosteo/rxada/archive/v0.1.0.tar.gz"
+origin-hashes = ["sha512:6ff779c7da3da0f3a89955be8333f1483cfb4b225889455eb9c8d841ce360b9847b53d50b33ce94c37adeff329be15aa48a6de38e497380120fcfc1b9dc881d9"]
diff --git a/index/sd/sdlada.toml b/index/sd/sdlada.toml
index bcc85e66..96f31e01 100644
--- a/index/sd/sdlada.toml
+++ b/index/sd/sdlada.toml
@@ -3,6 +3,7 @@ description = "Ada 2012 bindings to SDL 2"
 licenses = ["zlib"]
 authors = ["Luke A. Guest"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 project-files = ["build/gnat/sdlada.gpr"]
 
@@ -21,7 +22,8 @@ project-files = ["build/gnat/sdlada.gpr"]
     '...' = false
 
 ['2.3.1']
-origin = "git+https://github.com/alire-project/sdlada.git@570232193facb90a58f67aadac93df9dfae8bcd4"
+origin = "https://github.com/Lucretia/sdlada/archive/v2.3.1.tar.gz"
+origin-hashes = ["sha512:786a047fd74f5105eef9d8b3f1ad082b915339cf9da4a2c32f7789dc12005acb2999301e616a67ec0b2a4c084586e812f8d6343dbd33d8bd165ba58a94db16e3"]
 
     ['2.3.1'.depends-on]
     libsdl2 = "^2.0"
diff --git a/index/se/semantic_versioning.toml b/index/se/semantic_versioning.toml
index 6385215b..2cc02e2e 100644
--- a/index/se/semantic_versioning.toml
+++ b/index/se/semantic_versioning.toml
@@ -2,18 +2,8 @@
 description = "Semantic Versioning in Ada"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
-['0.3.2']
-origin = "git+https://github.com/alire-project/semantic_versioning.git@dc462f11adb34bbb3d9163e44c287add5b3421c6"
-
-['0.3.1']
-origin = "git+https://github.com/alire-project/semantic_versioning.git@71653babaab97d835ecd22edb562b9b529dd8948"
-
-['0.3']
-origin = "git+https://github.com/alire-project/semantic_versioning.git@ebf71f00daba91489238f79819078a37e36be188"
-
-['0.2']
-origin = "git+https://github.com/alire-project/semantic_versioning.git@2937c650511ad3c87af64be963eca7eba7aebb68"
-
-['0.1.2']
-origin = "git+https://github.com/alire-project/semantic_versioning.git@09774d80fac62ea3a09d46b22d4807da530387e2"
+['1.0.1']
+origin = "https://github.com/alire-project/semantic_versioning/archive/v1.0.1.tar.gz"
+origin-hashes = ["sha512:9c00fc816683f25c085e812b8b42b62faeaafd4fdbdb91a4ee453f6ccbb0b0ff82841dff4ff9f1528d594d97cd7c9d3681d5072f010f3f51722dce2a8f062e26"]
diff --git a/index/si/simple_components.toml b/index/si/simple_components.toml
index 6523e372..d5fdaa27 100644
--- a/index/si/simple_components.toml
+++ b/index/si/simple_components.toml
@@ -1,9 +1,10 @@
 [general]
 description = "Simple Components - A collection of support packages"
-maintainers = [ "alejandro@mosteo.com" ]
 authors = [ "Dmitry A. Kazakov" ]
 website = "http://www.dmitry-kazakov.de/ada/components.htm"
 licenses = ["GMGPL 2.0"]
+maintainers = [ "alejandro@mosteo.com" ]
+maintainers-logins = ["mosteo"]
 
 [general.gpr-externals]
 Legacy = ["Ada95", "Ada2005", "Ada2012"]
@@ -25,8 +26,9 @@ libgnutls = "^3.5.8"
 unixODBC  = "^2.3"
 
 
-['4.27']
-origin = "git+https://github.com/alire-project/dak_simple_components.git@7cafd2da4a92cfe2b1a45374de6d35fc904b2788"
+['4.42']
+origin = "http://www.dmitry-kazakov.de/ada/components_4_42.tgz"
+origin-hashes = ["sha512:d428a64b7e457d616dd402ac75f8324e7564ed42e667c8efc909079638213426232ea6d856f1080b633d5bb90dda5567073b8e66cbb55462f27ea64ff7360107"]
 
 project-files = [
     "components.gpr",
diff --git a/index/si/simple_logging.toml b/index/si/simple_logging.toml
index 96b5a103..50ef33e3 100644
--- a/index/si/simple_logging.toml
+++ b/index/si/simple_logging.toml
@@ -2,6 +2,9 @@
 description = "Simple logging to console"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
+
+['1.1.0']
+origin = "https://github.com/alire-project/simple_logging/archive/v1.1.0.tar.gz"
+origin-hashes = ["sha512:4cc7cc190a2c5fe493bd73bcc7e6be8dd43455819ce35eb5c3fc32773c5b8ea8cdaccf1ac16e777e8b35f11b2c58b5773b82942033ba920a5b5680bf37a81cd9"]
 
-['1.0']
-origin = "git+https://github.com/alire-project/simple_logging.git@d98242b8bd1c7f964cebc454e9b1206ffdbb0ca9"
diff --git a/index/te/templates_parser.toml b/index/te/templates_parser.toml
index e5f9be7c..65826494 100644
--- a/index/te/templates_parser.toml
+++ b/index/te/templates_parser.toml
@@ -4,6 +4,7 @@ licenses = ["GPL 3.0"]
 authors = ["AdaCore"]
 website = "https://github.com/AdaCore/templates-parser"
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
     [general.gpr-externals]
     PRJ_BUILD = ["Debug", "Release"]
@@ -21,8 +22,9 @@ maintainers = ["alejandro@mosteo.com"]
     type = "post-fetch"
     command = "cp config/tp_xmlada_installed.gpr tp_xmlada.gpr"
 
-['19.2']
-origin = "git+https://github.com/AdaCore/templates-parser.git@d80bb73d582cac39cd60dcd5b2bdd32d367e30c6"
+['17.2']
+origin = "https://github.com/AdaCore/templates-parser/archive/17.2.tar.gz"
+origin-hashes = ["sha512:997a4ca50fef45846b125813ae2b5863632fa45120f7fc97fe501fd712049c5cde6544ce4df35f5d6a0064137507a9f35b0baffd3c07339adb4058705dce6178"]
 
-    ['19.2'.depends-on]
+    ['17.2'.depends-on]
     xmlada = "any"
diff --git a/index/un/unixodbc.toml b/index/un/unixodbc.toml
index 770f943a..fc3f3c51 100644
--- a/index/un/unixodbc.toml
+++ b/index/un/unixodbc.toml
@@ -2,6 +2,7 @@
 description = "Open Database Connectivity drivers for UNIX platforms"
 licenses = []
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 website = "http://www.unixodbc.org"
 
 ['2.3']
diff --git a/index/xm/xml_ez_out.toml b/index/xm/xml_ez_out.toml
index eb0cdd2e..2df1befe 100644
--- a/index/xm/xml_ez_out.toml
+++ b/index/xm/xml_ez_out.toml
@@ -4,8 +4,9 @@ licenses = []
 authors = ["Marc A. Criley"]
 website = "http://www.mckae.com/xmlEz.html"
 maintainers = ["alejandro@mosteo.com"]
-
+maintainers-logins = ["mosteo"]
 executables = ["tmeztf"]
 
 ['1.6']
-origin = "git+https://github.com/alire-project/xmlezout.git@48bf688f0eb672b597ed5a4f54cd6c535be452f2"
+origin = "https://github.com/alire-project/xmlezout/archive/alr-1.6.tar.gz"
+origin-hashes = ["sha512:c90d08dcdb96bf39f1e06def716ea9936b2aec25fec2ea4f3314c53a2befefa4ea84c037c35abe6d7675af1c91a8847f6ce4e5e8dd32da1008f2ba43ed79151b"]
diff --git a/index/xm/xmlada.toml b/index/xm/xmlada.toml
index e5836238..cbca8735 100644
--- a/index/xm/xmlada.toml
+++ b/index/xm/xmlada.toml
@@ -4,6 +4,7 @@ licenses = ["GPL 3.0"]
 authors = ["AdaCore"]
 website = "https://github.com/AdaCore/xmlada"
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 project-files = ["distrib/xmlada.gpr",
                  "dom/xmlada_dom.gpr",
@@ -21,13 +22,13 @@ project-files = ["distrib/xmlada.gpr",
     type = "post-fetch"
     command = "sh configure"
 
-    [[general.actions]]
+    [[general.actions]] # Is ordering preserved by TOML load?
     type = "post-fetch"
     command = "rm -f xmlada.gpr"
 
     [general.available.'case(os)']
     windows = false
-    '...' = true
 
-['18.2']
-origin = "git+https://github.com/AdaCore/xmlada.git@5c3c4a1621a970849601a9df36423d8974c13dec"
+['16.1']
+origin = "https://github.com/AdaCore/xmlada/archive/xmlada-16.1.tar.gz"
+origin-hashes = ["sha512:a2d454745af202a17e9bcfc3cd8226010652ab46c4699e7d374868966c6ac8e20d9fdee45ccc52c8ee99ca9ead0e979c401b1eff1647293308b975c96017692e"]
diff --git a/index/zl/zlib.toml b/index/zl/zlib.toml
index c71900cd..d1a8e91f 100644
--- a/index/zl/zlib.toml
+++ b/index/zl/zlib.toml
@@ -3,6 +3,7 @@ description = "Library implementing the deflate method from gzip/PKZIP"
 licenses = []
 authors = ["Jean-loup Gailly", "Mark Adler"]
 maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
 
 ['1.2']
 
diff --git a/index/zl/zlib_ada.toml b/index/zl/zlib_ada.toml
index a07ba940..d84eda0d 100644
--- a/index/zl/zlib_ada.toml
+++ b/index/zl/zlib_ada.toml
@@ -4,12 +4,13 @@ licenses = []
 authors = ["Dmitriy Anisimkov"]
 website = "http://zlib-ada.sourceforge.net/"
 maintainers = ["alejandro@mosteo.com"]
-
+maintainers-logins = ["mosteo"]
 project-files = ["zlib.gpr"]
 executables = ["buffer_demo", "mtest", "read", "test"]
 
-['1.3.0']
-origin = "git+https://github.com/alire-project/zlib-ada.git@2bacba46c2d4d753c300848fe8134ee150078167"
+['1.3']
+origin = "https://sourceforge.net/projects/zlib-ada/files/zlib-ada/1.3/zlib-ada-1.3.tar.gz"
+origin-hashes = ["sha512:e1677e3caa1fa963073b11bfba28f90e4ecd3032c1615792ad61a9860b25c73f5ef8ad062277ce29bc2ce7af08f45995161760baf4e60b79d194986fa2839977"]
 
-    ['1.3.0'.depends-on]
+    ['1.3'.depends-on]
     zlib = "^1.2"
diff --git a/index/ad/ada_lua.toml b/orphaned/ad/ada_lua.toml
similarity index 100%
rename from index/ad/ada_lua.toml
rename to orphaned/ad/ada_lua.toml
diff --git a/index/ad/adacurses.toml b/orphaned/ad/adacurses.toml
similarity index 100%
rename from index/ad/adacurses.toml
rename to orphaned/ad/adacurses.toml
diff --git a/index/al/alire.toml b/orphaned/al/alire.toml
similarity index 100%
rename from index/al/alire.toml
rename to orphaned/al/alire.toml
diff --git a/index/al/alr.toml b/orphaned/al/alr.toml
similarity index 100%
rename from index/al/alr.toml
rename to orphaned/al/alr.toml
diff --git a/index/ap/apq.toml b/orphaned/ap/apq.toml
similarity index 96%
rename from index/ap/apq.toml
rename to orphaned/ap/apq.toml
index fcb299b6..0f58a974 100644
--- a/index/ap/apq.toml
+++ b/orphaned/ap/apq.toml
@@ -13,4 +13,3 @@ origin = "git+https://github.com/alire-project/apq.git@3b5b4b99f528f853e02abf239
 
     ['3.2.0'.available.'case(compiler)']
     'gnat-community-2018' = false # Because of -gnat05
-    '...' = true
diff --git a/index/au/aunit.toml b/orphaned/au/aunit.toml
similarity index 100%
rename from index/au/aunit.toml
rename to orphaned/au/aunit.toml
diff --git a/index/de/deepend.toml b/orphaned/de/deepend.toml
similarity index 100%
rename from index/de/deepend.toml
rename to orphaned/de/deepend.toml
diff --git a/index/dl/dl_ada.toml b/orphaned/dl/dl_ada.toml
similarity index 100%
rename from index/dl/dl_ada.toml
rename to orphaned/dl/dl_ada.toml
diff --git a/index/ea/eagle_lander.toml b/orphaned/ea/eagle_lander.toml
similarity index 100%
rename from index/ea/eagle_lander.toml
rename to orphaned/ea/eagle_lander.toml
diff --git a/index/gl/globe_3d.toml b/orphaned/gl/globe_3d.toml
similarity index 100%
rename from index/gl/globe_3d.toml
rename to orphaned/gl/globe_3d.toml
diff --git a/index/gn/gnatcoll_slim.toml b/orphaned/gn/gnatcoll_slim.toml
similarity index 100%
rename from index/gn/gnatcoll_slim.toml
rename to orphaned/gn/gnatcoll_slim.toml
diff --git a/index/gn/gnatcoll_strings.toml b/orphaned/gn/gnatcoll_strings.toml
similarity index 100%
rename from index/gn/gnatcoll_strings.toml
rename to orphaned/gn/gnatcoll_strings.toml
diff --git a/index/in/ini_files.toml b/orphaned/in/ini_files.toml
similarity index 51%
rename from index/in/ini_files.toml
rename to orphaned/in/ini_files.toml
index 99b09a37..ac09410f 100644
--- a/index/in/ini_files.toml
+++ b/orphaned/in/ini_files.toml
@@ -4,8 +4,9 @@ licenses = ["MIT"]
 authors = ["Gautier de Montmollin", "Rolf Ebert"]
 website = "https://sourceforge.net/p/ini-files/"
 maintainers = ["alejandro@mosteo.com"]
-
+maintainers-logins = ["mosteo"]
 project-files = ["ini_files_gnat.gpr"]
 
 ['8.0']
-origin = "svn+https://svn.code.sf.net/p/ini-files/code/@28"
+origin = "https://sourceforge.net/projects/ini-files/files/ini-files/ini-files-08.zip"
+origin-hashes = ["sha512:9532d18f10ccdd461213b54be9ccee818de7cda1455c069a9b0f4b2653351f1d3881287963d49f875cf4213f3106e1ddc99a847688fc53516d1ca90c99018349"]
diff --git a/index/li/libadacrypt.toml b/orphaned/li/libadacrypt.toml
similarity index 100%
rename from index/li/libadacrypt.toml
rename to orphaned/li/libadacrypt.toml
diff --git a/index/ma/mathpaqs.toml b/orphaned/ma/mathpaqs.toml
similarity index 100%
rename from index/ma/mathpaqs.toml
rename to orphaned/ma/mathpaqs.toml
diff --git a/index/pd/pdf_out.toml b/orphaned/pd/pdf_out.toml
similarity index 100%
rename from index/pd/pdf_out.toml
rename to orphaned/pd/pdf_out.toml
diff --git a/index/pn/png_io.toml b/orphaned/pn/png_io.toml
similarity index 92%
rename from index/pn/png_io.toml
rename to orphaned/pn/png_io.toml
index fb06af02..8c7f112d 100644
--- a/index/pn/png_io.toml
+++ b/orphaned/pn/png_io.toml
@@ -1,7 +1,7 @@
 [general]
 description = "Ada95 coder/decoder for Portable Network Graphics"
 licenses = ["GPL 3.0"]
-authors = ["Steve Sangwine"]
+authors = ["Stephen J. Sangwine"]
 website = "http://png-io.sourceforge.net/"
 maintainers = ["alejandro@mosteo.com"]
 
diff --git a/index/pr/pragmarc.toml b/orphaned/pr/pragmarc.toml
similarity index 100%
rename from index/pr/pragmarc.toml
rename to orphaned/pr/pragmarc.toml
diff --git a/index/sm/smart_pointers.toml b/orphaned/sm/smart_pointers.toml
similarity index 100%
rename from index/sm/smart_pointers.toml
rename to orphaned/sm/smart_pointers.toml
diff --git a/index/st/steamsky.toml b/orphaned/st/steamsky.toml
similarity index 100%
rename from index/st/steamsky.toml
rename to orphaned/st/steamsky.toml
diff --git a/index/wh/whitakers_words.toml b/orphaned/wh/whitakers_words.toml
similarity index 100%
rename from index/wh/whitakers_words.toml
rename to orphaned/wh/whitakers_words.toml
diff --git a/index/xs/xstrings.toml b/orphaned/xs/xstrings.toml
similarity index 100%
rename from index/xs/xstrings.toml
rename to orphaned/xs/xstrings.toml
diff --git a/orphaned/zl/zlib_ada.toml b/orphaned/zl/zlib_ada.toml
new file mode 100644
index 00000000..d84eda0d
--- /dev/null
+++ b/orphaned/zl/zlib_ada.toml
@@ -0,0 +1,16 @@
+[general]
+description = "ZLib for Ada thick binding"
+licenses = []
+authors = ["Dmitriy Anisimkov"]
+website = "http://zlib-ada.sourceforge.net/"
+maintainers = ["alejandro@mosteo.com"]
+maintainers-logins = ["mosteo"]
+project-files = ["zlib.gpr"]
+executables = ["buffer_demo", "mtest", "read", "test"]
+
+['1.3']
+origin = "https://sourceforge.net/projects/zlib-ada/files/zlib-ada/1.3/zlib-ada-1.3.tar.gz"
+origin-hashes = ["sha512:e1677e3caa1fa963073b11bfba28f90e4ecd3032c1615792ad61a9860b25c73f5ef8ad062277ce29bc2ce7af08f45995161760baf4e60b79d194986fa2839977"]
+
+    ['1.3'.depends-on]
+    zlib = "^1.2"