1 files changed, 5 insertions, 14 deletions
diff --git a/setup.py b/setup.py
index 10c27b2e..961bcb40 100644
--- a/setup.py
+++ b/setup.py
@@ -20,21 +20,12 @@ required = [
     'leap.common',
 ]
 
+mail_deps = ['leap.soledad.client', 'gnupg']
+gui_deps = ['vext.pyqt5', 'leap.bitmask_js']
 extras = {
-    'mail': [
-        'leap.soledad.client',
-        'gnupg',
-    ],
-    'gui': [
-        'vext.pyqt5',
-        'leap.bitmask_js',
-    ],
-    'all': [
-        'vext.pyqt5',
-        'bitmask_js',
-        'leap.soledad.client',
-        'gnupg',
-    ]
+    'mail': mail_deps,
+    'gui': gui_deps,
+    'all': mail_deps + gui_deps
 }