diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0f6baf..eb5bebd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@
         - Use it's existing Path config and completely ignore embedded Git.
       - Else if Cmder embedded Git exists and is newer
         - Match User installed Git path config using Cmder embedded Git folders.
-    - Else if Cmder embedded Git exists 
+    - Else if Cmder embedded Git exists
       - Add Cmder embedded Git folders to the path.
         - `$env:cmder_root\vendor\git-for-windows\cmd;$env:path`
         - `$env:path;$env:cmder_root\vendor\git-for-windows\usr\bin`
@@ -78,13 +78,13 @@
 
 ### Fixes
 
-* Merge pull request #2357 from FloSchwalm/fix-git-version-comparison  [Dax T Games]                                                                   
-* Merge pull request #2339 from daxgames/fix_global_vars_vscode_err  [Dax T Games]                                                                     
+* Merge pull request #2357 from FloSchwalm/fix-git-version-comparison  [Dax T Games]
+* Merge pull request #2339 from daxgames/fix_global_vars_vscode_err  [Dax T Games]
 
 ### Changes
 
-* Merge pull request #2358 from FloSchwalm/update-to-git-2.28  [Dax T Games]               
-                                                                                                                                                                          
+* Merge pull request #2358 from FloSchwalm/update-to-git-2.28  [Dax T Games]
+
 ## [1.3.15](https://github.com/cmderdev/cmder/tree/v1.3.15) (2020-06-26)
 
 * Fixes #2247, fixes #2254 [#2265](https://github.com/cmderdev/cmder/pull/2265)
@@ -153,7 +153,7 @@
   * Fixes [#1985](https://github.com/cmderdev/cmder/issues/1985)
 * Pull Request: [#2106](https://github.com/cmderdev/cmder/pull/2106)
   * Portable Git requires running `post-install.bat` which deletes itself when done.  This was not happening.
-  * Resolves [#2105](https://github.com/cmderdev/cmder/issues/2105) 
+  * Resolves [#2105](https://github.com/cmderdev/cmder/issues/2105)
 * Pull Request: [#2002](https://github.com/cmderdev/cmder/pull/2002)
   * Updated the HG prompt code to use the '-ib' option to 'hg id' so the branch name is always available, regardless of the state of the working copy
 
@@ -188,7 +188,7 @@
 * Fix uncommenting `call ssh-agent` in `user_profile.cmd` breaks Cmder prompt. [#1990](https://github.com/cmderdev/cmder/issues/1990), [#1807](https://github.com/cmderdev/cmder/issues/1807), [#1785](https://github.com/cmderdev/cmder/issues/1785), [#1885](https://github.com/cmderdev/cmder/issues/1885)
   * Pull Request: [#1999](https://github.com/cmderdev/cmder/issues/1999) fix ssh-agent call in user_profile.cmd.default
 * Unable to use '%' character in git branch names [#1779](https://github.com/cmderdev/cmder/issues/1779)
-  * Pull Request: [#1991](https://github.com/cmderdev/cmder/issues/1991) add percent escaping for string.gsub 
+  * Pull Request: [#1991](https://github.com/cmderdev/cmder/issues/1991) add percent escaping for string.gsub
 * sort command, unix vs windows (/usr/bin/sort vs sort.exe) [#1931](https://github.com/cmderdev/cmder/issues/1931)
   * Pull Request: [#1988](https://github.com/cmderdev/cmder/issues/1988) Prefer /nix_tools option
 
diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp
index 3167615..fc34eeb 100644
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@@ -193,7 +193,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			userAliasesPath, (size_t)MAX_PATH);
 		rename(lPr, pR);
 	}
-	
+
 	/*
 	Was /c [path] specified?
 	*/
@@ -309,7 +309,7 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 			ExpandEnvironmentStrings(userConEmuCfgPath, userConEmuCfgPath, sizeof(userConEmuCfgPath) / sizeof(userConEmuCfgPath[0]));
 		}
 	}
-	else if (PathFileExists(userCfgPath)) // config/user_conemu.xml exists, use it. 
+	else if (PathFileExists(userCfgPath)) // config/user_conemu.xml exists, use it.
 	{
 		if (cfgRoot.length() == 0) // '/c [path]' was NOT specified
 		{
diff --git a/launcher/src/app.manifest b/launcher/src/app.manifest
index bf133f7..71c4a8f 100644
--- a/launcher/src/app.manifest
+++ b/launcher/src/app.manifest
@@ -4,7 +4,7 @@
 
 	<!-- Project description definition -->
 	<description>Cmder Console Emulator</description>
-	
+
 	<!-- Project dependency definition -->
 	<dependency>
 		<dependentAssembly>
@@ -16,7 +16,7 @@
 				language="*" />
 		</dependentAssembly>
 	</dependency>
-	
+
 	<!-- Win32 User Account Control definition -->
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
@@ -27,7 +27,7 @@
 			</requestedPrivileges>
 		</security>
 	</trustInfo>
-	
+
 	<!-- Required for appcompat behaviour -->
 	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
 		<application>
@@ -43,12 +43,12 @@
 			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
 		</application>
 	</compatibility>
-	
+
 	<!-- Add dpi awareness -->
 	<asmv3:application>
 		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
 			<dpiAware>true/pm</dpiAware>
 		</asmv3:windowsSettings>
 	</asmv3:application>
-	
+
 </assembly>
diff --git a/launcher/src/resource.rc b/launcher/src/resource.rc
index 28d3980..5960625 100644
--- a/launcher/src/resource.rc
+++ b/launcher/src/resource.rc
@@ -1,12 +1,12 @@
-/*                  _           
-  ___ _ __ ___   __| | ___ _ __ 
+/*                  _
+  ___ _ __ ___   __| | ___ _ __
  / __| '_ ` _ \ / _` |/ _ \ '__|
-| (__| | | | | | (_| |  __/ |   
- \___|_| |_| |_|\__,_|\___|_|   
+| (__| | | | | | (_| |  __/ |
+ \___|_| |_| |_|\__,_|\___|_|
 =============================================================================
  The Cmder Console Emulator Project
 */
-                                
+
 #include "resource.h"
 #include "version.rc2"
 #include "strings.rc2"
diff --git a/launcher/src/strings.rc2 b/launcher/src/strings.rc2
index 71dcf5a..0887307 100644
--- a/launcher/src/strings.rc2
+++ b/launcher/src/strings.rc2
@@ -5,7 +5,7 @@
 STRINGTABLE
 {
 	IDS_TITLE             "Cmder Launcher"
-	
+
 	IDS_SWITCHES          L"Valid options:\n\n    /c [CMDER User Root Path]\n    /task [ConEmu Task Name]\n    /icon [CMDER Icon Path]\n    [/start [Start in Path] | [Start in Path]]\n    /single\n    /m\n    /x [ConEmu extra arguments]\n\nor, either:\n    /register [USER | ALL]\n    /unregister [USER | ALL]"
 }
 
diff --git a/scripts/utils.ps1 b/scripts/utils.ps1
index ddfb929..b2486c6 100644
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@@ -66,33 +66,26 @@ function Digest-Hash($path) {
 }
 
 function Get-VersionStr() {
-
     # Clear existing variable
     if ($string) { Clear-Variable -name string }
 
     # Determine if git is available
-    if (Get-Command "git.exe" -ErrorAction SilentlyContinue)
-    {
-
+    if (Get-Command "git.exe" -ErrorAction SilentlyContinue) {
         # Determine if the current diesctory is a git repository
         $GitPresent = Invoke-Expression "git rev-parse --is-inside-work-tree" -erroraction SilentlyContinue
 
-        if ( $GitPresent -eq 'true' )
-        {
+        if ( $GitPresent -eq 'true' ) {
             $string = Invoke-Expression "git describe --abbrev=0 --tags"
         }
-
     }
 
     # Fallback used when Git is not available
-    if ( -not($string) )
-    {
+    if ( -not($string) ) {
         $string = Parse-Changelog ($PSScriptRoot + '\..\' + 'CHANGELOG.md')
     }
 
     # Add build number, if AppVeyor is present
-    if ( $Env:APPVEYOR -eq 'True' )
-    {
+    if ( $Env:APPVEYOR -eq 'True' ) {
         $string = $string + '.' + $Env:APPVEYOR_BUILD_NUMBER
     }
 
@@ -100,11 +93,9 @@ function Get-VersionStr() {
     $string = $string -replace '^v+','' # normalize version string
 
     return $string
-
 }
 
 function Parse-Changelog($file) {
-
     # Define the regular expression to match the version string from changelog
     [regex]$regex = '^## \[(?<version>[\w\-\.]+)\]\([^\n()]+\)\s+\([^\n()]+\)$';
 
@@ -115,7 +106,6 @@ function Parse-Changelog($file) {
 }
 
 function Create-RC($string, $path) {
-
     $version  = $string + '.0.0.0.0' # padding for version string
 
     if ( !(Test-Path "$path.sample") ) {
@@ -135,13 +125,12 @@ function Create-RC($string, $path) {
             $resource = $resource.Replace( "{" + $pattern[$index++] + "}", $fragment )
         }
     }
-    
+
     # Add the version string
     $resource = $resource.Replace( "{Cmder-Version-Str}", '"' + $string + '"' )
 
     # Write the results
     Set-Content -Path $path -Value $resource
-
 }
 
 function Register-Cmder() {
@@ -204,13 +193,13 @@ function Download-File {
         $File
     )
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-    
+
     # I think this is the problem
     $File = $File -Replace "/", "\"
     Write-Verbose "Downloading from $Url to $File"
     $wc = New-Object System.Net.WebClient
     if ($env:https_proxy) {
-      $wc.proxy = (New-Object System.Net.WebProxy($env:https_proxy))
+        $wc.proxy = (New-Object System.Net.WebProxy($env:https_proxy))
     }
     $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials;
     $wc.DownloadFile($Url, $File)
diff --git a/vendor/clink.lua b/vendor/clink.lua
index e56e087..c26b29d 100644
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@@ -600,7 +600,7 @@ local function svn_prompt_filter()
             else
                 svnStatus = get_svn_status()
             end
- 
+
             if svnStatus == nil then
                 color = colors.nostatus
             elseif svnStatus then
diff --git a/vendor/git-prompt.sh b/vendor/git-prompt.sh
index 957dcdc..fd237f4 100644
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@@ -1,5 +1,5 @@
 function getGitStatusSetting() {
-  gitStatusSetting=$(git --no-pager config -l 2>/dev/null)  
+  gitStatusSetting=$(git --no-pager config -l 2>/dev/null)
 
   if [[ -n ${gitStatusSetting} ]] && [[ ${gitStatusSetting} =~ cmder.status=false ]] || [[ ${gitStatusSetting} =~ cmder.shstatus=false ]]
   then
@@ -14,14 +14,14 @@ function getSimpleGitBranch() {
   if [ -z "$gitDir" ]; then
 		return 0
 	fi
-  
+
   headContent=$(< "$gitDir/HEAD")
   if [[ "$headContent" == "ref: refs/heads/"* ]]
   then
       echo " (${headContent:16})"
   else
       echo " (HEAD detached at ${headContent:0:7})"
-  fi 
+  fi
 }
 
 if test -f /etc/profile.d/git-sdk.sh
@@ -68,7 +68,7 @@ else
   fi
   PS1="$PS1"'\[\033[0m\]'        # change color
   PS1="$PS1"'\n'                 # new line
-  PS1="$PS1"'λ '                 # prompt: always λ 
+  PS1="$PS1"'λ '                 # prompt: always λ
 fi
 
 MSYS2_PS1="$PS1"               # for detection by MSYS2 SDK's bash.basrc
diff --git a/vendor/init.bat b/vendor/init.bat
index ad946e8..41ef933 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -175,7 +175,7 @@ if "%CMDER_CLINK%" == "1" (
       copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\clink_settings"
       echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
     )
-    
+
     if not exist "%CMDER_ROOT%\config\cmder_prompt_config.lua" (
       echo Creating Cmder prompt config file: "%CMDER_ROOT%\config\cmder_prompt_config.lua"
       copy "%CMDER_ROOT%\vendor\cmder_prompt_config.lua.default" "%CMDER_ROOT%\config\cmder_prompt_config.lua"
diff --git a/vendor/lib/lib_base.cmd b/vendor/lib/lib_base.cmd
index 1ca8a9f..a4d57b7 100644
--- a/vendor/lib/lib_base.cmd
+++ b/vendor/lib/lib_base.cmd
@@ -63,7 +63,7 @@ exit /b
 :::-------------------------------------------------------------------------------
     call :detect_comspec %ComSpec%
     exit /b
-    
+
 :detect_comspec
     set CMDER_SHELL=%~n1
     if not defined CMDER_CLINK (