diff --git a/tasks/__init__.py b/tasks/__init__.py
index b646be65..6e5a74ac 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -111,7 +111,7 @@ def customize_user_settings(ctx):
     with open(os.path.expanduser('~/.gitconfig.custom'), 'w') as custom_file:
         custom_file.write("""[user]
         name = {0}
-	email = {1}""".format(username, email))
+        email = {1}""".format(username, email))
 
 
 @ctask
@@ -127,6 +127,7 @@ def fix_dropbox_permissions(ctx):
     ctx.run("sudo chmod -R 700 ~/.ssh")
     ctx.run("sudo chmod -R 700 $(readlink -f ~/.ssh)")
     ctx.run("sudo chmod -R 700 ~/Dropbox/auth/foolery.pem")
+    ctx.run("sudo chmod -R 700 ~/Dropbox/configs/dotfiles/gnupg")
 
 
 ns.add_task(fix_pip)
diff --git a/tasks/osx.py b/tasks/osx.py
index 341ddf36..03ec5745 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -17,7 +17,6 @@ def setup(ctx):
     fonts(ctx)
     fix_htop(ctx)
     iTerm(ctx)
-    # setup_dbus(ctx)
     keyboard_settings(ctx)
     custom_keyboard_shortcuts(ctx)
 
@@ -32,14 +31,16 @@ def macvim(ctx):
     ctx.run("brew install {0}".format(macvim_install))
     ctx.run("vim +BundleInstall! +q +q")
 
+
 @ctask
 def setup_dbus(ctx):
     ctx.run("ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents")
 
+
 @ctask
-def osx_config(ctx):
-    ctx.run('sudo {0}'.format(
-        os.path.join(util.RESOURCES_DIRECTORY, 'osx.sh')
+def system_settings(ctx):
+    ctx.run('{0}'.format(
+        os.path.join(util.RESOURCES_DIRECTORY, 'osx_setup.sh')
     ), pty=True)
 
 
@@ -58,13 +59,6 @@ def brew(ctx):
         ctx.run('ruby -e "$(curl -fsSL {0}'.format(path))
 
 
-@ctask
-def packages(ctx):
-    ctx.run('brew update')
-    for package_name in ESSENTIAL + BASICS + SHOULD_INSTALL + MISC:
-        ctx.run('brew install {0}'.format(package_name))
-
-
 @ctask
 def set_path_for_launchd(ctx):
     launch_agent_dir = os.path.expanduser('~/Library/LaunchAgents/')
@@ -78,6 +72,8 @@ def set_path_for_launchd(ctx):
 
 
 APPS_NEEDING_ASSISTIVE_DEVICE_ACCESS = ('Slate', 'Synergy', 'iTerm')
+
+
 @ctask
 def access_for_assistive_devices(ctx):
     for app in APPS_NEEDING_ASSISTIVE_DEVICE_ACCESS:
@@ -101,6 +97,7 @@ def access_if_exists(ctx, app_string):
             )
         )
 
+
 @ctask(aliases=['karabiner', 'fast_repeat'])
 def hyper(ctx):
     source = '{0}/karabiner-hyper.xml'.format(util.RESOURCES_DIRECTORY)
@@ -175,6 +172,8 @@ settings_directory = os.path.join(util.RESOURCES_DIRECTORY, 'osx_settings')
 all_save_settings = []
 all_write_settings = []
 all_diff_settings = []
+
+
 def functions_for_filename(filename):
     filepath = os.path.join(settings_directory, filename)
     task_name = 'settings-write:' + filename.replace('.', '-')
@@ -205,6 +204,8 @@ def functions_for_filename(filename):
         ))
     globals()[task_name] = task
     all_diff_settings.append(task)
+
+
 for _, _, filenames in os.walk(settings_directory):
     for filename in filenames:
         functions_for_filename(filename)