diff --git a/app/Commands/ConfigureSystemCommand.php b/app/Commands/ConfigureSystemCommand.php
index b750e81..13f952d 100644
--- a/app/Commands/ConfigureSystemCommand.php
+++ b/app/Commands/ConfigureSystemCommand.php
@@ -2,8 +2,6 @@
 
 namespace App\Commands;
 
-use Illuminate\Support\Facades\File;
-
 class ConfigureSystemCommand extends StepCommand
 {
     /**
@@ -36,26 +34,93 @@ public function handle()
      */
     protected function configureGithub()
     {
-        $current_username = $this->terminal()->run('git config user.name');
-        $current_email = $this->terminal()->run('git config user.email');
+        $this->task('Setting up user settings...', function () {
+            $this->addUserSettings();
+
+            return true;
+        }, '');
+
+        $this->task('Setting up default config...', function () {
+            $this->addConfigSettings();
+
+            return true;
+        }, '');
+
+        $this->task('Setting up authentication...', function () {
+            $this->setupAuthentication();
+
+            return true;
+        }, '');
+    }
+
+    /**
+     * Add user values.
+     */
+    protected function addUserSettings()
+    {
+        $name = trim((string) $this->terminal()->run('git config --global user.name'));
+        $email = trim((string) $this->terminal()->run('git config --global user.email'));
+        $username = trim((string) $this->terminal()->run('git config --global user.username'));
+
+        while (strlen($name) === 0) {
+            $name = $this->ask('What is your name?', trim($name));
+        }
+
+        while (strlen($email) === 0) {
+            $email = $this->ask('What is your Github user email?', trim($email));
+        }
+
+        while (strlen($username) === 0) {
+            $username = $this->ask('What is your Github username?', trim($username));
+        }
 
-        $git_username = $this->ask('What is your Git name', trim((string) $current_username));
-        $git_email = $this->ask('What is your Git email', trim((string) $current_email));
+        $this->terminal()->output($this)->run("git config --global user.name '$name'");
+        $this->terminal()->output($this)->run("git config --global user.email '$email'");
+        $this->terminal()->output($this)->run("git config --global user.username '$username'");
+        $this->terminal()->output($this)->run("git config --global github.user '$username'");
+    }
+
+    /**
+     * Add .gitconfig settings.
+     */
+    protected function addConfigSettings()
+    {
+        $settings = [
+            'filters' => [
+                'clean' => 'git-lfs clean -- %f',
+                'smudge' => 'git-lfs smudge -- %f',
+                'process' => 'git-lfs filter-process',
+                'required' => 'true',
+            ],
+            'pull' => [
+                'rebase' => 'false',
+            ],
+        ];
 
-        $this->terminal()->output($this)->run("git config --global user.name '$git_username'");
-        $this->terminal()->output($this)->run("git config --global user.email '$git_email'");
+        foreach ($settings as $group => $values) {
+            foreach ($values as $key => $value) {
+                $this->terminal()->output($this)->run("git config --global $group.$key '$value'");
+            }
+        }
+    }
 
-        if ($this->confirm('Do you want to set up Github authentication now?', true)) {
-            if ($token = $this->secret('Create a token on Github (https://github.com/settings/tokens/new) and enter it')) {
+    /**
+     * Set up Github authentication using GCM.
+     */
+    protected function setupAuthentication()
+    {
+        if ($this->shouldInstall('which git-credential-manager-core')) {
+            if ($this->confirm('Do you want to set up Github authentication now?', true)) {
+                $this->task('Installing GCM...', function () {
+                    if ($this->shouldInstall('which git')) {
+                        $this->terminal()->output($this)->run('brew install git');
+                    }
 
-                // Set git to user the OSX keychain.
-                $this->terminal()->output($this)->run('git config --global credential.helper osxkeychain');
+                    $this->terminal()->output($this)->run('brew tap microsoft/git');
+                    $this->terminal()->output($this)->run('brew install --cask git-credential-manager-core');
 
-                // Store the credentials.
-                File::put(
-                    $this->homeDirectory('.git'),
-                    "https://{$git_username}:{$token}@github.com/{$git_username}"
-                );
+                    $this->comment('Git Credential Manager was successfully installed. You will be prompted to log in via the browser on your first connection to git.');
+                });
             }
         }
     }
@@ -65,7 +130,7 @@ protected function configureGithub()
      */
     protected function setupGlobalIgnore()
     {
-        $path = $_SERVER['HOME'].'/.gitignore';
+        $path = home_path('/.gitignore');
 
         if (! is_file($path)) {
             $url = 'https://raw.githubusercontent.com/freekmurze/dotfiles/master/shell/.global-gitignore';
diff --git a/app/Commands/ConfigureiTerm2.php b/app/Commands/ConfigureiTerm2.php
new file mode 100644
index 0000000..42478de
--- /dev/null
+++ b/app/Commands/ConfigureiTerm2.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Commands;
+
+use Illuminate\Support\Facades\File;
+use ZipArchive;
+
+class ConfigureiTerm2 extends StepCommand
+{
+    /**
+     * The signature of the command.
+     *
+     * @var string
+     */
+    protected $signature = 'configure:iterm2';
+
+    /**
+     * The description of the command.
+     *
+     * @var string
+     */
+    protected $description = 'Install the Python API for iTerm2.';
+
+    protected static $packageName = 'iterm2env';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        // Get manifest...
+        $this->comment('Downloading python for iTerm2...');
+
+        $manifest = json_decode(file_get_contents('https://iterm2.com/downloads/pyenv/manifest.json'), true);
+
+        // Download file locally.
+        $url = $manifest[0]['url'];
+
+        $tempFolder = storage_path('tmp');
+        $path = $tempFolder.'/env.zip';
+
+        if (File::isDirectory($tempFolder)) {
+            File::deleteDirectory($tempFolder);
+        }
+
+        File::makeDirectory($tempFolder);
+
+        $remote_file_contents = file_get_contents($url);
+
+        file_put_contents($path, $remote_file_contents);
+
+        // Unzip
+        $this->comment('Unzipping package...');
+
+        $zipArchive = new ZipArchive();
+
+        if ($zipArchive->open($path)) {
+            $zipArchive->extractTo($tempFolder);
+            $zipArchive->close();
+
+            // Delete the zip file.
+            File::delete($path);
+
+            $sourceFolder = $tempFolder.'/'.static::$packageName;
+
+            // Move files.
+            $versions = $manifest[0]['python_versions'];
+            $versions[] = '';
+
+            foreach ($versions as $version) {
+                $folder = static::$packageName;
+
+                if (strlen($version) > 0) {
+                    $folder .= '-'.$version;
+                }
+
+                $destinationFolder = $this->homePath('Library/ApplicationSupport/iTerm2/'.$folder);
+
+                $this->comment("Moving package to: $destinationFolder");
+
+                $this->terminal()->output($this)->with([
+                    'source' => $sourceFolder.'/',
+                    'destination' => $destinationFolder,
+                ])->run('rsync --progress --stats --human-readable --recursive --timeout=300 {{ $source }} {{ $destination }}');
+            }
+
+            // Cleanup
+            $this->comment('Cleaning up...');
+            File::deleteDirectory($tempFolder);
+        }
+
+        $this->line('python for iTerm2 installed.');
+    }
+}
diff --git a/app/Commands/InstallAppsCommand.php b/app/Commands/InstallAppsCommand.php
index 52b451b..b5b3dc9 100644
--- a/app/Commands/InstallAppsCommand.php
+++ b/app/Commands/InstallAppsCommand.php
@@ -38,16 +38,12 @@ public function handle()
 
             foreach ($selections as $selection) {
 
-                // We only want to install an app if it passes checks based on it's "type"
+                // We only want to install an app if it passes checks based on its "type"
                 $checks = $config['type'] === 'anyOf' ? [$selection['check']] : Arr::pluck($selections, 'check');
 
-                $this->task("Installing {$selection['name']}", function () use ($checks, $selection) {
-                    if ($this->shouldInstallApp($checks)) {
-                        $this->terminal()->output($this)->run($selection['command']);
-                    }
-
-                    return true;
-                }, 'installing...');
+                if ($this->shouldInstall($checks)) {
+                    $this->install($selection);
+                }
             }
         }
     }
@@ -60,7 +56,13 @@ public function handle()
      */
     protected function getSelections($config): array
     {
-        $choices = $this->buildQuestion($config);
+        $term = $config['type'] === 'anyOf' ? 'apps' : 'app';
+
+        $choices = $this->buildQuestion(
+            "Select the {$config['group']} {$term} you want to install",
+            $this->buildOptions($config['options']),
+            $config['type'] === 'anyOf'
+        );
 
         if (! is_array($choices)) {
             $choices = [$choices];
@@ -75,48 +77,13 @@ protected function getSelections($config): array
         }, $choices);
     }
 
-    /**
-     * Build and display apps question.
-     *
-     * @param $config
-     * @param $options
-     * @return array|string
-     */
-    protected function buildQuestion($config)
-    {
-        $term = $config['type'] === 'anyOf' ? 'apps' : 'app';
-
-        return $this->choice(
-            "Select the {$config['group']} {$term} you want to install",
-            $this->buildOptions($config['options']),
-            'none', null, $config['type'] === 'anyOf',
-        );
-    }
-
-    /**
-     * Build options for apps question.
-     *
-     * @param  array  $options
-     * @return array
-     */
-    protected function buildOptions(array $options): array
-    {
-        $items = ['none' => 'None'];
-
-        foreach ($options as $key => $option) {
-            $items[$key] = "{$option['name']} ({$option['url']})";
-        }
-
-        return $items;
-    }
-
     /**
      * Check if an app should be installed.
      *
-     * @param  array  $checks
+     * @param $checks
      * @return bool
      */
-    protected function shouldInstallApp(array $checks): bool
+    protected function shouldInstall($checks): bool
     {
         $results = array_filter($checks, function ($check) {
             return $this->terminal()->run("mdfind \"kMDItemKind == 'Application'\" | grep -i $check")->ok();
diff --git a/app/Commands/InstallCliToolsCommand.php b/app/Commands/InstallCliToolsCommand.php
index 62b7d89..6f5acde 100644
--- a/app/Commands/InstallCliToolsCommand.php
+++ b/app/Commands/InstallCliToolsCommand.php
@@ -45,13 +45,9 @@ public function handle()
         ));
 
         foreach ($selections as $selection) {
-            $this->task("Installing {$selection['name']}", function () use ($selection) {
-                if ($this->shouldInstallCliTool($selection)) {
-                    $this->terminal()->output($this)->run($selection['command']);
-                }
-
-                return true;
-            }, 'installing...');
+            if ($this->shouldInstall($selection['check'])) {
+                $this->install($selection);
+            }
         }
     }
 
@@ -63,7 +59,14 @@ public function handle()
      */
     protected function getSelections(array $groups): array
     {
-        $choices = $this->buildQuestion();
+        $choices = $this->buildQuestion(
+            'Select the environments you want to install',
+            [
+                'backend' => 'Backend',
+                'frontend' => 'Frontend',
+            ],
+            true
+        );
 
         if (! is_array($choices)) {
             $choices = [$choices];
@@ -84,37 +87,19 @@ protected function getSelections(array $groups): array
         return $selections;
     }
 
-    /**
-     * Build and display apps question.
-     *
-     * @return array|string
-     */
-    protected function buildQuestion()
-    {
-        return $this->choice(
-            'Select the environments you want to install',
-            [
-                'none' => 'None',
-                'backend' => 'Backend',
-                'frontend' => 'Frontend',
-            ],
-            'none', null, true
-        );
-    }
-
     /**
      * Check if a CLI tool should be installed, or if it exists already.
      *
-     * @param  array  $selection
+     * @param $checks
      * @return bool
      */
-    protected function shouldInstallCliTool(array $selection): bool
+    protected function shouldInstall($checks): bool
     {
-        if (! array_key_exists('check', $selection)) {
+        if (! array_key_exists('check', $checks)) {
             return true;
         }
 
-        $response = $this->terminal()->run($selection['check']);
+        $response = $this->terminal()->run($checks['check']);
 
         return ! $response->ok()
             || $response->getExitCode() === 1
diff --git a/app/Commands/InstallShellCommand.php b/app/Commands/InstallShellCommand.php
index 3b58b94..fd32171 100644
--- a/app/Commands/InstallShellCommand.php
+++ b/app/Commands/InstallShellCommand.php
@@ -29,45 +29,14 @@ public function handle()
 
         $options = config('manifest.shell.options');
 
-        $choice = $this->buildQuestion($options);
+        $choice = $this->buildQuestion('Select the Unix shell you want to install', $options);
 
         if ($choice !== 'none') {
             $config = $options[$choice];
 
-            $this->installShell($config);
-        }
-    }
-
-    /**
-     * Ask for app selection(s) and return the resolved configs.
-     *
-     * @param  array  $options
-     * @return string
-     */
-    protected function buildQuestion(array $options): string
-    {
-        $choices = ['none' => 'None'];
-
-        foreach ($options as $key => $option) {
-            $choices[$key] = $option['name'];
-        }
-
-        return $this->choice(
-            'Select the Unix shell you want to install',
-            $choices,
-            'none', null, false,
-        );
-    }
-
-    /**
-     * Install the chosen shell.
-     *
-     * @param  array  $config
-     */
-    public function installShell(array $config)
-    {
-        if (! $this->terminal()->run($config['check'])->ok()) {
-            $this->terminal()->output($this)->run($config['command']);
+            if ($this->shouldInstall($config['check'])) {
+                $this->install($config);
+            }
         }
     }
 }
diff --git a/app/Commands/SetupOhMyZsh.php b/app/Commands/SetupOhMyZsh.php
deleted file mode 100644
index 265c32a..0000000
--- a/app/Commands/SetupOhMyZsh.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace App\Commands;
-
-use Illuminate\Support\Facades\File;
-use ZipArchive;
-
-class SetupOhMyZsh extends StepCommand
-{
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
-    protected $signature = 'configure:oh-my-zsh';
-
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
-    protected $description = 'Configure Oh My Zsh.';
-
-    protected static $packageName = 'iterm2env';
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $this->newLine();
-        $this->line('Configuring Oh My Zsh...');
-        $this->newLine();
-
-        $tasks = [
-            [
-                'description' => 'Adding Zsh theme...',
-                'source' => resource_path('config/cobalt2-custom.zsh-theme'),
-                'destination' => $this->homeDirectory('.oh-my-zsh/themes/cobalt2-clair.zsh-theme'),
-            ],
-            [
-                'description' => 'Adding iTerm2 theme...',
-                'source' => resource_path('config/iTerm2-custom.zsh'),
-                'destination' => $this->homeDirectory('.oh-my-zsh/custom/iTerm2-clair.zsh'),
-            ],
-            [
-                'description' => 'Adding .zshrc...',
-                'source' => resource_path('config/.zshrc'),
-                'destination' => $this->homeDirectory('/.zshrc-tmp'),
-            ],
-            [
-                'description' => 'Configuring shell aliases...',
-                'command' => "echo 'alias python2=\"/usr/bin/python\"' >> ~/.zshrc && echo 'alias python=\"/usr/local/bin/python3\"' >> ~/.zshrc && source ~/.zshrc",
-            ],
-            [
-                'description' => 'Installing Powerline...',
-                'command' => 'pip3 install iterm2 && pip3 install --user powerline-status && cd ~ && git clone https://github.com/powerline/fonts && cd fonts && ./install.sh && cd ~',
-            ],
-            [
-                'description' => 'Configuring iTerm2...',
-                'source' => resource_path('scripts/default-profile.py'),
-                'destination' => $this->homeDirectory('/Library/Application Support/iTerm2/Scripts/AutoLaunch/clair-profile.py'),
-                'method' => 'installiTerm2Python',
-            ],
-        ];
-
-        foreach ($tasks as $task) {
-            $this->task($task['description'], function () use ($task) {
-                if (array_key_exists('source', $task)) {
-                    File::copy($task['source'], $task['destination']);
-                }
-
-                if (array_key_exists('command', $task)) {
-                    $this->newLine();
-                    $this->terminal()->output($this)->run($task['command']);
-                }
-
-                if (array_key_exists('method', $task) && method_exists($this, $task['method'])) {
-                    $this->newLine();
-                    call_user_func([$this, $task['method']]);
-                }
-
-                return true;
-            }, '');
-        }
-
-        $this->newLine();
-        $this->comment('Oh My Zsh successfully configured.');
-        $this->newLine();
-    }
-
-    protected function installiTerm2Python()
-    {
-        // Get manifest...
-        $this->comment('Downloading package...');
-
-        $manifest = json_decode(file_get_contents('https://iterm2.com/downloads/pyenv/manifest.json'), true);
-
-        // Download file locally.
-        $url = $manifest[0]['url'];
-
-        $tempFolder = storage_path('tmp');
-        $path = $tempFolder.'/env.zip';
-
-        if (File::isDirectory($tempFolder)) {
-            File::deleteDirectory($tempFolder);
-        }
-
-        File::makeDirectory($tempFolder);
-
-        $remote_file_contents = file_get_contents($url);
-
-        file_put_contents($path, $remote_file_contents);
-
-        // Unzip
-        $this->comment('Unzipping package...');
-
-        $zipArchive = new ZipArchive();
-
-        if ($zipArchive->open($path)) {
-            $zipArchive->extractTo($tempFolder);
-            $zipArchive->close();
-
-            // Delete the zip file.
-            File::delete($path);
-
-            $sourceFolder = $tempFolder.'/'.static::$packageName;
-
-            // Move files.
-            $versions = $manifest[0]['python_versions'];
-            $versions[] = '';
-
-            foreach ($versions as $version) {
-                $folder = static::$packageName;
-
-                if (strlen($version) > 0) {
-                    $folder .= '-'.$version;
-                }
-
-                $destinationFolder = $this->homeDirectory('Library/ApplicationSupport/iTerm2/'.$folder);
-
-                $this->comment("Moving package to: $destinationFolder");
-
-                $this->terminal()->output($this)->with([
-                    'source' => $sourceFolder.'/',
-                    'destination' => $destinationFolder,
-                ])->run('rsync --progress --stats --human-readable --recursive --timeout=300 {{ $source }} {{ $destination }}');
-            }
-
-            // Cleanup
-            $this->comment('Cleaning up...');
-            File::deleteDirectory($tempFolder);
-        }
-    }
-}
diff --git a/app/Commands/SetupReposCommand.php b/app/Commands/SetupReposCommand.php
index 11de594..eb69dbe 100644
--- a/app/Commands/SetupReposCommand.php
+++ b/app/Commands/SetupReposCommand.php
@@ -39,7 +39,7 @@ class SetupReposCommand extends StepCommand
      */
     public function handle()
     {
-        $this->repoFolder = $this->ask('What is your repo folder?', $this->homeDirectory('Web'));
+        $this->repoFolder = $this->ask('What is your repo folder?', $this->homePath('Web'));
 
         File::ensureDirectoryExists($this->repoFolder);
 
@@ -112,7 +112,7 @@ protected function buildQuestions()
     {
         return $this->choice(
             'Select the repos you want to clone and set up (comma-separated)',
-            $this->buildOptions(),
+            $this->buildOptions(config('manifest.repos')),
             'none', null, true
         );
     }
@@ -120,13 +120,14 @@ protected function buildQuestions()
     /**
      * Return repo options.
      *
+     * @param  array  $options
      * @return array
      */
-    protected function buildOptions(): array
+    protected function buildOptions(array $options = []): array
     {
         return array_merge(
             ['none' => 'None'],
-            collect(config('manifest.repos'))->mapWithKeys(function ($item, $key) {
+            collect($options)->mapWithKeys(function ($item, $key) {
                 return [$key => $item['name']];
             })->toArray()
         );
diff --git a/app/Commands/StepCommand.php b/app/Commands/StepCommand.php
index 36589cb..5fcabe1 100644
--- a/app/Commands/StepCommand.php
+++ b/app/Commands/StepCommand.php
@@ -2,31 +2,52 @@
 
 namespace App\Commands;
 
-use Illuminate\Support\Str;
+use App\Concerns\HandlesChoices;
+use App\Concerns\HandlesInstallation;
 use LaravelZero\Framework\Commands\Command;
 use TitasGailius\Terminal\Terminal;
 
 abstract class StepCommand extends Command
 {
+    use HandlesChoices;
+    use HandlesInstallation;
+
     /**
      * @param  null  $context
      * @return mixed
      */
     protected function terminal($context = null)
     {
-        return Terminal::in($context ?? $this->homeDirectory());
+        return Terminal::in($context ?? $this->homePath());
     }
 
     /**
      * @param  null  $path
      * @return string
      */
-    protected function homeDirectory($path = null): string
+    protected function homePath($path = null): string
+    {
+        return home_path($path);
+    }
+
+    /**
+     * Checks if the option should be installed based on the "checks" value.
+     *
+     * @param $checks
+     * @return bool
+     */
+    protected function shouldInstall($checks): bool
     {
-        if (Str::startsWith($path, '/')) {
-            $path = Str::replaceFirst('/', '', $path);
+        if (! is_array($checks)) {
+            $checks = [$checks];
+        }
+
+        foreach ($checks as $check) {
+            if ($this->terminal()->run($check)->ok()) {
+                return false;
+            }
         }
 
-        return implode('/', [getenv('HOME'), $path]);
+        return true;
     }
 }
diff --git a/app/Concerns/HandlesChoices.php b/app/Concerns/HandlesChoices.php
new file mode 100644
index 0000000..13ab0e4
--- /dev/null
+++ b/app/Concerns/HandlesChoices.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Concerns;
+
+trait HandlesChoices
+{
+    /**
+     * Ask for app selection(s) and return the resolved configs.
+     *
+     * @param  string  $question
+     * @param  array  $options
+     * @param  bool  $allowMultiple
+     * @return string|array
+     */
+    protected function buildQuestion(string $question, array $options, bool $allowMultiple = false)
+    {
+        $choices = ['none' => 'None'];
+
+        foreach ($options as $key => $value) {
+            $choices[$key] = $value;
+        }
+
+        $choices = array_unique($choices);
+
+        return $this->choice(
+            $question,
+            $choices,
+            'none', null, $allowMultiple,
+        );
+    }
+
+    /**
+     * Build options for apps question.
+     *
+     * @param  array  $options
+     * @return array
+     */
+    protected function buildOptions(array $options = []): array
+    {
+        $items = ['none' => 'None'];
+
+        foreach ($options as $key => $option) {
+            $items[$key] = "{$option['name']} ({$option['url']})";
+        }
+
+        return $items;
+    }
+}
diff --git a/app/Concerns/HandlesInstallation.php b/app/Concerns/HandlesInstallation.php
new file mode 100644
index 0000000..91384a4
--- /dev/null
+++ b/app/Concerns/HandlesInstallation.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Concerns;
+
+trait HandlesInstallation
+{
+    use RunsTasks;
+
+    /**
+     * Install the choice using the provided configuration.
+     *
+     * @param  array  $config
+     * @param  string  $message
+     */
+    public function install(array $config, string $message = 'installing...')
+    {
+        $description = array_key_exists('description', $config) ? $config['description'] : "Installing {$config['name']}...";
+
+        $this->task($description, function () use ($config) {
+            $this->terminal()->output($this)->run($config['command']);
+
+            if (array_key_exists('tasks', $config)) {
+                $this->runTasks($config['tasks']);
+            }
+        }, $message);
+    }
+}
diff --git a/app/Concerns/RunsTasks.php b/app/Concerns/RunsTasks.php
new file mode 100644
index 0000000..fe96cac
--- /dev/null
+++ b/app/Concerns/RunsTasks.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Concerns;
+
+use Illuminate\Support\Facades\File;
+
+trait RunsTasks
+{
+    protected function runTasks(array $tasks)
+    {
+        foreach ($tasks as $task) {
+            $this->task($task['description'], function () use ($task) {
+                if (array_key_exists('source', $task)) {
+                    File::copy($task['source'], $task['destination']);
+                }
+
+                if (array_key_exists('command', $task)) {
+                    $this->newLine();
+                    $this->terminal()->output($this)->run($task['command']);
+                }
+
+                if (array_key_exists('method', $task) && method_exists($this, $task['method'])) {
+                    $this->newLine();
+                    call_user_func([$this, $task['method']]);
+                }
+
+                return true;
+            });
+        }
+    }
+}
diff --git a/app/helpers.php b/app/helpers.php
new file mode 100644
index 0000000..0175194
--- /dev/null
+++ b/app/helpers.php
@@ -0,0 +1,14 @@
+<?php
+
+use Illuminate\Support\Str;
+
+if (! function_exists('home_path')) {
+    function home_path($path = null): string
+    {
+        if (Str::startsWith($path, '/')) {
+            $path = Str::replaceFirst('/', '', $path);
+        }
+
+        return implode('/', [getenv('HOME'), $path]);
+    }
+}
diff --git a/composer.json b/composer.json
index 6d9ac01..d891456 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,9 @@
     "pestphp/pest": "^1.3"
   },
   "autoload": {
+    "files": [
+      "app/helpers.php"
+    ],
     "psr-4": {
       "App\\": "app/"
     }
diff --git a/config/commands.php b/config/commands.php
index 31dbe05..b31a473 100644
--- a/config/commands.php
+++ b/config/commands.php
@@ -69,7 +69,7 @@
         LaravelZero\Framework\Commands\MakeCommand::class,
         LaravelZero\Framework\Commands\RenameCommand::class,
         LaravelZero\Framework\Commands\StubPublishCommand::class,
-
+        App\Commands\ConfigureiTerm2::class,
     ],
 
     /*
diff --git a/config/manifest.php b/config/manifest.php
index 03ff1cd..6d32365 100644
--- a/config/manifest.php
+++ b/config/manifest.php
@@ -18,21 +18,19 @@
 
             'xcode' => [
                 'name' => 'XCode',
-                'description' => 'Installs XCode and git',
+                'description' => 'Installing XCode and git...',
                 'check' => 'xcode-select -p',
                 'command' => 'xcode-select --install',
             ],
 
             'brew' => [
                 'name' => 'Homebrew',
-                'description' => '',
                 'check' => 'which brew',
                 'command' => '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
             ],
 
             'npm' => [
                 'name' => 'npm',
-                'description' => '',
                 'check' => 'which npm',
                 'command' => 'brew install npm',
             ],
@@ -46,14 +44,12 @@
 
             'docker' => [
                 'name' => 'Docker',
-                'description' => '',
                 'check' => 'which docker',
                 'command' => 'brew install docker',
             ],
 
             'awscli' => [
                 'name' => 'AWS CLI',
-                'description' => '',
                 'check' => 'which aws',
                 'command' => 'brew install awscli',
             ],
@@ -64,36 +60,33 @@
 
             'php' => [
                 'name' => 'PHP',
-                'description' => '',
                 'check' => 'which php',
                 'command' => 'brew install php',
             ],
 
             'python' => [
                 'name' => 'Python',
-                'description' => 'Installing Python...',
                 'check' => 'which python3',
                 'command' => 'brew install python3',
             ],
 
             'composer' => [
                 'name' => 'Composer',
-                'description' => '',
                 'check' => 'which composer',
                 'command' => 'brew install composer',
             ],
 
             'valet' => [
                 'name' => 'Valet',
-                'description' => '',
                 'check' => 'which valet',
                 'command' => 'composer global require laravel/valet && valet domain test',
-            ],
-
-            'redis' => [
-                'name' => 'Redis',
-                'description' => '',
-                'command' => 'yes | pecl install -f redis',
+                'tasks' => [
+                    'redis' => [
+                        'name' => 'Redis',
+                        'description' => 'Installing Redis...',
+                        'command' => 'yes | pecl install -f redis',
+                    ],
+                ],
             ],
 
         ],
@@ -102,14 +95,12 @@
 
             'yarn' => [
                 'name' => 'yarn',
-                'description' => '',
                 'check' => 'which yarn',
                 'command' => 'brew install yarn',
             ],
 
             'expo' => [
                 'name' => 'expo',
-                'description' => '',
                 'check' => 'which expo-cli',
                 'command' => 'npm install -g expo-cli',
             ],
@@ -131,15 +122,48 @@
         'options' => [
             'ohmyzsh' => [
                 'name' => 'Oh My Zsh',
-                'description' => 'Oh My Zsh is an open source, community-driven framework for managing your zsh configuration. It comes with a bunch of features out of the box and improves your terminal experience.',
+                'description' => 'Installing Oh My Zsh and configurations...',
                 'url' => 'https://github.com/robbyrussell/oh-my-zsh',
                 'check' => 'which zsh',
-                'command' => 'sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" && clair configure:oh-my-zsh',
+                'command' => 'sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"',
+                'tasks' => [
+                    [
+                        'description' => 'Adding Zsh theme...',
+                        'source' => resource_path('config/cobalt2-custom.zsh-theme'),
+                        'destination' => home_path('.oh-my-zsh/themes/cobalt2-clair.zsh-theme'),
+                    ],
+                    [
+                        'description' => 'Adding iTerm2 theme...',
+                        'source' => resource_path('config/iTerm2-custom.zsh'),
+                        'destination' => home_path('.oh-my-zsh/custom/iTerm2-clair.zsh'),
+                    ],
+                    [
+                        'description' => 'Adding .zshrc...',
+                        'source' => resource_path('config/.zshrc'),
+                        'destination' => home_path('/.zshrc-tmp'),
+                    ],
+                    [
+                        'description' => 'Configuring shell aliases...',
+                        'command' => "echo 'alias python2=\"/usr/bin/python\"' >> ~/.zshrc && echo 'alias python=\"/usr/local/bin/python3\"' >> ~/.zshrc && source ~/.zshrc",
+                    ],
+                    [
+                        'description' => 'Installing Powerline...',
+                        'command' => 'pip3 install iterm2 && pip3 install --user powerline-status && cd ~ && git clone https://github.com/powerline/fonts && cd fonts && ./install.sh && cd ~',
+                    ],
+                    [
+                        'description' => 'Set iTerm2 default profile...',
+                        'source' => resource_path('scripts/default-profile.py'),
+                        'destination' => home_path('/Library/Application Support/iTerm2/Scripts/AutoLaunch/clair-profile.py'),
+                    ],
+                    [
+                        'description' => 'Enable iTerm2 Python API...',
+                        'command' => 'clair configure:iterm2',
+                    ],
+                ],
             ],
 
             'prezto' => [
                 'name' => 'Prezto',
-                'description' => 'Prezto is a configuration framework for zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes.',
                 'url' => 'https://github.com/sorin-ionescu/prezto',
                 'check' => 'which prezto',
                 'command' => '
@@ -174,7 +198,6 @@
             'options' => [
                 'dbngin' => [
                     'name' => 'DBngin',
-                    'description' => '',
                     'url' => 'https://dbngin.com/',
                     'licensed' => false,
                     'check' => 'dbngin',
@@ -182,7 +205,6 @@
                 ],
                 'postgresapp' => [
                     'name' => 'Postgres.app',
-                    'description' => '',
                     'url' => 'https://postgresapp.com/',
                     'licensed' => true,
                     'check' => 'postgres',
@@ -198,7 +220,6 @@
             'options' => [
                 'postico' => [
                     'name' => 'Postico',
-                    'description' => '',
                     'url' => 'https://eggerapps.at/postico/',
                     'licensed' => true,
                     'check' => 'postico',
@@ -206,7 +227,6 @@
                 ],
                 'tableplus' => [
                     'name' => 'TablePlus',
-                    'description' => '',
                     'url' => 'https://tableplus.com/',
                     'licensed' => true,
                     'check' => 'tableplus',
@@ -221,7 +241,6 @@
             'options' => [
                 'phpstorm' => [
                     'name' => 'PHPStorm',
-                    'description' => '',
                     'url' => 'https://www.jetbrains.com/phpstorm/',
                     'licensed' => true,
                     'check' => 'phpstorm',
@@ -229,7 +248,6 @@
                 ],
                 'sublime' => [
                     'name' => 'Sublime Text',
-                    'description' => '',
                     'url' => 'https://www.sublimetext.com/',
                     'licensed' => true,
                     'check' => 'sublime',
@@ -237,7 +255,6 @@
                 ],
                 'visual_studio' => [
                     'name' => 'Visual Studio Code',
-                    'description' => '',
                     'url' => 'https://code.visualstudio.com/',
                     'licensed' => true,
                     'check' => 'visual studio',
@@ -252,7 +269,6 @@
             'options' => [
                 'paw' => [
                     'name' => 'Paw',
-                    'description' => '',
                     'url' => 'https://paw.cloud/',
                     'licensed' => true,
                     'check' => 'paw',
@@ -260,7 +276,6 @@
                 ],
                 'postman' => [
                     'name' => 'Postman',
-                    'description' => '',
                     'url' => 'https://www.postman.com/',
                     'licensed' => true,
                     'check' => 'postman',
@@ -275,7 +290,6 @@
             'options' => [
                 'iterm2' => [
                     'name' => 'iTerm2',
-                    'description' => '',
                     'url' => 'https://iterm2.com/',
                     'licensed' => false,
                     'check' => 'iterm',