From: Paco Esteban <paco@e1e0.net>
Subject: maintainer update net/gajim to 2.3.6
To: "ports@openbsd.org" <ports@openbsd.org>
Date: Sun, 05 Oct 2025 11:54:57 +0200

Hi ports@,

This is an update of net/gajim to its latest version 2.3.6
It needs an update of net/py-nbxmpp sent on a different thread.

It works fine for me on amd64 with the usual caveats (no emojis, ...)

Ok to commit after unlock ?

Paco.

diff --git a/net/gajim/Makefile b/net/gajim/Makefile
index 040c0048649..11201494c35 100644
--- a/net/gajim/Makefile
+++ b/net/gajim/Makefile
@@ -1,8 +1,7 @@
 COMMENT=	fully-featured XMPP client written in Python
-MODPY_DISTV=	2.0.3
+MODPY_DISTV=	2.3.6
 DISTNAME=	gajim-${MODPY_DISTV}
 CATEGORIES=	net x11
-REVISION=	0
 
 HOMEPAGE=	https://www.gajim.org
 
@@ -21,7 +20,7 @@ BUILD_DEPENDS=	devel/gettext,-tools
 RUN_DEPENDS=	audio/gsound \
 		databases/py-sqlalchemy \
 		devel/desktop-file-utils \
-		devel/glib2>=2.66.0 \
+		devel/glib2 \
 		devel/libsoup3 \
 		devel/pango>=1.50.0 \
 		devel/py-gobject3 \
@@ -29,7 +28,7 @@ RUN_DEPENDS=	audio/gsound \
 		graphics/py-cairo \
 		graphics/py-qrcode>=7.3.1 \
 		multimedia/gstreamer1/py-gstreamer \
-		net/py-nbxmpp>=6.0.0 \
+		net/py-nbxmpp>=6.3.0 \
 		security/py-cryptodome \
 		security/py-cryptography \
 		security/py-gnupg \
@@ -41,9 +40,11 @@ RUN_DEPENDS=	audio/gsound \
 		textproc/py-css-parser \
 		textproc/py-emoji>=2.6.0 \
 		textproc/py-precis_i18n \
+		www/py-httpx \
 		x11/dbus-python \
 		x11/gtk+4,-guic \
-		x11/gtksourceview5
+		x11/gtksourceview5 \
+		x11/gnome/libadwaita
 
 post-install:
 	cd ${WRKSRC}; \
diff --git a/net/gajim/distinfo b/net/gajim/distinfo
index d6c71dee713..b2f1893624e 100644
--- a/net/gajim/distinfo
+++ b/net/gajim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gajim-2.0.3.tar.gz) = DbM80fyJ+jwB9Yc9vfoiDqW7Sx7MDR0OEkHdOC6nRG4=
-SIZE (gajim-2.0.3.tar.gz) = 4711551
+SHA256 (gajim-2.3.6.tar.gz) = XzSsPUILwFGcXJjdpBNrNPUzN3WgTSU/k+uby+uJjUg=
+SIZE (gajim-2.3.6.tar.gz) = 4803318
diff --git a/net/gajim/patches/patch-pyproject_toml b/net/gajim/patches/patch-pyproject_toml
new file mode 100644
index 00000000000..366da8f74c3
--- /dev/null
+++ b/net/gajim/patches/patch-pyproject_toml
@@ -0,0 +1,21 @@
+Silence setuptools license declaration deprecation warning
+Index: pyproject.toml
+--- pyproject.toml.orig
++++ pyproject.toml
+@@ -9,7 +9,7 @@ name = "gajim"
+ description = "A GTK XMPP Client"
+ readme = "README.md"
+ requires-python = ">=3.11"
+-license = {text = "GPL-3.0-or-later"}
++license = "GPL-3.0-or-later"
+ authors = [
+     {name = "Philipp Hörist", email = "philipp@hoerist.com"},
+     {name = "Yann Leboulanger", email = "yann@leboulanger.org"},
+@@ -18,7 +18,6 @@ keywords = ["chat", "messaging", "im", "xmpp", "voip"]
+ classifiers = [
+   "Development Status :: 5 - Production/Stable",
+   "Environment :: X11 Applications :: GTK",
+-  "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+   "Operating System :: OS Independent",
+   "Programming Language :: Python :: 3.11",
+   "Topic :: Communications :: Chat",
diff --git a/net/gajim/pkg/PLIST b/net/gajim/pkg/PLIST
index 9b3b6560a4d..94ec3811f77 100644
--- a/net/gajim/pkg/PLIST
+++ b/net/gajim/pkg/PLIST
@@ -202,6 +202,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}la
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}last_activity.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mam.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}message.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}message_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -212,6 +214,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}mo
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}moderations.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc_blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}muc_blocking.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}omemo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}omemo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -228,6 +232,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}re
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}retraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}retraction.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}roster_item_exchange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -276,11 +282,13 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/iq.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/jingle.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/last_activity.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/mam.py
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/mds.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/message.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/message_util.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/misc.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/moderations.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/muc.py
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/muc_blocking.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/omemo.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/pep.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/ping.py
@@ -289,6 +297,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/pubsub.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/reactions.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/receipts.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/register.py
+lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/retraction.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/roster.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/roster_item_exchange.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/search.py
@@ -309,7 +318,10 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCAC
 lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCACHE}thumbnail.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCACHE}thumbnail.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCACHE}video_thumbnail.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/${MODPY_PYCACHE}video_thumbnail.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/thumbnail.py
+lib/python${MODPY_VERSION}/site-packages/gajim/common/multiprocess/video_thumbnail.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/passwords.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/preview.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/regex.py
@@ -391,6 +403,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}muc.$
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}muc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}standards.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}standards.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -411,6 +425,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/util/image.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/jid.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/muc.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/preview.py
+lib/python${MODPY_VERSION}/site-packages/gajim/common/util/standards.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/status.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/text.py
 lib/python${MODPY_VERSION}/site-packages/gajim/common/util/uri.py
@@ -429,23 +444,31 @@ lib/python${MODPY_VERSION}/site-packages/gajim/config.py.in
 lib/python${MODPY_VERSION}/site-packages/gajim/data/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/account_page.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/account_popover.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/account_popover_row.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/account_wizard.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/activity_default.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/activity_gajim_update.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/activity_list_row.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/activity_muc_invitation.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/activity_subscription.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/add_contact.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/advanced_configuration.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/app_page.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/app_side_bar.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/assistant.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/blocking_list.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/call_window.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/certificate.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_banner.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_control.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_list_header.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_list_row.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_paned.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_info.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_tooltip.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_popover.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_popover_info_row.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_view_item.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/db_migration.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/debug_console.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/device_info.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/emoji_completion_view_item.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/exception_dialog.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/file_transfer.ui
@@ -453,6 +476,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/file_transfer_jingle.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/file_transfer_selector.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/global_view_item.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_affiliation.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_blocks.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_config.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_contact_header_view_item.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_contact_view_item.ui
@@ -468,164 +492,55 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_roster_tooltip
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/groupchat_state.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/history_export.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/main.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/mam_preferences.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/manage_proxies.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/manage_roster.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/manage_sounds.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/message_actions_box.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/omemo_trust_manager.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/password_dialog.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/pep_config.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/plugins.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preferences.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/plugin_row.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/archiving.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/blocked_contacts.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/certificate.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/connection-details.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/copy_button.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/manage_roster.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/placeholder_box.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preference/provider_info.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preview.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preview_audio.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/profile.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/quit_dialog.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/roster_item_exchange.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/search_view.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/server_info.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/service_discovery_window.ui
-lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/shortcuts_window.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/shortcuts_manager_row.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/side_bar_listbox_row.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/ssl_error_dialog.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/start_chat_dialog.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/status_message_selector.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/status_selector.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/status_selector_popover.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/status_selector_popover_button.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/themes_window.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/video_preview.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/voice_message_recorder.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/workspace_dialog.ui
+lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/workspace_listbox.ui
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/LICENSE
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-camera-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-camera-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-check-double-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-check-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-clock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-eye-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-eye-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-filter-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-globe-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-hard-drive-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-hash-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-home-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-info-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-lock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-log-in-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-log-out-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-mic-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-mic-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-more-horizontal-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-server-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-shield-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-shield-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-unlock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-user-check-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-user-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/feather-users-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-arrow-left-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-arrow-right-left-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-arrow-right-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-bot-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-file-down-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-file-up-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/devices/lucide-x-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-event.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-plugins.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-away.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-chat.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-connecting.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-dnd.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-error.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-event.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-muc-active.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-muc-inactive.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-offline.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-online.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/16x16/status/gajim-status-xa.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-bytestreams.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-conference.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-disc.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-facebook.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-gadu-gadu.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-http-ws.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-icq.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-irc.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-jabber.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-jud.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-mail.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-mrim.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-msn.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-pubsub.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-rss.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-sip.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-sms.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-tv.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-twitter.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/categories/gajim-agent-weather.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/LICENSE
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-briefcase-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-camera-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-camera-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-filter-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-hash-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-home-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-info-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-log-in-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-log-out-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-more-horizontal-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-user-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/feather-users-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/devices/lucide-bot-symbolic.symbolic.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-event.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-away.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-chat.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-connecting.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-dnd.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-error.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-event.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-muc-active.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-muc-inactive.png
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-message-new.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-offline.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-online.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/32x32/status/gajim-status-xa.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/devices/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/devices/lucide-bot-symbolic.symbolic.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-chat-msg-recv.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-group-chat-invitation.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-status-offline.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-status-online.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-subscription-request.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/48x48/status/gajim-unsubscribed.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/96x96/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/96x96/apps/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/96x96/apps/gajim.png
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/96x96/categories/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/96x96/categories/map.png
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/index.theme
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/apps/
@@ -635,60 +550,126 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/apps/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/apps/gajim.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/categories/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/categories/map.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/LICENSE
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-briefcase-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-camera-off-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-camera-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-check-double-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-check-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-clock-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-eye-off-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-eye-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-filter-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-globe-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-hard-drive-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-hash-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-home-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-info-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-lock-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-log-in-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-log-out-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-mic-off-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-mic-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-minimize-2-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-minus-circle-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-minus-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-more-horizontal-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-plus-circle-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-plus-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-refresh-cw-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-server-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-shield-off-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-shield-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-tag-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-trash-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-unlock-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-user-check-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-user-plus-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-user-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-users-symbolic.svg
-lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/feather-zap-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-app-window-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-arrow-left-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-arrow-right-left-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-arrow-right-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-bell-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-bot-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-briefcase-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-brush-cleaning-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-calendar-search-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-calendar-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-camera-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-camera-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-check-check-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-check-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-down-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-first-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-last-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-left-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-right-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevron-up-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-chevrons-down-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-alert-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-dashed-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-minus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-plus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-question-mark-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-circle-x-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-clipboard-paste-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-clock-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-cloud-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-cloud-off.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-copy-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-database-backup-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-ellipsis-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-ellipsis-vertical-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-eye-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-eye-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-fast-forward-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-file-down-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-file-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-file-up-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-folder-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-frown-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-globe-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-hard-drive-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-hash-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-house-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-image-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-info-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-italic-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-keyboard-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-languages-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-laptop-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-list-filter-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-lock-open-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-lock-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-log-in-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-log-out-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-mail-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-map-pin-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-megaphone-off-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-megaphone-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-message-circle-more-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-message-circle-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-mic-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-mic-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-minimize-2-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-minus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-monitor-smartphone-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-music-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-notebook-tabs-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-package-plus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-package-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-palette-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-paperclip-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-pause-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-phone-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-phone-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-play-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-plus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-refresh-cw-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-reply-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-rewind-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-rotate-ccw-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-save-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-scan-qr-code-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-search-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-send-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-server-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-settings-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-share-2-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-alert-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-check-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-question-mark-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-shield-x-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-smartphone-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-smile-plus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-smile-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-square-asterisk-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-square-pen-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-tag-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-terminal-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-trash-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user-check-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user-cog-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user-plus-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user-round-x-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-user.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-users-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-video-play.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-volume-off-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-webcam-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-wrench-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-x-symbolic.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/devices/lucide-zap-symbolic.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-agent-bytestreams.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-agent-conference.svg
@@ -725,6 +706,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/statu
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-status-online.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-status-xa.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-subscribe.svg
+lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-subscription-request.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gajim-unsubscribe.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gateway-discord.svg
 lib/python${MODPY_VERSION}/site-packages/gajim/data/icons/hicolor/scalable/status/gateway-facebook.svg
@@ -859,8 +841,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/locale/zh_CN/LC_MESSAGES/gaj
 lib/python${MODPY_VERSION}/site-packages/gajim/data/locale/zh_TW/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/locale/zh_TW/LC_MESSAGES/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/locale/zh_TW/LC_MESSAGES/gajim.mo
-lib/python${MODPY_VERSION}/site-packages/gajim/data/other/
-lib/python${MODPY_VERSION}/site-packages/gajim/data/other/shortcuts.json
 lib/python${MODPY_VERSION}/site-packages/gajim/data/sounds/
 lib/python${MODPY_VERSION}/site-packages/gajim/data/sounds/CREDITS
 lib/python${MODPY_VERSION}/site-packages/gajim/data/sounds/attention.wav
@@ -879,6 +859,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/style/default-dark.css
 lib/python${MODPY_VERSION}/site-packages/gajim/data/style/default.css
 lib/python${MODPY_VERSION}/site-packages/gajim/data/style/gajim-dark.css
 lib/python${MODPY_VERSION}/site-packages/gajim/data/style/gajim.css
+lib/python${MODPY_VERSION}/site-packages/gajim/data/style/windows.css
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}/
@@ -888,20 +869,20 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}about.${MODPY
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}about.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_page.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_wizard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}account_wizard.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}accounts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}accounts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}activity_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}activity_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}activity_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}activity_page.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}add_contact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}add_contact.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}adhoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}advanced_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}advanced_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_page.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_page.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}alert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}alert.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}app_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -914,8 +895,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar.${MODP
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}avatar_selector.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}blocking.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}call_window.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -932,6 +911,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_function
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_function_page.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_header.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_header.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_row.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_row.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}chat_list_stack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -950,6 +931,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_info.
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_name_widget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_name_widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_popover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_popover.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contact_settings.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}contacts_flowbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -964,8 +947,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}db_migration.
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}db_migration.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}debug_console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}debug_console.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dialogs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dialogs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}dropdown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -984,6 +965,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filetransfer.
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}filetransfer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_affiliation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_affiliation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_blocks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_blocks.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}groupchat_creation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1020,14 +1003,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_sync.
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}history_sync.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_menu_button.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_menu_button.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_stack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}main_stack.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}mam_preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}mam_preferences.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_roster.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_sounds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}manage_sounds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}menus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1038,8 +1015,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_input
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}message_input.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification_manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}omemo_trust_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}omemo_trust_manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}password_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1048,8 +1023,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}pep_config.${
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}pep_config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preferences.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preview_audio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1062,6 +1035,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}profile.${MOD
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}proxies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}proxies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}quit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}quit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}referenced_message.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}referenced_message.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}remove_account.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1074,12 +1049,12 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}search_view.$
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}search_view.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}security_label_selector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}security_label_selector.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}service_registration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}service_registration.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_listbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_listbox.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_switcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sidebar_switcher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}ssl_error_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1112,24 +1087,23 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}widgets.${MOD
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_dialog.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_side_bar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_side_bar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_listbox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}workspace_listbox.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/about.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/account_page.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/account_side_bar.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/account_wizard.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/accounts.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/activity_list.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/activity_page.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/add_contact.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/adhoc.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/advanced_config.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/app_page.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/alert.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/app_side_bar.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/application.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/apply_button_box.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/assistant.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/avatar.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/avatar_selector.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/blocking.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/builder.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/builder.pyi
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/call_window.py
@@ -1139,6 +1113,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_banner.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_filter.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_function_page.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_list.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_list_header.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_list_row.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_list_stack.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/chat_page.py
@@ -1168,6 +1143,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/component_search.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/const.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/contact_info.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/contact_name_widget.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/contact_popover.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/contact_settings.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/contacts_flowbox.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/control.py
@@ -1254,7 +1230,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/css_config.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/dataform.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/db_migration.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/debug_console.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/dialogs.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/discovery.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/dropdown.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/emoji_chooser.py
@@ -1264,6 +1239,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/file_transfer_selector.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/filechoosers.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/filetransfer.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/groupchat_affiliation.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/groupchat_blocks.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/groupchat_config.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/groupchat_creation.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/groupchat_details.py
@@ -1282,36 +1258,67 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/gstreamer.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/history_export.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/history_sync.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/main.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/main_menu_button.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/main_stack.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/mam_preferences.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/manage_roster.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/manage_sounds.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/menus.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/message_actions_box.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/message_input.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/notification.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/notification_manager.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/omemo_trust_manager.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/password_dialog.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/pep_config.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/plugins.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preferences.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}archiving.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}archiving.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}blocked_contacts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}blocked_contacts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}certificate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}certificate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}dialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}dialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}manage_roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}manage_roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}server_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/account.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/app.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/archiving.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/blocked_contacts.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/certificate.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/dialog.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/manage_roster.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/server_info.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/shortcuts.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preference/widgets.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preview.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preview_audio.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preview_audio_analyzer.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preview_audio_visualizer.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/profile.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/proxies.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/quit.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/referenced_message.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/remove_account.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/resource_selector.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/roster_item_exchange.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/search_view.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/security_label_selector.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/server_info.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/service_registration.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/settings.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/sidebar_listbox.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/sidebar_switcher.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/ssl_error_dialog.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/start_chat.py
@@ -1348,7 +1355,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/voice_message_recorder.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/voice_message_recorder_widget.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/widgets.py
 lib/python${MODPY_VERSION}/site-packages/gajim/gtk/workspace_dialog.py
-lib/python${MODPY_VERSION}/site-packages/gajim/gtk/workspace_side_bar.py
+lib/python${MODPY_VERSION}/site-packages/gajim/gtk/workspace_listbox.py
 lib/python${MODPY_VERSION}/site-packages/gajim/main.py
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/
 lib/python${MODPY_VERSION}/site-packages/gajim/plugins/__init__.py
@@ -1386,5 +1393,4 @@ share/doc/pkg-readmes/${PKGSTEM}
 @tag gtk-update-icon-cache %D/share/icons/hicolor
 share/icons/hicolor/scalable/apps/org.gajim.Gajim-symbolic.svg
 share/icons/hicolor/scalable/apps/org.gajim.Gajim.svg
-share/metainfo/
 share/metainfo/org.gajim.Gajim.metainfo.xml