diff --git a/appveyor.yml b/appveyor.yml
index 0ec51d3..9c55d87 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@
 version: '{build}'
 max_jobs: 1
 image: WMF 5
+clone_depth: 5
 branches:
   only:
   - master
@@ -10,32 +11,36 @@ branches:
 #  verbosity: minimal
 
 environment:
-  #Set au version to use or omit to use the latest. Specify branch name to use development version from Github
+  # Set au version to use or omit to use the latest. Specify branch name to use development version from Github
   au_version:
   au_push: true
 
-  #Github token to commit pushed packages to repository
+  # Github token to commit pushed packages to repository
   github_user_repo: {github_user}/{repository}
   github_api_key:
     secure: YOUR_GITHUB_API_KEY_HERE_ENCRYPTED_STRING #https://ci.appveyor.com/tools/encrypt
 
 
-  #Mail credentials - for error notifications
+  # Mail credentials - for error notifications
   mail_user:
     secure: YOUR_EMAIL_ACCOUNT_HERE_ENCRYPTED_STRING #https://ci.appveyor.com/tools/encrypt
   mail_pass:
     secure: YOUR_EMAIL_PASSWORD_HERE_ENCRYPTED_STRING #https://ci.appveyor.com/tools/encrypt
+  mail_server: smtp.gmail.com
+  mail_port: 587
+  mail_enablessl: true
 
-  #ID of the gist used to save run results
+  # ID of the gist used to save run results - create a gist under the github_user (secret or not) and grab the id - https://gist.github.com/name/id
+  # Optional, leave empty to create anonymous gist
   gist_id:
 
-  #Chocolatey API key - to push updated packages
+  # Chocolatey API key - to push updated packages
   api_key:
     secure: YOUR_CHOCO_API_KEY_HERE_ENCRYPTED_STRING # https://ci.appveyor.com/tools/encrypt
 
 init:
 - git config --global user.email "chocolatey@realdimensions.net"
-- git config --global user.name  "Chocolatey AU"
+- git config --global user.name  "Chocolatey"
 - git config --global core.safecrlf false
 
 install:
@@ -56,7 +61,7 @@ install:
         Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
 
         $params = @{ Name = 'au' }
-        if ( $Env:au_version -ne $null ) { $params.Version = $Env:au_version }
+        if ( $Env:au_version -ne $null ) { $params.MinimumVersion = $Env:au_version }
         Install-Module @params
 
         Get-Module au -ListAvailable | select Name, Version
diff --git a/update_all.ps1 b/update_all.ps1
index 0410ec7..9264614 100644
--- a/update_all.ps1
+++ b/update_all.ps1
@@ -39,11 +39,11 @@ $Options = [ordered]@{
     Mail = if ($Env:mail_user) {
             @{
                 To          = $Env:mail_user
-                Server      = 'smtp.gmail.com'
+                Server      = $Env:mail_server
                 UserName    = $Env:mail_user
                 Password    = $Env:mail_pass
-                Port        = 587
-                EnableSsl   = $true
+                Port        = $Env:mail_port
+                EnableSsl   = $Env:enable_ssl
                 Attachments = "$PSScriptRoot\update_info.xml"
                 UserMessage = ''
                 SendAlways  = $false                        #Send notifications every time
@@ -51,8 +51,7 @@ $Options = [ordered]@{
            } else {}
 }
 
-$global:au_NoPlugins = $false                              #Quickly enable or disable plugins here
-$global:au_Root      = "$PSScriptRoot"                     #Path to the AU packages
+$global:au_Root = "$PSScriptRoot"                           #Path to the AU packages
 $info = updateall -Name $Name -Options $Options
 
 #Uncomment to fail the build on AppVeyor on any package error
diff --git a/update_vars_default.ps1 b/update_vars_default.ps1
index 9573f26..87f4b56 100644
--- a/update_vars_default.ps1
+++ b/update_vars_default.ps1
@@ -1,9 +1,13 @@
 # AU Packages Template: https://github.com/majkinetor/au-packages-template
 
-$Env:mail_user          = ''
-$Env:mail_pass          = ''
-$Env:api_key            = ''          #Chocolatey api key
-$Env:gist_id            = ''
-$Env:github_user_repo   = ''          #{github_user>/{repo}
-$Env:github_api_key     = ''
-$Env:au_Push            = 'false'     #Push to chocolatey
+$Env:mail_user        = ''
+$Env:mail_pass        = ''
+$Env:mail_server      = 'smtp.gmail.com'
+$Env:mail_port        = '587'
+$Env:mail_enablessl   = 'true'
+
+$Env:api_key          = ''          #Chocolatey api key
+$Env:gist_id          = ''          #Specify your gist id or leave empty for anonymous gist
+$Env:github_user_repo = ''          #{github_user>/{repo}
+$Env:github_api_key   = ''          #Github personal access token
+$Env:au_Push          = 'false'     #Push to chocolatey