diff --git a/README.md b/README.md
index db4ac916..54ef8859 100644
--- a/README.md
+++ b/README.md
@@ -123,10 +123,10 @@ _Business Intelligence_
 
 Some [Content Management System](#content-management-systems-cms) solutions also feature archiving and digital preservation.
 
-- [Access to Memory (AtoM)](https://www.accesstomemory.org/) - Web-based, open source application for standards-based archival description and access in a multilingual, multi-repository environment. ([Demo](https://demo.accesstomemory.org/), [Source Code](https://github.com/artefactual/atom)) `PHP` `AGPL-3.0-only`
-- [Archivematica](https://www.archivematica.org/) - Mature digital preservation system designed to maintain standards-based, long-term access to collections of digital objects. ([Demo](http://sandbox.archivematica.org/administration/accounts/login/), [Source Code](https://github.com/artefactual/archivematica)) `Python` `AGPL-3.0-only`
-- [ArchivesSpace](https://archivesspace.org/) - Archives information management application for managing and providing Web access to archives, manuscripts and digital objects. ([Demo](https://archivesspace.org/application/demo/), [Source Code](https://github.com/archivesspace/archivesspace)) `Ruby` `ECL-2.0`
-- [Collective Access: Providence](http://collectiveaccess.org/) - Highly configurable Web-based framework for management, description, and discovery of digital and physical collections supporting a variety of metadata standards, data types, and media formats. ([Source Code](https://github.com/collectiveaccess/providence)) `PHP` `GPL-3.0-only`
+- [Access to Memory (AtoM)](https://www.accesstomemory.org/) - Web-based, open source application for standards-based archival description and access in a multilingual, multi-repository environment. ([Demo](https://demo.accesstomemory.org/), [Source Code](https://github.com/artefactual/atom)) `AGPL-3.0-only` `PHP`
+- [Archivematica](https://www.archivematica.org/) - Mature digital preservation system designed to maintain standards-based, long-term access to collections of digital objects. ([Demo](http://sandbox.archivematica.org/administration/accounts/login/), [Source Code](https://github.com/artefactual/archivematica)) `AGPL-3.0-only` `Python`
+- [ArchivesSpace](https://archivesspace.org/) - Archives information management application for managing and providing Web access to archives, manuscripts and digital objects. ([Demo](https://archivesspace.org/application/demo/), [Source Code](https://github.com/archivesspace/archivesspace)) `ECL-2.0` `Ruby`
+- [Collective Access: Providence](http://collectiveaccess.org/) - Highly configurable Web-based framework for management, description, and discovery of digital and physical collections supporting a variety of metadata standards, data types, and media formats. ([Source Code](https://github.com/collectiveaccess/providence)) `GPL-3.0-only` `PHP`
 
 ## Automation
 
@@ -791,8 +791,8 @@ See also [awesome-gis](https://github.com/sshuair/awesome-gis).
 - [MapBBCodeShare](https://github.com/MapBBCode/share.mapbbcode.org) - Tool for sharing custom OSM maps. Support for annotated markers, polygons, lines, multi-format import/export, multiple layers, shortlinks. ([Demo](http://share.mapbbcode.org/)) `WTFPL/Other` `PHP`
 - [OpenGTS](http://www.opengts.org/) - Entry-level fleet tracking system. Supports variety of tracking devices and protocols. Comes with rich web-interface and reporting features. ([Demo](http://track.opengts.org/track/Track), [Source Code](https://sourceforge.net/projects/opengts/files/server-base/)) `Apache-2.0` `Java`
 - [OpenStreetMap](https://www.openstreetmap.org/) - Collaborative project to create a free editable map of the world. ([Source Code](https://github.com/openstreetmap/openstreetmap-website)) `GPL-2.0` `Ruby`
-  - [CityZen](http://cityzenapp.co/) - Privacy-respecting Android app that helps you find Points of Interest ("POIs") such as ATMs, gas stations, etcetera, based on your location using OpenStreetMap. ([Source Code](https://github.com/CityZenApp/Android-Development)) `Java` `MPL-2.0`
-  - [OpenStretMap Automated Navigation and Directions (OsmAnd)](https://osmand.net/) - Offline mobile maps and navigation app [for Android](https://f-droid.org/packages/net.osmand.plus/) and iOS clients with further online capabilities. ([Source Code](https://github.com/osmandapp)) `Java/Objective-C++` `GPL-3.0/MIT`
+  - [CityZen](http://cityzenapp.co/) - Privacy-respecting Android app that helps you find Points of Interest ("POIs") such as ATMs, gas stations, etcetera, based on your location using OpenStreetMap. ([Source Code](https://github.com/CityZenApp/Android-Development)) `MPL-2.0` `Java`
+  - [OpenStretMap Automated Navigation and Directions (OsmAnd)](https://osmand.net/) - Offline mobile maps and navigation app [for Android](https://f-droid.org/packages/net.osmand.plus/) and iOS clients with further online capabilities. ([Source Code](https://github.com/osmandapp)) `GPL-3.0/MIT` `Java/Objective-C++`
   - [OSM Contributor](https://wiki.openstreetmap.org/wiki/OSM_Contributor_Mapping_Tool) - Easy to learn Android application for individual users to add or edit data in OpenStreetMap's database. ([Source Code](https://github.com/jawg/osm-contributor)) `GPL-3.0` `Java`
   - [StreetComplete](https://wiki.openstreetmap.org/wiki/StreetComplete) - Gamified interface that offers "quests" to correct or complete data in OpenStreetMap's database. ([Source Code](https://github.com/westnordost/StreetComplete/)) `Java` `GPL-3.0`
 - [OpenTripPlanner](https://www.opentripplanner.org/) - Multimodal trip planning software based on OpenStreetMap data and consuming published GTFS-formatted data to suggest routes using local public transit systems. ([Source Code](https://github.com/opentripplanner/OpenTripPlanner)) `LGPL-3.0` `Java/JavaScript`