diff --git a/ansible/roles/dotfiles/tasks/dotfiles.yml b/ansible/roles/dotfiles/tasks/dotfiles.yml
index 6c7eb9b7..9a07c914 100644
--- a/ansible/roles/dotfiles/tasks/dotfiles.yml
+++ b/ansible/roles/dotfiles/tasks/dotfiles.yml
@@ -18,11 +18,6 @@
     stow --stow --target={{ ansible_env.HOME }} {{ item }}
   with_items: stow
   tags: stow
-- command: >
-    chdir={{ ansible_env.HOME }}/.dotfiles
-    stow --stow --target={{ ansible_env.HOME }} osx
-  when: ansible_distribution == "MacOSX"
-  tags: stow
 - file:
     src: "{{ ansible_env.HOME }}/.dotfiles/{{ item.key }}"
     dest: "{{ ansible_env.HOME}}/{{ item.value }}"
diff --git a/ansible/roles/osx/tasks/main.yml b/ansible/roles/osx/tasks/main.yml
index 18258254..d3728f10 100644
--- a/ansible/roles/osx/tasks/main.yml
+++ b/ansible/roles/osx/tasks/main.yml
@@ -5,6 +5,7 @@
 - include: casks.yml
 - include: fonts.yml
 - include: defaults.yml
+- include: mackup.yml
 - file: path=~/Library/KeyBindings state=directory
 - copy: src=.tmux.conf.local dest=~/.tmux.conf.local
 - copy: src=DefaultKeyBinding.dict dest=~/Library/KeyBindings/DefaultKeyBinding.dict
diff --git a/mackup/.mackup.cfg b/mackup/.mackup.cfg
new file mode 100644
index 00000000..72263b2b
--- /dev/null
+++ b/mackup/.mackup.cfg
@@ -0,0 +1,11 @@
+[storage]
+engine = dropbox
+directory = mackup
+
+[applications_to_sync]
+1password
+adium
+colors
+fantastical
+things
+yorufukurou
diff --git a/mackup/.mackup/1password.cfg b/mackup/.mackup/1password.cfg
new file mode 100644
index 00000000..66a87c6e
--- /dev/null
+++ b/mackup/.mackup/1password.cfg
@@ -0,0 +1,5 @@
+[application]
+name = 1Password
+
+[configuration_files]
+Library/Preferences/com.agilebits.onepassword4.plist
diff --git a/mackup/.mackup/colors.cfg b/mackup/.mackup/colors.cfg
new file mode 100644
index 00000000..761f9e55
--- /dev/null
+++ b/mackup/.mackup/colors.cfg
@@ -0,0 +1,5 @@
+[application]
+name = Colors
+
+[configuration_files]
+Library/Colors
diff --git a/mackup/.mackup/things.cfg b/mackup/.mackup/things.cfg
new file mode 100644
index 00000000..6bad48b8
--- /dev/null
+++ b/mackup/.mackup/things.cfg
@@ -0,0 +1,5 @@
+[application]
+name = Things
+
+[configuration_files]
+Library/Preferences/com.culturedcode.things.plist
diff --git a/mackup/.mackup/yorufukurou.cfg b/mackup/.mackup/yorufukurou.cfg
new file mode 100644
index 00000000..307d0d73
--- /dev/null
+++ b/mackup/.mackup/yorufukurou.cfg
@@ -0,0 +1,5 @@
+[application]
+name = YoruFukurou
+
+[configuration_files]
+Library/Preferences/com.YoruFukurouProject.YoruFukurou.plist
diff --git a/osx/Library/Colors/Base16 Default.clr b/osx/Library/Colors/Base16 Default.clr
deleted file mode 100644
index 1ed636e5..00000000
Binary files a/osx/Library/Colors/Base16 Default.clr and /dev/null differ
diff --git a/osx/Library/Colors/Base16 Flat.clr b/osx/Library/Colors/Base16 Flat.clr
deleted file mode 100644
index 1fdaba88..00000000
Binary files a/osx/Library/Colors/Base16 Flat.clr and /dev/null differ
diff --git a/osx/Library/Colors/Base16 Solarized.clr b/osx/Library/Colors/Base16 Solarized.clr
deleted file mode 100644
index 1152764d..00000000
Binary files a/osx/Library/Colors/Base16 Solarized.clr and /dev/null differ