diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,17 +1,21 @@
 name       : mailnag
-version    : 1.2.1
-release    : 2
+version    : 2.0.0
+release    : 3
 source     :
-    - https://github.com/pulb/mailnag/archive/v1.2.1.tar.gz : ec7ac027d93bc7d88fc270858f5a181453a6ff07f43cab20563d185818801fee
+    - https://github.com/pulb/mailnag/archive/v2.0.0.tar.gz : 9e57afac6e730846414ea304ba096387ce4d4f493fb3e4bf0feabf074e794974
 license    : GPL-2.0
 component  : network.mail
 summary    : Mailnag is a daemon program that checks POP3 and IMAP servers for new mail
 description: |
     Mailnag is a daemon program that checks POP3 and IMAP servers for new mail
-rundeps  :
-    - python-gobject2
+rundeps    :
+    - gst-plugins-base
+    - libnotify
+    - libsecret
+    - python-gobject
+    - python-dbus
     - pyxdg
 build      : |
-    %python_setup
+    %python3_setup
 install    : |
-    %python_install
+    %python3_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
     <Source>
         <Name>mailnag</Name>
         <Packager>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@stroblindustries.com</Email>
+            <Name>Marc-André Renaud</Name>
+            <Email>ma.renaud@slashvoid.com</Email>
         </Packager>
         <License>GPL-2.0</License>
         <PartOf>network.mail</PartOf>
         <Summary xml:lang="en">Mailnag is a daemon program that checks POP3 and IMAP servers for new mail</Summary>
         <Description xml:lang="en">Mailnag is a daemon program that checks POP3 and IMAP servers for new mail
 </Description>
-        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>mailnag</Name>
@@ -19,63 +19,75 @@
 </Description>
         <PartOf>network.mail</PartOf>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/accounts.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/accounts.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/config.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/config.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/credentialstore.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/credentialstore.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/dist_cfg.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/dist_cfg.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/exceptions.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/exceptions.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/i18n.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/i18n.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/imaplib2.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/imaplib2.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/plugins.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/plugins.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/subproc.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/subproc.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/utils.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/common/utils.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/accountdialog.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/accountdialog.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/configwindow.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/configwindow.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/plugindialog.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/configuration/plugindialog.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/__init__.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/conntest.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/conntest.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/idlers.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/idlers.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mailchecker.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mailchecker.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mailnagdaemon.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mailnagdaemon.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mails.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/daemon/mails.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/dbusplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/dbusplugin.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/libnotifyplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/libnotifyplugin.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/soundplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/soundplugin.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/spamfilterplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/spamfilterplugin.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/userscriptplugin.py</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/Mailnag/plugins/userscriptplugin.pyc</Path>
-            <Path fileType="library">/usr/lib/python2.7/site-packages/mailnag-1.2.1-py2.7.egg-info</Path>
-            <Path fileType="data">/usr/share/appdata/mailnag.appdata.xml</Path>
+            <Path fileType="executable">/usr/bin/mailnag</Path>
+            <Path fileType="executable">/usr/bin/mailnag-config</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__pycache__/base.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__pycache__/imap.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__pycache__/local.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/__pycache__/pop3.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/base.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/imap.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/local.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/backends/pop3.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/accounts.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/config.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/dist_cfg.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/exceptions.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/i18n.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/imaplib2.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/mutf7.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/plugins.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/secretstore.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/subproc.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/__pycache__/utils.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/accounts.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/config.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/dist_cfg.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/exceptions.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/i18n.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/imaplib2.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/mutf7.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/plugins.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/secretstore.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/subproc.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/common/utils.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/__pycache__/accountdialog.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/__pycache__/configwindow.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/__pycache__/plugindialog.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/accountdialog.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/configwindow.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/configuration/plugindialog.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/conntest.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/dbus.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/idlers.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/mailchecker.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/mailnagdaemon.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/__pycache__/mails.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/conntest.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/dbus.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/idlers.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/mailchecker.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/mailnagdaemon.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/daemon/mails.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/__pycache__/libnotifyplugin.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/__pycache__/soundplugin.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/__pycache__/spamfilterplugin.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/__pycache__/userscriptplugin.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/libnotifyplugin.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/soundplugin.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/spamfilterplugin.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/Mailnag/plugins/userscriptplugin.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/mailnag-2.0.0-py3.7.egg-info</Path>
             <Path fileType="data">/usr/share/applications/mailnag-config.desktop</Path>
             <Path fileType="data">/usr/share/applications/mailnag.desktop</Path>
             <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/mailnag.png</Path>
@@ -86,17 +98,39 @@
             <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/mailnag.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/mailnag.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/96x96/apps/mailnag.png</Path>
-            <Path fileType="localedata">/usr/share/locale</Path>
-            <Path fileType="data">/usr/share/mailnag</Path>
+            <Path fileType="localedata">/usr/share/locale/bg/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/cs/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/de/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/es/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/fr/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/gl/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/hr/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/id/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/it/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/pl/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/pt/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/pt_BR/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/ru/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/sr/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/sv/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/tr/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/uk/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/zh_CN/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="localedata">/usr/share/locale/zh_TW/LC_MESSAGES/mailnag.mo</Path>
+            <Path fileType="data">/usr/share/mailnag/account_widget.ui</Path>
+            <Path fileType="data">/usr/share/mailnag/config_window.ui</Path>
+            <Path fileType="data">/usr/share/mailnag/mailnag.ogg</Path>
+            <Path fileType="data">/usr/share/mailnag/mailnag.png</Path>
+            <Path fileType="data">/usr/share/metainfo/mailnag.appdata.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2016-11-18</Date>
-            <Version>1.2.1</Version>
+        <Update release="3">
+            <Date>2020-07-22</Date>
+            <Version>2.0.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joshua Strobl</Name>
-            <Email>joshua@stroblindustries.com</Email>
+            <Name>Marc-André Renaud</Name>
+            <Email>ma.renaud@slashvoid.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file