diff --git a/ansible/roles/osx/tasks/casks.yml b/ansible/roles/osx/tasks/casks.yml
index afbfe205..07050bbd 100644
--- a/ansible/roles/osx/tasks/casks.yml
+++ b/ansible/roles/osx/tasks/casks.yml
@@ -1,4 +1,5 @@
 ---
+- include_vars: casks.yml
 # - homebrew: name=caskroom/cask/brew-cask state=upgraded
 - command: brew install caskroom/cask/brew-cask
 - homebrew_cask: name={{ item }} state=installed
diff --git a/ansible/roles/osx/tasks/defaults.yml b/ansible/roles/osx/tasks/defaults.yml
index 280a377a..82ba3e42 100644
--- a/ansible/roles/osx/tasks/defaults.yml
+++ b/ansible/roles/osx/tasks/defaults.yml
@@ -1,4 +1,5 @@
 ---
+- include_vars: defaults.yml
 - command: defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -int 1
   sudo: True
 - command: defaults write {{ item }}
diff --git a/ansible/roles/osx/tasks/fonts.yml b/ansible/roles/osx/tasks/fonts.yml
index 2898aaf7..9679213f 100644
--- a/ansible/roles/osx/tasks/fonts.yml
+++ b/ansible/roles/osx/tasks/fonts.yml
@@ -1,4 +1,5 @@
 ---
+- include_vars: fonts.yml
 - homebrew_tap: tap=caskroom/fonts state=present
 - homebrew_cask: name={{ item }} state=installed
   with_items: fonts
diff --git a/ansible/roles/osx/tasks/homebrew.yml b/ansible/roles/osx/tasks/formulae.yml
similarity index 85%
rename from ansible/roles/osx/tasks/homebrew.yml
rename to ansible/roles/osx/tasks/formulae.yml
index 3bf5792b..a720eccf 100644
--- a/ansible/roles/osx/tasks/homebrew.yml
+++ b/ansible/roles/osx/tasks/formulae.yml
@@ -1,4 +1,5 @@
 ---
+- include_vars: formulae.yml
 - homebrew: name={{ item }} state=present
   with_items: formulae
 - homebrew: name=macvim install_options=override-system-vim state=present
diff --git a/ansible/roles/osx/tasks/main.yml b/ansible/roles/osx/tasks/main.yml
index ab60fde4..3166be15 100644
--- a/ansible/roles/osx/tasks/main.yml
+++ b/ansible/roles/osx/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - homebrew: update_homebrew=yes
-- include: homebrew.yml
+- include: formulae.yml
 - include: casks.yml
 - include: fonts.yml
 - include: defaults.yml
diff --git a/ansible/roles/osx/vars/casks.yml b/ansible/roles/osx/vars/casks.yml
new file mode 100644
index 00000000..e1f71adf
--- /dev/null
+++ b/ansible/roles/osx/vars/casks.yml
@@ -0,0 +1,23 @@
+---
+casks:
+  - adium
+  - alfred
+  - bittorrent-sync
+  - black-ink
+  - dropbox
+  - google-chrome
+  - fantastical
+  - firefox
+  - flux
+  - moom
+  - onepassword
+  - plug
+  - qlmarkdown
+  - qlstephen
+  - quicklook-csv
+  - quicklook-json
+  - steam
+  - things
+  - transmission
+  - vlc
+  - ynab
diff --git a/ansible/roles/osx/vars/main.yml b/ansible/roles/osx/vars/defaults.yml
similarity index 80%
rename from ansible/roles/osx/vars/main.yml
rename to ansible/roles/osx/vars/defaults.yml
index 728f1231..4a781cd5 100644
--- a/ansible/roles/osx/vars/main.yml
+++ b/ansible/roles/osx/vars/defaults.yml
@@ -1,40 +1,4 @@
 ---
-formulae:
-  - chruby
-  - ctags
-  - fasd
-  - git
-  # - macvim # Needs install_options=override-system-vim
-  - ruby-install
-  - reattach-to-user-namespace
-  - the_silver_searcher
-  - tmux
-  - youtube-dl
-  - zsh
-casks:
-  - adium
-  - alfred
-  - bittorrent-sync
-  - black-ink
-  - dropbox
-  - google-chrome
-  - fantastical
-  - firefox
-  - flux
-  - moom
-  - onepassword
-  - plug
-  - qlmarkdown
-  - qlstephen
-  - quicklook-csv
-  - quicklook-json
-  - steam
-  - things
-  - transmission
-  - vlc
-  - ynab
-fonts:
-  - font-sauce-code-powerline
 defaults:
   - -g NSDisableAutomaticTermination -bool true # Don't quit idle applications
 
diff --git a/ansible/roles/osx/vars/fonts.yml b/ansible/roles/osx/vars/fonts.yml
new file mode 100644
index 00000000..bdf2dded
--- /dev/null
+++ b/ansible/roles/osx/vars/fonts.yml
@@ -0,0 +1,3 @@
+---
+fonts:
+  - font-sauce-code-powerline
diff --git a/ansible/roles/osx/vars/formulae.yml b/ansible/roles/osx/vars/formulae.yml
new file mode 100644
index 00000000..352e8618
--- /dev/null
+++ b/ansible/roles/osx/vars/formulae.yml
@@ -0,0 +1,13 @@
+---
+formulae:
+  - chruby
+  - ctags
+  - fasd
+  - git
+  # - macvim # Needs install_options=override-system-vim
+  - ruby-install
+  - reattach-to-user-namespace
+  - the_silver_searcher
+  - tmux
+  - youtube-dl
+  - zsh