diff --git a/mac_setup.py b/mac_setup.py
deleted file mode 100644
index c074592..0000000
--- a/mac_setup.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from setuptools import setup
-import setup as og_setup
-
-APP = ['poliBeePSync.py']
-DATA_FILES = []
-OPTIONS = {
- 'O1': True,
- 'app': 'poliBeePSync.py',
- 'arch': 'x86_64',
- 'dist_dir': 'packaging/mac_os/',
- 'packages': 'requests,appdirs,PySide2,beautifulsoup4,lxml,pyparsing,'
-             'keyring,signalslot,PyQt5',
- 'plist': {
-     'CFBundleName': 'poliBeePSync',
-     'CFBundleShortVersionString': og_setup.find_version("polibeepsync"
-                                                         "/__init__.py"),
-     'CFBundleVersion': og_setup.find_version("polibeepsync/__init__.py"),
-     'CFBundleIdentifier': 'com.github.jacotsu.polibeepsync',
-     'NSHumanReadableCopyright': '@ Davide Olianas, Raffaele Di Campli 2020'
- }
-}
-
-setup(
-    app=APP,
-    data_files=DATA_FILES,
-    options={'py2app': OPTIONS},
-    setup_requires=['py2app'],
-    name='poliBeePsync',
-    version=og_setup.find_version("polibeepsync/__init__.py"),
-    url="https://github.com/Jacotsu/polibeepsync",
-    author="Davide Olianas, Raffaele Di Campli",
-    author_email="ubuntupk@gmail.com, dcdrj.pub@gmail.com",
-    license='GPLv3+',
-    python_requires='>=3.7',
-    packages=['polibeepsync'],
-    package_data={'': ['new_gui.ui']},
-    include_package_data=True,
-    description="Sync files from https://beep.metid.polimi.it "
-    "(for students of Politecnico di Milano)",
-    long_description=og_setup.long_description,
-    classifiers=og_setup.classifiers,
-    entry_points={
-        'console_scripts': [
-            'polibeepsync=polibeepsync.qtgui:main',
-        ],
-        'gui_scripts': [
-            'polibeepsync-gui=polibeepsync.qtgui:main'
-        ]
-    }
-)
diff --git a/requirements.txt b/requirements.txt
index e8271c3..b021663 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
-beautifulsoup4>=4.3.2
-requests>=2.3.0
-PySide2>=5.11.0
 appdirs>=1.4.0
-pyparsing>=2.0.3
+beautifulsoup4>=4.3.2
 keyring>=18.0.0
 lxml
-signalslot
+pyparsing>=2.0.3
 PyQt5>=5.14.1
+PySide2>=5.11.0
+requests>=2.3.0
+signalslot
diff --git a/setup.py b/setup.py
index 0330b4e..01f36fe 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,6 @@ def find_version(*file_paths):
 }
 
 
-
 setup(
     app=APP,
     data_files=DATA_FILES,
@@ -68,15 +67,15 @@ def find_version(*file_paths):
     author_email="ubuntupk@gmail.com, dcdrj.pub@gmail.com",
     license='GPLv3+',
     install_requires=[
-        "requests",
         "appdirs",
-        "PySide2",
         "beautifulsoup4",
+        "keyring",
         "lxml",
         "pyparsing",
-        "keyring",
-        "signalslot",
         "PyQt5"
+        "PySide2",
+        "requests",
+        "signalslot",
     ],
     python_requires='>=3.7',
     packages=['polibeepsync'],
diff --git a/test-requirements.txt b/test-requirements.txt
index d7c7e29..a3d32b8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,16 +1,22 @@
+appdirs>=1.4.0
+beautifulsoup4>=4.3.2
 behave>=1.2.4
-pytest>=3.6.3
-coverage>=3.7.1
-pytest-cov>=1.8.1
-pyflakes>=0.8.1
 cov-core>=1.15.0
+coverage>=3.7.1
+keyring>=18.0.0
+lxml
+pluggy
+py2app
 py>=1.5.4
+pyflakes>=0.8.1
+pynsist
+pyparsing>=2.0.3
+PyQt5>=5.14.1
+PySide2>=5.11.0
+pytest-cov>=1.8.1
+pytest>=3.6.3
+requests>=2.3.0
+signalslot
 stdeb
-pluggy
-lxml
 twine
 wheel
-pynsist
-signalslot
-PyQt5>=5.14.1
-py2app