diff --git a/licenses.yml b/licenses.yml
index e8a642dbb3..2538af26ef 100644
--- a/licenses.yml
+++ b/licenses.yml
@@ -179,6 +179,10 @@
   name: Sendmail License
   url: https://www.sendmail.com/pdfs/open_source/sendmail_license.pdf
 
+- identifier: Ruby
+  name: Ruby License
+  url: http://www.ruby-lang.org/en/LICENSE.txt
+
 - identifier: Unlicense
   name: The Unlicense
   url: https://unlicense.org/
diff --git a/software/2fauth.yml b/software/2fauth.yml
index 5e76185ac3..384c645aff 100644
--- a/software/2fauth.yml
+++ b/software/2fauth.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Miscellaneous
 demo_url: https://demo.2fauth.app/
-stargazers_count: 515
-updated_at: '2022-07-30'
+stargazers_count: 516
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/a-dark-room.yml b/software/a-dark-room.yml
index 92e1679e16..c5b4fe6003 100644
--- a/software/a-dark-room.yml
+++ b/software/a-dark-room.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Games
 demo_url: https://adarkroom.doublespeakgames.com/
-stargazers_count: 5945
-updated_at: '2022-07-31'
+stargazers_count: 5946
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/afterlogic-webmail-lite.yml b/software/afterlogic-webmail-lite.yml
deleted file mode 100644
index 79c216f6d9..0000000000
--- a/software/afterlogic-webmail-lite.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Afterlogic WebMail Lite
-website_url: https://afterlogic.org/webmail-lite
-description: Fast and easy-to-use webmail front-end for your existing IMAP mail server,
-  Plesk or cPanel.
-licenses:
-  - AGPL-3.0
-platforms:
-  - PHP
-tags:
-  - Communication - Email - Webmail Clients
-source_code_url: https://github.com/afterlogic/webmail-lite
-demo_url: https://lite.afterlogic.com/
diff --git a/software/airsonic-advanced.yml b/software/airsonic-advanced.yml
index d10361fabd..40d4c99c33 100644
--- a/software/airsonic-advanced.yml
+++ b/software/airsonic-advanced.yml
@@ -8,6 +8,6 @@ platforms:
   - Java
 tags:
   - Media Streaming - Audio Streaming
-stargazers_count: 697
-updated_at: '2022-07-31'
+stargazers_count: 699
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/ansible-nas.yml b/software/ansible-nas.yml
index 9e68320df4..09e59ebaef 100644
--- a/software/ansible-nas.yml
+++ b/software/ansible-nas.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Self-hosting Solutions
-stargazers_count: 1940
+stargazers_count: 1941
 updated_at: '2022-07-31'
 archived: false
diff --git a/software/audiobookshelf.yml b/software/audiobookshelf.yml
new file mode 100644
index 0000000000..e30fe09f7d
--- /dev/null
+++ b/software/audiobookshelf.yml
@@ -0,0 +1,14 @@
+name: Audiobookshelf
+website_url: https://www.audiobookshelf.org/
+description: Fully open-source self-hosted audiobook and podcast server. It streams
+  all audio formats, keeps and syncs progress across devices. Comes with open-source
+  apps for Android and iOS.
+licenses:
+  - GPL-3.0
+platforms:
+  - Docker
+  - Nodejs
+tags:
+  - Media Streaming - Audio Streaming
+source_code_url: https://github.com/advplyr/audiobookshelf
+related_software_url: https://github.com/advplyr/audiobookshelf#android-app-beta
diff --git a/software/audioserve.yml b/software/audioserve.yml
index f05903cbaf..e4234f84aa 100644
--- a/software/audioserve.yml
+++ b/software/audioserve.yml
@@ -9,6 +9,6 @@ platforms:
   - Rust
 tags:
   - Media Streaming - Audio Streaming
-stargazers_count: 529
-updated_at: '2022-07-29'
+stargazers_count: 530
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/babelfish.yml b/software/babelfish.yml
index 8ba9d880e7..bfab14a1f3 100644
--- a/software/babelfish.yml
+++ b/software/babelfish.yml
@@ -9,6 +9,6 @@ platforms:
   - Go
 tags:
   - Software Development - IDE & Tools
-stargazers_count: 329
-updated_at: '2022-07-09'
+stargazers_count: 330
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/baby-buddy.yml b/software/baby-buddy.yml
index be5f3642b9..48e5efe2e3 100644
--- a/software/baby-buddy.yml
+++ b/software/baby-buddy.yml
@@ -10,5 +10,5 @@ tags:
   - Personal Dashboards
 demo_url: https://demo.baby-buddy.net/login/?next=/
 stargazers_count: 1408
-updated_at: '2022-07-30'
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/beehive.yml b/software/beehive.yml
index e9dab526c1..a62c113014 100644
--- a/software/beehive.yml
+++ b/software/beehive.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Automation
-stargazers_count: 5689
-updated_at: '2022-07-30'
+stargazers_count: 5690
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/betanin.yml b/software/betanin.yml
index a2f06566a8..690828703f 100644
--- a/software/betanin.yml
+++ b/software/betanin.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Automation
-stargazers_count: 173
-updated_at: '2022-07-25'
+stargazers_count: 175
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/bitcartcc.yml b/software/bitcartcc.yml
new file mode 100644
index 0000000000..3bc05858be
--- /dev/null
+++ b/software/bitcartcc.yml
@@ -0,0 +1,13 @@
+name: BitcartCC
+website_url: https://bitcartcc.com
+description: A self-hosted cryptocurrencies payment processor and development platform.
+licenses:
+  - GPL-3.0-or-later
+platforms:
+  - Docker
+  - Python
+  - Nodejs
+tags:
+  - Money, Budgeting & Management
+source_code_url: https://github.com/bitcartcc
+demo_url: https://admin.bitcartcc.com
diff --git a/software/black-candy.yml b/software/black-candy.yml
index 63b2d2a81e..20a0835d05 100644
--- a/software/black-candy.yml
+++ b/software/black-candy.yml
@@ -7,6 +7,6 @@ platforms:
   - Ruby
 tags:
   - Media Streaming - Audio Streaming
-stargazers_count: 863
-updated_at: '2022-07-29'
+stargazers_count: 864
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/blocky.yml b/software/blocky.yml
index b6b37c1cb7..8a34288823 100644
--- a/software/blocky.yml
+++ b/software/blocky.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - DNS
-stargazers_count: 1715
-updated_at: '2022-07-31'
+stargazers_count: 1717
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/calibre-web.yml b/software/calibre-web.yml
index ef57dccdaa..18f7abac27 100644
--- a/software/calibre-web.yml
+++ b/software/calibre-web.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Document Management - E-books
-stargazers_count: 7134
-updated_at: '2022-07-31'
+stargazers_count: 7137
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/changedetection.io.yml b/software/changedetection.io.yml
index 837399b211..85c44b9622 100644
--- a/software/changedetection.io.yml
+++ b/software/changedetection.io.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Miscellaneous
-stargazers_count: 5079
-updated_at: '2022-07-31'
+stargazers_count: 5085
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/cloud-torrent.yml b/software/cloud-torrent.yml
index 06cf369cd3..8e92f76b9c 100644
--- a/software/cloud-torrent.yml
+++ b/software/cloud-torrent.yml
@@ -7,6 +7,6 @@ platforms:
   - Go
 tags:
   - File Transfer - Peer-to-peer Filesharing
-stargazers_count: 5307
-updated_at: '2022-07-31'
+stargazers_count: 5308
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/croodle.yml b/software/croodle.yml
index 9e52b626f5..dce66f0156 100644
--- a/software/croodle.yml
+++ b/software/croodle.yml
@@ -8,6 +8,6 @@ platforms:
   - Javascript
 tags:
   - Polls and Events
-stargazers_count: 135
-updated_at: '2022-07-27'
+stargazers_count: 136
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/cyberchef.yml b/software/cyberchef.yml
index c234de9d9e..d96ee68de1 100644
--- a/software/cyberchef.yml
+++ b/software/cyberchef.yml
@@ -10,6 +10,6 @@ platforms:
 tags:
   - Miscellaneous
 demo_url: https://gchq.github.io/CyberChef
-stargazers_count: 17062
-updated_at: '2022-07-31'
+stargazers_count: 17072
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/dailynotes.yml b/software/dailynotes.yml
index b0ed63fca8..ff4b4f69fe 100644
--- a/software/dailynotes.yml
+++ b/software/dailynotes.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Note-taking & Editors
-stargazers_count: 521
-updated_at: '2022-07-30'
+stargazers_count: 522
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/darkwire.io.yml b/software/darkwire.io.yml
index 9946f617f8..7308e95911 100644
--- a/software/darkwire.io.yml
+++ b/software/darkwire.io.yml
@@ -7,6 +7,6 @@ platforms:
   - Nodejs
 tags:
   - Communication - Custom Communication Systems
-stargazers_count: 743
-updated_at: '2022-07-29'
+stargazers_count: 744
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/dashdot.yml b/software/dashdot.yml
index 2acaa52a97..48a8a13eca 100644
--- a/software/dashdot.yml
+++ b/software/dashdot.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Personal Dashboards
 demo_url: https://dash.mauz.io
-stargazers_count: 536
+stargazers_count: 537
 updated_at: '2022-07-31'
 archived: false
diff --git a/software/dashy.yml b/software/dashy.yml
index 1c7c7d2a94..7f7cc11847 100644
--- a/software/dashy.yml
+++ b/software/dashy.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Personal Dashboards
 demo_url: https://demo.dashy.to/
-stargazers_count: 6847
-updated_at: '2022-07-31'
+stargazers_count: 6859
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/deepfakehttp.yml b/software/deepfakehttp.yml
index 6d427dd292..d17f016a37 100644
--- a/software/deepfakehttp.yml
+++ b/software/deepfakehttp.yml
@@ -6,7 +6,7 @@ licenses:
 platforms:
   - Java
 tags:
-  - Software Development - UX Testing
+  - Software Development - Testing
 stargazers_count: 404
 updated_at: '2022-07-29'
 archived: false
diff --git a/software/depay.yml b/software/depay.yml
new file mode 100644
index 0000000000..c17db3270e
--- /dev/null
+++ b/software/depay.yml
@@ -0,0 +1,12 @@
+name: DePay
+website_url: https://depay.fi
+description: Accept Web3 Payments directly into your wallet. Peer-to-peer, free, self-hosted
+  & open-source.
+licenses:
+  - MIT
+platforms:
+  - Nodejs
+tags:
+  - Money, Budgeting & Management
+source_code_url: https://github.com/depayfi/widgets
+demo_url: https://depay.fi/products/payments
diff --git a/software/dim.yml b/software/dim.yml
index 0d659ecb96..f72dbd4a1d 100644
--- a/software/dim.yml
+++ b/software/dim.yml
@@ -9,6 +9,6 @@ platforms:
   - Rust
 tags:
   - Media Streaming - Multimedia Streaming
-stargazers_count: 2905
-updated_at: '2022-07-31'
+stargazers_count: 2906
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/dogbin.yml b/software/dogbin.yml
index 6813565445..a07317d6fc 100644
--- a/software/dogbin.yml
+++ b/software/dogbin.yml
@@ -7,6 +7,6 @@ platforms:
   - Kotlin
 tags:
   - Pastebins
-stargazers_count: 327
-updated_at: '2022-07-29'
+stargazers_count: 328
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/drift.yml b/software/drift.yml
index 68509a39bf..cb58e55d5a 100644
--- a/software/drift.yml
+++ b/software/drift.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Pastebins
 demo_url: https://drift.maxleiter.com/
-stargazers_count: 805
-updated_at: '2022-07-31'
+stargazers_count: 808
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/emailwiz.yml b/software/emailwiz.yml
index 81d02c05c1..c874d4a16e 100644
--- a/software/emailwiz.yml
+++ b/software/emailwiz.yml
@@ -8,6 +8,6 @@ platforms:
   - Bash
 tags:
   - Communication - Email - Complete Solutions
-stargazers_count: 1005
-updated_at: '2022-07-30'
+stargazers_count: 1006
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/exatorrent.yml b/software/exatorrent.yml
index 4daeedd958..3e42cff9f1 100644
--- a/software/exatorrent.yml
+++ b/software/exatorrent.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - File Transfer - Peer-to-peer Filesharing
-stargazers_count: 1473
-updated_at: '2022-07-31'
+stargazers_count: 1474
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/fenrus.yml b/software/fenrus.yml
index 347c52b9e9..fa8d6c28cf 100644
--- a/software/fenrus.yml
+++ b/software/fenrus.yml
@@ -9,6 +9,6 @@ platforms:
   - Nodejs
 tags:
   - Personal Dashboards
-stargazers_count: 110
-updated_at: '2022-07-31'
+stargazers_count: 111
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/firefox-sync-server.yml b/software/firefox-sync-server.yml
index c9a0109fa1..091439a58d 100644
--- a/software/firefox-sync-server.yml
+++ b/software/firefox-sync-server.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Bookmarks and Link Sharing
-stargazers_count: 1653
-updated_at: '2022-07-30'
+stargazers_count: 1652
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/flame.yml b/software/flame.yml
index 1fce47cb24..66cce97dd2 100644
--- a/software/flame.yml
+++ b/software/flame.yml
@@ -8,6 +8,6 @@ platforms:
   - Nodejs
 tags:
   - Personal Dashboards
-stargazers_count: 2684
-updated_at: '2022-07-31'
+stargazers_count: 2692
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/formspree.yml b/software/formspree.yml
deleted file mode 100644
index 6cceadf810..0000000000
--- a/software/formspree.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: formspree
-website_url: https://formspree.io/
-description: Just send your form to our URL and we'll forward it to your email. No
-  PHP, Javascript or sign up required.
-licenses:
-  - AGPL-3.0
-platforms:
-  - Python
-tags:
-  - Miscellaneous
-source_code_url: https://github.com/formspree/formspree
-demo_url: https://test.formspree.io/
-depends_3rdparty: true
diff --git a/software/freescout.yml b/software/freescout.yml
index 51a4f5752b..9dd74a22ed 100644
--- a/software/freescout.yml
+++ b/software/freescout.yml
@@ -8,6 +8,6 @@ platforms:
   - PHP
 tags:
   - Ticketing
-stargazers_count: 1572
-updated_at: '2022-07-31'
+stargazers_count: 1573
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/fx.yml b/software/fx.yml
index 1fa68f5fa4..b70f8f0212 100644
--- a/software/fx.yml
+++ b/software/fx.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Software Development - FaaS & Serverless
-stargazers_count: 1791
-updated_at: '2022-07-28'
+stargazers_count: 1792
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/git-webui.yml b/software/git-webui.yml
deleted file mode 100644
index a233254ccc..0000000000
--- a/software/git-webui.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Git WebUI
-website_url: https://github.com/alberthier/git-webui
-description: Standalone web based user interface for git repositories.
-licenses:
-  - Apache-2.0
-platforms:
-  - Python
-tags:
-  - Software Development - Project Management
-stargazers_count: 802
-updated_at: '2022-07-28'
-archived: false
diff --git a/software/gonic.yml b/software/gonic.yml
index 2d7c3d73de..12578d6078 100644
--- a/software/gonic.yml
+++ b/software/gonic.yml
@@ -7,6 +7,6 @@ platforms:
   - Go
 tags:
   - Media Streaming - Audio Streaming
-stargazers_count: 837
-updated_at: '2022-07-31'
+stargazers_count: 838
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/google-webfonts-helper.yml b/software/google-webfonts-helper.yml
index a4d71edae1..cce32e226d 100644
--- a/software/google-webfonts-helper.yml
+++ b/software/google-webfonts-helper.yml
@@ -10,6 +10,6 @@ tags:
   - Miscellaneous
 demo_url: https://google-webfonts-helper.herokuapp.com/
 depends_3rdparty: true
-stargazers_count: 9853
-updated_at: '2022-07-31'
+stargazers_count: 9857
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/gotosocial.yml b/software/gotosocial.yml
new file mode 100644
index 0000000000..a7ef9ee364
--- /dev/null
+++ b/software/gotosocial.yml
@@ -0,0 +1,14 @@
+name: GoToSocial
+website_url: https://github.com/superseriousbusiness/gotosocial
+description: ActivityPub federated social network server implementing the Mastodon
+  client API.
+licenses:
+  - AGPL-3.0
+platforms:
+  - Docker
+  - Go
+tags:
+  - Communication - Social Networks and Forums
+stargazers_count: 572
+updated_at: '2022-07-30'
+archived: false
diff --git a/software/groove-basin.yml b/software/groove-basin.yml
index a7e2956557..55b3196660 100644
--- a/software/groove-basin.yml
+++ b/software/groove-basin.yml
@@ -8,6 +8,6 @@ platforms:
   - Nodejs
 tags:
   - Media Streaming - Audio Streaming
-stargazers_count: 1802
-updated_at: '2022-07-27'
+stargazers_count: 1803
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/hauk.yml b/software/hauk.yml
index 0deac7e577..d86980766e 100644
--- a/software/hauk.yml
+++ b/software/hauk.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Maps and Global Positioning System (GPS)
 demo_url: https://github.com/bilde2910/Hauk#demo-server
-stargazers_count: 411
-updated_at: '2022-07-30'
+stargazers_count: 415
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/headphones.yml b/software/headphones.yml
index 3ef9a9faba..04e84b1663 100644
--- a/software/headphones.yml
+++ b/software/headphones.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Automation
-stargazers_count: 3124
-updated_at: '2022-07-30'
+stargazers_count: 3125
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/homer.yml b/software/homer.yml
index 249374bc18..072af486bf 100644
--- a/software/homer.yml
+++ b/software/homer.yml
@@ -8,6 +8,6 @@ platforms:
   - HTML5
 tags:
   - Personal Dashboards
-stargazers_count: 5384
-updated_at: '2022-07-31'
+stargazers_count: 5389
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/horahora.yml b/software/horahora.yml
index 5103c03779..05f0ed9117 100644
--- a/software/horahora.yml
+++ b/software/horahora.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Archiving and Digital Preservation (DP)
-stargazers_count: 671
-updated_at: '2022-07-31'
+stargazers_count: 672
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/huboard.yml b/software/huboard.yml
deleted file mode 100644
index 6deb9cdf62..0000000000
--- a/software/huboard.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: HuBoard
-website_url: https://github.com/huboard/huboard
-description: Instant project management for your GitHub issues (Connects directly
-  GitHub API).
-licenses:
-  - MIT
-platforms:
-  - Ruby
-tags:
-  - Ticketing
-depends_3rdparty: true
-stargazers_count: 1695
-updated_at: '2022-07-18'
-archived: false
diff --git a/software/huginn.yml b/software/huginn.yml
index 6a4c8cbede..b80b7731f1 100644
--- a/software/huginn.yml
+++ b/software/huginn.yml
@@ -7,6 +7,6 @@ platforms:
   - Ruby
 tags:
   - Automation
-stargazers_count: 36123
-updated_at: '2022-07-31'
+stargazers_count: 36129
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/imagestore.yml b/software/imagestore.yml
index 91129267c4..35107c967f 100644
--- a/software/imagestore.yml
+++ b/software/imagestore.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Photo and Video Galleries
 demo_url: https://gregordr.github.io/ImageStore/
-stargazers_count: 596
-updated_at: '2022-07-29'
+stargazers_count: 597
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/imgpush.yml b/software/imgpush.yml
index fbeea63bdb..39cd329ba3 100644
--- a/software/imgpush.yml
+++ b/software/imgpush.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - File Transfer - Single-click & Drag-n-drop Upload
-stargazers_count: 214
+stargazers_count: 213
 updated_at: '2022-07-31'
 archived: false
diff --git a/software/immich.yml b/software/immich.yml
index 52e536a238..4506b2d847 100644
--- a/software/immich.yml
+++ b/software/immich.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Photo and Video Galleries
-stargazers_count: 2366
-updated_at: '2022-07-31'
+stargazers_count: 2379
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/instiki.yml b/software/instiki.yml
new file mode 100644
index 0000000000..b66116ba9f
--- /dev/null
+++ b/software/instiki.yml
@@ -0,0 +1,11 @@
+name: Instiki
+website_url: https://golem.ph.utexas.edu/wiki/instiki/show/HomePage
+description: Instiki is a wiki clone so pretty and easy to set up, you'll wonder if
+  it’s really a wiki. Runs on Rails and focuses on portability and stability.
+licenses:
+  - Ruby
+platforms:
+  - Ruby
+tags:
+  - Wikis
+source_code_url: https://github.com/parasew/instiki
diff --git a/software/invidious.yml b/software/invidious.yml
index 722324b8dd..efe12c2fee 100644
--- a/software/invidious.yml
+++ b/software/invidious.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Media Streaming - Video Streaming
 demo_url: https://docs.invidious.io/instances/
-stargazers_count: 7860
-updated_at: '2022-07-31'
+stargazers_count: 7863
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/ironfunctions.yml b/software/ironfunctions.yml
index 4c6f8d0c5b..fcc192f7d3 100644
--- a/software/ironfunctions.yml
+++ b/software/ironfunctions.yml
@@ -7,6 +7,6 @@ platforms:
   - Go
 tags:
   - Software Development - FaaS & Serverless
-stargazers_count: 3033
-updated_at: '2022-07-29'
+stargazers_count: 3035
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/kiwix-serve.yml b/software/kiwix-serve.yml
new file mode 100644
index 0000000000..4e4bc10948
--- /dev/null
+++ b/software/kiwix-serve.yml
@@ -0,0 +1,10 @@
+name: kiwix-serve
+website_url: https://www.kiwix.org/en/downloads/kiwix-serve/
+description: HTTP daemon for serving wikis from ZIM files.
+licenses:
+  - GPL-3.0
+platforms:
+  - C++
+tags:
+  - Note-taking & Editors
+source_code_url: https://github.com/kiwix/kiwix-tools
diff --git a/software/kyélà.yml b/software/kyélà.yml
deleted file mode 100644
index 642a09578e..0000000000
--- a/software/kyélà.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Kyélà
-website_url: https://kyela.net/
-description: Participation polls for group events.
-licenses:
-  - AGPL-3.0
-platforms:
-  - PHP
-tags:
-  - Polls and Events
-source_code_url: https://github.com/abienvenu/Kyela
-demo_url: https://kyela.net/concert/
diff --git a/software/legend-of-the-green-dragon.yml b/software/legend-of-the-green-dragon.yml
index 10cd07b566..0cfc7aed1c 100644
--- a/software/legend-of-the-green-dragon.yml
+++ b/software/legend-of-the-green-dragon.yml
@@ -10,6 +10,6 @@ platforms:
 tags:
   - Games
 demo_url: http://lotgd.net/
-stargazers_count: 127
-updated_at: '2022-07-30'
+stargazers_count: 128
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/librephotos.yml b/software/librephotos.yml
index 040e27b573..82fc57d0a4 100644
--- a/software/librephotos.yml
+++ b/software/librephotos.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Photo and Video Galleries
-stargazers_count: 4288
-updated_at: '2022-07-31'
+stargazers_count: 4293
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/linkding.yml b/software/linkding.yml
index bbec2d845b..f87fa4de8b 100644
--- a/software/linkding.yml
+++ b/software/linkding.yml
@@ -11,6 +11,6 @@ platforms:
 tags:
   - Bookmarks and Link Sharing
 demo_url: https://demo.linkding.link/
-stargazers_count: 1972
+stargazers_count: 1973
 updated_at: '2022-07-31'
 archived: false
diff --git a/software/maddy-mail-server.yml b/software/maddy-mail-server.yml
index 2ad54a2004..8085122a03 100644
--- a/software/maddy-mail-server.yml
+++ b/software/maddy-mail-server.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Communication - Email - Complete Solutions
-stargazers_count: 3192
-updated_at: '2022-07-31'
+stargazers_count: 3194
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mailhog.yml b/software/mailhog.yml
index a4d9668a2b..51e244b3c2 100644
--- a/software/mailhog.yml
+++ b/software/mailhog.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Communication - Email - Mail Transfer Agents
-stargazers_count: 10538
-updated_at: '2022-07-31'
+stargazers_count: 10545
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mailtrain.yml b/software/mailtrain.yml
index 7cda5cf5f1..025b45c7c7 100644
--- a/software/mailtrain.yml
+++ b/software/mailtrain.yml
@@ -7,6 +7,6 @@ platforms:
   - Nodejs
 tags:
   - Communication - Email - Mailing Lists and Newsletters
-stargazers_count: 5069
-updated_at: '2022-07-30'
+stargazers_count: 5071
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mango.yml b/software/mango.yml
index d0fa55a538..5a19c0eb49 100644
--- a/software/mango.yml
+++ b/software/mango.yml
@@ -7,6 +7,6 @@ platforms:
   - Crystal
 tags:
   - Document Management - E-books
-stargazers_count: 1137
-updated_at: '2022-07-31'
+stargazers_count: 1138
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mars-server.yml b/software/mars-server.yml
index 46e4d913c7..698a5edfbb 100644
--- a/software/mars-server.yml
+++ b/software/mars-server.yml
@@ -7,6 +7,6 @@ platforms:
   - Docker
 tags:
   - Self-hosting Solutions
-stargazers_count: 12
-updated_at: '2022-07-26'
+stargazers_count: 13
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mejiro.yml b/software/mejiro.yml
index 895ebeec37..252102d6d0 100644
--- a/software/mejiro.yml
+++ b/software/mejiro.yml
@@ -7,6 +7,6 @@ platforms:
   - PHP
 tags:
   - Photo and Video Galleries
-stargazers_count: 123
-updated_at: '2022-07-18'
+stargazers_count: 124
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/metube.yml b/software/metube.yml
index 13b943658a..58508000c4 100644
--- a/software/metube.yml
+++ b/software/metube.yml
@@ -10,6 +10,6 @@ platforms:
   - Docker
 tags:
   - Automation
-stargazers_count: 1015
-updated_at: '2022-07-31'
+stargazers_count: 1016
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mindsdb.yml b/software/mindsdb.yml
index f8ee31a296..c133dae45d 100644
--- a/software/mindsdb.yml
+++ b/software/mindsdb.yml
@@ -9,6 +9,6 @@ platforms:
   - Python
 tags:
   - Miscellaneous
-stargazers_count: 9056
-updated_at: '2022-07-31'
+stargazers_count: 9081
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/minimalist-web-notepad.yml b/software/minimalist-web-notepad.yml
index a4adf84cf7..3b782bb631 100644
--- a/software/minimalist-web-notepad.yml
+++ b/software/minimalist-web-notepad.yml
@@ -9,5 +9,5 @@ tags:
   - Note-taking & Editors
 demo_url: https://notes.orga.cat/
 stargazers_count: 665
-updated_at: '2022-07-30'
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/miniserve.yml b/software/miniserve.yml
index 05b1ecaa80..91be89ad3f 100644
--- a/software/miniserve.yml
+++ b/software/miniserve.yml
@@ -7,6 +7,6 @@ platforms:
   - Rust
 tags:
   - File Transfer - Web-based File Managers
-stargazers_count: 3466
-updated_at: '2022-07-31'
+stargazers_count: 3468
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/ml-workspace.yml b/software/ml-workspace.yml
index 649c289d81..ed7ff046ab 100644
--- a/software/ml-workspace.yml
+++ b/software/ml-workspace.yml
@@ -7,6 +7,6 @@ platforms:
   - Docker
 tags:
   - Software Development - IDE & Tools
-stargazers_count: 2661
-updated_at: '2022-07-30'
+stargazers_count: 2662
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/mypaas.yml b/software/mypaas.yml
index b1a4c9813c..adfded2a5f 100644
--- a/software/mypaas.yml
+++ b/software/mypaas.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Miscellaneous
-stargazers_count: 242
-updated_at: '2022-07-29'
+stargazers_count: 243
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/nats.yml b/software/nats.yml
new file mode 100644
index 0000000000..4178c40f0a
--- /dev/null
+++ b/software/nats.yml
@@ -0,0 +1,13 @@
+name: NATS
+website_url: https://nats.io/
+description: Publish/Subscribe event bus, durable queues, key-value store, object
+  store, and more. Native multi-tenancy, multiple authentication and authorization
+  mechanisms. Easy to self-host and federate.
+licenses:
+  - Apache-2.0
+platforms:
+  - Go
+tags:
+  - Miscellaneous
+source_code_url: https://github.com/nats-io/nats-server
+related_software_url: https://github.com/nats-io
diff --git a/software/nefarious.yml b/software/nefarious.yml
index f00ada292a..870e588e3e 100644
--- a/software/nefarious.yml
+++ b/software/nefarious.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Automation
-stargazers_count: 627
-updated_at: '2022-07-31'
+stargazers_count: 628
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/newtelco-tab.yml b/software/newtelco-tab.yml
index 36d8013008..34b28a9123 100644
--- a/software/newtelco-tab.yml
+++ b/software/newtelco-tab.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Personal Dashboards
 demo_url: https://portal.newtelco.de/
-stargazers_count: 7
-updated_at: '2022-07-21'
+stargazers_count: 8
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/notifo.yml b/software/notifo.yml
index c797c781fe..552e58a412 100644
--- a/software/notifo.yml
+++ b/software/notifo.yml
@@ -8,6 +8,6 @@ platforms:
   - C#
 tags:
   - Communication - Custom Communication Systems
-stargazers_count: 246
-updated_at: '2022-07-29'
+stargazers_count: 245
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/novu.yml b/software/novu.yml
new file mode 100644
index 0000000000..1842d8a056
--- /dev/null
+++ b/software/novu.yml
@@ -0,0 +1,11 @@
+name: Novu
+website_url: https://novu.co/
+description: Self-hosted / cloud notification infrastructure for developers.
+licenses:
+  - MIT
+platforms:
+  - Docker
+  - Nodejs
+tags:
+  - Communication - Custom Communication Systems
+source_code_url: https://github.com/novuhq/novu/
diff --git a/software/nullboard.yml b/software/nullboard.yml
index 26b29b59c4..3d3389a44a 100644
--- a/software/nullboard.yml
+++ b/software/nullboard.yml
@@ -8,6 +8,6 @@ platforms:
   - Javascript
 tags:
   - Task Management & To-do Lists
-stargazers_count: 2220
-updated_at: '2022-07-30'
+stargazers_count: 2219
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/onionshare.yml b/software/onionshare.yml
index b1c9a00347..d55349189d 100644
--- a/software/onionshare.yml
+++ b/software/onionshare.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - File Transfer - Single-click & Drag-n-drop Upload
-stargazers_count: 5253
-updated_at: '2022-07-31'
+stargazers_count: 5256
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/open-event-server.yml b/software/open-event-server.yml
index 69bc31dfe2..0e75114e9d 100644
--- a/software/open-event-server.yml
+++ b/software/open-event-server.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Polls and Events
-stargazers_count: 2866
-updated_at: '2022-07-31'
+stargazers_count: 2868
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/opennote.yml b/software/opennote.yml
index 0cad1cdddd..73ed088986 100644
--- a/software/opennote.yml
+++ b/software/opennote.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Note-taking & Editors
 demo_url: https://foxusa.github.io/OpenNote/OpenNote/#/folder
-stargazers_count: 1531
-updated_at: '2022-07-29'
+stargazers_count: 1532
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/organizr.yml b/software/organizr.yml
index 9e43c767ec..5f0ee2a7e2 100644
--- a/software/organizr.yml
+++ b/software/organizr.yml
@@ -7,6 +7,6 @@ platforms:
   - PHP
 tags:
   - Personal Dashboards
-stargazers_count: 3919
-updated_at: '2022-07-31'
+stargazers_count: 3921
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/otranscribe.yml b/software/otranscribe.yml
index de35254ac7..494326edb0 100644
--- a/software/otranscribe.yml
+++ b/software/otranscribe.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Miscellaneous
 demo_url: https://otranscribe.com/
-stargazers_count: 698
-updated_at: '2022-07-29'
+stargazers_count: 699
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/owncast.yml b/software/owncast.yml
index 988e71da0c..1c5398b70a 100644
--- a/software/owncast.yml
+++ b/software/owncast.yml
@@ -9,6 +9,6 @@ platforms:
   - Go
 tags:
   - Media Streaming - Video Streaming
-stargazers_count: 6221
-updated_at: '2022-07-31'
+stargazers_count: 6222
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/paperless-ngx.yml b/software/paperless-ngx.yml
index ac8ba03d86..445312393c 100644
--- a/software/paperless-ngx.yml
+++ b/software/paperless-ngx.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Document Management
 demo_url: https://demo.paperless-ngx.com/
-stargazers_count: 3666
-updated_at: '2022-07-31'
+stargazers_count: 3675
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/personal-management-system.yml b/software/personal-management-system.yml
index 6e5a90cc95..a389b9bbd1 100644
--- a/software/personal-management-system.yml
+++ b/software/personal-management-system.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Personal Dashboards
 demo_url: http://personal-management-system.pl/
-stargazers_count: 2418
-updated_at: '2022-07-31'
+stargazers_count: 2421
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/photo-stream.yml b/software/photo-stream.yml
index 4cd4d51b83..89081474ce 100644
--- a/software/photo-stream.yml
+++ b/software/photo-stream.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Photo and Video Galleries
 demo_url: https://floremotion.de/
-stargazers_count: 203
-updated_at: '2022-07-30'
+stargazers_count: 204
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/plik.yml b/software/plik.yml
index df6bbe1f59..91eecebfc7 100644
--- a/software/plik.yml
+++ b/software/plik.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - File Transfer - Single-click & Drag-n-drop Upload
 demo_url: https://plik.root.gg/
-stargazers_count: 1017
-updated_at: '2022-07-31'
+stargazers_count: 1018
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/plugnmeet.yml b/software/plugnmeet.yml
new file mode 100644
index 0000000000..1d86f91908
--- /dev/null
+++ b/software/plugnmeet.yml
@@ -0,0 +1,12 @@
+name: plugNmeet
+website_url: https://www.plugnmeet.org/
+description: Scalable, High Performance, Open source web conferencing system.
+licenses:
+  - MIT
+platforms:
+  - Docker
+  - Go
+tags:
+  - Communication - Custom Communication Systems
+source_code_url: https://github.com/mynaparrot/plugNmeet-server
+demo_url: https://demo.plugnmeet.com/login.html
diff --git a/software/processwire.yml b/software/processwire.yml
deleted file mode 100644
index 10f4e00e70..0000000000
--- a/software/processwire.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: ProcessWire
-website_url: https://processwire.com/
-description: ProcessWire is an open source content management system (CMS) and web
-  application framework aimed at the needs of designers, developers and their clients.
-licenses:
-  - MPL-2.0
-platforms:
-  - PHP
-tags:
-  - Content Management Systems (CMS)
-source_code_url: https://github.com/ryancramerdesign/ProcessWire
diff --git a/software/pyshelf.yml b/software/pyshelf.yml
index 719a53fcae..4b6864a614 100644
--- a/software/pyshelf.yml
+++ b/software/pyshelf.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Document Management - E-books
-stargazers_count: 425
-updated_at: '2022-07-31'
+stargazers_count: 426
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/rconcli.yml b/software/rconcli.yml
index c4e670ebe2..67796625e6 100644
--- a/software/rconcli.yml
+++ b/software/rconcli.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Games - Administrative Utilities & Control Panels
-stargazers_count: 89
-updated_at: '2022-07-17'
+stargazers_count: 90
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/reader.yml b/software/reader.yml
index af7f3a6630..5fd9ce38ad 100644
--- a/software/reader.yml
+++ b/software/reader.yml
@@ -8,6 +8,6 @@ platforms:
   - Python
 tags:
   - Feed Readers
-stargazers_count: 228
-updated_at: '2022-07-28'
+stargazers_count: 229
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/readflow.yml b/software/readflow.yml
index 74aa2168f9..893ebc4da2 100644
--- a/software/readflow.yml
+++ b/software/readflow.yml
@@ -7,5 +7,5 @@ licenses:
 platforms:
   - Go
 tags:
-  - Read-it-later Lists
+  - Miscellaneous
 source_code_url: https://github.com/ncarlier/readflow
diff --git a/software/redbird.yml b/software/redbird.yml
index 45d2aa3fab..34f451ba25 100644
--- a/software/redbird.yml
+++ b/software/redbird.yml
@@ -8,6 +8,6 @@ platforms:
   - Javascript
 tags:
   - Proxy
-stargazers_count: 4330
-updated_at: '2022-07-29'
+stargazers_count: 4331
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/reminiscence.yml b/software/reminiscence.yml
index e2091eef82..98fabf20f4 100644
--- a/software/reminiscence.yml
+++ b/software/reminiscence.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Bookmarks and Link Sharing
-stargazers_count: 1579
-updated_at: '2022-07-29'
+stargazers_count: 1581
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/rss-bridge.yml b/software/rss-bridge.yml
index bbb2491cee..d4c7816c3f 100644
--- a/software/rss-bridge.yml
+++ b/software/rss-bridge.yml
@@ -7,6 +7,6 @@ platforms:
   - PHP
 tags:
   - Feed Readers
-stargazers_count: 5087
-updated_at: '2022-07-31'
+stargazers_count: 5089
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/seaweedfs.yml b/software/seaweedfs.yml
index 839b071d0e..2cc313e8c8 100644
--- a/software/seaweedfs.yml
+++ b/software/seaweedfs.yml
@@ -9,6 +9,6 @@ platforms:
   - Go
 tags:
   - File Transfer - Object Storage & File Servers
-stargazers_count: 14917
-updated_at: '2022-07-31'
+stargazers_count: 14926
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/selenoid.yml b/software/selenoid.yml
index bc9d998130..447e3a4ba0 100644
--- a/software/selenoid.yml
+++ b/software/selenoid.yml
@@ -7,5 +7,5 @@ licenses:
 platforms:
   - Go
 tags:
-  - Software Development - UX Testing
+  - Software Development - Testing
 source_code_url: https://github.com/aerokube/selenoid
diff --git a/software/send.yml b/software/send.yml
index d7a382b512..ad978ccf5e 100644
--- a/software/send.yml
+++ b/software/send.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - File Transfer - Peer-to-peer Filesharing
 related_software_url: https://github.com/timvisee/send#clients
-stargazers_count: 2386
-updated_at: '2022-07-31'
+stargazers_count: 2390
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/sftpgo.yml b/software/sftpgo.yml
index c6009f9f31..50f0d41ad8 100644
--- a/software/sftpgo.yml
+++ b/software/sftpgo.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - File Transfer - Object Storage & File Servers
-stargazers_count: 4569
-updated_at: '2022-07-31'
+stargazers_count: 4571
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/shaarli.yml b/software/shaarli.yml
index 0b8f6cfef9..2f43fa0c94 100644
--- a/software/shaarli.yml
+++ b/software/shaarli.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Bookmarks and Link Sharing
 demo_url: https://demo.shaarli.org
-stargazers_count: 2704
-updated_at: '2022-07-31'
+stargazers_count: 2705
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/shiori.yml b/software/shiori.yml
index 229f1a4757..5508d42444 100644
--- a/software/shiori.yml
+++ b/software/shiori.yml
@@ -7,6 +7,6 @@ platforms:
   - Go
 tags:
   - Bookmarks and Link Sharing
-stargazers_count: 6321
-updated_at: '2022-07-31'
+stargazers_count: 6323
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/simplex-chat.yml b/software/simplex-chat.yml
index 143e42d767..8d1e1a0a83 100644
--- a/software/simplex-chat.yml
+++ b/software/simplex-chat.yml
@@ -8,6 +8,6 @@ platforms:
   - Haskell
 tags:
   - Communication - Custom Communication Systems
-stargazers_count: 1406
-updated_at: '2022-07-31'
+stargazers_count: 1409
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/sish.yml b/software/sish.yml
index 8b5f55b317..e7e79e8e46 100644
--- a/software/sish.yml
+++ b/software/sish.yml
@@ -8,6 +8,6 @@ platforms:
   - Go
 tags:
   - Proxy
-stargazers_count: 2868
-updated_at: '2022-07-31'
+stargazers_count: 2873
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/sorry-cypress.yml b/software/sorry-cypress.yml
index d6f68b87d8..aba1a2d3c2 100644
--- a/software/sorry-cypress.yml
+++ b/software/sorry-cypress.yml
@@ -7,6 +7,6 @@ licenses:
 platforms:
   - Typescript
 tags:
-  - Software Development - UX Testing
+  - Software Development - Testing
 source_code_url: https://github.com/sorry-cypress/sorry-cypress
 demo_url: https://sorry-cypress-demo.herokuapp.com
diff --git a/software/sovereign.yml b/software/sovereign.yml
index 5a959ff2a9..0129092dd8 100644
--- a/software/sovereign.yml
+++ b/software/sovereign.yml
@@ -9,6 +9,6 @@ platforms:
   - Other
 tags:
   - Self-hosting Solutions
-stargazers_count: 10235
-updated_at: '2022-07-28'
+stargazers_count: 10236
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/sshwifty.yml b/software/sshwifty.yml
index 939d595dd6..af72983044 100644
--- a/software/sshwifty.yml
+++ b/software/sshwifty.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Gateways and Terminal Sharing
-stargazers_count: 1116
-updated_at: '2022-07-31'
+stargazers_count: 1117
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/streama.yml b/software/streama.yml
index ced5ab7720..7617247223 100644
--- a/software/streama.yml
+++ b/software/streama.yml
@@ -7,6 +7,6 @@ platforms:
   - Java
 tags:
   - Media Streaming - Video Streaming
-stargazers_count: 9130
-updated_at: '2022-07-29'
+stargazers_count: 9131
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/stretto.yml b/software/stretto.yml
index dda4e606b1..34af9b40f0 100644
--- a/software/stretto.yml
+++ b/software/stretto.yml
@@ -9,6 +9,6 @@ tags:
   - Media Streaming - Audio Streaming
 demo_url: https://next.kaiserapps.com
 related_software_url: https://github.com/benkaiser/stretto-mobile-next
-stargazers_count: 567
-updated_at: '2022-07-18'
+stargazers_count: 568
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/swag-secure-web-application-gateway.yml b/software/swag-secure-web-application-gateway.yml
index 797bc50c66..785af21c15 100644
--- a/software/swag-secure-web-application-gateway.yml
+++ b/software/swag-secure-web-application-gateway.yml
@@ -8,6 +8,6 @@ platforms:
   - Docker
 tags:
   - Proxy
-stargazers_count: 1360
-updated_at: '2022-07-30'
+stargazers_count: 1361
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/synctube.yml b/software/synctube.yml
index a21150c8e8..3c7dcc2861 100644
--- a/software/synctube.yml
+++ b/software/synctube.yml
@@ -10,6 +10,6 @@ platforms:
 tags:
   - Media Streaming - Video Streaming
 demo_url: https://synctube-example.herokuapp.com/
-stargazers_count: 145
-updated_at: '2022-07-28'
+stargazers_count: 146
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/tania.yml b/software/tania.yml
index 9fbcee24c3..33df4edff6 100644
--- a/software/tania.yml
+++ b/software/tania.yml
@@ -9,6 +9,6 @@ platforms:
   - Go
 tags:
   - Resource Planning
-stargazers_count: 565
-updated_at: '2022-07-31'
+stargazers_count: 566
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/tanoshi.yml b/software/tanoshi.yml
index 5741245ab6..298e484649 100644
--- a/software/tanoshi.yml
+++ b/software/tanoshi.yml
@@ -7,6 +7,6 @@ platforms:
   - Rust
 tags:
   - Document Management - E-books
-stargazers_count: 266
-updated_at: '2022-07-28'
+stargazers_count: 268
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/technitium-dns-server.yml b/software/technitium-dns-server.yml
new file mode 100644
index 0000000000..5f5b4d7bb6
--- /dev/null
+++ b/software/technitium-dns-server.yml
@@ -0,0 +1,12 @@
+name: Technitium DNS Server
+website_url: https://technitium.com/dns/
+description: An open source authoritative as well as recursive DNS server that can
+  be used for self hosting a DNS server for privacy & security.
+licenses:
+  - GPL-3.0
+platforms:
+  - Docker
+  - C#
+tags:
+  - DNS
+source_code_url: https://github.com/TechnitiumSoftware/DnsServer
diff --git a/software/teslamate.yml b/software/teslamate.yml
index 4b5ca4174a..f7eff816b8 100644
--- a/software/teslamate.yml
+++ b/software/teslamate.yml
@@ -7,6 +7,6 @@ platforms:
   - Elixir
 tags:
   - Miscellaneous
-stargazers_count: 2960
-updated_at: '2022-07-31'
+stargazers_count: 2965
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/textbelt.yml b/software/textbelt.yml
index 609fed6dec..9c009e1ab5 100644
--- a/software/textbelt.yml
+++ b/software/textbelt.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Communication - Custom Communication Systems
 depends_3rdparty: true
-stargazers_count: 2442
-updated_at: '2022-07-31'
+stargazers_count: 2444
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/the-battle-for-wesnoth.yml b/software/the-battle-for-wesnoth.yml
index 28a4c14a5f..49d89d855c 100644
--- a/software/the-battle-for-wesnoth.yml
+++ b/software/the-battle-for-wesnoth.yml
@@ -9,6 +9,6 @@ platforms:
   - C++
 tags:
   - Games
-stargazers_count: 4012
-updated_at: '2022-07-31'
+stargazers_count: 4014
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/touca.yml b/software/touca.yml
new file mode 100644
index 0000000000..24244ed13a
--- /dev/null
+++ b/software/touca.yml
@@ -0,0 +1,12 @@
+name: Touca
+website_url: https://touca.io
+description: Continuous regression testing for engineering teams. Get feedback when
+  you write code that could break your software.
+licenses:
+  - Apache-2.0
+platforms:
+  - Docker
+  - Nodejs
+tags:
+  - Software Development - Testing
+source_code_url: https://github.com/trytouca/trytouca
diff --git a/software/trilium-notes.yml b/software/trilium-notes.yml
index f83e9c1eb4..d3e4122f8b 100644
--- a/software/trilium-notes.yml
+++ b/software/trilium-notes.yml
@@ -8,6 +8,6 @@ platforms:
   - Nodejs
 tags:
   - Note-taking & Editors
-stargazers_count: 16936
-updated_at: '2022-07-31'
+stargazers_count: 16942
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/uier.yml b/software/uier.yml
index fabdb0f47a..6f4e363381 100644
--- a/software/uier.yml
+++ b/software/uier.yml
@@ -9,7 +9,7 @@ licenses:
 platforms:
   - Nodejs
 tags:
-  - Software Development - UX Testing
+  - Software Development - Testing
 stargazers_count: 145
 updated_at: '2022-07-13'
 archived: false
diff --git a/software/uptime-kuma.yml b/software/uptime-kuma.yml
index cb760d828c..1b9ae37524 100644
--- a/software/uptime-kuma.yml
+++ b/software/uptime-kuma.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Status / Uptime pages
 demo_url: https://demo.uptime.kuma.pet
-stargazers_count: 19755
-updated_at: '2022-07-31'
+stargazers_count: 19775
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/vaultwarden.yml b/software/vaultwarden.yml
index b9aabf392c..f6a949b55e 100644
--- a/software/vaultwarden.yml
+++ b/software/vaultwarden.yml
@@ -7,6 +7,6 @@ platforms:
   - Rust
 tags:
   - Password Managers
-stargazers_count: 17475
-updated_at: '2022-07-31'
+stargazers_count: 17493
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/vsmtp.yml b/software/vsmtp.yml
new file mode 100644
index 0000000000..84d96e79f9
--- /dev/null
+++ b/software/vsmtp.yml
@@ -0,0 +1,10 @@
+name: vSMTP
+website_url: https://viridit.com/vsmtp-mail-transfer-agent/
+description: Next-gen MTA. Secured, Faster and Greener.
+licenses:
+  - GPL-3.0
+platforms:
+  - Rust
+tags:
+  - Communication - Email - Mail Transfer Agents
+source_code_url: https://github.com/viridIT/vSMTP
diff --git a/software/wallabag.yml b/software/wallabag.yml
index 958333b5e9..1271c5689e 100644
--- a/software/wallabag.yml
+++ b/software/wallabag.yml
@@ -7,5 +7,5 @@ licenses:
 platforms:
   - PHP
 tags:
-  - Read-it-later Lists
+  - Miscellaneous
 source_code_url: https://github.com/wallabag/wallabag
diff --git a/software/warpgate.yml b/software/warpgate.yml
new file mode 100644
index 0000000000..d0d9b7dcaf
--- /dev/null
+++ b/software/warpgate.yml
@@ -0,0 +1,13 @@
+name: Warpgate
+website_url: https://github.com/warp-tech/warpgate
+description: Smart SSH and HTTPS bastion that works with any SSH client.
+licenses:
+  - Apache-2.0
+platforms:
+  - Rust
+  - Docker
+tags:
+  - Gateways and Terminal Sharing
+stargazers_count: 1552
+updated_at: '2022-08-01'
+archived: false
diff --git a/software/web-portal.yml b/software/web-portal.yml
index e855b9cdec..7ca27a696d 100644
--- a/software/web-portal.yml
+++ b/software/web-portal.yml
@@ -9,6 +9,6 @@ platforms:
   - Python
 tags:
   - Personal Dashboards
-stargazers_count: 36
-updated_at: '2022-07-30'
+stargazers_count: 38
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/webui-aria2.yml b/software/webui-aria2.yml
index ab213fa42f..169e291602 100644
--- a/software/webui-aria2.yml
+++ b/software/webui-aria2.yml
@@ -9,6 +9,6 @@ platforms:
 tags:
   - Automation
 demo_url: https://ziahamza.github.io/webui-aria2/
-stargazers_count: 8860
-updated_at: '2022-07-31'
+stargazers_count: 8861
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/whoogle.yml b/software/whoogle.yml
index 4a166c0865..ad28ef09b2 100644
--- a/software/whoogle.yml
+++ b/software/whoogle.yml
@@ -8,6 +8,6 @@ platforms:
 tags:
   - Search Engines
 depends_3rdparty: true
-stargazers_count: 5994
-updated_at: '2022-07-31'
+stargazers_count: 5998
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/wikmd.yml b/software/wikmd.yml
index 63153ab8ef..87b480018b 100644
--- a/software/wikmd.yml
+++ b/software/wikmd.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Wikis
-stargazers_count: 122
-updated_at: '2022-07-30'
+stargazers_count: 123
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/ydl_api_ng.yml b/software/ydl_api_ng.yml
index 6eda67c29e..479ba011f9 100644
--- a/software/ydl_api_ng.yml
+++ b/software/ydl_api_ng.yml
@@ -7,6 +7,6 @@ platforms:
   - Python
 tags:
   - Automation
-stargazers_count: 18
-updated_at: '2022-07-16'
+stargazers_count: 19
+updated_at: '2022-07-31'
 archived: false
diff --git a/software/your-spotify.yml b/software/your-spotify.yml
index cda2825bbb..d4e1b940ea 100644
--- a/software/your-spotify.yml
+++ b/software/your-spotify.yml
@@ -10,6 +10,6 @@ platforms:
 tags:
   - Personal Dashboards
 depends_3rdparty: true
-stargazers_count: 733
-updated_at: '2022-07-30'
+stargazers_count: 735
+updated_at: '2022-08-01'
 archived: false
diff --git a/software/youtubedl-material.yml b/software/youtubedl-material.yml
index f1229cff3b..c8887c8160 100644
--- a/software/youtubedl-material.yml
+++ b/software/youtubedl-material.yml
@@ -9,6 +9,6 @@ platforms:
   - Nodejs
 tags:
   - Automation
-stargazers_count: 1525
-updated_at: '2022-07-31'
+stargazers_count: 1527
+updated_at: '2022-08-01'
 archived: false
diff --git a/tags/analytics.yml b/tags/analytics.yml
index eef67a0428..11a5015486 100644
--- a/tags/analytics.yml
+++ b/tags/analytics.yml
@@ -1,5 +1,7 @@
 name: Analytics
-description: ''
+description: '[Analytics](https://en.wikipedia.org/wiki/Analytics) is the systematic
+  computational analysis of data or statistics. It is used for the discovery, interpretation,
+  and communication of meaningful patterns in data.'
 related_tags:
   - Personal Dashboards
 delegate_to:
diff --git a/tags/archiving-and-digital-preservation-dp.yml b/tags/archiving-and-digital-preservation-dp.yml
index 984a0868bf..15ff1c1d83 100644
--- a/tags/archiving-and-digital-preservation-dp.yml
+++ b/tags/archiving-and-digital-preservation-dp.yml
@@ -1,5 +1,6 @@
 name: Archiving and Digital Preservation (DP)
-description: ''
+description: Digital [archiving](https://en.wikipedia.org/wiki/Archival_science) and
+  [preservation](https://en.wikipedia.org/wiki/Digital_preservation) software.
 related_tags:
   - Content Management Systems (CMS)
 delegate_to: []
diff --git a/tags/automation.yml b/tags/automation.yml
index 1809b7d54a..58a8b77c0c 100644
--- a/tags/automation.yml
+++ b/tags/automation.yml
@@ -1,5 +1,6 @@
 name: Automation
-description: ''
+description: '[Automation](https://en.wikipedia.org/wiki/Automation) software designed
+  to reduce human intervention in processes.'
 related_tags:
   - Internet of Things (IoT)
 delegate_to: []
diff --git a/tags/blogging-platforms.yml b/tags/blogging-platforms.yml
index cfbbefdc3d..0d116ea255 100644
--- a/tags/blogging-platforms.yml
+++ b/tags/blogging-platforms.yml
@@ -1,5 +1,6 @@
 name: Blogging Platforms
-description: ''
+description: A [blog](https://en.wikipedia.org/wiki/Blog) is a discussion or informational
+  website consisting of discrete, diary-style text entries (posts).
 related_tags:
   - Static Site Generators
   - Content Management Systems (CMS)
diff --git a/tags/booking-and-scheduling.yml b/tags/booking-and-scheduling.yml
index 0b1b6c5433..af97d66c76 100644
--- a/tags/booking-and-scheduling.yml
+++ b/tags/booking-and-scheduling.yml
@@ -1,5 +1,5 @@
 name: Booking and Scheduling
-description: ''
+description: Event scheduling, reservation, and appointment management software.
 related_tags:
   - Polls and Events
 delegate_to: []
diff --git a/tags/bookmarks-and-link-sharing.yml b/tags/bookmarks-and-link-sharing.yml
index 1837f8185d..279a532755 100644
--- a/tags/bookmarks-and-link-sharing.yml
+++ b/tags/bookmarks-and-link-sharing.yml
@@ -1,5 +1,6 @@
 name: Bookmarks and Link Sharing
-description: ''
+description: Software which allows users to add, annotate, edit, and share [bookmarks](https://en.wikipedia.org/wiki/Bookmark_(digital))
+  of web documents.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/calendar--contacts---caldav-or-carddav-servers.yml b/tags/calendar--contacts---caldav-or-carddav-servers.yml
index 01be3fb995..6aa9f67c16 100644
--- a/tags/calendar--contacts---caldav-or-carddav-servers.yml
+++ b/tags/calendar--contacts---caldav-or-carddav-servers.yml
@@ -1,5 +1,6 @@
 name: Calendar & Contacts - CalDAV or CardDAV Servers
-description: ''
+description: '[CalDAV](https://en.wikipedia.org/wiki/CalDAV) and [CardDAV](https://en.wikipedia.org/wiki/CardDAV)
+  protocol servers.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/calendar--contacts---caldav-or-carddav-web-based-clients.yml b/tags/calendar--contacts---caldav-or-carddav-web-based-clients.yml
index 95fed8617e..9deb1b92d7 100644
--- a/tags/calendar--contacts---caldav-or-carddav-web-based-clients.yml
+++ b/tags/calendar--contacts---caldav-or-carddav-web-based-clients.yml
@@ -1,5 +1,6 @@
 name: Calendar & Contacts - CalDAV or CardDAV Web-based Clients
-description: ''
+description: '[CalDAV](https://en.wikipedia.org/wiki/CalDAV) and [CardDAV](https://en.wikipedia.org/wiki/CardDAV)
+  protocol web clients/interfaces.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/calendar--contacts.yml b/tags/calendar--contacts.yml
index dda83866c7..3d90880062 100644
--- a/tags/calendar--contacts.yml
+++ b/tags/calendar--contacts.yml
@@ -1,5 +1,7 @@
 name: Calendar & Contacts
-description: ''
+description: '[Electronic calendar](https://en.wikipedia.org/wiki/Calendaring_software)
+  and [address book](https://en.wikipedia.org/wiki/Address_book)/[contact management](https://en.wikipedia.org/wiki/Contact_manager)
+  software.'
 related_tags:
   - Groupware
 delegate_to: []
diff --git a/tags/communication---custom-communication-systems.yml b/tags/communication---custom-communication-systems.yml
index b5d4dcb368..e11f3fdd05 100644
--- a/tags/communication---custom-communication-systems.yml
+++ b/tags/communication---custom-communication-systems.yml
@@ -1,5 +1,5 @@
 name: Communication - Custom Communication Systems
-description: ''
+description: Communication software using their own custom procols.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---email---mail-delivery-agents.yml b/tags/communication---email---mail-delivery-agents.yml
index c369aed40d..9467ed03fd 100644
--- a/tags/communication---email---mail-delivery-agents.yml
+++ b/tags/communication---email---mail-delivery-agents.yml
@@ -1,5 +1,7 @@
 name: Communication - Email - Mail Delivery Agents
-description: MDAs - IMAP/POP3 software
+description: '[Mail Delivery Agents](https://en.wikipedia.org/wiki/Message_delivery_agent)
+  (MDAs) - [IMAP](https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol)/[POP3](https://en.wikipedia.org/wiki/Post_Office_Protocol)
+  server software.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---email---mail-transfer-agents.yml b/tags/communication---email---mail-transfer-agents.yml
index 06421d5d6d..aad365f6b2 100644
--- a/tags/communication---email---mail-transfer-agents.yml
+++ b/tags/communication---email---mail-transfer-agents.yml
@@ -1,5 +1,6 @@
 name: Communication - Email - Mail Transfer Agents
-description: MTAs / SMTP servers
+description: '[Mail Transfer Agents](https://en.wikipedia.org/wiki/Message_transfer_agent)
+  (MTAs) - [SMTP](https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol) servers.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---email---mailing-lists-and-newsletters.yml b/tags/communication---email---mailing-lists-and-newsletters.yml
index afa9380331..d0e686ecde 100644
--- a/tags/communication---email---mailing-lists-and-newsletters.yml
+++ b/tags/communication---email---mailing-lists-and-newsletters.yml
@@ -1,6 +1,6 @@
 name: Communication - Email - Mailing Lists and Newsletters
-description: Mailing lists servers and mass mailing software - one message to many
-  recipients.
+description: '[Mailing list](https://en.wikipedia.org/wiki/Mailing_list) servers and
+  mass mailing software - one message to many recipients.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---email---webmail-clients.yml b/tags/communication---email---webmail-clients.yml
index 64b28d9863..8fb5b9d321 100644
--- a/tags/communication---email---webmail-clients.yml
+++ b/tags/communication---email---webmail-clients.yml
@@ -1,5 +1,5 @@
 name: Communication - Email - Webmail Clients
-description: '[Webmail](https://en.wikipedia.org/wiki/Webmail) clients for email '
+description: '[Webmail](https://en.wikipedia.org/wiki/Webmail) clients.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---email.yml b/tags/communication---email.yml
index d106f3ca12..74a59de379 100644
--- a/tags/communication---email.yml
+++ b/tags/communication---email.yml
@@ -1,5 +1,5 @@
 name: Communication - Email
-description: ''
+description: '[E-mail](https://en.wikipedia.org/wiki/Email) software.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---xmpp---servers.yml b/tags/communication---xmpp---servers.yml
index 05f4c63368..7c77e14f78 100644
--- a/tags/communication---xmpp---servers.yml
+++ b/tags/communication---xmpp---servers.yml
@@ -1,5 +1,5 @@
 name: Communication - XMPP - Servers
-description: ''
+description: XMPP servers.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---xmpp---web-clients.yml b/tags/communication---xmpp---web-clients.yml
index 7c10410675..7c6dc2cbbb 100644
--- a/tags/communication---xmpp---web-clients.yml
+++ b/tags/communication---xmpp---web-clients.yml
@@ -1,5 +1,5 @@
 name: Communication - XMPP - Web Clients
-description: ''
+description: XMPP Web clients/interfaces.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication---xmpp.yml b/tags/communication---xmpp.yml
index 00ac263708..49351f2c43 100644
--- a/tags/communication---xmpp.yml
+++ b/tags/communication---xmpp.yml
@@ -1,6 +1,6 @@
 name: Communication - XMPP
 description: '[Extensible Messaging and Presence Protocol](https://en.wikipedia.org/wiki/XMPP)
-  software.'
+  communication software.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/communication.yml b/tags/communication.yml
index 16a09d27ac..4d8c254e94 100644
--- a/tags/communication.yml
+++ b/tags/communication.yml
@@ -1,5 +1,7 @@
 name: Communication
-description: ''
+description: '[Communication software](https://en.wikipedia.org/wiki/Communication_software)
+  used to provide remote access to systems and exchange files and messages in text,
+  audio and/or video formats between different computers or users.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/conference-management.yml b/tags/conference-management.yml
index f1552ce552..5d4e8f2839 100644
--- a/tags/conference-management.yml
+++ b/tags/conference-management.yml
@@ -1,5 +1,6 @@
 name: Conference Management
-description: ''
+description: Software for submission of [abstracts](https://en.wikipedia.org/wiki/Abstract_management)
+  and preparation/management of academic conferences.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/content-management-systems-cms.yml b/tags/content-management-systems-cms.yml
index 030a429884..f2bbb5107b 100644
--- a/tags/content-management-systems-cms.yml
+++ b/tags/content-management-systems-cms.yml
@@ -1,7 +1,7 @@
 name: Content Management Systems (CMS)
-description: CMS are a practical way to setup a website with many features. CMS often
-  come with third party plugins, themes and functionality that is easy to add and
-  customize to your needs.
+description: '[Content Management Systems](https://en.wikipedia.org/wiki/Content_management_system)
+  offer a practical way to setup a website with many features, using third party plugins,
+  themes and functionality that are easy to add and customize.'
 related_tags:
   - Blogging Platforms
   - Static Site Generators
diff --git a/tags/dns.yml b/tags/dns.yml
index df5ac439c9..305af8f386 100644
--- a/tags/dns.yml
+++ b/tags/dns.yml
@@ -1,5 +1,6 @@
 name: DNS
-description: ''
+description: '[DNS](https://en.wikipedia.org/wiki/Domain_Name_System) servers and
+  management tools.'
 related_tags: []
 delegate_to: []
 external_links:
diff --git a/tags/document-management---e-books.yml b/tags/document-management---e-books.yml
index 2919a0658b..f397101e50 100644
--- a/tags/document-management---e-books.yml
+++ b/tags/document-management---e-books.yml
@@ -1,5 +1,5 @@
 name: Document Management - E-books
-description: ''
+description: '[Ebook](https://en.wikipedia.org/wiki/Ebook) library management software.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/document-management---institutional-repository-and-digital-library-software.yml b/tags/document-management---institutional-repository-and-digital-library-software.yml
index 7e57684398..4c0ea90b50 100644
--- a/tags/document-management---institutional-repository-and-digital-library-software.yml
+++ b/tags/document-management---institutional-repository-and-digital-library-software.yml
@@ -1,5 +1,7 @@
 name: Document Management - Institutional Repository and Digital Library Software
-description: ''
+description: '[Institutional repository](https://en.wikipedia.org/wiki/Institutional_repository)
+  and [digital library](https://en.wikipedia.org/wiki/Digital_library) management
+  software.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/document-management---integrated-library-systems-ils.yml b/tags/document-management---integrated-library-systems-ils.yml
index 9543ace918..9788f62d3b 100644
--- a/tags/document-management---integrated-library-systems-ils.yml
+++ b/tags/document-management---integrated-library-systems-ils.yml
@@ -1,5 +1,7 @@
 name: Document Management - Integrated Library Systems (ILS)
-description: ''
+description: An [integrated library system](https://en.wikipedia.org/wiki/Integrated_library_system)
+  is an enterprise resource planning system for a library, used to track items owned,
+  orders made, bills paid, and patrons who have borrowed.
 related_tags:
   - Content Management Systems (CMS)
   - Archiving and Digital Preservation (DP)
diff --git a/tags/document-management.yml b/tags/document-management.yml
index 115aedc3b8..d0b423e1ed 100644
--- a/tags/document-management.yml
+++ b/tags/document-management.yml
@@ -1,5 +1,7 @@
 name: Document Management
-description: ''
+description: A [document management system](https://en.wikipedia.org/wiki/Document_management_system)
+  (DMS) is a system used to receive, track, manage and store documents and reduce
+  paper.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/e-commerce.yml b/tags/e-commerce.yml
index 51a2bf6e88..3d2ab1740f 100644
--- a/tags/e-commerce.yml
+++ b/tags/e-commerce.yml
@@ -1,5 +1,5 @@
 name: E-commerce
-description: ''
+description: '[E-commerce](https://en.wikipedia.org/wiki/E-commerce) software.'
 related_tags:
   - Community-Supported Agriculture (CSA)
 delegate_to: []
diff --git a/tags/federated-identity--authentication.yml b/tags/federated-identity--authentication.yml
index 551fbc3094..d4d4ecb75e 100644
--- a/tags/federated-identity--authentication.yml
+++ b/tags/federated-identity--authentication.yml
@@ -1,5 +1,6 @@
 name: Federated Identity & Authentication
-description: ''
+description: '[Federated identity](https://en.wikipedia.org/wiki/Federated_identity)
+  and [authentication](https://en.wikipedia.org/wiki/Electronic_authentication) software.'
 related_tags: []
 delegate_to:
   - title: awesome-sysadmin/Identity Management
diff --git a/tags/feed-readers.yml b/tags/feed-readers.yml
index 68a2f31682..d3f9cc582a 100644
--- a/tags/feed-readers.yml
+++ b/tags/feed-readers.yml
@@ -1,10 +1,8 @@
 name: Feed Readers
 description: A [news aggregator](https://en.wikipedia.org/wiki/News_aggregator), also
   termed a feed aggregator, feed reader, news reader, [RSS](https://en.wikipedia.org/wiki/RSS)
-  reader or simply an aggregator, is client software or a web application that aggregates
-  syndicated web content such as online newspapers, blogs/vlogs, podcasts, and other
-  updates in one location for easy viewing. This also section includes RSS/Atom automation
-  tools.
+  reader, is an application that aggregates web content such as newspapers/blogs/vlogs/podcasts
+  in one location for easy viewing.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/file-transfer---distributed-filesystems.yml b/tags/file-transfer---distributed-filesystems.yml
index 96e7d16029..315b9d3355 100644
--- a/tags/file-transfer---distributed-filesystems.yml
+++ b/tags/file-transfer---distributed-filesystems.yml
@@ -1,5 +1,5 @@
 name: File Transfer - Distributed Filesystems
-description: ''
+description: Network distributed filesystems.
 related_tags: []
 delegate_to:
   - title: awesome-sysadmin/Distributed Filesystems
diff --git a/tags/file-transfer---object-storage--file-servers.yml b/tags/file-transfer---object-storage--file-servers.yml
index b3103ce0b1..318bed5469 100644
--- a/tags/file-transfer---object-storage--file-servers.yml
+++ b/tags/file-transfer---object-storage--file-servers.yml
@@ -1,5 +1,8 @@
 name: File Transfer - Object Storage & File Servers
-description: ''
+description: '[Object storage](https://en.wikipedia.org/wiki/Object_storage) is a
+  computer data storage that manages data as objects, as opposed to other storage
+  architectures like file systems which manages data as a file hierarchy, and block
+  storage which manages data as blocks within sectors and tracks.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/file-transfer---peer-to-peer-filesharing.yml b/tags/file-transfer---peer-to-peer-filesharing.yml
index d1c7c4c99f..8a7242d86f 100644
--- a/tags/file-transfer---peer-to-peer-filesharing.yml
+++ b/tags/file-transfer---peer-to-peer-filesharing.yml
@@ -1,5 +1,8 @@
 name: File Transfer - Peer-to-peer Filesharing
-description: ''
+description: '[Peer-to-peer file sharing](https://en.wikipedia.org/wiki/Peer-to-peer_file_sharing)
+  is the distribution and [sharing](https://en.wikipedia.org/wiki/File_sharing) of
+  digital media using [peer-to-peer](https://en.wikipedia.org/wiki/Peer-to-peer) (P2P)
+  networking technology.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/file-transfer---single-click--drag-n-drop-upload.yml b/tags/file-transfer---single-click--drag-n-drop-upload.yml
index 3e2cdd0e94..22cfe7a970 100644
--- a/tags/file-transfer---single-click--drag-n-drop-upload.yml
+++ b/tags/file-transfer---single-click--drag-n-drop-upload.yml
@@ -1,5 +1,7 @@
 name: File Transfer - Single-click & Drag-n-drop Upload
-description: ''
+description: Simplified file servers for sharing of one-time/short-lived/temporary
+  files, providing single-click or [drag-and-drop](https://en.wikipedia.org/wiki/Drag_and_drop)
+  updload functionality.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/file-transfer---web-based-file-managers.yml b/tags/file-transfer---web-based-file-managers.yml
index 56b47f4a6c..a7697e07ab 100644
--- a/tags/file-transfer---web-based-file-managers.yml
+++ b/tags/file-transfer---web-based-file-managers.yml
@@ -1,5 +1,6 @@
 name: File Transfer - Web-based File Managers
-description: ''
-related_tags: []
+description: Web-based [file managers](https://en.wikipedia.org/wiki/File_manager).
+related_tags:
+  - Groupware
 delegate_to: []
 external_links: []
diff --git a/tags/file-transfer--synchronization.yml b/tags/file-transfer--synchronization.yml
index a42e594b97..0c2a734658 100644
--- a/tags/file-transfer--synchronization.yml
+++ b/tags/file-transfer--synchronization.yml
@@ -1,5 +1,7 @@
 name: File Transfer & Synchronization
-description: ''
+description: '[File transfer](https://en.wikipedia.org/wiki/File_transfer), [sharing](https://en.wikipedia.org/wiki/File_sharing)
+  and [synchronization software](https://en.wikipedia.org/wiki/File_synchronization)
+  software.'
 related_tags:
   - Groupware
 delegate_to: []
diff --git a/tags/games---administrative-utilities--control-panels.yml b/tags/games---administrative-utilities--control-panels.yml
index 8e579fde41..c8b1478e2f 100644
--- a/tags/games---administrative-utilities--control-panels.yml
+++ b/tags/games---administrative-utilities--control-panels.yml
@@ -1,5 +1,5 @@
 name: Games - Administrative Utilities & Control Panels
-description: ''
+description: Utilities for managing game servers.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/games.yml b/tags/games.yml
index 16c5601f68..1617184670 100644
--- a/tags/games.yml
+++ b/tags/games.yml
@@ -1,5 +1,5 @@
 name: Games
-description: ''
+description: Multiplayer game servers and [browser games](https://en.wikipedia.org/wiki/Browser_game).
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/genealogy.yml b/tags/genealogy.yml
index be65302b1d..fae7411526 100644
--- a/tags/genealogy.yml
+++ b/tags/genealogy.yml
@@ -1,5 +1,6 @@
 name: Genealogy
-description: ''
+description: '[Genealogy software](https://en.wikipedia.org/wiki/Genealogy_software)
+  used to record, organize, and publish genealogical data.'
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/groupware.yml b/tags/groupware.yml
index 515b529509..794c5c013a 100644
--- a/tags/groupware.yml
+++ b/tags/groupware.yml
@@ -1,5 +1,8 @@
 name: Groupware
-description: ''
+description: Collaborative software or [groupware](https://en.wikipedia.org/wiki/Collaborative_software)
+  is designed to help people working on a common task to attain their goals. Groupware
+  often regroups multiple services such as file sharing, calendar/events management,
+  address books... in a single, integrated application.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/human-resources-management-hrm.yml b/tags/human-resources-management-hrm.yml
index 0b9deddc36..f25ff7cdaf 100644
--- a/tags/human-resources-management-hrm.yml
+++ b/tags/human-resources-management-hrm.yml
@@ -1,5 +1,8 @@
 name: Human Resources Management (HRM)
-description: ''
+description: A [human resources management system](https://en.wikipedia.org/wiki/Human_resource_management_system)
+  combines a number of systems and processes to ensure the easy management of [human
+  resources](https://en.wikipedia.org/wiki/Human_resources), business processes and
+  data.
 related_tags: []
 delegate_to: []
 external_links: []
diff --git a/tags/read-it-later-lists.yml b/tags/software-development---testing.yml
similarity index 64%
rename from tags/read-it-later-lists.yml
rename to tags/software-development---testing.yml
index d2a63b8599..51d7461729 100644
--- a/tags/read-it-later-lists.yml
+++ b/tags/software-development---testing.yml
@@ -1,4 +1,4 @@
-name: Read-it-later Lists
+name: Software Development - Testing
 description: ''
 related_tags: []
 delegate_to: []
diff --git a/tags/software-development---ux-testing.yml b/tags/software-development---ux-testing.yml
deleted file mode 100644
index 1668d7ae9e..0000000000
--- a/tags/software-development---ux-testing.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: Software Development - UX Testing
-description: ''
-related_tags: []
-delegate_to: []
-external_links: []