diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,16 +1,18 @@
 name       : safeeyes
-version    : 2.0.9
-release    : 4
+version    : 2.1.1
+release    : 5
 source     :
-    - https://github.com/slgobinath/SafeEyes/archive/v2.0.9.tar.gz : a6264f52032c8d43b0c98166cffdd32a01d2c4a0bdb1b266b887857636383a93
+    - https://github.com/slgobinath/SafeEyes/archive/v2.1.1.tar.gz : 3f0781e738b65069341d3b4dc1bc96551ecf0156b84d1b17b18ea8453866ad23
+homepage   : http://slgobinath.github.io/SafeEyes/
 license    : GPL-3.0-or-later
 component  : desktop
-summary    : Safe Eyes is a Free and Open Source tool for Linux users to reduce and prevent repetitive strain injury (RSI)
+summary    : Safe Eyes is a tool to reduce and prevent repetitive strain injury (RSI)
 description: |
     Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder.
 rundeps    :
     - libappindicator
     - python-babel
+    - python-croniter
     - python-psutil
     - python-xlib
     - xprintidle
@@ -19,3 +21,9 @@
     %python3_setup
 install    : |
     %python3_install
+
+    # Move icons and desktop entry to correct locations
+    install -dm00644 $installdir/usr/share/applications
+    mv $installdir/usr/lib/python3.7/site-packages/safeeyes/platform/icons $installdir/usr/share/icons
+    mv $installdir/usr/lib/python3.7/site-packages/safeeyes/platform/safeeyes.desktop -t $installdir/usr/share/applications
+    rm -r $installdir/usr/lib/python3.7/site-packages/safeeyes/platform
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,50 +1,42 @@
 <PISI>
     <Source>
         <Name>safeeyes</Name>
+        <Homepage>http://slgobinath.github.io/SafeEyes/</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Algent Albrahimi</Name>
+            <Email>algent@protonmail.com</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>desktop</PartOf>
-        <Summary xml:lang="en">Safe Eyes is a Free and Open Source tool for Linux users to reduce and prevent repetitive strain injury (RSI)</Summary>
+        <Summary xml:lang="en">Safe Eyes is a tool to reduce and prevent repetitive strain injury (RSI)</Summary>
         <Description xml:lang="en">Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>safeeyes</Name>
-        <Summary xml:lang="en">Safe Eyes is a Free and Open Source tool for Linux users to reduce and prevent repetitive strain injury (RSI)</Summary>
+        <Summary xml:lang="en">Safe Eyes is a tool to reduce and prevent repetitive strain injury (RSI)</Summary>
         <Description xml:lang="en">Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder.
 </Description>
         <PartOf>desktop</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/safeeyes</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/entry_points.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/requires.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.0.9-py3.7.egg-info/top_level.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/AboutDialog.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/BreakScreen.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/PluginManager.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/SafeEyes.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/SafeEyesCore.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/Utility.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes-2.1.1-py3.7.egg-info/top_level.txt</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__main__.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/AboutDialog.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/BreakScreen.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/PluginManager.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/SafeEyes.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/SafeEyesCore.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/Utility.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/__init__.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/__main__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/core.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/model.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/plugin_manager.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/rpc.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/settings.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/safeeyes.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/__pycache__/utility.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/ar/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/bg/LC_MESSAGES/safeeyes.mo</Path>
@@ -59,6 +51,8 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/de/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/en_US/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/en_US/LC_MESSAGES/safeeyes.po</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/eo/LC_MESSAGES/safeeyes.mo</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/eo/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/es/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/es/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/et/LC_MESSAGES/safeeyes.mo</Path>
@@ -67,6 +61,8 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/fa/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/fr/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/fr/LC_MESSAGES/safeeyes.po</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/he/LC_MESSAGES/safeeyes.mo</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/he/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/hi/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/hi/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/hu/LC_MESSAGES/safeeyes.mo</Path>
@@ -75,12 +71,18 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/id/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/it/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/it/LC_MESSAGES/safeeyes.po</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/kn/LC_MESSAGES/safeeyes.mo</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/kn/LC_MESSAGES/safeeyes.po</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.mo</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/ko/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/lt/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/lt/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/lv/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/lv/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/mk/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/mk/LC_MESSAGES/safeeyes.po</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/mr/LC_MESSAGES/safeeyes.mo</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/mr/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/nb/LC_MESSAGES/safeeyes.mo</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/nb/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/nl/LC_MESSAGES/safeeyes.mo</Path>
@@ -114,6 +116,7 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/locale/zh_TW/LC_MESSAGES/safeeyes.po</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/safeeyes.json</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/config/style/safeeyes_style.css</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/core.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/glade/about_dialog.glade</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/glade/break_screen.glade</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/glade/item_bool.glade</Path>
@@ -126,6 +129,7 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/glade/settings_dialog.glade</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/glade/settings_plugin.glade</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/model.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugin_manager.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/audiblealert/__pycache__/plugin.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/audiblealert/config.json</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/audiblealert/icon.png</Path>
@@ -134,8 +138,10 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/donotdisturb/config.json</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/donotdisturb/icon.png</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/donotdisturb/plugin.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/__pycache__/dependency_checker.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/__pycache__/plugin.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/config.json</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/dependency_checker.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/icon.png</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/healthstats/plugin.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/mediacontrol/__pycache__/plugin.cpython-37.pyc</Path>
@@ -152,8 +158,10 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/screensaver/icon.png</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/screensaver/plugin.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/screensaver/resource/lock.png</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/__pycache__/dependency_checker.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/__pycache__/plugin.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/config.json</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/dependency_checker.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/icon.png</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/smartpause/plugin.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/plugins/trayicon/__pycache__/plugin.cpython-37.pyc</Path>
@@ -165,7 +173,16 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/resource/on_pre_break.wav</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/resource/on_stop_break.wav</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/rpc.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/settings.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/safeeyes.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/__pycache__/about_dialog.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/__pycache__/break_screen.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/__pycache__/settings_dialog.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/about_dialog.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/break_screen.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/ui/settings_dialog.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/safeeyes/utility.py</Path>
             <Path fileType="data">/usr/share/applications/safeeyes.desktop</Path>
             <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/safeeyes.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/safeeyes.png</Path>
@@ -186,12 +203,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="4">
-            <Date>2020-01-27</Date>
-            <Version>2.0.9</Version>
+        <Update release="5">
+            <Date>2020-12-29</Date>
+            <Version>2.1.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Algent Albrahimi</Name>
+            <Email>algent@protonmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file