diff --git a/plinth/modules/bepasty/manifest.py b/plinth/modules/bepasty/manifest.py
index 6eb552dbb..754532584 100644
--- a/plinth/modules/bepasty/manifest.py
+++ b/plinth/modules/bepasty/manifest.py
@@ -20,4 +20,4 @@ backup = {
     'services': ['uwsgi'],
 }
 
-tags = [_('File Sharing'), _('Pastebin')]
+tags = [_('File sharing'), _('Pastebin')]
diff --git a/plinth/modules/calibre/manifest.py b/plinth/modules/calibre/manifest.py
index f92b136ed..005fcc64a 100644
--- a/plinth/modules/calibre/manifest.py
+++ b/plinth/modules/calibre/manifest.py
@@ -17,4 +17,4 @@ backup = {
     'services': ['calibre-server-freedombox']
 }
 
-tags = [_('Ebook'), _('Library'), _('Ebook Reader')]
+tags = [_('Ebook'), _('Library'), _('Ebook reader')]
diff --git a/plinth/modules/coturn/manifest.py b/plinth/modules/coturn/manifest.py
index 777f09a21..779da3716 100644
--- a/plinth/modules/coturn/manifest.py
+++ b/plinth/modules/coturn/manifest.py
@@ -4,4 +4,4 @@ from django.utils.translation import gettext_lazy as _
 
 backup = {'secrets': {'directories': ['/etc/coturn']}, 'services': ['coturn']}
 
-tags = [_('VoIP'), _('STUN'), _('TURN')]
+tags = [_('Video conference'), _('STUN'), _('TURN')]
diff --git a/plinth/modules/deluge/manifest.py b/plinth/modules/deluge/manifest.py
index 7335ea1b5..c3d4b0bbf 100644
--- a/plinth/modules/deluge/manifest.py
+++ b/plinth/modules/deluge/manifest.py
@@ -18,4 +18,4 @@ backup = {
     'services': ['deluged', 'deluge-web']
 }
 
-tags = [_('File Sharing'), _('BitTorrent'), _('Client'), _('P2P')]
+tags = [_('File sharing'), _('BitTorrent'), _('Web client'), _('P2P')]
diff --git a/plinth/modules/ejabberd/manifest.py b/plinth/modules/ejabberd/manifest.py
index 62108c4ce..825ac2e6c 100644
--- a/plinth/modules/ejabberd/manifest.py
+++ b/plinth/modules/ejabberd/manifest.py
@@ -121,10 +121,8 @@ backup = {
 }
 
 tags = [
+    _('Encrypted messaging'),
+    _('Audio chat'),
+    _('Video chat'),
     _('XMPP'),
-    _('VoIP'),
-    _('IM'),
-    _('Encrypted Messaging'),
-    _('Audio Chat'),
-    _('Video Chat')
 ]
diff --git a/plinth/modules/email/manifest.py b/plinth/modules/email/manifest.py
index 6097000e2..8927516fb 100644
--- a/plinth/modules/email/manifest.py
+++ b/plinth/modules/email/manifest.py
@@ -79,4 +79,4 @@ backup = {
     'services': ['postfix', 'dovecot', 'rspamd']
 }
 
-tags = [_('Email')]
+tags = [_('Email server'), _('IMAP'), _('Spam control')]
diff --git a/plinth/modules/featherwiki/manifest.py b/plinth/modules/featherwiki/manifest.py
index 2855ee098..6e6d569fd 100644
--- a/plinth/modules/featherwiki/manifest.py
+++ b/plinth/modules/featherwiki/manifest.py
@@ -15,4 +15,4 @@ clients = [{
 
 backup = {'data': {'directories': [str(wiki_dir)]}}
 
-tags = [_('Wiki'), _('Note Taking'), _('Website'), _('Quine'), _('non-Debian')]
+tags = [_('Wiki'), _('Note taking'), _('Website'), _('Quine'), _('Non-Debian')]
diff --git a/plinth/modules/gitweb/manifest.py b/plinth/modules/gitweb/manifest.py
index f48d69410..c5102c31e 100644
--- a/plinth/modules/gitweb/manifest.py
+++ b/plinth/modules/gitweb/manifest.py
@@ -34,4 +34,4 @@ clients = [
 
 backup = {'data': {'directories': [GIT_REPO_PATH]}}
 
-tags = [_('Git'), _('Version Control'), _('Dev Tool')]
+tags = [_('Git hosting'), _('Version control'), _('Developer tool')]
diff --git a/plinth/modules/i2p/manifest.py b/plinth/modules/i2p/manifest.py
index 2f1f64beb..8e4cdda96 100644
--- a/plinth/modules/i2p/manifest.py
+++ b/plinth/modules/i2p/manifest.py
@@ -40,4 +40,4 @@ backup = {
     'services': ['i2p']
 }
 
-tags = [_('Anonymity Network'), _('Censorship Resistance')]
+tags = [_('Anonymity network'), _('Censorship resistance')]
diff --git a/plinth/modules/infinoted/manifest.py b/plinth/modules/infinoted/manifest.py
index fad1f5786..cc27ca983 100644
--- a/plinth/modules/infinoted/manifest.py
+++ b/plinth/modules/infinoted/manifest.py
@@ -43,4 +43,4 @@ backup = {
     'services': ['infinoted']
 }
 
-tags = [_('Note Taking'), _('Collaborative Editing'), _('Gobby')]
+tags = [_('Note taking'), _('Collaborative editing'), _('Gobby')]
diff --git a/plinth/modules/janus/manifest.py b/plinth/modules/janus/manifest.py
index 780f75efb..e8ece3120 100644
--- a/plinth/modules/janus/manifest.py
+++ b/plinth/modules/janus/manifest.py
@@ -13,4 +13,4 @@ clients = [{
 
 backup: dict = {}
 
-tags = [_('Video Conferencing'), _('WebRTC')]
+tags = [_('Video conference'), _('WebRTC'), _('Web conference')]
diff --git a/plinth/modules/jsxc/manifest.py b/plinth/modules/jsxc/manifest.py
index 565924b3f..00dffa0c4 100644
--- a/plinth/modules/jsxc/manifest.py
+++ b/plinth/modules/jsxc/manifest.py
@@ -13,4 +13,4 @@ clients = [{
 
 backup: dict = {}
 
-tags = [_('XMPP'), _('Client')]
+tags = [_('Web chat'), _('XMPP'), _('Client')]
diff --git a/plinth/modules/kiwix/manifest.py b/plinth/modules/kiwix/manifest.py
index f989f9cd8..536bb30a1 100644
--- a/plinth/modules/kiwix/manifest.py
+++ b/plinth/modules/kiwix/manifest.py
@@ -19,4 +19,9 @@ backup = {
     'services': ['kiwix-server-freedombox']
 }
 
-tags = [_('Offline Reader'), _('Archival'), _('Censorship Resistance')]
+tags = [
+    _('Offline reader'),
+    _('Archival'),
+    _('Censorship resistance'),
+    _('Wikipedia')
+]
diff --git a/plinth/modules/matrixsynapse/manifest.py b/plinth/modules/matrixsynapse/manifest.py
index fc7ad7da0..009529ea2 100644
--- a/plinth/modules/matrixsynapse/manifest.py
+++ b/plinth/modules/matrixsynapse/manifest.py
@@ -98,11 +98,9 @@ backup = {
 }
 
 tags = [
-    _('Chat Room'),
-    _('Encrypted Messaging'),
-    _('IM'),
-    _('Audio Chat'),
-    _('Video Chat'),
-    _('Matrix'),
-    _('VoIP')
+    _('Chat room'),
+    _('Encrypted messaging'),
+    _('Audio chat'),
+    _('Video chat'),
+    _('Matrix server'),
 ]
diff --git a/plinth/modules/minetest/manifest.py b/plinth/modules/minetest/manifest.py
index 539a8c148..3963d7ce2 100644
--- a/plinth/modules/minetest/manifest.py
+++ b/plinth/modules/minetest/manifest.py
@@ -46,4 +46,4 @@ backup = {
     'services': ['minetest-server']
 }
 
-tags = [_('Game'), _('Block Sandbox')]
+tags = [_('Game server'), _('Block sandbox'), _('Platform')]
diff --git a/plinth/modules/minidlna/manifest.py b/plinth/modules/minidlna/manifest.py
index 007e8ce76..8f0f4d3e8 100644
--- a/plinth/modules/minidlna/manifest.py
+++ b/plinth/modules/minidlna/manifest.py
@@ -113,4 +113,4 @@ backup = {
     'services': ['minidlna']
 }
 
-tags = [_('Media Server'), _('Television'), _('UPnP'), _('DLNA')]
+tags = [_('Media server'), _('Television'), _('UPnP'), _('DLNA')]
diff --git a/plinth/modules/miniflux/manifest.py b/plinth/modules/miniflux/manifest.py
index f112c564b..7082fb720 100644
--- a/plinth/modules/miniflux/manifest.py
+++ b/plinth/modules/miniflux/manifest.py
@@ -135,4 +135,4 @@ backup = {
     'services': ['miniflux']
 }
 
-tags = [_('Feed Reader'), _('News'), _('RSS'), _('ATOM')]
+tags = [_('Feed reader'), _('News aggregation'), _('RSS'), _('ATOM')]
diff --git a/plinth/modules/mumble/manifest.py b/plinth/modules/mumble/manifest.py
index fa7843aed..b51c1d3e9 100644
--- a/plinth/modules/mumble/manifest.py
+++ b/plinth/modules/mumble/manifest.py
@@ -64,4 +64,4 @@ backup = {
     'services': ['mumble-server']
 }
 
-tags = [_('Audio Chat'), _('VoIP')]
+tags = [_('Audio chat'), _('Group conference'), _('Server')]
diff --git a/plinth/modules/nextcloud/manifest.py b/plinth/modules/nextcloud/manifest.py
index cf30d69d2..3b1e7172b 100644
--- a/plinth/modules/nextcloud/manifest.py
+++ b/plinth/modules/nextcloud/manifest.py
@@ -53,4 +53,4 @@ backup = {
     }
 }
 
-tags = [_('Cloud Storage'), _('File Sharing'), _('non-Debian')]
+tags = [_('File sync'), _('Sharing'), _('Groupware'), _('Non-Debian')]
diff --git a/plinth/modules/openvpn/manifest.py b/plinth/modules/openvpn/manifest.py
index cf7f2b613..68abee13d 100644
--- a/plinth/modules/openvpn/manifest.py
+++ b/plinth/modules/openvpn/manifest.py
@@ -57,4 +57,4 @@ clients = [{
     }]
 }]
 
-tags = [_('VPN'), _('Anonymity'), _('Remote Access')]
+tags = [_('VPN server'), _('Privacy'), _('Remote access')]
diff --git a/plinth/modules/privoxy/manifest.py b/plinth/modules/privoxy/manifest.py
index f346fe0a0..1e236221c 100644
--- a/plinth/modules/privoxy/manifest.py
+++ b/plinth/modules/privoxy/manifest.py
@@ -7,4 +7,4 @@ from django.utils.translation import gettext_lazy as _
 
 backup: dict = {}
 
-tags = [_('Ad Blocker'), _('Proxy'), _('Local Network')]
+tags = [_('Ad blocker'), _('Proxy server'), _('Local network')]
diff --git a/plinth/modules/quassel/manifest.py b/plinth/modules/quassel/manifest.py
index 63aa96256..df7c69112 100644
--- a/plinth/modules/quassel/manifest.py
+++ b/plinth/modules/quassel/manifest.py
@@ -51,4 +51,4 @@ backup = {
     'services': ['quasselcore'],
 }
 
-tags = [_('Chat Room'), _('IRC'), _('Client')]
+tags = [_('Chat room'), _('IRC'), _('Client')]
diff --git a/plinth/modules/radicale/manifest.py b/plinth/modules/radicale/manifest.py
index b27bc7523..1a12e0e81 100644
--- a/plinth/modules/radicale/manifest.py
+++ b/plinth/modules/radicale/manifest.py
@@ -88,10 +88,4 @@ backup = {
     'services': ['uwsgi']
 }
 
-tags = [
-    _('Calendar'),
-    _('Contacts'),
-    _('Synchronization'),
-    _('CalDAV'),
-    _('CardDAV')
-]
+tags = [_('Calendar'), _('Contacts'), _('Server'), _('CalDAV'), _('CardDAV')]
diff --git a/plinth/modules/roundcube/manifest.py b/plinth/modules/roundcube/manifest.py
index 919f53bde..5ea6c3e97 100644
--- a/plinth/modules/roundcube/manifest.py
+++ b/plinth/modules/roundcube/manifest.py
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
+"""Application manifest for roundcube."""
 
 from django.utils.translation import gettext_lazy as _
 
@@ -19,4 +20,4 @@ backup = {
     }
 }
 
-tags = [_('Email'), _('Contacts'), _('Client')]
+tags = [_('Email'), _('Contacts'), _('Web client')]
diff --git a/plinth/modules/rssbridge/manifest.py b/plinth/modules/rssbridge/manifest.py
index cfe398c9f..cfc2675bc 100644
--- a/plinth/modules/rssbridge/manifest.py
+++ b/plinth/modules/rssbridge/manifest.py
@@ -1,9 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
+"""Application manifest for RSS-Bridge."""
 
 from django.utils.translation import gettext_lazy as _
-"""
-Application manifest for RSS-Bridge.
-"""
 
 clients = [{
     'name': _('RSS-Bridge'),
@@ -15,4 +13,4 @@ clients = [{
 
 backup = {'data': {'files': ['/etc/rss-bridge/is_public']}}
 
-tags = [_('Feed Generator'), _('News'), _('RSS'), _('ATOM')]
+tags = [_('Feed generator'), _('News'), _('RSS'), _('ATOM')]
diff --git a/plinth/modules/samba/manifest.py b/plinth/modules/samba/manifest.py
index 4195c3753..6cdb6994b 100644
--- a/plinth/modules/samba/manifest.py
+++ b/plinth/modules/samba/manifest.py
@@ -85,4 +85,10 @@ clients = [{
 
 backup: dict = {}
 
-tags = [_('File Sharing'), _('Local Network')]
+tags = [
+    _('File sharing'),
+    _('Local network'),
+    _('Network drive'),
+    _('Media storage'),
+    _('Backup storage')
+]
diff --git a/plinth/modules/searx/manifest.py b/plinth/modules/searx/manifest.py
index 5643f9354..66bd6f1af 100644
--- a/plinth/modules/searx/manifest.py
+++ b/plinth/modules/searx/manifest.py
@@ -14,4 +14,4 @@ PUBLIC_ACCESS_SETTING_FILE = '/etc/searx/allow_public_access'
 
 backup = {'config': {'files': [PUBLIC_ACCESS_SETTING_FILE]}}
 
-tags = [_('Web Search'), _('Metasearch Engine')]
+tags = [_('Web search'), _('Metasearch Engine')]
diff --git a/plinth/modules/shaarli/manifest.py b/plinth/modules/shaarli/manifest.py
index ae4a70823..6e34a337a 100644
--- a/plinth/modules/shaarli/manifest.py
+++ b/plinth/modules/shaarli/manifest.py
@@ -31,4 +31,4 @@ clients = [{
 
 backup = {'data': {'directories': ['/var/lib/shaarli/data']}}
 
-tags = [_('Bookmarks'), _('Link Blog'), _('Single User')]
+tags = [_('Bookmarks'), _('Link blog'), _('Single user')]
diff --git a/plinth/modules/shadowsocks/manifest.py b/plinth/modules/shadowsocks/manifest.py
index 5715b73c1..337d5d270 100644
--- a/plinth/modules/shadowsocks/manifest.py
+++ b/plinth/modules/shadowsocks/manifest.py
@@ -15,9 +15,9 @@ backup = {
 }
 
 tags = [
-    _('Proxy'),
-    _('Client'),
-    _('SOCKS5'),
-    _('Censorship Resistance'),
-    _('Shadowsocks')
+    _('Proxy server'),
+    _('Censorship resistance'),
+    _('Encrypted tunnel'),
+    _('Entry point'),
+    _('Shadowsocks'),
 ]
diff --git a/plinth/modules/shadowsocksserver/manifest.py b/plinth/modules/shadowsocksserver/manifest.py
index 0f34ea395..859e4c55d 100644
--- a/plinth/modules/shadowsocksserver/manifest.py
+++ b/plinth/modules/shadowsocksserver/manifest.py
@@ -14,4 +14,9 @@ backup = {
     'services': ['shadowsocks-libev-server@fbxserver']
 }
 
-tags = [_('Proxy'), _('SOCKS5'), _('Censorship Resistance'), _('Shadowsocks')]
+tags = [
+    _('Censorship resistance'),
+    _('Encrypted tunnel'),
+    _('Exit point'),
+    _('Shadowsocks')
+]
diff --git a/plinth/modules/sharing/manifest.py b/plinth/modules/sharing/manifest.py
index f7b839a21..f626db1a7 100644
--- a/plinth/modules/sharing/manifest.py
+++ b/plinth/modules/sharing/manifest.py
@@ -16,4 +16,4 @@ backup = {
     }]
 }
 
-tags = [_('File Sharing')]
+tags = [_('File sharing'), _('Web sharing')]
diff --git a/plinth/modules/syncthing/manifest.py b/plinth/modules/syncthing/manifest.py
index 2225a1a69..5b6c132fb 100644
--- a/plinth/modules/syncthing/manifest.py
+++ b/plinth/modules/syncthing/manifest.py
@@ -55,4 +55,4 @@ backup = {
     'services': ['syncthing@syncthing']
 }
 
-tags = [_('Synchronization'), _('File Sharing'), _('Cloud Storage')]
+tags = [_('File sync'), _('File sharing'), _('P2P')]
diff --git a/plinth/modules/tiddlywiki/manifest.py b/plinth/modules/tiddlywiki/manifest.py
index d7da627f0..c91dad349 100644
--- a/plinth/modules/tiddlywiki/manifest.py
+++ b/plinth/modules/tiddlywiki/manifest.py
@@ -17,11 +17,11 @@ backup = {'data': {'directories': [str(wiki_dir)]}}
 
 tags = [
     _('Wiki'),
-    _('Note Taking'),
+    _('Note taking'),
     _('Website'),
     _('Journal'),
-    _('Digital Garden'),
+    _('Digital garden'),
     _('Zettelkasten'),
     _('Quine'),
-    _('non-Debian')
+    _('Non-Debian')
 ]
diff --git a/plinth/modules/tor/manifest.py b/plinth/modules/tor/manifest.py
index 3d3eafe96..93f70fc8b 100644
--- a/plinth/modules/tor/manifest.py
+++ b/plinth/modules/tor/manifest.py
@@ -54,8 +54,9 @@ backup = {
 }
 
 tags = [
+    _('Onion services'),
     _('Relay'),
-    _('Anonymity Network'),
-    _('Censorship Resistance'),
-    _('Tor')
+    _('Anonymity network'),
+    _('Censorship resistance'),
+    _('Tor'),
 ]
diff --git a/plinth/modules/torproxy/manifest.py b/plinth/modules/torproxy/manifest.py
index 6378e8876..7d51fee96 100644
--- a/plinth/modules/torproxy/manifest.py
+++ b/plinth/modules/torproxy/manifest.py
@@ -52,9 +52,8 @@ backup = {
 }
 
 tags = [
-    _('Proxy'),
-    _('SOCKS5'),
-    _('Anonymity Network'),
-    _('Censorship Resistance'),
+    _('Proxy server'),
+    _('Anonymity network'),
+    _('Censorship resistance'),
     _('Tor')
 ]
diff --git a/plinth/modules/transmission/manifest.py b/plinth/modules/transmission/manifest.py
index b99e3c49c..76e960db3 100644
--- a/plinth/modules/transmission/manifest.py
+++ b/plinth/modules/transmission/manifest.py
@@ -36,4 +36,4 @@ backup = {
     'services': ['transmission-daemon']
 }
 
-tags = [_('File Sharing'), _('BitTorrent'), _('Client'), _('P2P')]
+tags = [_('File sharing'), _('BitTorrent'), _('Web client'), _('P2P')]
diff --git a/plinth/modules/ttrss/manifest.py b/plinth/modules/ttrss/manifest.py
index 2510c0d3d..523b85870 100644
--- a/plinth/modules/ttrss/manifest.py
+++ b/plinth/modules/ttrss/manifest.py
@@ -52,4 +52,4 @@ backup = {
     'services': ['tt-rss']
 }
 
-tags = [_('Feed Reader'), _('News'), _('RSS'), _('ATOM')]
+tags = [_('Feed reader'), _('News aggregation'), _('RSS'), _('ATOM')]
diff --git a/plinth/modules/wireguard/manifest.py b/plinth/modules/wireguard/manifest.py
index 274783aa3..c7e9732e5 100644
--- a/plinth/modules/wireguard/manifest.py
+++ b/plinth/modules/wireguard/manifest.py
@@ -42,4 +42,4 @@ clients = [{
     }]
 }]
 
-tags = [_('VPN'), _('Anonymity'), _('Remote Access'), _('P2P')]
+tags = [_('VPN client'), _('VPN server'), _('Privacy'), _('Remote access')]
diff --git a/plinth/modules/wordpress/manifest.py b/plinth/modules/wordpress/manifest.py
index 1928f26ad..ca90cf852 100644
--- a/plinth/modules/wordpress/manifest.py
+++ b/plinth/modules/wordpress/manifest.py
@@ -23,4 +23,4 @@ backup = {
     },
 }
 
-tags = [_('Website'), _('Blog')]
+tags = [_('Website'), _('Blog'), _('Content management system')]
diff --git a/plinth/modules/zoph/manifest.py b/plinth/modules/zoph/manifest.py
index 81680b453..b973c0963 100644
--- a/plinth/modules/zoph/manifest.py
+++ b/plinth/modules/zoph/manifest.py
@@ -23,4 +23,4 @@ backup = {
     }
 }
 
-tags = [_('Image Viewer'), _('Photo'), _('Library')]
+tags = [_('Photo'), _('Organizer'), _('Web sharing')]
diff --git a/plinth/tests/tags/test_functional.py b/plinth/tests/tags/test_functional.py
index 85c8bd6f1..11ef3dd35 100644
--- a/plinth/tests/tags/test_functional.py
+++ b/plinth/tests/tags/test_functional.py
@@ -4,8 +4,8 @@ Functional, browser based tests for transmission app.
 """
 
 import pytest
-
 from selenium.webdriver.common.keys import Keys
+
 from plinth.tests import functional
 
 pytestmark = [pytest.mark.tags]
@@ -39,11 +39,11 @@ def test_search_for_tag(session_browser):
     search_input = session_browser.driver.find_element_by_id('add-tag-input')
     with functional.wait_for_page_update(
             session_browser, timeout=10,
-            expected_url='/plinth/apps/?tag=BitTorrent&tag=File%20Sharing'):
+            expected_url='/plinth/apps/?tag=BitTorrent&tag=File%20sharing'):
         search_input.click()
         search_input.send_keys('file')
         search_input.send_keys(Keys.ENTER)
-    for app in ['deluge', 'nextcloud', 'sharing', 'syncthing', 'transmission']:
+    for app in ['deluge', 'samba', 'sharing', 'syncthing', 'transmission']:
         _is_app_listed(session_browser, app)
 
 
@@ -52,9 +52,9 @@ def test_click_on_tag(session_browser):
     search_input = session_browser.driver.find_element_by_id('add-tag-input')
     with functional.wait_for_page_update(
             session_browser, timeout=10,
-            expected_url='/plinth/apps/?tag=BitTorrent&tag=Cloud%20Storage'):
+            expected_url='/plinth/apps/?tag=BitTorrent&tag=File%20sync'):
         search_input.click()
         session_browser.find_by_css(
-            ".dropdown-item[data-value='Cloud Storage']").click()
+            ".dropdown-item[data-value='File sync']").click()
     for app in ['deluge', 'nextcloud', 'syncthing', 'transmission']:
         _is_app_listed(session_browser, app)