diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,18 +1,21 @@
 name       : nicotine-plus
-version    : 3.0.6
-release    : 10
+version    : 3.1.1
+release    : 11
 source     :
-    - https://github.com/Nicotine-Plus/nicotine-plus/archive/refs/tags/3.0.6.tar.gz : 7ff5a256eb428037b2706bd87918fda509a36aa994cd157861acfdaaf140a6a2
+    - https://github.com/nicotine-plus/nicotine-plus/archive/refs/tags/3.1.1.tar.gz : d02f374eaf4cf8cebb2b4068ed5dd36f5774d5ea72b61715ff39bfd6936252d0
 license    : GPL-3.0-or-later
 component  : network.download
 summary    : A graphical client for the SoulSeek peer-to-peer system
 description: |
     A graphical client for the SoulSeek peer-to-peer system
 builddeps  :
-    - python-pytest   # Tests
+    - python-pytest # Tests.
 rundeps    :
     - libappindicator
+    - libgtk-3
     - python-gobject
+build      : |
+    %python3_setup
 install    : |
     %python3_install
     rm -rf $installdir/usr/share/doc
@@ -21,5 +24,5 @@
         -or -iname "license*" -prune -exec rm -r '{}' +
 check      : |
     cd nicotine-plus-$version
-    # Skip a test that requires network.
-    python3 -m pytest -k 'not version'
+    # Skip the startup test which requires a desktop environment.
+    python3 -m pytest -k 'not startup'
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>nicotine-plus</Name>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>network.download</PartOf>
@@ -20,28 +20,38 @@
         <PartOf>network.download</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/nicotine</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/nicotine_plus-3.0.6-py3.9.egg-info</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/nicotine_plus-3.1.1-py3.9.egg-info</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__main__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/__init__.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/__main__.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/chatrooms.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/config.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/i18n.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/interests.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/logfacility.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/networkfilter.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/notifications.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/nowplaying.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/pluginsystem.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/privatechat.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/pynicotine.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/search.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/shares.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/slskmessages.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/slskproto.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/transfers.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/userbrowse.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/userinfo.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/userlist.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/__pycache__/utils.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/chatrooms.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/config.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/__pycache__/__init__.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/__pycache__/countrycodes.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/__pycache__/geoip.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/__pycache__/ip2location.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/countrycodes.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/geoip.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/ip2location.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/geoip/ipcountrydb.bin</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/__init__.py</Path>
@@ -357,10 +367,6 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/downloads.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/interests.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/mainwindow.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/menus/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/menus/__pycache__/__init__.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/menus/mainmenu.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/menus/menubar.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/popovers/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/popovers/__pycache__/__init__.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/popovers/chatroomcommands.ui</Path>
@@ -378,23 +384,21 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/completion.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/downloads.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/events.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/fontscolors.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/geoblock.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/icons.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/ignore.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/log.ui</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/network.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/notifications.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/nowplaying.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/plugin.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/search.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/server.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/settingswindow.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/shares.ui</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/tabs.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/tts.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/uploads.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/urlcatch.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/userinfo.ui</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/settings/userinterface.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/uploads.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/userbrowse.ui</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/ui/userinfo.ui</Path>
@@ -405,32 +409,36 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/utils.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/__init__.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/dialogs.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/filechooser.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/iconnotebook.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/infobar.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/messagedialogs.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/popupmenu.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/textentry.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/textview.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/theme.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/trayicon.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/__pycache__/treeview.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/dialogs.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/filechooser.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/iconnotebook.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/infobar.py</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/messagedialogs.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/popupmenu.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/textentry.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/textview.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/theme.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/trayicon.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/widgets/treeview.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/gtkgui/wishlist.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/i18n.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/interests.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/logfacility.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/metadata/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/metadata/__pycache__/__init__.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/metadata/__pycache__/tinytag.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/metadata/tinytag.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/networkfilter.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/notifications.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/nowplaying.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/__pycache__/__init__.cpython-39.pyc</Path>
@@ -440,9 +448,6 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/leech_detector/PLUGININFO</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/leech_detector/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/leech_detector/__pycache__/__init__.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/memory_debugger/PLUGININFO</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/memory_debugger/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/memory_debugger/__pycache__/__init__.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/multipaste/PLUGININFO</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/multipaste/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/multipaste/__pycache__/__init__.cpython-39.pyc</Path>
@@ -452,9 +457,9 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/now_playing_sender/PLUGININFO</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/now_playing_sender/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/now_playing_sender/__pycache__/__init__.cpython-39.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugindebugger/PLUGININFO</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugindebugger/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugindebugger/__pycache__/__init__.cpython-39.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugin_debugger/PLUGININFO</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugin_debugger/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/plugin_debugger/__pycache__/__init__.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/reddit/PLUGININFO</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/reddit/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/reddit/__pycache__/__init__.cpython-39.pyc</Path>
@@ -465,6 +470,7 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/testreplier/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/plugins/testreplier/__pycache__/__init__.cpython-39.pyc</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/pluginsystem.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/privatechat.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/pynicotine.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/search.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/shares.py</Path>
@@ -479,6 +485,9 @@
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/upnp/portmapper.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/upnp/ssdp.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/upnp/upnp.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/userbrowse.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/userinfo.py</Path>
+            <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/userlist.py</Path>
             <Path fileType="library">/usr/lib/python3.9/site-packages/pynicotine/utils.py</Path>
             <Path fileType="data">/usr/share/applications/org.nicotine_plus.Nicotine.desktop</Path>
             <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/org.nicotine_plus.Nicotine-away.svg</Path>
@@ -506,12 +515,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="10">
-            <Date>2021-07-29</Date>
-            <Version>3.0.6</Version>
+        <Update release="11">
+            <Date>2021-08-13</Date>
+            <Version>3.1.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file