diff --git a/config.yml b/config.yml
index 7cefd40d7..b85bf7f8e 100644
--- a/config.yml
+++ b/config.yml
@@ -1,42 +1,110 @@
+downloads: ~/.ansible-downloads/
+
+configure_dotfiles: true
 configure_terminal: true
 configure_osx: true
 
+# Set to 'true' to configure the Dock via dockutil.
+configure_dock: false
+dockitems_remove:
+  - Launchpad
+  - TV
+  - Messages
+  - Mail
+  - Calendar
+  - Freeform
+  - Music
+  - Contacts
+  - Notes
+  - Reminders
+  - Maps
+  - Photos
+  - FaceTime
+  - App Store
+  - System Settings
+dockitems_persist: []
+# - name: "Sublime Text"
+#   path: "/Applications/Sublime Text.app/"
+#   pos: 5
+
+configure_sudoers: false
+sudoers_custom_config: ''
+# Example:
+# sudoers_custom_config: |
+#   # Allow users in admin group to use sudo with no password.
+#   %admin ALL=(ALL) NOPASSWD: ALL
+
+dotfiles_repo: https://github.com/simonsax/dotfiles.git
+dotfiles_repo_accept_hostkey: true
+dotfiles_repo_local_destination: ~/Development/GitHub/dotfiles
+dotfiles_files:
+  - .zshrc
+  - .gitignore
+  - .inputrc
+  - .osx
+  - .vimrc
+
 homebrew_installed_packages:
+  # - ansible # Installed via Pip.
+  - autoconf
   - bash-completion
+  - node
+  - ssh-copy-id
+  - zsh-history-substring-search
   - python
+  - poetry
+  - pyenv
   - git
   - node
-  - zsh-history-substring-search
   - poetry
   - awscli
+  - azure-cli
+
+homebrew_taps: []
 
+homebrew_cask_appdir: /Applications
 homebrew_cask_apps:
+  - slack
   - docker
-  - dropbox
   - jetbrains-toolbox
   - google-chrome
-  - onedrive
   - rectangle
   - visual-studio-code
   - bitwarden
+  - git-credential-manager
 
-#pip_packages:
-#  - name: pipenv
+# See `geerlingguy.mas` role documentation for usage instructions.
+mas_installed_apps: []
+mas_email: ""
+mas_password: ""
 
-configure_dock: true
-dockitems_remove:
-  - Launchpad
-  - TV
-  - Messages
-  - Mail
-  - Calendar
-  - Freeform
-  - Music
-  - Contacts
-  - Notes
-  - Reminders
-  - Maps
-  - Photos
-  - FaceTime
-  - App Store
-  - System Settings
+osx_script: "~/.osx --no-restart"
+
+# Install packages from other package managers.
+# Note: You are responsible for making sure the required package managers are
+# installed, eg. through homebrew.
+composer_packages: []
+# - name: drush
+#   state: present # present/absent, default: present
+#   version: "^8.1" # default: N/A
+gem_packages: []
+# - name: bundler
+#   state: present # present/absent/latest, default: present
+#   version: "~> 1.15.1" # default: N/A
+npm_packages: []
+# - name: webpack
+#   state: present # present/absent/latest, default: present
+#   version: "^2.6" # default: N/A
+pip_packages: []
+# - name: mkdocs
+#   state: present # present/absent/latest, default: present
+#   version: "0.16.3" # default: N/A
+
+# Set to 'true' to configure Sublime Text.
+configure_sublime: false
+sublime_base_path: '~/Library/Application Support/Sublime Text'
+sublime_config_path: "Packages/User"
+sublime_package_control:
+
+# Glob pattern to ansible task files to run after all other tasks are finished.
+post_provision_tasks: []
diff --git a/default.config.yml b/default.config.yml
index cfd9cf8fb..177ec8dbb 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -24,7 +24,7 @@ sudoers_custom_config: ''
 #   # Allow users in admin group to use sudo with no password.
 #   %admin ALL=(ALL) NOPASSWD: ALL
 
-dotfiles_repo: https://github.com/geerlingguy/dotfiles.git
+dotfiles_repo: https://github.com/simonsax/dotfiles.git
 dotfiles_repo_accept_hostkey: true
 dotfiles_repo_local_destination: ~/Development/GitHub/dotfiles
 dotfiles_files: