diff --git a/apps/chrome.json b/apps/chrome.json
index 13685cf..72ab71b 100644
--- a/apps/chrome.json
+++ b/apps/chrome.json
@@ -1,4 +1,5 @@
-{"names":["Google Chrome"],
+{"names":["Google Chrome",
+	  "Chrome"],
  "comment":"Google Chrome is a proprietary browser from Google. Which is based on Chromium.",
  "links":{"website":"https://www.google.com/chrome/index.html",
 	  "wikipedia":"https://en.wikipedia.org/wiki/Google_Chrome",
diff --git a/apps/chromium.json b/apps/chromium.json
new file mode 100644
index 0000000..9a8be72
--- /dev/null
+++ b/apps/chromium.json
@@ -0,0 +1,21 @@
+{"names":["Chromium"],
+ "comment":"A Free Software web-browser under a push-over license which allowed Google Chrome to exist.",
+ "links":{"website":"https://www.chromium.org/chromium-projects/",
+	  "git":"https://chromium.googlesource.com/chromium/src",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Chromium_(web_browser)",
+	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Chromium_Logo.svg/64px-Chromium_Logo.svg.png"},
+ "platforms":["Android",
+	      "Windows",
+	      "MacOS",
+	      "iOS",
+	      "GNU/Linux",
+	      "BSD"],
+ "licenses":["BSD-3-Clause"],
+ "languages":["C++"],
+ "interface":["Touch",
+	      "JavaScript"],
+ "networks_read":["http"],
+ "networks_write":["http"],
+ "formats_read":["pdf"],
+ "formats_write":[],
+ "generic_name":["Browser"]}
diff --git a/apps/discord.json b/apps/discord.json
new file mode 100644
index 0000000..bf60928
--- /dev/null
+++ b/apps/discord.json
@@ -0,0 +1,24 @@
+{"names":["Discord"],
+ "comment":"An unfortunatly way too popular Non-Free Messenger.",
+ "links":{"website":"https://discord.com/",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Discord_(software)",
+	  "icon":"https://upload.wikimedia.org/wikipedia/en/9/98/Discord_logo.svg"},
+ "platforms":["Android",
+	      "Windows",
+	      "MacOS",
+	      "iOS",
+	      "GNU/Linux"],
+ "interface":["Touch",
+	      "JavaScript",
+	      "Electron"],
+ "networks_read":["discord"],
+ "networks_write":["discord"],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Messenger",
+		 "Group Messenger",
+		 "Video Calls",
+		 "Audio Calls",
+		 "Video Conference"],
+ "issues":["Surveillance",
+	   "Non-Free Software"]}
diff --git a/apps/element.json b/apps/element.json
index c2761ec..feb84bb 100644
--- a/apps/element.json
+++ b/apps/element.json
@@ -25,6 +25,7 @@
  "formats_read":[],
  "formats_write":[],
  "generic_name":["Messenger",
+		 "Group Messenger",
 		 "Video Calls",
 		 "Audio Calls",
 		 "Video Conference"]}
diff --git a/apps/jami.json b/apps/jami.json
new file mode 100644
index 0000000..1370599
--- /dev/null
+++ b/apps/jami.json
@@ -0,0 +1,31 @@
+{"names":["GNU Jami",
+	  "Jami",
+	  "Gnome Ring",
+	  "GNU Ring",
+	  "SFLphone"],
+ "comment": "A GNU package for Instant Messaging and Calls.",
+ "links":{"website":"https://jami.net/",
+	  "git":"https://git.jami.net/savoirfairelinux/jami-project/",
+	  "wikipedia":"https://en.wikipedia.org/wiki/Jami_(software)",
+	  "icon":"https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/JamiGNU.png/220px-JamiGNU.png"},
+ "licenses":["GPL-3.0-or-later"],
+ "platforms":["GNU/Linux",
+	      "MacOS",
+	      "Windows",
+	      "iOS",
+	      "Android",
+	      "Android TV",
+	      "Web"],
+ "interface":["GTK",
+	      "Touch"],
+ "languages":["Java",
+	      "Kotlin",
+	      "Python"],
+ "networks_read":["jami"],
+ "networks_write":["jami"],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Messenger",
+		 "Video Calls",
+		 "Audio Calls",
+		 "Video Conference"]}
diff --git a/apps/revolt.json b/apps/revolt.json
new file mode 100644
index 0000000..51ea8ed
--- /dev/null
+++ b/apps/revolt.json
@@ -0,0 +1,23 @@
+{"names":["Revolt",
+	  "Revolt.Chat"],
+ "comment": "A messenger designed specifically to replace Discord",
+ "links":{"website":"https://revolt.chat",
+	  "git":"https://github.com/revoltchat",
+	  "icon":"https://avatars.githubusercontent.com/u/57727799?s=200&v=4"},
+ "licenses":["AGPL-3.0"],
+ "platforms":["GNU/Linux",
+	      "MacOS",
+	      "Windows",
+	      "Android",
+	      "Web"],
+ "interface":["JavaScript",
+	      "Touch",
+	      "Electron"],
+ "languages":["Python",
+	      "TypeScript"],
+ "networks_read":["revolt"],
+ "networks_write":["revolt"],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Messenger",
+		 "Group Messenger"]}
diff --git a/apps/rocket.chat.json b/apps/rocket.chat.json
new file mode 100644
index 0000000..ea64df5
--- /dev/null
+++ b/apps/rocket.chat.json
@@ -0,0 +1,28 @@
+{"names":["Rocket.Chat",
+	  "Rocket Chat",
+	 "RocketChat"],
+ "comment": "A self-hosted messanger for large communities.",
+ "links":{"website":"https://rocket.chat",
+	  "git":"https://github.com/RocketChat/Rocket.Chat",
+	  "icon":"https://github.com/RocketChat/Rocket.Chat.Artwork/raw/master/Logos/2020/png/logo-horizontal-red.png"},
+ "licenses":["MIT"],
+ "platforms":["GNU/Linux",
+	      "MacOS",
+	      "Windows",
+	      "iOS",
+	      "Android",
+	      "Web"],
+ "interface":["JavaScript",
+	      "Touch",
+	      "Electron"],
+ "languages":["JavaScript",
+	      "TypeScript"],
+ "networks_read":["rocket.chat"],
+ "networks_write":["rocket.chat"],
+ "formats_read":[],
+ "formats_write":[],
+ "generic_name":["Messenger",
+		 "Video Calls",
+		 "Audio Calls",
+		 "Video Conference"],
+ "issues":["Some official clients are Non-Free"]}
diff --git a/apps/whatsapp.json b/apps/whatsapp.json
index 3fbc268..f8cc33e 100644
--- a/apps/whatsapp.json
+++ b/apps/whatsapp.json
@@ -14,8 +14,12 @@
  "networks_write":["xmpp"],
  "formats_read":[],
  "formats_write":[],
- "generic_name":["Messenger Client",
-		 "Messenger"],
+ "generic_name":["WhatsApp Client",
+		 "Messenger",
+		 "Group Messenger",
+		 "Video Calls",
+		 "Audio Calls",
+		 "Video Conference"],
  "issues":["Surveillance",
 	   "Non-Free Software",
 	   "Non-Free JavaScript",