diff --git a/app_codimd.md b/app_codimd.md
new file mode 100644
index 00000000..562e0659
--- /dev/null
+++ b/app_codimd.md
@@ -0,0 +1,18 @@
+# <img src="/images/codimd_logo.png" height="80px" alt="CodiMD’s logo"> CodiMD
+
+[![Install CodiMD with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=codimd) [![Integration level](https://dash.yunohost.org/integration/codimd.svg)](https://dash.yunohost.org/appci/app/codimd)
+
+### Index
+
+- [Useful links](#useful-links)
+
+CodiMD is a collaborative, real-time word processing web service. It uses Markdown language, which is a simple way to format text.  
+CodiMD offers a wide range of features for all common uses of word processing, including title management, table of contents, insertion of images, tables, footnotes, video overlay, PDF viewers, LaTeX mathematical expressions with MathJax, diagrams, etc.  
+Different levels of permission allow you to choose who can read or edit the document.
+
+## Useful links
+
++ Official demo: [https://demo.codimd.org/](https://demo.codimd.org/)
++ Official documentation: [github.com/codimd](https://github.com/codimd/server/tree/master/docs/)
++ Application software repository: [github.com - YunoHost-Apps/codimd](https://github.com/YunoHost-Apps/codimd_ynh)
++ Fix a bug or an improvement by creating a ticket (issue): [github.com - YunoHost-Apps/codimd/issues](https://github.com/YunoHost-Apps/codimd_ynh/issues)
diff --git a/app_codimd_fr.md b/app_codimd_fr.md
new file mode 100644
index 00000000..66eed39c
--- /dev/null
+++ b/app_codimd_fr.md
@@ -0,0 +1,18 @@
+# <img src="/images/codimd_logo.png" height="80px" alt="logo de CodiMD"> CodiMD
+
+[![Installer CodiMD avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=codimd) [![Integration level](https://dash.yunohost.org/integration/codimd.svg)](https://dash.yunohost.org/appci/app/codimd)
+
+### Index
+
+- [Liens utiles](#liens-utiles)
+
+CodiMD est un service web de traitement de texte collaboratif en temps réel. Il utilise le langage Markdown, qui est un moyen simple pour formater un texte.  
+CodiMD propose un vaste choix de fonctionnalités pour toutes les utilisations courantes du traitement de texte parmi lesquelles gestion des titres, table de matières, insertion d’images, tableaux, notes de bas de page, incrustation de vidéos, visualisateurs PDF, expressions mathématiques LaTeX avec MathJax, diagrammes, etc.  
+Différents niveaux de permission permettent de choisir qui peut lire ou éditer le document.
+
+## Liens utiles
+
++ Démo officielle : [https://demo.codimd.org/](https://demo.codimd.org/)
++ Documentation officielle : [github.com/codimd](https://github.com/codimd/server/tree/master/docs/)
++ Dépôt logiciel de l’application : [github.com - YunoHost-Apps/codimd](https://github.com/YunoHost-Apps/codimd_ynh)
++ Remonter un bug ou une amélioration en créant un ticket (issue) : [github.com -YunoHost-Apps/codimd/issues](https://github.com/YunoHost-Apps/codimd_ynh/issues)
diff --git a/apps_wishlist.md b/apps_wishlist.md
index 690dbeb3..e4582d26 100644
--- a/apps_wishlist.md
+++ b/apps_wishlist.md
@@ -55,7 +55,6 @@ The following list is a compiled wishlist of applications that would be nice-to-
 - [Graphhopper](https://www.graphhopper.com/) / [github](https://github.com/graphhopper/graphhopper#get-started) or other routing service that can be plugged to [Nextcloud Maps](https://apps.nextcloud.com/apps/maps), e.g. OSRM (see below)
 - [Guacamole](http://guacamole.apache.org/)
 - [Habitica](https://habitica.com/) / [github](https://github.com/HabitRPG/habitica)
-- [HackMD CE](https://github.com/hackmdio/hackmd)
 - [Helpy](https://github.com/helpyio/helpy)
 - [Hexo](https://hexo.io/) / [github](https://github.com/hexojs/hexo)
 - [Icecast 2](http://www.icecast.org) / [gitlab](https://gitlab.xiph.org/xiph/icecast-server/)
diff --git a/images/codimd_logo.png b/images/codimd_logo.png
new file mode 100644
index 00000000..2422174f
Binary files /dev/null and b/images/codimd_logo.png differ