Merge pull request #2144 from daxgames/1.3.12

1.3.12 Release
CHANGELOG.md
2025-07-16 20:49:54 +08:00 · 2019-08-18 18:33:40 -04:00 · 2019-08-18 18:26:21 -04:00 · 2019-08-18 17:49:56 -04:00 · 2019-08-18 17:39:29 -04:00 · 2019-08-18 16:33:43 -04:00
33 changed files with 1885 additions and 596 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@ -10,16 +10,18 @@

  • Searched for existing issues (including the **closed** ones)
    for the similar problems here:
+
    https://github.com/cmderdev/cmder/issues?q=is:issue

-  • Read the README.md and the Wiki:
+  • Read both the README.md and the Wiki:
+
    - https://github.com/cmderdev/cmder/blob/master/README.md
    - https://github.com/cmderdev/cmder/wiki

    (What you may be asking here could already be explained there!)

-  • Please understand that Cmder by default uses ConEmu as the
-    underlying Terminal Emulator. If your issue is regarding
+  • Please understand that Cmder uses ConEmu as the default
+    underlying Terminal Emulator.  If your issue is regarding
    the **Terminal Emulator**, please visit the ConEmu issues page:

    https://github.com/Maximus5/ConEmu/issues?q=is:issue
@ -31,9 +33,10 @@

    more info: https://conemu.github.io/en/ThirdPartyProblems.html

-  • If you are asking for guides on how to integrate Cmder into
-    your favorite IDE of choice, or how to perform an specific
-    task with Cmder, make sure you visit our label section first!
+  • If you would like to ask for guides on how to integrate Cmder with
+    your favorite IDE of choice, or how to perform a specific task
+    with Cmder, make sure you visit our label section first.
+
    You may already have an answer under the Guides or Questions section.

    For a list of labels, visit:
@ -41,24 +44,46 @@

    (Be sure to also check “Closed” issues in the labels section!)

-  • If the issue is regarding the other upstream technologies that
-    Cmder uses (e.g. Clink, Git, etc), please make sure that the
-    bug you are reporting only applies when they are used in
-    combination with Cmder. If the bug applies when the mentioned
-    tools are NOT used within Cmder, there's a good chance that
-    you should open the bug at the corresponding repo instead.
+  • If you have a request to provide auto-complete support for a new tool,
+    please post your request here:
+
+    https://github.com/vladimir-kotikov/clink-completions/issues
+
+  • If you are having an issue with any of the **upstream technologies**
+    that are used by Cmder, please make sure that the issue is reproducible
+    _only_ when used in combination with Cmder.
+
+    We may not directly address the issues related to the following tools:
+       - Clink, the default shell in Cmder
+       - ConEmu, the terminal emulator
+       - Git/MinGW, which also provide *NIX tools
+       - clink-completions, which provide autocompletion
+
+    The issues related to upstream technologies are labeled as 👆 [name].
+
+    We'll try our best to help you -- but we recommend creating an issue
+    specifically at each of the corresponding repositories for the best
+    result.
+
+    ► Try to reproduce the bug you're reporting, on a stand-alone edition
+      of each tool, without using Cmder.  If the bug applies when the
+      mentioned tools are NOT used within Cmder, there's a good chance that
+      you should open the bug at the corresponding repo instead.
+
+  • Lastly, have a look at official documentation for Cmder over
+    our website, and our wiki.

    Read more on about Cmder on ConEmu docs:
    https://conemu.github.io/en/cmder.html


-  Thank you for making sure you are opening a new valid issue!
+  Thank you for making sure you are opening a new valid issue! ♥

 -->

 <!--
  Some tips on how to write a better report:
-  - Put an `x` into all the boxes [ ] relevant to your issue (example: [x]).
+  - Put an `x` into all the boxes [ ] relevant to your issue (correct example: [x] -- not like this: [ x] or [x ]).
  - Use the *Preview* tab to see how your issue will actually look like, before sending it.
  - Make sure the description is worded well enough to be understood, and with as much context and examples as possible.
  - Post a screenshot or the command the triggered the problem, if applicable.
@ -66,6 +91,7 @@
    Help us reproduce the issue by explaining what went wrong, and what did you expect to happen.
  - Please keep the ticket language to English only here.
    We can't process your issue if it's written in Russian or Chinese as we can't understand them.
+  - You can find the version of Cmder.exe and ConEmu.exe binaries using Right Click → Properties → Details menu.
  - ⚠ Read the following page to avoid posting a bad issue: https://conemu.github.io/en/BadIssue.html
 -->

@ -74,5 +100,10 @@
 - [ ] Feature request (request for new functionality)
 - [ ] Question

+### Version Information
+<!-- Please write your Cmder and ConEmu version here -->
+
+<!-- If applicable, write down your Windows edition too (e.g. Windows 10 Pro 1809) -->
+
 ### Description of the issue
 <!-- Provide a clear, simple description of your issue here -->
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "📌 Pinned"
+# Label to use when marking an issue as stale
+staleLabel: "👀 Awaiting Response"
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  any recent activity. It will be closed in a week if no further activity occurs.
+  Thank you for your contribution(s).
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed due to it not having any
+  activity since it was marked as stale.
+  Thank you for your contribution(s).
--- a/.gitignore
+++ b/.gitignore
@ -1,21 +1,26 @@

 ## Those files should be taken from their repositary

+bin/*
+!bin/Readme.md
+
 vendor/*/*
+!vendor/bin/*
 !vendor/lib/*
 !vendor/*
 !vendor/psmodules/PsGet

-config/.history
+config/*
+!config/Readme.md
+
+config_user/*
+
 Thumbs.db
 *.exe
 *.dll
 build/
 Version v*
 *.bak
-config/user-*
-config/settings
-config/aliases
-config/profile.d
 .github_changelog_generator
 launcher/.vs
+launcher/src/version.rc2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,217 @@
 # Change Log

+## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.12) (2019-08-18)
+
+### Fixes
+
+* Pull Request: [#2113](https://github.com/cmderdev/cmder/pull/2113)
+  * Add `vendor\bin\vscode_init.cmd` for use with Visual Studio Code
+  * Fixes [#2118](https://github.com/cmderdev/cmder/issues/2118)
+  * 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) 
+* 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
+
+### Changes
+
+* Pull Request: [#2055](https://github.com/cmderdev/cmder/pull/2055)
+  * Upgrade git to 2.21.0
+  * Provide default settings for Clink that updates the history file in real time
+    * Turn this on in existing Cmder using `clink set history_io 1`
+  * Allow clink disable by setting CMDER_CLINK=0 before starting task
+* Pull Request: [#2068](https://github.com/cmderdev/cmder/pull/2068)
+  * Print Index in History Command Output.
+  * Sets default `history_expand_mode = 3` in initial Clink Settings.
+
+### Adds
+
+* Pull Request  : [#2096](https://github.com/cmderdev/cmder/pull/2096)
+  * Question issue: [#2094](https://github.com/cmderdev/cmder/issues/2094)
+  * New argument created to ConEmu forwarding arguments.
+    * Syntax: `/x [ConEmu extras arguments]`
+    *   e.g.: `Cmder.exe /x "-min -tsa"`
+
+## [1.3.11](https://github.com/cmderdev/cmder/tree/v1.3.11) (2018-12-22)
+
+### Fixes
+
+* 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 
+* 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
+
+### Adds
+
+* [#1988](https://github.com/cmderdev/cmder/issues/1988) Prefer /nix_tools option
+* [#1982](https://github.com/cmderdev/cmder/issues/1982) make /register work with /single
+* [#1975](https://github.com/cmderdev/cmder/issues/1975) Add `/nix_tools 0` option to init.bat to prevent adding !GIT_INSTALL_ROOT!\usr\bin to PATH
+
+
+### Changes
+
+* [#1987](https://github.com/cmderdev/cmder/issues/1987) Use default files for default user profiles
+
+## [1.3.10](https://github.com/cmderdev/cmder/tree/v1.3.10) (2018-11-30)
+
+### Fixes
+
+* Replaces Cmder Release v1.3.9 which has been removed.
+* /c now completely separates user config including Conemu configuration. This enables true multi-user Cmder with no configuration collisions. See PR #1949.
+* Fix #1959 Start cmder "find" errors. See PR #1961.
+* Fix #1956 Git detection should use env from git install root. See PR #1969
+
+### Adds
+
+* /m initially creates %cmder_root%/config/conemu-%computername%.xml for users that want per computer Conemu configuration with shared init scripts. See PR #1949.
+* /register now recognizes /c [path] and creates an appropriate Cmder Here shell context menu. See PR #1949.
+
+## [1.3.8](https://github.com/cmderdev/cmder/tree/v1.3.8) (2018-11-10)
+
+### Fixes
+
+* Fix \vendor\bin\timer.cmd was unexpected at this time. on session start.
+
+## [1.3.7](https://github.com/cmderdev/cmder/tree/v1.3.7) (2018-11-10)
+## Updated components
+
+* ConEmu to 180626
+* Update Git to 2.19.0
+
+## Fixes:
+
+* Cmder now opens in the in the current working dir
+
+## Commits
+### Aaron Arney (1):
+
+* Update README
+
+### Arion Roberto Krause (1):
+
+* Fixed typo
+
+### Benjamin Staneck (8):
+
+* Revert "replace user-aliases with user_aliases"
+* replace user-aliases with user_aliases
+* better fix for #1265
+* Revert "sanitize dir before assigning to prompt"
+* sanitize dir before assigning to prompt
+* Update CHANGELOG.md
+
+### Bob Hood (1):
+
+* Refactored the Mercurial prompt code to be more efficient.
+
+### David Refoua (1):
+
+* fix some spelling issues
+
+### Dax T Games (30):
+
+* Revert "Ignore %cmder_root%\config (#1945)"
+* Ignore %cmder_root%\config (#1945)
+* Add /f for fast init. (#1942)
+* add diag helper scripts and adds to the path (#1918)
+* Fix #1806 #1675 (#1870)
+* Profile.ps1 (#1796)
+* Fix lib base (#1794)
+* Little Changes
+* Fixed move of default conemu.xml to the vendor folder
+* ignore all of config folder
+* move default comemu.xml to vendor folder
+* fixes
+* more headers
+* init.bat update for cexec
+* git prompt yellow
+* fix user lua and git detection
+* allow conditionally setting environment variables
+* added exit codes
+* flag_exists.cmd to flag_exec.cmd, also to lib as an option
+* fixed
+* handle start dir args with trailing "
+* cleanup
+* '.gitignore'
+* verbose output
+* cmder_shell settings
+* add cmder_shell method
+* replace - with \_ in debug-output and verbose-output
+* Trying to get tcc working
+* move user-aliases.cmd to user_aliases.cmd
+* move bin\alias.bat to vendor\bin\alias.cmd
+* fix /unregister
+
+### Dmitri S. Guskov (2):
+
+* Powershell 5.1 compatibility
+* Update profile.ps1
+
+### Gregory Lucas (1):
+
+* Initialize time_init to fix init error message
+
+### Josef Pihrt (2):
+
+* Fix typos, remove escaping inside inline code, replace single quote with backtick
+* Fix typo and broken link
+
+### Merlin (1):
+
+* Remove duplicate Install-Module detection
+
+### Nicolas Arnaud-Cormos (1):
+
+* Ensure the right git path is found in case of shim.
+
+### Thorsten Sommer (1):
+
+* Fixed spelling
+
+### gaoslin (1):
+
+* Update init.bat
+
+### leochien0102 (1):
+
+* fix the 'was unexpected at this time.'
+
+### xiazeyu (4):
+
+* chore: unite slash
+* docs: update to latest useage
+* refactor: reduce global varible useage, fixed quote issue, added parameters support
+* doc: fix typo
+
+### xiazeyu_2011 (8):
+
+* docs: migrated instructions to the wiki pages
+* rename /bin/have.bat to /vendor/lib/flag_exists.cmd
+* fix: bug when no argument is passed in
+* docs: update doc for have.bat
+* feat: add have.bat as a wrapper
+* Optimize comments of using arguments in user-profile.cmd
+* fix conflict with init.bat build-in command parser, update user-profile.cmd
+* Pass arguments to user-profile.cmd
+
+刘祺 (1):
+
+* add LANG support
+
+## [1.3.6](https://github.com/cmderdev/cmder/tree/v1.3.6) (2018-05-30)
+**Updated components:**
+
+* Git updated to v2.17.1.windows.2
+* ConEmu updated to 180528
+
+**Updates:**
+
+* Cmder now opens in the in the current working dir
+* TBD
+
 ## [1.3.6-pre2](https://github.com/cmderdev/cmder/tree/v1.3.6-pre2) (2018-03-01)

 **Updated components:**
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -11,7 +11,7 @@ If you follow them your contribution will likely be pulled in quicker.

 ## Making Changes

-* Make changes in your seperate branch.
+* Make changes in your separate branch.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are easy to understand
 * Squash your 'Correcting mistakes' commits if you have a lot of them. (See the 'Squashing Commits' link below)
@ -35,4 +35,4 @@ If you follow them your contribution will likely be pulled in quicker.

 * [Squashing Commits](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)
 * [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [GitHub pull request documentation](http://help.github.com/articles/creating-a-pull-request/)
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
 2. Extract the archive. *Note: This path should not be `C:\Program Files` or anywhere else that would require Administrator access for modifying configuration files*
 3. (optional) Place your own executable files into the `%cmder_root%\bin` folder to be injected into your PATH.
-4. Run Cmder.exe
+4. Run `Cmder.exe`

 ### Shared Cmder install with Non-Portable Individual User Config
 1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
@ -26,7 +26,7 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 3. (optional) Place your own executable files into the `%cmder_root%\bin` folder to be injected into your PATH.
 4. (optional) Create `%userprofile%\cmder_config\bin` folder to be injected into individual users PATH.  Default is to auto create this on first run.
 5. (optional) Place your own executable files into the `%userprofile%\cmder_config\bin` folder to be injected into your PATH.
-6. Run Cmder.exe with "/C" command line argument. Example: `cmder.exe /C %userprofile%\cmder_config`
+6. Run `Cmder.exe` with `/C` command line argument. Example: `cmder.exe /C %userprofile%\cmder_config`
   * This will create the following directory structure if it is missing.

     ```
@ -41,12 +41,16 @@ The Cmder's user interface is also designed to be more eye pleasing, and you can
 ## Cmder.exe Command Line Arguments


-| Argument            | Description                                                             |
-| ------------------- | ----------------------------------------------------------------------- |
-| /C [user_root_path] | Individual user Cmder root folder.  Example: %userprofile%\cmder_config |
-| /SINGLE             | Start Cmder is single mode.                                             |
-| /START [start_path] | Folder path to start in.                                                |
-| /TASK [task_name]   | Task to start after launch.                                             |
+| Argument                  | Description                                                                              |
+| -------------------       | -----------------------------------------------------------------------                  |
+| `/C [user_root_path]`     | Individual user Cmder root folder.  Example: `%userprofile%\cmder_config`                |
+| `/M`                      | Use `conemu-%computername%.xml` for ConEmu settings storage instead of `user_conemu.xml` |
+| `/REGISTER [ALL, USER]`   | Register a Windows Shell Menu shortcut.                                                  |
+| `/UNREGISTER [ALL, USER]` | Un-register a Windows Shell Menu shortcut.                                               |
+| `/SINGLE`                 | Start Cmder in single mode.                                                              |
+| `/START [start_path]`     | Folder path to start in.                                                                 |
+| `/TASK [task_name]`       | Task to start after launch.                                                              |
+| `/X [ConEmu extras pars]` | Forwads parameters to ConEmu                                                             |

 ## Context Menu Integration

@ -90,24 +94,24 @@ You can open multiple tabs each containing one of the following shells:

 | Task                | Shell          | Description                                                                                                  |
 | ----                | -----          | -----------                                                                                                  |
-| Cmder               | cmd.exe        | Windows 'cmd.exe' shell enhanced with Git, Git aware prompt, Clink (GNU Readline), and Aliases.              |
-| Cmder as Admin      | cmd.exe        | Administrative Windows 'cmd.exe' Cmder shell.                                                                |
-| PowerShell          | powershell.exe | Windows PowerShell enhanced with Git and Git aware prompt .                                                  |
-| PowerShell as Admin | powershell.exe | Administrative Windows 'powershell.exe' Cmder shell.                                                         |
-| Bash                | bash.exe       | Unix/Linux like bash shell running on Windows.                                                               |
-| Bash as Admin       | bash.exe       | Administrative Unix/Linux like bash shell running on Windows.                                                |
-| Mintty              | bash.exe       | Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences                |
-| Mintty as Admin     | bash.exe       | Administrative Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences |
+| Cmder               | `cmd.exe`        | Windows `cmd.exe` shell enhanced with Git, Git aware prompt, Clink (GNU Readline), and Aliases.              |
+| Cmder as Admin      | `cmd.exe`        | Administrative Windows `cmd.exe` Cmder shell.                                                                |
+| PowerShell          | `powershell.exe` | Windows PowerShell enhanced with Git and Git aware prompt .                                                  |
+| PowerShell as Admin | `powershell.exe` | Administrative Windows `powershell.exe` Cmder shell.                                                         |
+| Bash                | `bash.exe`       | Unix/Linux like bash shell running on Windows.                                                               |
+| Bash as Admin       | `bash.exe`       | Administrative Unix/Linux like bash shell running on Windows.                                                |
+| Mintty              | `bash.exe`       | Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences                |
+| Mintty as Admin     | `bash.exe`       | Administrative Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences |

 Cmder, PowerShell, and Bash tabs all run on top of the Windows Console API and work as you might expect in Cmder with access to use ConEmu's color schemes, key bindings and other settings defined in the ConEmu Settings dialog.

-⚠ *NOTE:* Only the full edition of Cmder comes with a pre-installed bash, using a vendored [git-for-windows](https://gitforwindows.org/) installation. The pre-configured Bash tabs may not work on Cmder mini eidition without additional configuration.
+⚠ *NOTE:* Only the full edition of Cmder comes with a pre-installed bash, using a vendored [git-for-windows](https://gitforwindows.org/) installation. The pre-configured Bash tabs may not work on Cmder mini edition without additional configuration.

 You may however, choose to use an external installation of bash, such as Microsoft's [Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10) (called WSL) or the [Cygwin](https://cygwin.com/) project which provides POSIX support on windows.

 ⚠ *NOTE:* Mintty tabs use a program called 'mintty' as the terminal emulator that is not based on the Windows Console API, rather it's rendered graphically by ConEmu. Mintty differs from the other tabs in that it supports xterm/xterm-256color TERM types, and does not work with ConEmu settings like color schemes and key bindings.  As such, some differences in functionality are to be expected, such as Cmder not being able to apply a system-wide configuration to it.

-As a result mintty specific config is done via the '[%USERPROFILE%|$HOME]/.minttyrc' file.  You may read more about Mintty and its config file [here](https://github.com/mintty/mintty).
+As a result mintty specific config is done via the `[%USERPROFILE%|$HOME]/.minttyrc` file.  You may read more about Mintty and its config file [here](https://github.com/mintty/mintty).

 An example of setting Cmder portable terminal colors for mintty:

@ -117,18 +121,18 @@ From a bash/mintty shell:
 cd $CMDER_ROOT/vendor
 git clone https://github.com/karlin/mintty-colors-solarized.git
 cd mintty-colors-solarized/
-echo source \$CMDER_ROOT/vendor/mintty-colors-solarized/mintty-solarized-dark.sh>>$CMDER_ROOT/config/user-profile.sh
+echo source \$CMDER_ROOT/vendor/mintty-colors-solarized/mintty-solarized-dark.sh>>$CMDER_ROOT/config/user_profile.sh
 ```

 You may find some Monokai color schemes for mintty to match Cmder [here](https://github.com/PhilipDaniels/mintty/blob/master/themes/Monokai) or [here](https://github.com/oumu/mintty-color-schemes/blob/master/base16-monokai-mod.minttyrc).

-### Changing Cmder Default 'cmd.exe' Shell Startup Behaviour Using Task Arguments
+### Changing Cmder Default `cmd.exe` Shell Startup Behaviour Using Task Arguments

 1. Press <kbd>Win</kbd> + <kbd>Alt</kbd> + <kbd>T</kbd>
 1. Click either:
  * `1. {cmd::Cmder as Admin}`
  * `2. {cmd::Cmder}`
-1. Add command line argumentswhere specified below:
+1. Add command line arguments where specified below:

  *Note: Pay attention to the quotes!*

@ -138,80 +142,84 @@ You may find some Monokai color schemes for mintty to match Cmder [here](https:/

 ##### Command Line Arguments for `init.bat`

-| Argument                      | Description                                                                                      | Default                               |
-| ----------------------------- | ----------------------------------------------------------------------------------------------   | ------------------------------------- |
-| /c [user cmder root]          | Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment. | not set                               |
-| /d                            | Enables debug output.                                                                            | not set                               |
-| /git_install_root [file path] | User specified Git installation root path.                                                       | '%CMDER_ROOT%\vendor\Git-for-Windows' |
-| /home [home folder]           | User specified folder path to set `%HOME%` environment variable.                                 | '%userprofile%'                       |
-| /max_depth [1-5]              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`   | 1                                     |
-| /svn_ssh [path to ssh.exe]    | Define %SVN_SSH% so we can use git svn with ssh svn repositories.                                | '%GIT_INSTALL_ROOT%\bin\ssh.exe'      |
-| /user_aliases [file path]     | File path pointing to user aliases.                                                              | '%CMDER_ROOT%\config\user-liases.cmd' |
-| /v                            | Enables verbose output.                                                                          | not set                               |
+| Argument                        | Description                                                                                                                                        | Default                                |
+| -----------------------------   | ----------------------------------------------------------------------------------------------                                                     | -------------------------------------  |
+| `/c [user cmder root]`          | Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment.                                                   | not set                                |
+| `/d`                            | Enables debug output.                                                                                                                              | not set                                |
+| `/f`                            | Enables Cmder Fast Init Mode. This disables some features, see pull request [#1492](https://github.com/cmderdev/cmder/pull/1942) for more details. | not set                                |
+| `/t`                            | Enables Cmder Timed Init Mode. This displays the time taken run init scripts | not set                                |
+| `/git_install_root [file path]` | User specified Git installation root path.                                                                                                         | `%CMDER_ROOT%\vendor\Git-for-Windows`  |
+| `/home [home folder]`           | User specified folder path to set `%HOME%` environment variable.                                                                                   | `%userprofile%`                        |
+| `/max_depth [1-5]`              | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`                                                     | 1                                      |
+| `/nix_tools [0-2]`              | Define how `*nix` tools are added to the path.  Prefer Windows Tools: 1, Prefer *nix Tools: 2, No `/usr/bin` in `%PATH%`: 0                        | 1                                      |
+| `/svn_ssh [path to ssh.exe]`    | Define `%SVN_SSH%` so we can use git svn with ssh svn repositories.                                                                                | `%GIT_INSTALL_ROOT%\bin\ssh.exe`       |
+| `/user_aliases [file path]`     | File path pointing to user aliases.                                                                                                                | `%CMDER_ROOT%\config\user-aliases.cmd` |
+| `/v`                            | Enables verbose output.                                                                                                                            | not set                                |
+| (custom arguments)              | User defined arguments processed by `cexec`. Type `cexec /?` for more useage.                                                                      | not set                                |

 ### Cmder Shell User Config
 Single user portable configuration is possible using the cmder specific shell config files.  Edit the below files to add your own configuration:

 | Shell         | Cmder Portable User Config                |
 | ------------- | ----------------------------------------- |
-| Cmder         | %CMDER_ROOT%\\config\\user-profile.cmd    |
-| PowerShell    | $ENV:CMDER_ROOT\\config\\user-profile.ps1 |
-| Bash/Mintty   | $CMDER_ROOT/config/user-profile.sh        |
+| Cmder         | `%CMDER_ROOT%\config\user_profile.cmd`    |
+| PowerShell    | `$ENV:CMDER_ROOT\config\user_profile.ps1` |
+| Bash/Mintty   | `$CMDER_ROOT/config/user_profile.sh`        |

-Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file if it exists after it sources '$CMDER_ROOT/config/user-profile.sh'.
+Note: Bash and Mintty sessions will also source the `$HOME/.bashrc` file if it exists after it sources `$CMDER_ROOT/config/user_profile.sh`.

-You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CMDER_ROOT%\config\profile.d folder to add startup config to Cmder.
+You can write `*.cmd|*.bat`, `*.ps1`, and `*.sh` scripts and just drop them in the `%CMDER_ROOT%\config\profile.d` folder to add startup config to Cmder.

-| Shell         | Cmder 'Profile.d' Scripts                         |
+| Shell         | Cmder `Profile.d` Scripts                         |
 | ------------- | --------------------------------------------------|
-| Cmder         | %CMDER_ROOT%\\config\\profile.d\\\*.bat and *.cmd |
-| PowerShell    | $ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1        |
-| Bash/Mintty   | $CMDER_ROOT/config/profile.d/*.sh                 |
+| Cmder         | `%CMDER_ROOT%\config\profile.d\*.bat and *.cmd` |
+| PowerShell    | `$ENV:CMDER_ROOT\config\profile.d\*.ps1`        |
+| Bash/Mintty   | `$CMDER_ROOT/config/profile.d/*.sh`                 |

 ### Aliases
-#### Cmder(Cmd.exe) Aliases
+#### Cmder(`Cmd.exe`) Aliases
 You can define simple aliases for `cmd.exe` sessions with a command like `alias name=command`.  Cmd.exe aliases support optional parameters through the `$1-9` or the `$*` special characters so the alias `vi=vim.exe $*` typed as `vi [filename]` will open `[filename]` in `vim.exe`.

-Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/doskey.mspx?mfr=true) for additional details on complex aliases/macros for 'cmd.exe'
+Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/doskey.mspx?mfr=true) for additional details on complex aliases/macros for `cmd.exe`

 Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\user-aliases.cmd` file

 To make an alias and/or any other profile settings permanent add it to one of the following:

-Note: These are loaded in this order by '$CMDER_ROOT/vendor/init.bat'.  Anyhing stored in '%CMDER_ROOT%' will be a portable setting and will follow cmder to another machine.
+Note: These are loaded in this order by `$CMDER_ROOT/vendor/init.bat`.  Anything stored in `%CMDER_ROOT%` will be a portable setting and will follow cmder to another machine.

-* '%CMDER_ROOT%\\config\\profile.d\\\*.cmd and \*.bat'
-* '%CMDER_ROOT%\\config\\user-aliases.cmd'
-* '%CMDER_ROOT%\\config\\user-profile.cmd'
+* `%CMDER_ROOT%\config\profile.d\*.cmd` and `\*.bat`
+* `%CMDER_ROOT%\config\user-aliases.cmd`
+* `%CMDER_ROOT%\config\user_profile.cmd`

 #### Bash.exe|Mintty.exe Aliases
 Bash shells support simple and complex aliases with optional parameters natively so they work a little different.  Typing `alias name=command` will create an alias only for the current running session.

 To make an alias and/or any other profile settings permanent add it to one of the following:

-Note: These are loaded in this order by '$CMDER_ROOT/vendor/git-for-windows/etc/profile.d/cmder.sh'.  Anyhing stored in '$CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+Note: These are loaded in this order by `$CMDER_ROOT/vendor/git-for-windows/etc/profile.d/cmder.sh`.  Anything stored in `$CMDER_ROOT` will be a portable setting and will follow cmder to another machine.

-* '$CMDER_ROOT/config/profile.d/*.sh'
-* '$CMDER_ROOT/config/user-profile.sh'
-* '$HOME/.bashrc'
+* `$CMDER_ROOT/config/profile.d/*.sh`
+* `$CMDER_ROOT/config/user_profile.sh`
+* `$HOME/.bashrc`

-If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will be portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.
+If you add bash aliases to `$CMDER_ROOT/config/user_profile.sh` they will be portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.

 #### PowerShell.exe Aliases
 PowerShell has native simple alias support, for example `[new-alias | set-alias] alias command`, so complex aliases with optional parameters are not supported in PowerShell sessions.  Type `get-help [new-alias|set-alias] -full` for help on PowerShell aliases.

 To make an alias and/or any other profile settings permanent add it to one of the following:

-Note: These are loaded in this order by '$ENV:CMDER_ROOT\\vendor\\user-profile.ps1'.  Anyhing stored in '$ENV:CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+Note: These are loaded in this order by `$ENV:CMDER_ROOT\vendor\user_profile.ps1`.  Anything stored in `$ENV:CMDER_ROOT` will be a portable setting and will follow cmder to another machine.

-* '$ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1'
-* '$ENV:CMDER_ROOT\\config\\user-profile.ps1'
+* `$ENV:CMDER_ROOT\config\profile.d\*.ps1`
+* `$ENV:CMDER_ROOT\config\user_profile.ps1`

 ### SSH Agent

 To start the vendored SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder.

-If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `%CMDER_ROOT%/config/user-profile.cmd` (usually just uncomment it).
+If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd"` in `%CMDER_ROOT%/config/user_profile.cmd` (usually just uncomment it).

 ### Vendored Git

@ -223,22 +231,22 @@ You may use your favorite version of Git by including its path in the `%PATH%` e

 You may run bash (the default shell used on Linux, macOS and GNU/Hurd) externally on Cmder, using the following instructions:

-1. Setup a new task by pressing '<kbd>Win</kbd> +<kbd>Alt</kbd> + <kbd>T</kbd>'.
-1. Click the '+' button to add a task.
+1. Setup a new task by pressing <kbd>Win</kbd> +<kbd>Alt</kbd> + <kbd>T</kbd>.
+1. Click the `+` button to add a task.
 1. Name the new task in the top text box.
 1. Provide task parameters, this is optional.
-1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console``` to the `Commands` text box.
+1. Add `cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console` to the `Commands` text box.

 **Recommended Optional Steps:**

-Copy the 'vendor/cmder_exinit' file to the Cygwin/Babun, MSys2, or Git for Windows SDK environments ```/etc/profile.d/``` folder to use portable settings in the $CMDER_ROOT/config folder.
+Copy the `vendor/cmder_exinit` file to the Cygwin/Babun, MSys2, or Git for Windows SDK environments `/etc/profile.d/` folder to use portable settings in the `$CMDER_ROOT/config` folder.

-Note: MinGW could work if the init scripts include profile.d but this has not been tested.
+Note: MinGW could work if the init scripts include `profile.d` but this has not been tested.

 The destination file extension depends on the shell you use in that environment.  For example:

-* bash - Copy to /etc/profile.d/cmder_exinit.sh
-* zsh  - Copy to /etc/profile.d/cmder_exinit.zsh
+* bash - Copy to `/etc/profile.d/cmder_exinit.sh`
+* zsh  - Copy to `/etc/profile.d/cmder_exinit.zsh`

 Uncomment and edit the below line in the script to use Cmder config even when launched from outside Cmder.

@ -246,7 +254,56 @@ Uncomment and edit the below line in the script to use Cmder config even when la
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
 ```

+### Customizing user sessions using `init.bat` custom arguments. 
+
+You can pass custom arguments to `init.bat` and use `cexec.cmd` in your `user_profile.cmd` to evaluate these
+arguments then execute commands based on a particular flag being detected or not.
+
+`init.bat` creates two shortcuts for using `cexec.cmd` in your profile scripts.
+
+#### `%ccall%` - Evaluates flags, runs commands if found,  and returns to the calling script and continues.
+
+```
+ccall=call C:\Users\user\cmderdev\vendor\bin\cexec.cmd
+```  
+
+Example: `%ccall% /startnotepad start notepad.exe`
+
+#### `%cexec%` - Evaluates flags, runs commands if found, and does not return to the calling script.
+
+```
+cexec=C:\Users\user\cmderdev\vendor\bin\cexec.cmd
+```
+
+Example: `%cexec% /startnotepad start notepad.exe`
+
+It is useful when you have multiple tasks to execute `cmder` and need it to initialize
+the session differently depending on the task chosen.
+
+To conditionally start `notepad.exe` when you start a specific `cmder` task:
+
+* Press <kbd>win</kbd>+<kbd>alt</kbd>+<kbd>t</kbd>
+* Click `+` to add a new task.
+* Add the below to the `Commands` block:
+
+  ```batch
+  
+  cmd.exe /k ""%ConEmuDir%\..\init.bat" /startnotepad"
+  
+  ```
+
+* Add the below to your `%cmder_root%\config\user_profile.cmd`
+
+  ```batch
+  
+  %ccall% "/startNotepad" "start" "notepad.exe"`
+  
+  ```
+
+To see detailed usage of `cexec`, type `cexec /?` in cmder.
+
 ### Integrating Cmder with [Hyper](https://github.com/zeit/hyper), [Microsoft VS Code](https://code.visualstudio.com/), and your favorite IDEs
+
 Cmder by default comes with a vendored ConEmu installation as the underlying terminal emulator, as stated [here](https://conemu.github.io/en/cmder.html).

 However, Cmder can in fact run in a variety of other terminal emulators, and even integrated IDEs. Assuming you have the latest version of Cmder, follow the following instructions to get Cmder working with your own terminal emulator.
@ -257,26 +314,26 @@ For instructions on how to integrate Cmder with your IDE, please read our [Wiki

 The process of upgrading Cmder depends on the version/build you are currently running.

-If you have a `[cmder_root]/config/user-conemu.xml`, you are running a newer version of Cmder, follow the below process: 
+If you have a `[cmder_root]/config/user[-|_]conemu.xml`, you are running a newer version of Cmder, follow the below process:

-1. Exit all Cmder sessions and relaunch `[cmder_root]/cmder.exe`, this backs up your existing `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user-conemu.xml`.
+1. Exit all Cmder sessions and relaunch `[cmder_root]/cmder.exe`, this backs up your existing `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user[-|_]conemu.xml`.

-   * The `[cmder_root]/config/user-conemu.xml` contains any custom settings you have made using the 'Setup Tasks' settings dialog.
+   * The `[cmder_root]/config/user[-|_]conemu.xml` contains any custom settings you have made using the 'Setup Tasks' settings dialog.

 2. Exit all Cmder sessions and backup any files you have manually edited under `[cmder_root]/vendor`.

-   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in '[cmder_root]/config' folder.
+   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in `[cmder_root]/config` folder.

 3.  Delete the `[cmder_root]/vendor` folder.
 4.  Extract the new `cmder.zip` or `cmder_mini.zip` into `[cmder_root]/` overwriting all files when prompted.

-If you do not have a `[cmder_root]/config/user-conemu.xml`, you are running an older version of cmder, follow the below process: 
+If you do not have a `[cmder_root]/config/user[-|_]conemu.xml`, you are running an older version of cmder, follow the below process:

-1. Exit all Cmder sessions and backup `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user-conemu.xml`.
+1. Exit all Cmder sessions and backup `[cmder_root]/vendor/conemu-maximus5/conemu.xml` to `[cmder_root]/config/user[-|_]conemu.xml`.

 2. Backup any files you have manually edited under `[cmder_root]/vendor`.

-   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in '[cmder_root]/config' folder.
+   * Editing files under `[cmder_root]/vendor` is not recommended since you will need to re-apply these changes after any upgrade.  All user customizations should go in `[cmder_root]/config` folder.

 3.  Delete the `[cmder_root]/vendor` folder.
 4.  Extract the new `cmder.zip` or `cmder_mini.zip` into `[cmder_root]/` overwriting all files when prompted.
--- a/config/Readme.md
+++ b/config/Readme.md
@ -4,11 +4,12 @@ All config files must be in this folder. If there is no option to set this folde
 directly, it has to be hardlinked.

 * `user-aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
-  `vendor\user-aliases.cmd.example`.
+  `vendor\user-aliases.cmd.default`.
 * `*.lua`: clink completions and prompt filters; autoloaded after all
  prompt filter and clink completions are initialized; add your own.
 * `user-profile.{sh|cmd|ps1}`: startup files for bash|cmd|powershell tasks; called from their
-  respective startup scripts in `vendor\`; autocreated on first start of such a task.
+  respective startup scripts in `vendor\`; autocreated from
+  `vendor\user-profile.{sh|cmd|ps1}.default` on first start of such a task.
 * `.history`: the current commandline history; autoupdated on close.
 * `settings`: settings for readline; overwritten on update.
 * `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update.
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -9,6 +9,7 @@
 #include <iostream>

 #pragma comment(lib, "Shlwapi.lib")
+#pragma warning( disable : 4091 )

 #ifndef UNICODE
 #error "Must be compiled with unicode support."
@ -19,6 +20,8 @@
 #define MB_TITLE L"Cmder Launcher"
 #define SHELL_MENU_REGISTRY_PATH_BACKGROUND L"Directory\\Background\\shell\\Cmder"
 #define SHELL_MENU_REGISTRY_PATH_LISTITEM L"Directory\\shell\\Cmder"
+#define SHELL_MENU_REGISTRY_DRIVE_PATH_BACKGROUND L"Drive\\Background\\shell\\Cmder"
+#define SHELL_MENU_REGISTRY_DRIVE_PATH_LISTITEM L"Drive\\shell\\Cmder"

 #define streqi(a, b) (_wcsicmp((a), (b)) == 0)

@ -68,7 +71,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }

-void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"")
+void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstring taskName = L"", std::wstring cfgRoot = L"", bool use_user_cfg = true, std::wstring conemu_args = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@ -85,10 +88,17 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 	wchar_t userConfigDirPath[MAX_PATH] = { 0 };
 	wchar_t userBinDirPath[MAX_PATH] = { 0 };
 	wchar_t userProfiledDirPath[MAX_PATH] = { 0 };
+	wchar_t userProfilePath[MAX_PATH] = { 0 };
+	wchar_t legacyUserProfilePath[MAX_PATH] = { 0 };
+	wchar_t userAliasesPath[MAX_PATH] = { 0 };
+	wchar_t legacyUserAliasesPath[MAX_PATH] = { 0 };
 	wchar_t args[MAX_PATH * 2 + 256] = { 0 };
+	wchar_t userConEmuCfgPath[MAX_PATH] = { 0 };
+

 	std::wstring cmderStart = path;
 	std::wstring cmderTask = taskName;
+	std::wstring cmderConEmuArgs = conemu_args;

 	std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
 	userConfigDirPath[cfgRoot.length()] = 0;
@ -104,12 +114,54 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr
 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");

 	PathCombine(configDirPath, exeDir, L"config");
+
+	/*
+	Convert legacy user-profile.cmd to new name user_profile.cmd
+	*/
+	PathCombine(legacyUserProfilePath, configDirPath, L"user-profile.cmd");
+	if (PathFileExists(legacyUserProfilePath))
+	{
+		PathCombine(userProfilePath, configDirPath, L"user_profile.cmd");
+
+		char      *lPr = (char *)malloc(MAX_PATH);
+		char      *pR = (char *)malloc(MAX_PATH);
+		size_t i;
+		wcstombs_s(&i, lPr, (size_t)MAX_PATH,
+			legacyUserProfilePath, (size_t)MAX_PATH);
+		wcstombs_s(&i, pR, (size_t)MAX_PATH,
+			userProfilePath, (size_t)MAX_PATH);
+		rename(lPr, pR);
+	}
+
+	/*
+	Convert legacy user-aliases.cmd to new name user_aliases.cmd
+	*/
+	PathCombine(legacyUserAliasesPath, configDirPath, L"user-aliases.cmd");
+	if (PathFileExists(legacyUserAliasesPath))
+	{
+		PathCombine(userAliasesPath, configDirPath, L"user_aliases.cmd");
+
+		char      *lPr = (char *)malloc(MAX_PATH);
+		char      *pR = (char *)malloc(MAX_PATH);
+		size_t i;
+		wcstombs_s(&i, lPr, (size_t)MAX_PATH,
+			legacyUserAliasesPath, (size_t)MAX_PATH);
+		wcstombs_s(&i, pR, (size_t)MAX_PATH,
+			userAliasesPath, (size_t)MAX_PATH);
+		rename(lPr, pR);
+	}
+	
+	/*
+	Was /c [path] specified?
+	*/
 	if (wcscmp(userConfigDirPath, L"") == 0)
 	{
+		// No - It wasn't. 
 		PathCombine(userConfigDirPath, exeDir, L"config");
 	}
 	else
 	{
+		// Yes - It was.
 		PathCombine(userBinDirPath, userConfigDirPath, L"bin");
 		SHCreateDirectoryEx(0, userBinDirPath, 0);

@ -118,113 +170,231 @@ void StartCmder(std::wstring  path = L"", bool is_single_mode = false, std::wstr

 		PathCombine(userProfiledDirPath, userConfigDirPath, L"profile.d");
 		SHCreateDirectoryEx(0, userProfiledDirPath, 0);
+
+		/*
+		Convert legacy user-profile.cmd to new name user_profile.cmd
+		*/
+		PathCombine(legacyUserProfilePath, userConfigDirPath, L"user-profile.cmd");
+		if (PathFileExists(legacyUserProfilePath))
+		{
+			PathCombine(userProfilePath, userConfigDirPath, L"user_profile.cmd");
+
+			char      *lPr = (char *)malloc(MAX_PATH);
+			char      *pR = (char *)malloc(MAX_PATH);
+			size_t i;
+			wcstombs_s(&i, lPr, (size_t)MAX_PATH,
+				legacyUserProfilePath, (size_t)MAX_PATH);
+			wcstombs_s(&i, pR, (size_t)MAX_PATH,
+				userProfilePath, (size_t)MAX_PATH);
+			rename(lPr, pR);
+		}
+
+		/*
+		Convert legacy user-aliases.cmd to new name user_aliases.cmd
+		*/
+		PathCombine(legacyUserAliasesPath, userConfigDirPath, L"user-aliases.cmd");
+		if (PathFileExists(legacyUserAliasesPath))
+		{
+			PathCombine(userAliasesPath, userConfigDirPath, L"user_aliases.cmd");
+
+			char      *lPr = (char *)malloc(MAX_PATH);
+			char      *pR = (char *)malloc(MAX_PATH);
+			size_t i;
+			wcstombs_s(&i, lPr, (size_t)MAX_PATH,
+				legacyUserAliasesPath, (size_t)MAX_PATH);
+			wcstombs_s(&i, pR, (size_t)MAX_PATH,
+				userAliasesPath, (size_t)MAX_PATH);
+			rename(lPr, pR);
+		}
 	}

 	// Set path to vendored ConEmu config file
 	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");

 	// Set path to Cmder default ConEmu config file
-	PathCombine(defaultCfgPath, exeDir, L"config\\ConEmu.xml");
+	PathCombine(defaultCfgPath, exeDir, L"vendor\\ConEmu.xml.default");

 	// Check for machine-specific then user config source file.
 	PathCombine(cpuCfgPath, userConfigDirPath, L"ConEmu-%COMPUTERNAME%.xml");
 	ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0]));

+	// Set path to Cmder user ConEmu config file
 	PathCombine(userCfgPath, userConfigDirPath, L"user-ConEmu.xml");

-	if (PathFileExists(cpuCfgPath)) {
-		if (PathFileExists(cfgPath)) {
-			if (!CopyFile(cfgPath, cpuCfgPath, FALSE))
+	if ( PathFileExists(cpuCfgPath) || use_user_cfg == false ) // config/ConEmu-%COMPUTERNAME%.xml file exists or /m was specified on command line, use machine specific config.
+	{
+		if (cfgRoot.length() == 0) // '/c [path]' was NOT specified
+		{
+			if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml file exists, copy vendor/conemu-maximus5/ConEmu.xml to config/ConEmu-%COMPUTERNAME%.xml.
 			{
-				MessageBox(NULL,
-					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location! Restart Cmder as Administrator."
-					: L"Failed to copy ConEmu.xml file to ConEmu-%COMPUTERNAME%.xml backup location!", MB_TITLE, MB_ICONSTOP);
-				exit(1);
+				if (!CopyFile(cfgPath, cpuCfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/ConEmu-%COMPUTERNAME%.xml! Access Denied."
+						: L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/ConEmu-%COMPUTERNAME%.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
+			}
+			else // vendor/conemu-maximus5/ConEmu.xml config file does not exist, copy config/ConEmu-%COMPUTERNAME%.xml to vendor/conemu-maximus5/ConEmu.xml file
+			{
+				if (!CopyFile(cpuCfgPath, cfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy conig/ConEmu-%COMPUTERNAME%.xml file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+						: L"Failed to copy config/ConEmu-%COMPUTERNAME%.xml file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
 			}
 		}
-		else
+		else // '/c [path]' was specified, don't copy anything and use existing conemu-%COMPUTERNAME%.xml to start comemu.
 		{
-			if (!CopyFile(cpuCfgPath, cfgPath, FALSE))
+			if (use_user_cfg == false && PathFileExists(cfgPath) && !PathFileExists(cpuCfgPath)) // vendor/conemu-maximus5/ConEmu.xml file exists, copy vendor/conemu-maximus5/ConEmu.xml to config/ConEmu-%COMPUTERNAME%.xml.
 			{
-				MessageBox(NULL,
-					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
-					: L"Failed to copy ConEmu-%COMPUTERNAME%.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
-				exit(1);
+				if (!CopyFile(cfgPath, cpuCfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/ConEmu-%COMPUTERNAME%.xml! Access Denied."
+						: L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/ConEmu-%COMPUTERNAME%.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
 			}
+
+			PathCombine(userConEmuCfgPath, userConfigDirPath, L"ConEmu-%COMPUTERNAME%.xml");
+			ExpandEnvironmentStrings(userConEmuCfgPath, userConEmuCfgPath, sizeof(userConEmuCfgPath) / sizeof(userConEmuCfgPath[0]));
 		}
 	}
-	else if (PathFileExists(userCfgPath)) {
-		if (PathFileExists(cfgPath)) {
+	else if (PathFileExists(userCfgPath)) // config/user_conemu.xml exists, use it. 
+	{
+		if (cfgRoot.length() == 0) // '/c [path]' was NOT specified
+		{
+			if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml exists, copy vendor/conemu-maximus5/ConEmu.xml to config/user_conemu.xml.
+			{
+				if (!CopyFile(cfgPath, userCfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml! Access Denied."
+						: L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
+			}
+			else // vendor/conemu-maximus5/ConEmu.xml does not exist, copy config/user-conemu.xml to vendor/conemu-maximus5/ConEmu.xml
+			{
+				if (!CopyFile(userCfgPath, cfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy config/user-conemu.xml file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+						: L"Failed to copy config/user-conemu.xml file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
+			}
+		}
+		else // '/c [path]' was specified, don't copy anything and use existing user_conemu.xml to start comemu.
+		{
+			PathCombine(userConEmuCfgPath, userConfigDirPath, L"user-ConEmu.xml");
+		}
+	}
+	else if (cfgRoot.length() == 0) // '/c [path]' was NOT specified 
+	{
+		if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml exists, copy vendor/conemu-maximus5/ConEmu.xml to config/user_conemu.xml
+		{
 			if (!CopyFile(cfgPath, userCfgPath, FALSE))
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to backup location! Restart Cmder as Administrator."
-					: L"Failed to copy ConEmu.xml file to backup location!", MB_TITLE, MB_ICONSTOP);
+					? L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml! Access Denied."
+					: L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
+			else // vendor/ConEmu.xml.default config exists, copy Cmder vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml.
+			{
+				if (!CopyFile(defaultCfgPath, cfgPath, FALSE))
+				{
+					MessageBox(NULL,
+						(GetLastError() == ERROR_ACCESS_DENIED)
+						? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+						: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
+					exit(1);
+				}
+			}
 		}
-		else
-		{
-			if (!CopyFile(userCfgPath, cfgPath, FALSE))
+		else {
+			if (!CopyFile(defaultCfgPath, cfgPath, FALSE))
 			{
 				MessageBox(NULL,
 					(GetLastError() == ERROR_ACCESS_DENIED)
-					? L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
-					: L"Failed to copy ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
+					? L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml! Access Denied."
+					: L"Failed to copy vendor/ConEmu.xml.default file to vendor/conemu-maximus5/ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
 				exit(1);
 			}
 		}
 	}
-	else if (PathFileExists(cfgPath)) {
+	else if (PathFileExists(cfgPath)) // vendor/conemu-maximus5/ConEmu.xml exists, copy vendor/conemu-maximus5/ConEmu.xml to config/user_conemu.xml
+	{
 		if (!CopyFile(cfgPath, userCfgPath, FALSE))
 		{
 			MessageBox(NULL,
 				(GetLastError() == ERROR_ACCESS_DENIED)
-				? L"Failed to copy ConEmu.xml file to user-conemu.xml backup location! Restart Cmder as Administrator."
-				: L"Failed to copy ConEmu.xml file to user-conemu.xml backup location!", MB_TITLE, MB_ICONSTOP);
+				? L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml! Access Denied."
+				: L"Failed to copy vendor/conemu-maximus5/ConEmu.xml file to config/user-conemu.xml!", MB_TITLE, MB_ICONSTOP);
 			exit(1);
 		}
+
+		PathCombine(userConEmuCfgPath, userConfigDirPath, L"user-ConEmu.xml");
 	}
-	else {
-		if (!CopyFile(defaultCfgPath, cfgPath, FALSE))
+	else // '/c [path]' was specified and 'vendor/ConEmu.xml.default' config exists, copy Cmder 'vendor/ConEmu.xml.default' file to '[user specified path]/config/user_ConEmu.xml'.
+	{
+		if ( ! CopyFile(defaultCfgPath, userCfgPath, FALSE))
 		{
 			MessageBox(NULL,
 				(GetLastError() == ERROR_ACCESS_DENIED)
-				? L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location! Restart Cmder as Administrator."
-				: L"Failed to copy Cmder default ConEmu.xml file to vendored ConEmu.xml location!", MB_TITLE, MB_ICONSTOP);
+				? L"Failed to copy vendor/ConEmu.xml.default file to [user specified path]/config/user_ConEmu.xml! Access Denied."
+				: L"Failed to copy vendor/ConEmu.xml.default file to [user specified path]/config/user_ConEmu.xml!", MB_TITLE, MB_ICONSTOP);
 			exit(1);
 		}
+		PathCombine(userConEmuCfgPath, userConfigDirPath, L"user-ConEmu.xml");
 	}

 	SYSTEM_INFO sysInfo;
 	GetNativeSystemInfo(&sysInfo);
-	if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) {
+	if (sysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+	{
 		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu64.exe");
 	}
-	else {
+	else
+	{
 		PathCombine(conEmuPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.exe");
 	}

+	swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder", args, icoPath);
+
+	if (!streqi(cmderStart.c_str(), L""))
+	{
+		swprintf_s(args, L"%s /dir \"%s\"", args, cmderStart.c_str());
+	}
+
 	if (is_single_mode)
 	{
-		if (!streqi(cmderTask.c_str(), L"")) {
-			swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", args, icoPath, cmderStart.c_str(), cmderTask.c_str());
-		}
-		else {
-			swprintf_s(args, L"%s /single /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str());
-		}
+		swprintf_s(args, L"%s /single", args);
 	}
-	else
+
+	if (!streqi(cmderTask.c_str(), L""))
 	{
-		if (!streqi(cmderTask.c_str(), L"")) {
-			swprintf_s(args, L"/Icon \"%s\" /Title Cmder /dir \"%s\" /run {%s}", icoPath, cmderStart.c_str(), cmderTask.c_str());
-		}
-		else {
-			swprintf_s(args, L"%s /Icon \"%s\" /Title Cmder /dir \"%s\"", args, icoPath, cmderStart.c_str());
-		}
+		swprintf_s(args, L"%s /run {%s}", args, cmderTask.c_str());
+	}
+
+	if (cfgRoot.length() != 0)
+	{
+		swprintf_s(args, L"%s  -loadcfgfile \"%s\"", args, userConEmuCfgPath);
+	}
+
+	if (!streqi(cmderConEmuArgs.c_str(), L""))
+	{
+		swprintf_s(args, L"%s %s", args, cmderConEmuArgs.c_str());
 	}

 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
@ -290,8 +460,10 @@ HKEY GetRootKey(std::wstring opt)
 	return root;
 }

-void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
+void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName, std::wstring cfgRoot, bool single)
 {
+	wchar_t userConfigDirPath[MAX_PATH] = { 0 };
+
 	// First, get the paths we will use

 	wchar_t exePath[MAX_PATH] = { 0 };
@ -300,7 +472,23 @@ void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 	GetModuleFileName(NULL, exePath, sizeof(exePath));

 	wchar_t commandStr[MAX_PATH + 20] = { 0 };
-	swprintf_s(commandStr, L"\"%s\" \"%%V\"", exePath);
+	wchar_t baseCommandStr[MAX_PATH + 20] = { 0 };
+	if (!single) {
+		swprintf_s(baseCommandStr, L"\"%s\"", exePath);
+	}
+	else {
+		swprintf_s(baseCommandStr, L"\"%s\" /single", exePath);
+	}
+
+	if (cfgRoot.length() == 0) // '/c [path]' was NOT specified
+	{
+		swprintf_s(commandStr, L"%s \"%%V\"", baseCommandStr);
+	}
+	else {
+		std::copy(cfgRoot.begin(), cfgRoot.end(), userConfigDirPath);
+		userConfigDirPath[cfgRoot.length()] = 0;
+		swprintf_s(commandStr, L"%s /c \"%s\" \"%%V\"", baseCommandStr, userConfigDirPath);
+	}

 	// Now that we have `commandStr`, it's OK to change `exePath`...
 	PathRemoveFileSpec(exePath);
@ -345,7 +533,9 @@ struct cmderOptions
 	std::wstring cmderStart = L"";
 	std::wstring cmderTask = L"";
 	std::wstring cmderRegScope = L"USER";
+	std::wstring cmderConEmuArgs = L"";
 	bool cmderSingle = false;
+	bool cmderUserCfg = true;
 	bool registerApp = false;
 	bool unRegisterApp = false;
 	bool error = false;
@ -361,76 +551,112 @@ cmderOptions GetOption()

 	for (int i = 1; i < argCount; i++)
 	{
+
 		// MessageBox(NULL, szArgList[i], L"Arglist contents", MB_OK);
-
-		if (_wcsicmp(L"/c", szArgList[i]) == 0)
-		{
-			TCHAR userProfile[MAX_PATH];
-			const DWORD ret = GetEnvironmentVariable(L"USERPROFILE", userProfile, MAX_PATH);
-
-			wchar_t cmderCfgRoot[MAX_PATH] = { 0 };
-			PathCombine(cmderCfgRoot, userProfile, L"cmder_cfg");
-
-			cmderOptions.cmderCfgRoot = cmderCfgRoot;
-
-			if (szArgList[i + 1] != NULL && szArgList[i + 1][0] != '/') {
-				cmderOptions.cmderCfgRoot = szArgList[i + 1];
-				i++;
-			}
-		}
-		else if (_wcsicmp(L"/start", szArgList[i]) == 0)
-		{
-			if (PathFileExists(szArgList[i + 1]))
+		if (cmderOptions.error == false) {
+			if (_wcsicmp(L"/c", szArgList[i]) == 0)
 			{
-				cmderOptions.cmderStart = szArgList[i + 1];
-				i++;
-			}
-			else {
-				MessageBox(NULL, szArgList[i + 1], L"/START - Folder doses not exist!", MB_OK);
-			}
-		}
-		else if (_wcsicmp(L"/task", szArgList[i]) == 0)
-		{
-			cmderOptions.cmderTask = szArgList[i + 1];
-			i++;
-		}
-		else if (_wcsicmp(L"/single", szArgList[i]) == 0)
-		{
-			cmderOptions.cmderSingle = true;
-		}
-		else if (_wcsicmp(L"/register", szArgList[i]) == 0)
-		{
-			cmderOptions.registerApp = true;
-			cmderOptions.unRegisterApp = false;
-			if (szArgList[i + 1] != NULL)
-			{
-				if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+				TCHAR userProfile[MAX_PATH];
+				const DWORD ret = GetEnvironmentVariable(L"USERPROFILE", userProfile, MAX_PATH);
+
+				wchar_t cmderCfgRoot[MAX_PATH] = { 0 };
+				PathCombine(cmderCfgRoot, userProfile, L"cmder_cfg");
+
+				cmderOptions.cmderCfgRoot = cmderCfgRoot;
+
+				if (szArgList[i + 1] != NULL && szArgList[i + 1][0] != '/')
 				{
-					cmderOptions.cmderRegScope = szArgList[i + 1];
+					cmderOptions.cmderCfgRoot = szArgList[i + 1];
 					i++;
 				}
 			}
-		}
-		else if (_wcsicmp(L"/unregister", szArgList[i]) == 0)
-		{
-			cmderOptions.unRegisterApp = true;
-			cmderOptions.registerApp = false;
-			if (szArgList[i + 1] != NULL)
+			else if (_wcsicmp(L"/start", szArgList[i]) == 0)
 			{
-				if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+				int len = wcslen(szArgList[i + 1]);
+				if (wcscmp(&szArgList[i + 1][len - 1], L"\"") == 0)
 				{
-					cmderOptions.cmderRegScope = szArgList[i + 1];
+					szArgList[i + 1][len - 1] = '\0';
+				}
+
+				if (PathFileExists(szArgList[i + 1]))
+				{
+					cmderOptions.cmderStart = szArgList[i + 1];
 					i++;
 				}
+				else
+				{
+					MessageBox(NULL, szArgList[i + 1], L"/START - Folder does not exist!", MB_OK);
+				}
+			}
+			else if (_wcsicmp(L"/task", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderTask = szArgList[i + 1];
+				i++;
+			}
+			else if (_wcsicmp(L"/single", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderSingle = true;
+			}
+			else if (_wcsicmp(L"/m", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderUserCfg = false;
+			}
+			else if (_wcsicmp(L"/register", szArgList[i]) == 0)
+			{
+				cmderOptions.registerApp = true;
+				cmderOptions.unRegisterApp = false;
+				if (szArgList[i + 1] != NULL)
+				{
+					if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+					{
+						cmderOptions.cmderRegScope = szArgList[i + 1];
+						i++;
+					}
+				}
+			}
+			else if (_wcsicmp(L"/unregister", szArgList[i]) == 0)
+			{
+				cmderOptions.unRegisterApp = true;
+				cmderOptions.registerApp = false;
+				if (szArgList[i + 1] != NULL)
+				{
+					if (_wcsicmp(L"all", szArgList[i + 1]) == 0 || _wcsicmp(L"user", szArgList[i + 1]) == 0)
+					{
+						cmderOptions.cmderRegScope = szArgList[i + 1];
+						i++;
+					}
+				}
+			}
+			/* Used for passing arguments to conemu prog */
+			else if (_wcsicmp(L"/x", szArgList[i]) == 0)
+			{
+				cmderOptions.cmderConEmuArgs = szArgList[i + 1];
+				i++;
+			}
+			else if (cmderOptions.cmderStart == L"")
+			{
+				int len = wcslen(szArgList[i]);
+				if (wcscmp(&szArgList[i][len - 1], L"\"") == 0)
+				{
+					szArgList[i][len - 1] = '\0';
+				}
+
+				if (PathFileExists(szArgList[i]))
+				{
+					cmderOptions.cmderStart = szArgList[i];
+					i++;
+				}
+				else
+				{
+					MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+					cmderOptions.error = true;
+				}
+			}
+			else
+			{
+				MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\n    /m\n\n    /x [ConEmu extra arguments]\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+				cmderOptions.error = true;
 			}
-		}
-		else if (cmderOptions.cmderStart == L"" && PathFileExists(szArgList[i]))
-		{
-			cmderOptions.cmderStart = szArgList[i];
-		}
-		else {
-			MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
-			cmderOptions.error = true;
 		}
 	}

@ -450,14 +676,19 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,

 	cmderOptions cmderOptions = GetOption();

-	if (cmderOptions.registerApp == true) {
-		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
-		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
+	if (cmderOptions.registerApp == true)
+	{
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND, cmderOptions.cmderCfgRoot, cmderOptions.cmderSingle);
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM, cmderOptions.cmderCfgRoot, cmderOptions.cmderSingle);
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_DRIVE_PATH_BACKGROUND, cmderOptions.cmderCfgRoot, cmderOptions.cmderSingle);
+		RegisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_DRIVE_PATH_LISTITEM, cmderOptions.cmderCfgRoot, cmderOptions.cmderSingle);
 	}
 	else if (cmderOptions.unRegisterApp == true)
 	{
 		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
 		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_PATH_LISTITEM);
+		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_DRIVE_PATH_BACKGROUND);
+		UnregisterShellMenu(cmderOptions.cmderRegScope, SHELL_MENU_REGISTRY_DRIVE_PATH_LISTITEM);
 	}
 	else if (cmderOptions.error == true)
 	{
@ -465,7 +696,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot);
+		StartCmder(cmderOptions.cmderStart, cmderOptions.cmderSingle, cmderOptions.cmderTask, cmderOptions.cmderCfgRoot, cmderOptions.cmderUserCfg, cmderOptions.cmderConEmuArgs);
 	}

 	return 0;
--- a/vendor/ConEmu.xml.default
+++ b/vendor/ConEmu.xml.default
@ -508,7 +508,7 @@
 					<value name="Name" type="string" data="{PowerShell::PowerShell as Admin}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
+					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression 'Import-Module ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
 					<value name="Flags" type="dword" data="00000000"/>
@ -517,7 +517,7 @@
 					<value name="Name" type="string" data="{PowerShell::PowerShell}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
+					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression 'Import-Module ''%ConEmuDir%\..\profile.ps1'''&quot;"/>
 					<value name="Cmd2" type="string" data="&quot;%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe&quot;"/>
 					<value name="Active" type="long" data="0"/>
 					<value name="Count" type="long" data="1"/>
--- a/vendor/bin/alias.cmd
+++ b/vendor/bin/alias.cmd
@ -2,7 +2,7 @@


 if "%ALIASES%" == "" (
-  set ALIASES="%CMDER_ROOT%\config\user-aliases.cmd"
+  set ALIASES="%CMDER_ROOT%\config\user_aliases.cmd"
 )

 setlocal enabledelayedexpansion
@ -22,10 +22,15 @@ goto parseargument

  if /i "%currentarg%" equ "/f" (
    set ALIASES=%~2
+    set _f=%~2
    shift
    goto :do_shift
  ) else if /i "%currentarg%" == "/reload" (
    goto :p_reload
+  ) else if "%currentarg%" equ "/H" (
+    goto :p_help
+  ) else if "%currentarg%" equ "/h" (
+    goto :p_help
  ) else if "%currentarg%" equ "/?" (
    goto :p_help
  ) else if /i "%currentarg%" equ "/d" (
@ -40,7 +45,7 @@ goto parseargument
  ) else if "%currentarg%" neq "" (
    if "%~2" equ "" (
      :: Show the specified alias
-      doskey /macros | findstr /b %currentarg%= && exit /b
+      doskey /macros | %WINDIR%\System32\findstr /b %currentarg%= && exit /b
      echo insufficient parameters.
      goto :p_help
    ) else (
@ -48,9 +53,10 @@ goto parseargument
      set _x=%*
    )
  )
+
 rem #endregion parseargument

-if "%ALIASES%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
+if "%ALIASES%" neq "%CMDER_ROOT%\config\user_aliases.cmd" (
  set _x=!_x:/f "%ALIASES%" =!

  if not exist "%ALIASES%" (
@ -64,28 +70,28 @@ if "%ALIASES%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
 )

 :: validate alias
-for /f "delims== tokens=1,* usebackq" %%G in (`echo "%_x%"`) do (
+for /f "delims== tokens=1,* usebackq" %%G in (`echo "!_x!"`) do (
  set alias_name=%%G
  set alias_value=%%H
 )

 :: leading quotes added while validating
-set alias_name=%alias_name:~1%
+set alias_name=!alias_name:~1!

 :: trailing quotes added while validating
-set alias_value=%alias_value:~0,-1%
+set alias_value=!alias_value:~0,-1!

 ::remove spaces
 set _temp=%alias_name: =%

 if not ["%_temp%"] == ["%alias_name%"] (
-	echo Your alias name can not contain a space
-	endlocal
-	exit /b
+  echo Your alias name can not contain a space
+  endlocal
+  exit /b
 )

 :: replace already defined alias
-findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /b /v /i "%alias_name%=" "%ALIASES%" >> "%ALIASES%.tmp"
 echo %alias_name%=%alias_value% >> "%ALIASES%.tmp" && type "%ALIASES%.tmp" > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey /macrofile="%ALIASES%"
 endlocal
@ -93,7 +99,7 @@ exit /b

 :p_del
 set del_alias=%~1
-findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
+%WINDIR%\System32\findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
 doskey /macrofile="%ALIASES%"
@ -105,27 +111,38 @@ echo Aliases reloaded
 exit /b

 :p_show
-doskey /macros|findstr /v /r "^;=" | sort
+doskey /macros|%WINDIR%\System32\findstr /v /r "^;=" | sort
 exit /b

 :p_help
 echo.Usage:
 echo.
-echo.	alias [options] [alias=full command]
+echo.  alias [options] [alias=alias command]
 echo.
 echo.Options:
 echo.
-echo.     /d [alias]     Delete an [alias].
-echo.     /f [macrofile] Path to the [macrofile] you want to store the new alias in.
-echo.                    Default: %cmder_root%\config\user-aliases.cmd
-echo.     /reload        Reload the aliases file.  Can be used with /f argument.
-echo.                    Default: %cmder_root%\config\user-aliases.cmd
+echo.  Note: Options MUST precede the alias definition.
 echo.
-echo.	If alias is called with no parameters, it will display the list of existing aliases.
+echo.  /d [alias]     Delete an [alias].
+echo.  /f [macrofile] Path to the [macrofile] you want to store the new alias in.
+echo.                 Default: %cmder_root%\config\user_aliases.cmd
+echo.  /reload        Reload the aliases file.  Can be used with /f argument.
+echo.                 Default: %cmder_root%\config\user_aliases.cmd
 echo.
-echo.	In the command, you can use the following notations:
-echo.	$* allows the alias to assume all the parameters of the supplied command.
-echo.	$1-$9 Allows you to seperate parameter by number, much like %%1 in batch.
-echo.	$T is the command seperator, allowing you to string several commands together into one alias.
-echo.	For more information, read DOSKEY/?
+echo. If alias is called with no parameters, it will display the list of existing
+echo. aliases.
+echo.
+echo. In the alias command, you can use the following notations:
+echo.
+echo. ^^^^^^^^%% - %% signs in env vars must be escaped if preserving the variable
+echo.         in he alias is desired. Variables in aliases surrounded by double
+echo.         quotes only require '^^%%' vs '^^^^^^^^%%'
+echo. $*    - allows the alias to assume all the parameters of the supplied
+echo.         command.
+echo. $1-$9 - Allows you to seperate parameter by number, much like %%1 in
+echo.         batch.
+echo. $T    - Command seperator, allowing you to string several commands
+echo.         together into one alias.
+echo.
+echo. For more information, read DOSKEY /?
 exit /b
--- a/vendor/bin/cexec.cmd
+++ b/vendor/bin/cexec.cmd
@ -0,0 +1,135 @@
+@echo off
+setlocal
+
+if "%~1" equ "" goto :wrongSyntax
+
+if not defined CMDER_USER_FLAGS (
+  :: in case nothing was passed to %CMDER_USER_FLAGS%
+  set "CMDER_USER_FLAGS= "
+)
+
+set "feNot=false"
+goto :parseArgument
+
+:doShift
+  shift
+
+:parseArgument
+set "currenArgu=%~1"
+if /i "%currenArgu%" equ "/setPath" (
+  :: set %flag_exists% shortcut
+  endlocal
+  set "ccall=call %~dp0cexec.cmd"
+  set "cexec=%~dp0cexec.cmd"
+) else if /i "%currenArgu%" == "/?" (
+  goto :help
+) else if /i "%currenArgu%" equ "/help" (
+  goto :help
+) else if /i "%currenArgu%" equ "/h" (
+  goto :help
+) else if /i "%currenArgu%" equ "NOT" (
+  set "feNot=true"
+  goto :doShift
+) else (
+  if "%~1" equ "" goto :wrongSyntax
+  if "%~2" equ "" goto :wrongSyntax
+  set "feFlagName=%~1"
+  set "feCommand=%~2"
+  if not "%~3" equ "" (
+    set "feParam=%~3"
+  )
+  goto :detect
+)
+
+:detect
+:: to avoid erroneous deteciton like "/do" "/doNOT", which both have a "/do"
+:: we added a space after the flag name, like "/do ", which won't match "/doN"
+set "feFlagName=%feFlagName% "
+:: echo.
+:: echo %CMDER_USER_FLAGS%
+:: echo %feNOT%
+:: echo %feFlagName%
+:: echo %feCommand%
+:: echo %feParam%
+:: echo.
+echo %CMDER_USER_FLAGS% | %WINDIR%\System32\find /i "%feFlagName%">nul
+if "%ERRORLEVEL%" == "0" (
+  if "%feNOT%" == "false" (
+    endlocal && call %feCommand% %feParam%
+    exit /b 0
+  )
+) else (
+  if "%feNOT%" == "true" (
+    endlocal && call %feCommand% %feParam%
+    exit /b 0
+  )
+)
+endlocal
+exit /b 1
+
+:wrongSyntax
+echo The syntax of the command is incorrect.
+echo.
+echo use /? for help
+echo.
+endlocal
+exit /b
+
+:help
+echo.
+echo CExec - Conditional Exec
+echo.
+echo Handles with custom arguments for cmder's init.bat.
+echo   written by xiazeyu, inspired DRSDavidSoft.
+echo.
+echo Usage:
+echo.
+echo cexec /setPath [NOT] flagName command/program [parameters]
+echo.
+echo   /setPath         Generate a global varibles %%ccall%% and  %%cexec%% for
+echo                    quicker use. Following arguments will be ignored.
+echo.
+echo   NOT              Specifies that cexec should carry out
+echo                    the command only if the flag is missing.
+echo.
+echo   /[flagName]      Specifies which flag name is to detect. It's recommand
+echo                    to use a pair of double quotation marks to wrap
+echo                    your flag name to avoid exceed expectation.
+echo.
+echo   command/program  Specifies the command to carry out if the
+echo                    argument name is detected. It's recommand to
+echo                    use a pair of double quotation marks to
+echo                    wrap your command to avoid exceed expectation.
+echo.
+echo   parameters       These are the parameters passed to the command/program.
+echo                    It's recommand to use a pair of double quotation marks 
+echo                    to wrap your flag name to avoid exceed expectation.
+echo.
+echo Examples:
+echo.
+echo   These examples are expected to be written in %cmder_root%/config/user-profile.cmd
+echo   CExec evaluates the environment varible "CMDER_USER_FLAGS" and conditionally
+echo   caries out actions based on flags that are passed.
+echo.
+echo   Case 1:
+echo.
+echo   The following command in `user_profile.cmd` would execute "notepad.exe" and continue running the `user_profile.cmd`
+echo.
+echo     "%ccall%" "/startNotepad" "start" "notepad.exe"
+echo.
+echo   If you pass parameter to init.bat like:
+echo.
+echo     init.bat /startNotepad
+echo.
+echo   Case 2:
+echo.
+echo   The following command in `user_profile.cmd` would execute "notepad.exe" and stop running the `user_profile.cmd`
+echo.
+echo     "%cexec%" NOT "/dontStartNotepad" "start" "notepad.exe"
+echo.
+echo   UNLESS you pass parameter to init.bat like:
+echo.
+echo     init.bat /dontStartNotepad
+echo.
+endlocal
+exit /b
--- a/vendor/bin/cmder_diag.cmd
+++ b/vendor/bin/cmder_diag.cmd
@ -0,0 +1,41 @@
+@echo off
+
+echo ------------------------------------
+echo dir "%cmder_root%"
+echo ------------------------------------
+dir "%cmder_root%"
+
+echo.
+echo ------------------------------------
+echo dir "%cmder_root%\vendor"
+echo ------------------------------------
+dir "%cmder_root%\vendor"
+
+echo.
+echo ------------------------------------
+echo dir /s "%cmder_root%\bin"
+echo ------------------------------------
+dir /s "%cmder_root%\bin"
+
+echo.
+echo ------------------------------------
+echo dir /s "%cmder_root%\config"
+echo ------------------------------------
+dir /s "%cmder_root%\config"
+
+echo.
+echo ------------------------------------
+echo set
+echo ------------------------------------
+set
+
+echo.
+echo ------------------------------------
+echo where git
+echo ------------------------------------
+where git
+
+echo.
+echo ------------------------------------
+echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
+echo ------------------------------------
--- a/vendor/bin/cmder_diag.ps1
+++ b/vendor/bin/cmder_diag.ps1
@ -0,0 +1,39 @@
+write-host ------------------------------------
+write-host get-childitem "$env:CMDER_ROOT"
+write-host ------------------------------------
+get-childitem "$env:CMDER_ROOT"
+
+write-host ''
+write-host ------------------------------------
+write-host get-childitem "$env:CMDER_ROOT/vendor"
+write-host ------------------------------------
+get-childitem "$env:CMDER_ROOT/vendor"
+
+write-host ''
+write-host ------------------------------------
+write-host get-childitem -s "$env:CMDER_ROOT/bin"
+write-host ------------------------------------
+get-childitem -s "$env:CMDER_ROOT/bin"
+
+write-host ''
+write-host ------------------------------------
+write-host get-childitem -s "$env:CMDER_ROOT/config"
+write-host ------------------------------------
+get-childitem -s "$env:CMDER_ROOT/config"
+
+write-host ''
+write-host ------------------------------------
+write-host get-childitem env:
+write-host ------------------------------------
+get-childitem env: |ft -autosize -wrap
+
+write-host ''
+write-host ------------------------------------
+write-host get-command git
+write-host ------------------------------------
+get-command git
+
+write-host ''
+write-host ------------------------------------
+write-host Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
+write-host ------------------------------------
--- a/vendor/bin/cmder_diag.sh
+++ b/vendor/bin/cmder_diag.sh
@ -0,0 +1,39 @@
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT"
+echo ------------------------------------
+ls -la "$CMDER_ROOT"
+
+echo ''
+echo ------------------------------------
+echo ls -la "$CMDER_ROOT/vendor"
+echo ------------------------------------
+ls -la "$CMDER_ROOT/vendor"
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/bin"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/bin"
+
+echo ''
+echo ------------------------------------
+echo ls -la /s "$CMDER_ROOT/config"
+echo ------------------------------------
+ls -laR /s "$CMDER_ROOT/config"
+
+echo ''
+echo ------------------------------------
+echo env
+echo ------------------------------------
+env
+
+echo ''
+echo ------------------------------------
+echo which git
+echo ------------------------------------
+which git
+
+echo ''
+echo ------------------------------------
+echo Make sure you sanitize this output of private data prior to posting it online for review by the CMDER Team!
+echo ------------------------------------
--- a/vendor/bin/timer.cmd
+++ b/vendor/bin/timer.cmd
@ -0,0 +1,22 @@
+@echo off
+
+set start=%~1
+set end=%~2
+
+set options="tokens=1-4 delims=:.,"
+for /f %options% %%a in ("%start%") do set start_h=%%a&set /a start_m=100%%b %% 100&set /a start_s=100%%c %% 100&set /a start_ms=100%%d %% 100
+for /f %options% %%a in ("%end%") do set end_h=%%a&set /a end_m=100%%b %% 100&set /a end_s=100%%c %% 100&set /a end_ms=100%%d %% 100
+
+set /a hours=%end_h%-%start_h%
+set /a mins=%end_m%-%start_m%
+set /a secs=%end_s%-%start_s%
+set /a ms=%end_ms%-%start_ms%
+if %ms% lss 0 set /a secs = %secs% - 1 & set /a ms = 100%ms%
+if %secs% lss 0 set /a mins = %mins% - 1 & set /a secs = 60%secs%
+if %mins% lss 0 set /a hours = %hours% - 1 & set /a mins = 60%mins%
+if %hours% lss 0 set /a hours = 24%hours%
+if 1%ms% lss 100 set ms=0%ms%
+
+:: Mission accomplished
+set /a totalsecs = %hours%*3600 + %mins%*60 + %secs%
+echo Elapsed Time: %hours%:%mins%:%secs%.%ms% (%totalsecs%.%ms%s total)
--- a/vendor/bin/vscode_init.cmd
+++ b/vendor/bin/vscode_init.cmd
@ -0,0 +1,9 @@
+@echo off
+IF [%1] == [] (
+    REM -- manually opened console (Ctrl + Shift + `) --
+    CALL "%~dp0..\init.bat"
+) ELSE (
+    REM -- task --
+    CALL cmd %*
+    exit
+)
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@ -13,6 +13,14 @@ dofile(clink_lua_file)

 -- now add our own things...

+---
+-- Makes a string safe to use as the replacement in string.gsub
+---
+local function verbatim(s)
+    s = string.gsub(s, "%%", "%%%%")
+    return s
+end
+
 ---
 -- Setting the prompt in clink means that commands which rewrite the prompt do
 -- not destroy our own prompt. It also means that started cmds (or batch files
@ -41,11 +49,16 @@ local function set_prompt_filter()
    -- color codes: "\x1b[1;37;40m"
    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg}{svn} \n\x1b[1;39;40m{lamb} \x1b[0m"
    local lambda = "λ"
-    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", cwd)
+    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", verbatim(cwd))
+
    if env ~= nil then
        lambda = "("..env..") "..lambda
    end
-    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", lambda)
+    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", verbatim(lambda))
+end
+
+local function percent_prompt_filter()
+    clink.prompt.value = string.gsub(clink.prompt.value, "{percent}", "%%")
 end

 ---
@ -176,12 +189,15 @@ end
 -- @return {false|mercurial branch name}
 ---
 local function get_hg_branch()
-    for line in io.popen("hg branch 2>nul"):lines() do
+    local file = io.popen("hg branch 2>nul")
+    for line in file:lines() do
        local m = line:match("(.+)$")
        if m then
+            file:close()
            return m
        end
    end
+    file:close()

    return false
 end
@ -191,12 +207,15 @@ end
 -- @return {false|svn branch name}
 ---
 local function get_svn_branch(svn_dir)
-    for line in io.popen("svn info 2>nul"):lines() do
+    local file = io.popen("svn info 2>nul")
+    for line in file:lines() do
        local m = line:match("^Relative URL:")
        if m then
+            file:close()
            return line:sub(line:find("/")+1,line:len())
        end
    end
+    file:close()

    return false
 end
@ -216,6 +235,21 @@ local function get_git_status()
    return true
 end

+---
+-- Gets the conflict status
+-- @return {bool} indicating true for conflict, false for no conflicts
+---
+function get_git_conflict()
+    local file = io.popen("git diff --name-only --diff-filter=U 2>nul")
+    for line in file:lines() do
+        file:close()
+        return true;
+    end
+    file:close()
+    return false
+end
+
+
 ---
 -- Get the status of working dir
 -- @return {bool}
@ -235,7 +269,7 @@ end
 -- Get the status of working dir
 -- @return {bool}
 ---
-function get_svn_status()
+local function get_svn_status()
    local file = io.popen("svn status -q")
    for line in file:lines() do
        file:close()
@ -251,7 +285,8 @@ local function git_prompt_filter()
    -- Colors for git status
    local colors = {
        clean = "\x1b[1;37;40m",
-        dirty = "\x1b[31;1m",
+        dirty = "\x1b[33;3m",
+        conflict = "\x1b[31;1m"
    }

    local git_dir = get_git_dir()
@ -261,13 +296,19 @@ local function git_prompt_filter()
        local color
        if branch then
            -- Has branch => therefore it is a git folder, now figure out status
-            if get_git_status() then
+            local gitStatus = get_git_status()
+            local gitConflict = get_git_conflict()
+
+            color = colors.dirty
+            if gitStatus then
                color = colors.clean
-            else
-                color = colors.dirty
            end

-            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..branch..")")
+            if gitConflict then
+                color = colors.conflict
+            end 
+
+            clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..verbatim(branch)..")")
            return false
        end
    end
@ -279,31 +320,40 @@ end

 local function hg_prompt_filter()

-    -- Colors for mercurial status
-    local colors = {
-        clean = "\x1b[1;37;40m",
-        dirty = "\x1b[31;1m",
-    }
+    local result = ""

-    if get_hg_dir() then
-        -- if we're inside of mercurial repo then try to detect current branch
-        local branch = get_hg_branch()
-        local color
-        if branch then
-            -- Has branch => therefore it is a mercurial folder, now figure out status
-            if get_hg_status() then
-                color = colors.clean
-            else
-                color = colors.dirty
-            end
+    local hg_dir = get_hg_dir()
+    if hg_dir then
+        -- Colors for mercurial status
+        local colors = {
+            clean = "\x1b[1;37;40m",
+            dirty = "\x1b[31;1m",
+        }

-            clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", color.."("..branch..")")
-            return false
+        local pipe = io.popen("hg branch 2>&1")
+        local output = pipe:read('*all')
+        local rc = { pipe:close() }
+
+        -- strip the trailing newline from the branch name
+        local n = #output
+        while n > 0 and output:find("^%s", n) do n = n - 1 end
+        local branch = output:sub(1, n)
+
+        if branch ~= nil and
+           string.sub(branch,1,7) ~= "abort: " and             -- not an HG working copy
+           (not string.find(branch, "is not recognized")) then -- 'hg' not in path
+            local color = colors.clean
+
+            local pipe = io.popen("hg status -amrd 2>&1")
+            local output = pipe:read('*all')
+            local rc = { pipe:close() }
+
+            if output ~= nil and output ~= "" then color = colors.dirty end
+            result = color .. "(" .. branch .. ")"
        end
    end

-    -- No mercurial present or not in mercurial file
-    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", "")
+    clink.prompt.value = string.gsub(clink.prompt.value, "{hg}", verbatim(result))
    return false
 end

@ -325,7 +375,7 @@ local function svn_prompt_filter()
                color = colors.dirty
            end

-            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", color.."("..branch..")")
+            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", color.."("..verbatim(branch)..")")
            return false
        end
    end
@ -340,6 +390,7 @@ clink.prompt.register_filter(set_prompt_filter, 1)
 clink.prompt.register_filter(hg_prompt_filter, 50)
 clink.prompt.register_filter(git_prompt_filter, 50)
 clink.prompt.register_filter(svn_prompt_filter, 50)
+clink.prompt.register_filter(percent_prompt_filter, 51)

 local completions_dir = clink.get_env('CMDER_ROOT')..'/vendor/clink-completions/'
 for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
@ -351,3 +402,13 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
        dofile(filename)
    end
 end
+
+if clink.get_env('CMDER_USER_CONFIG') then
+  local cmder_config_dir = clink.get_env('CMDER_ROOT')..'/config/'
+  for _,lua_module in ipairs(clink.find_files(cmder_config_dir..'*.lua')) do
+    local filename = cmder_config_dir..lua_module
+    -- use dofile instead of require because require caches loaded modules
+    -- so config reloading using Alt-Q won't reload updated modules.
+    dofile(filename)
+  end
+end
--- a/vendor/clink_settings.default
+++ b/vendor/clink_settings.default
@ -0,0 +1,116 @@
+# name: Pressing Ctrl-D exits session
+# type: bool
+# Ctrl-D exits cmd.exe when it is pressed on an empty line.
+ctrld_exits = 1
+
+# name: Toggle if pressing Esc clears line
+# type: bool
+# Clink clears the current line when Esc is pressed (unless Readline's Vi mode
+# is enabled).
+esc_clears_line = 1
+
+# name: Match display colour
+# type: int
+# Colour to use when displaying matches. A value less than 0 will be the
+# opposite brightness of the default colour.
+match_colour = -1
+
+# name: Executable match style
+# type: enum
+#  0 = PATH only
+#  1 = PATH and CWD
+#  2 = PATH, CWD, and directories
+# Changes how Clink will match executables when there is no path separator on
+# the line. 0 = PATH only, 1 = PATH and CWD, 2 = PATH, CWD, and directories. In
+# all cases both executables and directories are matched when there is a path
+# separator present. A value of -1 will disable executable matching completely.
+exec_match_style = 2
+
+# name: Whitespace prefix matches files
+# type: bool
+# If the line begins with whitespace then Clink bypasses executable matching and
+# will match all files and directories instead.
+space_prefix_match_files = 1
+
+# name: Colour of the prompt
+# type: int
+# Surrounds the prompt in ANSI escape codes to set the prompt's colour. Disabled
+# when the value is less than 0.
+prompt_colour = -1
+
+# name: Auto-answer terminate prompt
+# type: enum
+#  0 = Disabled
+#  1 = Answer 'Y'
+#  2 = Answer 'N'
+# Automatically answers cmd.exe's 'Terminate batch job (Y/N)?' prompts. 0 =
+# disabled, 1 = answer 'Y', 2 = answer 'N'.
+terminate_autoanswer = 0
+
+# name: Lines of history saved to disk
+# type: int
+# When set to a positive integer this is the number of lines of history that
+# will persist when Clink saves the command history to disk. Use 0 for infinite
+# lines and <0 to disable history persistence.
+history_file_lines = 10000
+
+# name: Skip adding lines prefixed with whitespace
+# type: bool
+# Ignore lines that begin with whitespace when adding lines in to the history.
+history_ignore_space = 0
+
+# name: Controls how duplicate entries are handled
+# type: enum
+#  0 = Always add
+#  1 = Ignore
+#  2 = Erase previous
+# If a line is a duplicate of an existing history entry Clink will erase the
+# duplicate when this is set 2. A value of 1 will not add duplicates to the
+# history and a value of 0 will always add lines. Note that history is not
+# deduplicated when reading/writing to disk.
+history_dupe_mode = 2
+
+# name: Read/write history file each line edited
+# type: bool
+# When non-zero the history will be read from disk before editing a new line and
+# written to disk afterwards.
+history_io = 1
+
+# name: Sets how command history expansion is applied
+# type: enum
+#  0 = Off
+#  1 = On
+#  2 = Not in single quotes
+#  3 = Not in double quote
+#  4 = Not in any quotes
+# The '!' character in an entered line can be interpreted to introduce words
+# from the history. This can be enabled and disable by setting this value to 1
+# or 0. Values or 2, 3 or 4 will skip any ! character quoted in single, double,
+# or both quotes respectively.
+history_expand_mode = 3
+
+# name: Support Windows' Ctrl-Alt substitute for AltGr
+# type: bool
+# Windows provides Ctrl-Alt as a substitute for AltGr, historically to support
+# keyboards with no AltGr key. This may collide with some of Readline's
+# bindings.
+use_altgr_substitute = 1
+
+# name: Strips CR and LF chars on paste
+# type: enum
+#  0 = Paste unchanged
+#  1 = Strip
+#  2 = As space
+# Setting this to a value >0 will make Clink strip CR and LF characters from
+# text pasted into the current line. Set this to 1 to strip all newline
+# characters and 2 to replace them with a space.
+strip_crlf_on_paste = 2
+
+# name: Enables basic ANSI escape code support
+# type: bool
+# When printing the prompt, Clink has basic built-in support for SGR ANSI escape
+# codes to control the text colours. This is automatically disabled if a third
+# party tool is detected that also provides this facility. It can also be
+# disabled by setting this to 0.
+ansi_code_support = 1
+
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@ -1,6 +1,6 @@
 # DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE
 #
-# Add portable user customizations ${CMDER_ROOT}/config/user-profile.sh,
+# Add portable user customizations ${CMDER_ROOT}/config/user_profile.sh,
 # these customizations will follow Cmder if $CMDER_ROOT is copied
 # to another machine.
 #
@ -45,7 +45,7 @@ if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then
  PATH=${GIT_INSTALL_ROOT}/bin:$PATH
 fi

-PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
+PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}

 export PATH

@ -63,26 +63,34 @@ if [ -d "${CMDER_USER_CONFIG}/profile.d" ] ; then
  runProfiled  "${CMDER_USER_CONFIG}/profile.d"
 fi

-initialConfig="${CMDER_ROOT}/config/user-profile.sh"
-if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
-    . "${CMDER_ROOT}/config/user-profile.sh"
+
+# Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
+  mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
+fi
+
+CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
+    . "${CMDER_ROOT}/config/user_profile.sh"
 fi

 if [ "${CMDER_USER_CONFIG}" != "" ] ; then
-  initialConfig="${CMDER_USER_CONFIG}/user-profile.sh"
-  if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
-    . "${CMDER_USER_CONFIG}/user-profile.sh"
+  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
+    mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
+  fi
+
+  export PATH=${CMDER_USER_CONFIG}/bin:$PATH
+
+  CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+  if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
+    . "${CMDER_USER_CONFIG}/user_profile.sh"
  fi
 fi

-if [ ! -f "${initialConfig}" ] ; then
-    echo Creating user startup file: "${initialConfig}"
-    cat <<-eof >"${initialConfig}"
-# use this file to run your own startup commands for msys2 bash'
-
-# To add a new vendor to the path, do something like:
-# export PATH=\${CMDER_ROOT}/vendor/whatever:\${PATH}
-eof
+if [ ! -f "${CmderUserProfilePath}" ] ; then
+    echo Creating user startup file: "${CmderUserProfilePath}"
+    cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
 fi

 # Source the users .bashrc file if it exists
--- a/vendor/cmder_exinit
+++ b/vendor/cmder_exinit
@ -63,7 +63,7 @@ if [ ! "$CMDER_ROOT" = "" ] ; then

  export CMDER_ROOT

-  PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
+  PATH=${CMDER_ROOT}/bin:${CMDER_ROOT}/vendor/bin:$PATH:${CMDER_ROOT}

  export PATH

@ -82,25 +82,32 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
  fi


-  if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
-    . "${CMDER_ROOT}/config/user-profile.sh"
+  # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+  if [ -f "$CMDER_ROOT/config/user-profile.sh" ] ; then
+    mv "$CMDER_ROOT/config/user-profile.sh" "$CMDER_ROOT/config/user_profile.sh"
  fi

-  if [ -f "${CMDER_USER_CONFIG}/user-profile.sh" ] ; then
-      . "${CMDER_USER_CONFIG}/user-profile.sh"
-  else
-      if [ "${CMDER_USER_CONFIG}" != "" ] ; then
-        initialProfile="${CMDER_USER_CONFIG}/user-profile.sh"
-      else
-        initialProfile="${CMDER_ROOT}/config/user-profile.sh"
-      fi
+  CmderUserProfilePath="${CMDER_ROOT}/config/user_profile.sh"
+  if [ -f "${CMDER_ROOT}/config/user_profile.sh" ] ; then
+      . "${CMDER_ROOT}/config/user_profile.sh"
+  fi

-      echo Creating user startup file: "${initialProfile}"
-    cat <<-eof >"${initialProfile}"
-# use this file to run your own startup commands for msys2 bash'
+  if [ "${CMDER_USER_CONFIG}" != "" ] ; then
+    # Renaming to "config\user_profile.sh" to "user_profile.sh" for consistency.
+    if [ -f "$CMDER_USER_CONFIG/user-profile.sh" ] ; then
+      mv "$CMDER_USER_CONFIG/user-profile.sh" "$CMDER_USER_CONFIG/user_profile.sh"
+    fi

-# To add a new vendor to the path, do something like:
-# export PATH=\${CMDER_ROOT}/vendor/whatever:\${PATH}
-eof
+    export PATH=${CMDER_USER_CONFIG}/bin:$PATH
+
+    CmderUserProfilePath="${CMDER_USER_CONFIG}/user_profile.sh"
+    if [ -f "${CMDER_USER_CONFIG}/user_profile.sh" ] ; then
+      . "${CMDER_USER_CONFIG}/user_profile.sh"
+    fi
+  fi
+
+  if [ ! -f "${CmderUserProfilePath}" ] ; then
+      echo Creating user startup file: "${CmderUserProfilePath}"
+      cp "${CMDER_ROOT}/vendor/user_profile.sh.default" "${CmderUserProfilePath}"
  fi
 fi
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -1,15 +1,22 @@
@echo off

+set CMDER_INIT_START=%time%
+
 :: Init Script for cmd.exe
 :: Created as part of cmder project

 :: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
-:: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands
+:: !!! Use "%CMDER_ROOT%\config\user_profile.cmd" to add your own startup commands

 :: Use /v command line arg or set to > 0 for verbose output to aid in debugging.
-set verbose-output=0
-set debug-output=0
+set verbose_output=0
+set debug_output=0
+set time_init=0
+set fast_init=0
 set max_depth=1
+:: Add *nix tools to end of path. 0 turns off *nix tools.
+set nix_tools=1
+set "CMDER_USER_FLAGS= "

 :: Find root dir
 if not defined CMDER_ROOT (
@ -27,6 +34,7 @@ if not defined CMDER_ROOT (
 :: Remove trailing '\' from %CMDER_ROOT%
 if "%CMDER_ROOT:~-1%" == "\" SET "CMDER_ROOT=%CMDER_ROOT:~0,-1%"

+call "%cmder_root%\vendor\bin\cexec.cmd" /setpath
 call "%cmder_root%\vendor\lib\lib_base"
 call "%cmder_root%\vendor\lib\lib_path"
 call "%cmder_root%\vendor\lib\lib_console"
@ -36,10 +44,14 @@ call "%cmder_root%\vendor\lib\lib_profile"
 :var_loop
    if "%~1" == "" (
        goto :start
+    ) else if /i "%1" == "/f" (
+        set fast_init=1
+    ) else if /i "%1" == "/t" (
+        set time_init=1
    ) else if /i "%1"=="/v" (
-        set verbose-output=1
+        set verbose_output=1
    ) else if /i "%1"=="/d" (
-        set debug-output=1
+        set debug_output=1
    ) else if /i "%1" == "/max_depth" (
        if "%~2" geq "1" if "%~2" leq "5" (
            set "max_depth=%~2"
@ -58,7 +70,7 @@ call "%cmder_root%\vendor\lib\lib_profile"
        )
    ) else if /i "%1" == "/user_aliases" (
        if exist "%~2" (
-            set "user-aliases=%~2"
+            set "user_aliases=%~2"
            shift
        )
    ) else if /i "%1" == "/git_install_root" (
@ -69,6 +81,20 @@ call "%cmder_root%\vendor\lib\lib_profile"
            %lib_console% show_error "The Git install root folder "%~2", you specified does not exist!"
            exit /b
        )
+    ) else if /i "%1"=="/nix_tools" (
+        if "%2" equ "0" (
+            REM Do not add *nix tools to path
+            set nix_tools=0
+            shift
+        ) else if "%2" equ "1" (
+            REM Add *nix tools to end of path
+            set nix_tools=1
+            shift
+        ) else if "%2" equ "2" (
+            REM Add *nix tools to front of path
+            set nix_tools=2
+            shift
+        )
    ) else if /i "%1" == "/home" (
        if exist "%~2" (
            set "HOME=%~2"
@ -80,16 +106,20 @@ call "%cmder_root%\vendor\lib\lib_profile"
    ) else if /i "%1" == "/svn_ssh" (
        set SVN_SSH=%2
        shift
+    ) else (
+      set "CMDER_USER_FLAGS=%1 %CMDER_USER_FLAGS%"
    )
    shift
 goto var_loop

 :start
-%lib_console% debug-output init.bat "Env Var - CMDER_ROOT=%CMDER_ROOT%"
-%lib_console% debug-output init.bat "Env Var - debug-output=%debug-output%"
+:: Sets CMDER_SHELL, CMDER_CLINK, CMDER_ALIASES
+%lib_base% cmder_shell
+%lib_console% debug_output init.bat "Env Var - CMDER_ROOT=%CMDER_ROOT%"
+%lib_console% debug_output init.bat "Env Var - debug_output=%debug_output%"

 if defined CMDER_USER_CONFIG (
-    %lib_console% debug-output init.bat "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!"
+    %lib_console% debug_output init.bat "CMDER IS ALSO USING INDIVIDUAL USER CONFIG FROM '%CMDER_USER_CONFIG%'!"
 )

 :: Pick right version of clink
@ -101,21 +131,27 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
    set architecture_bits=64
 )

-:: Tell the user about the clink config files...
-if defined "%CMDER_USER_CONFIG%\settings" if not exist "%CMDER_USER_CONFIG%\settings" (
-    echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
-    echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
+if "%CMDER_CLINK%" == "1" (
+  %lib_console% verbose_output "Injecting Clink!"

-} else if not exist "%CMDER_ROOT%\config\settings" (
-    echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
-    echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
-)
-
-:: Run clink
-if defined CMDER_USER_CONFIG (
+  :: Run clink
+  if defined CMDER_USER_CONFIG (
+    if not exist "%CMDER_USER_CONFIG%\settings" (
+      echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
+      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
+      echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
+    )
    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
-) else (
+  ) else (
+    if not exist "%CMDER_ROOT%\config\settings" (
+      echo Generating clink initial settings in "%CMDER_ROOT%\config\settings"
+      copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\settings"
+      echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup.
+    )
    "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
+  )
+) else (
+  %lib_console% verbose_output "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!"
 )

 :: Prepare for git-for-windows
@ -131,20 +167,34 @@ if not defined TERM set TERM=cygwin
 :: also check that we have a recent enough version of git by examining the version string
 setlocal enabledelayedexpansion
 if defined GIT_INSTALL_ROOT (
-    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :FOUND_GIT)
+    if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :SPECIFIED_GIT
+) else if "%fast_init%" == "1" (
+    if exist "%CMDER_ROOT%\vendor\git-for-windows\cmd\git.exe" (
+      %lib_console% debug_output "Skipping Git Auto-Detect!"
+      goto :VENDORED_GIT
+    )
 )

-%lib_console% debug-output init.bat "Looking for Git install root..."
+%lib_console% debug_output init.bat "Looking for Git install root..."

 :: get the version information for vendored git binary
 %lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd"
-%lib_git% validate_version VENDORED !GIT_VERSION_VENDORED!
+%lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%

 :: check if git is in path...
 for /F "delims=" %%F in ('where git.exe 2^>nul') do (
    :: get the absolute path to the user provided git binary
    pushd %%~dpF
-    set "test_dir=!CD!"
+    :: check if there's shim - and if yes follow the path
+    if exist git.shim (
+        for /F "tokens=2 delims== " %%I in (git.shim) do (
+            pushd %%~dpI
+            set "test_dir=!CD!"
+            popd
+        )
+    ) else (
+        set "test_dir=!CD!"
+    )
    popd

    :: get the version information for the user provided git binary
@ -165,49 +215,79 @@ for /F "delims=" %%F in ('where git.exe 2^>nul') do (
            set test_dir=
            goto :FOUND_GIT
        ) else (
-            call :verbose-output Found old !GIT_VERSION_USER! in "!test_dir!", but not using...
+            call :verbose_output Found old !GIT_VERSION_USER! in "!test_dir!", but not using...
            set test_dir=
        )
    ) else (

        :: if the user provided git executable is not found
        if !errorlevel! equ -255 (
-            call :verbose-output No git at "!git_executable!" found.
+            call :verbose_output No git at "!git_executable!" found.
            set test_dir=
        )

    )
-
 )

 :: our last hope: our own git...
 :VENDORED_GIT
 if exist "%CMDER_ROOT%\vendor\git-for-windows" (
    set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
-    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd"
+    %lib_console% debug_output "Using vendored Git '!GIT_VERSION_VENDORED!' from '!GIT_INSTALL_ROOT!..."
+    goto :CONFIGURE_GIT
 ) else (
    goto :NO_GIT
 )

+:SPECIFIED_GIT
+%lib_console% debug_output "Using /GIT_INSTALL_ROOT from '%GIT_INSTALL_ROOT%..."
+goto :CONFIGURE_GIT
+
 :FOUND_GIT
+%lib_console% debug_output "Using found Git '!GIT_VERSION_USER!' from '%GIT_INSTALL_ROOT%..."
+goto :CONFIGURE_GIT
+
+:CONFIGURE_GIT
 :: Add git to the path
 if defined GIT_INSTALL_ROOT (
    rem add the unix commands at the end to not shadow windows commands like more
-    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" append
-    if exist "!GIT_INSTALL_ROOT!\mingw32" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32" append
-    ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
-        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
+    if %nix_tools% equ 1 (
+        %lib_console% debug_output init.bat "Preferring Windows commands"
+        set "path_position=append"
+    ) else (
+        %lib_console% debug_output init.bat "Preferring *nix commands"
+        set "path_position="
+    )
+
+    if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" !path_position!
+    if exist "!GIT_INSTALL_ROOT!\mingw32" (
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32\bin" !path_position!
+    ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" !path_position!
+    )
+
+    if %nix_tools% geq 1 (
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" !path_position!
    )
-    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append

    :: define SVN_SSH so we can use git svn with ssh svn repositories
    if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
+    
+    if not defined LANG (
+        :: Find locale.exe: From the git install root, from the path, using the git installed env, or fallback using the env from the path.
+        if not defined git_locale if exist "!GIT_INSTALL_ROOT!\usr\bin\locale.exe" set git_locale="!GIT_INSTALL_ROOT!\usr\bin\locale.exe"
+        if not defined git_locale for /F "delims=" %%F in ('where locale.exe 2^>nul') do (if not defined git_locale  set git_locale="%%F")
+        if not defined git_locale if exist "!GIT_INSTALL_ROOT!\usr\bin\env.exe" set git_locale="!GIT_INSTALL_ROOT!\usr\bin\env.exe" /usr/bin/locale
+        if not defined git_locale set git_locale=env /usr/bin/locale
+        for /F "delims=" %%F in ('!git_locale! -uU 2') do (
+            set "LANG=%%F"
+        )
+    )
 )

-endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
-%lib_console% debug-output init.bat "Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
-%lib_console% debug-output init.bat "Found Git in: '%GIT_INSTALL_ROOT%'"
+endlocal & set "PATH=%PATH%" & set "LANG=%LANG%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
+%lib_console% debug_output init.bat "Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
+%lib_console% debug_output init.bat "Found Git in: '%GIT_INSTALL_ROOT%'"
 goto :PATH_ENHANCE

 :NO_GIT
@ -215,6 +295,7 @@ goto :PATH_ENHANCE
 endlocal

 :PATH_ENHANCE
+%lib_path% enhance_path "%CMDER_ROOT%\vendor\bin"
 %lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
 if defined CMDER_USER_BIN (
  %lib_path% enhance_path_recursive "%CMDER_USER_BIN%" %max_depth%
@ -232,101 +313,112 @@ if defined CMDER_USER_CONFIG (
 :: scripts run above by setting the 'aliases' env variable.
 ::
 :: Note: If overriding default aliases store file the aliases
-:: must also be self executing, see '.\user-aliases.cmd.example',
+:: must also be self executing, see '.\user_aliases.cmd.default',
 :: and be in profile.d folder.
-if not defined user-aliases (
+if not defined user_aliases (
  if defined CMDER_USER_CONFIG (
-     set "user-aliases=%CMDER_USER_CONFIG%\user-aliases.cmd"
+     set "user_aliases=%CMDER_USER_CONFIG%\user_aliases.cmd"
  ) else (
-     set "user-aliases=%CMDER_ROOT%\config\user-aliases.cmd"
+     set "user_aliases=%CMDER_ROOT%\config\user_aliases.cmd"
  )
 )

-:: The aliases environment variable is used by alias.bat to id
-:: the default file to store new aliases in.
-if not defined aliases (
-  set "aliases=%user-aliases%"
-)
+if "%CMDER_ALIASES%" == "1" (
+  REM The aliases environment variable is used by alias.bat to id
+  REM the default file to store new aliases in.
+  if not defined aliases (
+    set "aliases=%user_aliases%"
+  )

-:: Make sure we have a self-extracting user-aliases.cmd file
-setlocal enabledelayedexpansion
-if not exist "%user-aliases%" (
-    echo Creating initial user-aliases store in "%user-aliases%"...
-    copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
-) else (
-    type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
-    if "!errorlevel!" == "1" (
-        echo Creating initial user-aliases store in "%user-aliases%"...
-        if defined CMDER_USER_CONFIG (
-            copy "%user-aliases%" "%user-aliases%.old_format"
-            copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
-        ) else (
-            copy "%user-aliases%" "%user-aliases%.old_format"
-            copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
-        )
-    )
-)
+  REM Make sure we have a self-extracting user_aliases.cmd file
+  setlocal enabledelayedexpansion
+  if not exist "%user_aliases%" (
+      echo Creating initial user_aliases store in "%user_aliases%"...
+      copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
+  ) else (
+      type "%user_aliases%" | %WINDIR%\System32\findstr /i ";= Add aliases below here" >nul
+      if "!errorlevel!" == "1" (
+          echo Creating initial user_aliases store in "%user_aliases%"...
+          if defined CMDER_USER_CONFIG (
+              copy "%user_aliases%" "%user_aliases%.old_format"
+              copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
+          ) else (
+              copy "%user_aliases%" "%user_aliases%.old_format"
+              copy "%CMDER_ROOT%\vendor\user_aliases.cmd.default" "%user_aliases%"
+          )
+      )
+  )

-:: Update old 'user-aliases' to new self executing 'user-aliases.cmd'
-if exist "%CMDER_ROOT%\config\aliases" (
-  echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
-  type "%CMDER_ROOT%\config\aliases" >> "%user-aliases%" && del "%CMDER_ROOT%\config\aliases"
-) else if exist "%user-aliases%.old_format" (
-  echo Updating old "%user-aliases%" to new format...
-  type "%user-aliases%.old_format" >> "%user-aliases%" && del "%user-aliases%.old_format"
+  :: Update old 'user_aliases' to new self executing 'user_aliases.cmd'
+  if exist "%CMDER_ROOT%\config\aliases" (
+    echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
+    type "%CMDER_ROOT%\config\aliases" >> "%user_aliases%"
+    del "%CMDER_ROOT%\config\aliases"
+  ) else if exist "%user_aliases%.old_format" (
+    echo Updating old "%user_aliases%" to new format...
+    type "%user_aliases%.old_format" >> "%user_aliases%"
+    del "%user_aliases%.old_format"
+  )
+  endlocal
 )
-endlocal

 :: Add aliases to the environment
-call "%user-aliases%"
+call "%user_aliases%"

 :: See vendor\git-for-windows\README.portable for why we do this
 :: Basically we need to execute this post-install.bat because we are
 :: manually extracting the archive rather than executing the 7z sfx
 if exist "%GIT_INSTALL_ROOT%\post-install.bat" (
-    %lib_console% verbose-output "Running Git for Windows one time Post Install...."
+    echo Running Git for Windows one time Post Install....
    pushd "%GIT_INSTALL_ROOT%\"
-    "%GIT_INSTALL_ROOT%\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
+    "%GIT_INSTALL_ROOT%\git-cmd.exe" --no-needs-console --no-cd --command=post-install.bat
    popd
 )

 :: Set home path
 if not defined HOME set "HOME=%USERPROFILE%"
-%lib_console% debug-output init.bat "Env Var - HOME=%HOME%"
+%lib_console% debug_output init.bat "Env Var - HOME=%HOME%"

-set "initialConfig=%CMDER_ROOT%\config\user-profile.cmd"
-if exist "%CMDER_ROOT%\config\user-profile.cmd" (
+set "initialConfig=%CMDER_ROOT%\config\user_profile.cmd"
+if exist "%CMDER_ROOT%\config\user_profile.cmd" (
    REM Create this file and place your own command in there
-    call "%CMDER_ROOT%\config\user-profile.cmd"
+    %lib_console% debug_output init.bat "Calling - %CMDER_ROOT%\config\user_profile.cmd"
+    call "%CMDER_ROOT%\config\user_profile.cmd"
 )

 if defined CMDER_USER_CONFIG (
-  set "initialConfig=%CMDER_USER_CONFIG%\user-profile.cmd"
-  if exist "%CMDER_USER_CONFIG%\user-profile.cmd" (
+  set "initialConfig=%CMDER_USER_CONFIG%\user_profile.cmd"
+  if exist "%CMDER_USER_CONFIG%\user_profile.cmd" (
      REM Create this file and place your own command in there
-      call "%CMDER_USER_CONFIG%\user-profile.cmd"
+      %lib_console% debug_output init.bat "Calling - %CMDER_USER_CONFIG%\user_profile.cmd
+      call "%CMDER_USER_CONFIG%\user_profile.cmd"
  )
 )

 if not exist "%initialConfig%" (
    echo Creating user startup file: "%initialConfig%"
-    (
-echo :: use this file to run your own startup commands
-echo :: use  in front of the command to prevent printing the command
-echo.
-echo :: uncomment this to have the ssh agent load when cmder starts
-echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd"
-echo.
-echo :: uncomment this next two lines to use pageant as the ssh authentication agent
-echo :: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock
-echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-pageant.cmd"
-echo.
-echo :: you can add your plugins to the cmder path like so
-echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
-echo.
-echo @echo off
-) >"%initialConfig%"
+    copy "%CMDER_ROOT%\vendor\user_profile.cmd.default" "%initialConfig%"
+)
+
+if "%CMDER_ALIASES%" == "1" if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMDER_ROOT%\vendor\bin\alias.cmd" (
+  echo Cmder's 'alias' command has been moved into "%CMDER_ROOT%\vendor\bin\alias.cmd"
+  echo to get rid of this message either:
+  echo.
+  echo Delete the file "%CMDER_ROOT%\bin\alias.bat"
+  echo.
+  echo or
+  echo.
+  echo If you have customized it and want to continue using it instead of the included version
+  echo   * Rename "%CMDER_ROOT%\bin\alias.bat" to "%CMDER_ROOT%\bin\alias.cmd".
+  echo   * Search for 'user-aliases' and replace it with 'user_aliases'.
 )

 set initialConfig=
+set CMDER_CONFIGURED=1
+
+set CMDER_INIT_END=%time%
+
+if %time_init% gtr 0 (
+  "%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END%
+)
 exit /b
--- a/vendor/lib/lib_base.cmd
+++ b/vendor/lib/lib_base.cmd
@ -3,7 +3,7 @@
 set lib_base=call "%~dp0lib_base.cmd"

 if "%~1" == "/h" (
-    %lib_base% help "%0"
+    %lib_base% help "%~0"
 ) else if "%1" neq "" (
    call :%*
 )
@ -16,7 +16,7 @@ exit /b
 :::.
 :::include:
 :::.
-:::       call "$0"
+:::       call "lib_base.cmd"
 :::.
 :::usage:
 :::.
@ -27,12 +27,9 @@ exit /b
 :::       file <in> full path to file containing lib_routines to display
 :::.
 :::-------------------------------------------------------------------------------
-
-    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| findstr /i /r "^:::"') do (
+    for /f "tokens=* delims=:" %%a in ('type "%~1" ^| %WINDIR%\System32\findstr /i /r "^:::"') do (
        rem echo a="%%a"

-        if "%%a"==" " (
-            echo.
        if "%%a"=="." (
            echo.
        ) else if /i "%%a" == "usage" (
@ -46,3 +43,39 @@ exit /b

    pause
    exit /b
+
+:cmder_shell
+:::===============================================================================
+:::show_subs - shows all sub routines in a .bat/.cmd file with documentation
+:::.
+:::include:
+:::.
+:::       call "lib_base.cmd"
+:::.
+:::usage:
+:::.
+:::       %lib_base% cmder_shell
+:::.
+:::options:
+:::.
+:::       file <in> full path to file containing lib_routines to display
+:::.
+:::-------------------------------------------------------------------------------
+    echo %comspec% | %WINDIR%\System32\find /i "\cmd.exe" > nul && set "CMDER_SHELL=cmd"
+    echo %comspec% | %WINDIR%\System32\find /i "\tcc.exe" > nul && set "CMDER_SHELL=tcc"
+    echo %comspec% | %WINDIR%\System32\find /i "\tccle" > nul && set "CMDER_SHELL=tccle"
+
+    if not defined CMDER_CLINK (
+      set CMDER_CLINK=1
+      if "%CMDER_SHELL%" equ "tcc" set CMDER_CLINK=0
+      if "%CMDER_SHELL%" equ "tccle" set CMDER_CLINK=0
+    )
+
+
+    if not defined CMDER_ALIASES (
+      set CMDER_ALIASES=1
+      if "%CMDER_SHELL%" equ "tcc" set CMDER_ALIASES=0
+      if "%CMDER_SHELL%" equ "tccle" set CMDER_ALIASES=0
+    )
+
+    exit /b
--- a/vendor/lib/lib_console.cmd
+++ b/vendor/lib/lib_console.cmd
@ -1,44 +1,44 @@
@echo off

-rem set args=%*
+if "%fast_init%" == "1" exit /b

 call "%~dp0lib_base.cmd"
 set lib_console=call "%~dp0lib_console.cmd"

 if "%~1" == "/h" (
-    %lib_base% help "%0"
+    %lib_base% help "%~0"
 ) else if "%1" neq "" (
    call :%*
 )

 exit /b

-:debug-output
+:debug_output
 :::===============================================================================
-:::debug-output - Output a debug message to the console.
+:::debug_output - Output a debug message to the console.
 :::.
 :::include:
 :::.
-:::  call "$0"
+:::  call "lib_console.cmd"
 :::.
 :::usage:
 :::.
-:::  %lib_console% debug-output [caller] [message]
+:::  %lib_console% debug_output [caller] [message]
 :::.
 :::required:
 :::.
-:::  [caller]  <in> Script/sub routine name calling debug-output
+:::  [caller]  <in> Script/sub routine name calling debug_output
 :::.
 :::  [message] <in> Message text to display.
 :::.
 :::-------------------------------------------------------------------------------

-    if %debug-output% gtr 0 echo DEBUG(%~1): %~2 & echo.
+    if %debug_output% gtr 0 echo DEBUG(%~1): %~2 & echo.
    exit /b

-:verbose-output
+:verbose_output
 :::===============================================================================
-:::verbose-output - Output a debug message to the console.
+:::verbose_output - Output a debug message to the console.
 :::.
 :::include:
 :::.
@ -46,7 +46,7 @@ exit /b
 :::.
 :::usage:
 :::.
-:::  %lib_console% verbose-output "[message]"
+:::  %lib_console% verbose_output "[message]"
 :::.
 :::required:
 :::.
@ -54,7 +54,7 @@ exit /b
 :::.
 :::-------------------------------------------------------------------------------

-    if %verbose-output% gtr 0 echo %~1
+    if %verbose_output% gtr 0 echo %~1
    exit /b

 :show_error
--- a/vendor/lib/lib_git.cmd
+++ b/vendor/lib/lib_git.cmd
@ -1,13 +1,11 @@
@echo off

-
 call "%~dp0lib_base.cmd"
 call "%%~dp0lib_console.cmd"
 set lib_git=call "%~dp0lib_git.cmd"

-
 if "%~1" == "/h" (
-    %lib_base% help "%0"
+    %lib_base% help "%~0"
 ) else if "%1" neq "" (
    call :%*
 )
@ -20,7 +18,7 @@ exit /b
 :::.
 :::include:
 :::.
-:::  call "$0"
+:::  call "lib_git.cmd"
 :::.
 :::usage:
 :::.
@ -42,19 +40,19 @@ exit /b

    :: set the executable path
    set "git_executable=%~2\git.exe"
-    %lib_console% debug-output :read_version "Env Var - git_executable=%git_executable%"
+    %lib_console% debug_output :read_version "Env Var - git_executable=%git_executable%"

    :: check if the executable actually exists
    if not exist "%git_executable%" (
-        %lib_console% debug-output :read_version "%git_executable% does not exist."
+        %lib_console% debug_output :read_version "%git_executable% does not exist."
        exit /b -255
    )

    :: get the git version in the provided directory
    for /F "tokens=1,2,3 usebackq" %%A in (`"%git_executable%" --version 2^>nul`) do (
        if /i "%%A %%B" == "git version" (
-            set "GIT_VERSION_%~1=%%C"
-            %lib_console% debug-output :read_version "Env Var - GIT_VERSION_%~1=%%C"
+            set "GIT_VERSION=%%C"
+            %lib_console% debug_output :read_version "Env Var - GIT_VERSION_%~1=!GIT_VERSION!"
        ) else (
            %lib_console% show_error "git --version" returned an inproper version string!
            pause
@ -62,7 +60,7 @@ exit /b
        )
    )

-    endlocal & set GIT_VERSION%~1=!GIT_VERSION%~1!
+    endlocal & set "GIT_VERSION_%~1=%GIT_VERSION%"
    exit /b

 :parse_version
@ -90,8 +88,12 @@ exit /b
 :::  [SCOPE]_BUILD <out> Scoped Build version.
 :::-------------------------------------------------------------------------------

-    setlocal enabledelayedexpansion
    :: process a `x.x.x.xxxx.x` formatted string
+    set "%~1_MAJOR="
+    set "%~1_MINOR="
+    set "%~1_PATCH="
+    set "%~1_BUILD="
+    %lib_console% debug_output :parse_version "ARGV[1]=%~1, ARGV[2]=%~2"
    for /F "tokens=1-3* delims=.,-" %%A in ("%2") do (
        set "%~1_MAJOR=%%A"
        set "%~1_MINOR=%%B"
@ -99,7 +101,6 @@ exit /b
        set "%~1_BUILD=%%D"
    )

-    endlocal & set "%~1_MAJOR=!%~1_MAJOR!" & set "%~1_MINOR=!%~1_MINOR!" & set "%~1_PATCH=!%~1_PATCH!" & set "%~1_BUILD=!%~1_BUILD!"
    exit /b

 :validate_version
@ -121,10 +122,11 @@ exit /b
 :::-------------------------------------------------------------------------------

    :: now parse the version information into the corresponding variables
+    %lib_console% debug_output :validate_version "ARGV[1]=%~1, ARGV[2]=%~2"
    call :parse_version %~1 %~2

    :: ... and maybe display it, for debugging purposes.
-    %lib_console% debug-output :validate_version "Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!"
+    %lib_console% debug_output :validate_version "Found Git Version for %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!"
    exit /b

 :compare_versions
@ -148,9 +150,9 @@ exit /b
    :: checks all major, minor, patch and build variables for the given arguments.
    :: whichever binary that has the most recent version will be used based on the return code.

-    :: %lib_console% debug-output Comparing:
-    :: %lib_console% debug-output %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
-    :: %lib_console% debug-output %~2: !%~2_MAJOR!.!%~2_MINOR!.!%~2_PATCH!.!%~2_BUILD!
+    %lib_console% debug_output Comparing:
+    %lib_console% debug_output %~1: !%~1_MAJOR!.!%~1_MINOR!.!%~1_PATCH!.!%~1_BUILD!
+    %lib_console% debug_output %~2: !%~2_MAJOR!.!%~2_MINOR!.!%~2_PATCH!.!%~2_BUILD!

    if !%~1_MAJOR! GTR !%~2_MAJOR! (exit /b  1)
    if !%~1_MAJOR! LSS !%~2_MAJOR! (exit /b -1)
--- a/vendor/lib/lib_path.cmd
+++ b/vendor/lib/lib_path.cmd
@ -6,7 +6,7 @@ call "%%~dp0lib_console"
 set lib_path=call "%~dp0lib_path.cmd"

 if "%~1" == "/h" (
-    %lib_base% help "%0"
+    %lib_base% help "%~0"
 ) else if "%1" neq "" (
    call :%*
 )
@ -19,7 +19,7 @@ exit /b
 :::
 :::include:
 :::
-:::  call "$0"
+:::  call "lib_path.cmd"
 :::
 :::usage:
 :::
@ -52,35 +52,49 @@ exit /b
        set "position="
    )

+    if "%fast_init%" == "1" (
+      if "%position%" == "append" (
+        set "PATH=%PATH%;%add_path%"
+      ) else (
+        set "PATH=%add_path%;%PATH%"
+      )
+      goto :end_enhance_path
+    )
+
+    set found=0
    set "find_query=%add_path%"
    set "find_query=%find_query:\=\\%"
    set "find_query=%find_query: =\ %"
-    set found=0

-    %lib_console% debug-output  :enhance_path "Env Var - find_query=%find_query%"
-    echo "%PATH%"|findstr >nul /I /R ";%find_query%\"$"
-    if "!ERRORLEVEL!" == "0" set found=1
+    if "%CMDER_CONFIGURED%" == "1" (
+      %lib_console% debug_output  :enhance_path "Env Var - find_query=%find_query%"
+      echo "%path%"|%WINDIR%\System32\findstr >nul /I /R ";%find_query%\"$"
+      if "!ERRORLEVEL!" == "0" set found=1
+    )
+    %lib_console% debug_output  :enhance_path "Env Var 1 - found=!found!"

-    %lib_console% debug-output  :enhance_path "Env Var 1 - found=!found!"
    if "!found!" == "0" (
-        echo "%PATH%"|findstr >nul /i /r ";%find_query%;"
-        if "!ERRORLEVEL!" == "0" set found=1
-        %lib_console% debug-output  :enhance_path "Env Var 2 - found=!found!"
+        if "%CMDER_CONFIGURED%" == "1" (
+            echo "%path%"|%WINDIR%\System32\findstr >nul /i /r ";%find_query%;"
+            if "!ERRORLEVEL!" == "0" set found=1
+        )
+        %lib_console% debug_output  :enhance_path "Env Var 2 - found=!found!"
    )

    if "%found%" == "0" (
-        %lib_console% debug-output :enhance_path "BEFORE Env Var - PATH=!path!"
+        %lib_console% debug_output :enhance_path "BEFORE Env Var - PATH=!path!"
        if /i "%position%" == "append" (
-            %lib_console% debug-output :enhance_path "Appending '%add_path%'"
+            %lib_console% debug_output :enhance_path "Appending '%add_path%'"
            set "PATH=%PATH%;%add_path%"
        ) else (
-            %lib_console% debug-output :enhance_path "Prepending '%add_path%'"
+            %lib_console% debug_output :enhance_path "Prepending '%add_path%'"
            set "PATH=%add_path%;%PATH%"
        )

-        %lib_console% debug-output  :enhance_path "AFTER Env Var - PATH=!path!"
+        %lib_console% debug_output  :enhance_path "AFTER Env Var - PATH=!path!"
    )

+    :end_enhance_path
    endlocal & set "PATH=%PATH:;;=;%"
    exit /b

@ -111,7 +125,6 @@ exit /b
 :::.
 :::  path       <out> Sets the path env variable if required.
 :::-------------------------------------------------------------------------------
-
    setlocal enabledelayedexpansion
    if "%~1" neq "" (
        set "add_path=%~1"
@ -132,24 +145,30 @@ exit /b
        set "position="
    )

+    if "%fast_init%" == "1" (
+      call :enhance_path "%add_path%" %position%
+      goto :end_enhance_path_recursive
+    )
+
    if "%depth%" == "" set depth=0

-    %lib_console% debug-output  :enhance_path_recursive "Env Var - add_path=%add_path%"
-    %lib_console% debug-output  :enhance_path_recursive "Env Var - position=%position%"
-    %lib_console% debug-output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"
+    %lib_console% debug_output  :enhance_path_recursive "Env Var - add_path=%add_path%"
+    %lib_console% debug_output  :enhance_path_recursive "Env Var - position=%position%"
+    %lib_console% debug_output  :enhance_path_recursive "Env Var - max_depth=%max_depth%"

    if %max_depth% gtr !depth! (
-        %lib_console% debug-output :enhance_path_recursive "Adding parent directory - '%add_path%'"
+        %lib_console% debug_output :enhance_path_recursive "Adding parent directory - '%add_path%'"
        call :enhance_path "%add_path%" %position%
        set /a "depth=!depth!+1"

        for /d %%i in ("%add_path%\*") do (
-            %lib_console% debug-output  :enhance_path_recursive "Env Var BEFORE - depth=!depth!"
-            %lib_console% debug-output :enhance_path_recursive "Found Subdirectory - '%%~fi'"
+            %lib_console% debug_output  :enhance_path_recursive "Env Var BEFORE - depth=!depth!"
+            %lib_console% debug_output :enhance_path_recursive "Found Subdirectory - '%%~fi'"
            call :enhance_path_recursive "%%~fi" %max_depth% %position%
-            %lib_console% debug-output  :enhance_path_recursive "Env Var AFTER- depth=!depth!"
+            %lib_console% debug_output  :enhance_path_recursive "Env Var AFTER- depth=!depth!"
        )
    )

+    :end_enhance_path_recursive
    endlocal & set "PATH=%PATH%"
    exit /b
--- a/vendor/lib/lib_profile.cmd
+++ b/vendor/lib/lib_profile.cmd
@ -1,12 +1,11 @@
@echo off

-
 call "%~dp0lib_base.cmd"
 call "%%~dp0lib_console"
 set lib_profile=call "%~dp0lib_profile.cmd"

 if "%~1" == "/h" (
-    %lib_base% help "%0"
+    %lib_base% help "%~0"
 ) else if "%1" neq "" (
    call :%*
 )
@ -19,7 +18,7 @@ exit /b
 :::
 :::include:
 :::
-:::  call "$0"
+:::  call "lib_profile.cmd"
 :::
 :::usage:
 :::
@ -39,8 +38,9 @@ exit /b

  pushd "%~1"
  for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
-    %lib_console% verbose-output "Calling '%~1\%%x'..."
+    %lib_console% verbose_output "Calling '%~1\%%x'..."
    call "%~1\%%x"
  )
  popd
  exit /b
+
--- a/vendor/lib/start-ssh-agent.sh
+++ b/vendor/lib/start-ssh-agent.sh
@ -0,0 +1,22 @@
+# Copied from https://help.github.com/articles/working-with-ssh-key-passphrases
+env=~/.ssh/agent.env
+
+agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }
+
+agent_start () {
+    (umask 077; ssh-agent >| "$env")
+    . "$env" >| /dev/null ; }
+
+agent_load_env
+
+# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
+agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)
+
+if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
+    agent_start
+    ssh-add
+elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
+    ssh-add
+fi
+
+unset env
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -2,7 +2,7 @@
 # Created as part of cmder project

 # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
-# !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands
+# !!! Use "%CMDER_ROOT%\config\user_profile.ps1" to add your own startup commands

 # Compatibility with PS major versions <= 2
 if(!$PSScriptRoot) {
@ -25,13 +25,9 @@ if (! $ENV:CMDER_ROOT ) {
 # Remove trailing '\'
 $ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))

-# do not load bundled psget if a module installer is already available
+# Do not load bundled psget if a module installer is already available
 # -> recent PowerShell versions include PowerShellGet out of the box
-$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue | Out-Null)
-
-# do not load bundled psget if a module installer is already available
-# -> recent PowerShell versions include PowerShellGet out of the box
-$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue | Out-Null)
+$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue)

 # Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"
@ -40,26 +36,21 @@ if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderMod
    $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }

-try {
-    Get-command -Name "vim" -ErrorAction Stop >$null
-} catch {
-    # # You could do this but it may be a little drastic and introduce a lot of
-    # # unix tool overlap with powershel unix like aliases
-    # $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\usr\bin")
-    # set-alias -name "vi" -value "vim"
-    # # I think the below is safer.
+function Configure-Git($GIT_INSTALL_ROOT){
+  $env:Path += $(";" + $GIT_INSTALL_ROOT + "\cmd")

-    new-alias -name "vim" -value $($ENV:CMDER_ROOT + "\vendor\git-for-windows\usr\bin\vim.exe")
-    new-alias -name "vi" -value vim
-}
+  # Add "$GIT_INSTALL_ROOT\usr\bin" to the path if exists and not done already
+  $GIT_INSTALL_ROOT_ESC=$GIT_INSTALL_ROOT.replace('\','\\')
+  if ((test-path "$GIT_INSTALL_ROOT\usr\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\usr\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\usr\bin"
+  }
  
-try {
-    # Check if git is on PATH, i.e. Git already installed on system
-    Get-command -Name "git" -ErrorAction Stop >$null
-} catch {
-    $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\cmd")
-    # for bash.exe, which in the cmd version is found as <GIT>\usr\bin\bash.exe
-    $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\bin")
+  # Add "$GIT_INSTALL_ROOT\mingw[32|64]\bin" to the path if exists and not done already
+  if ((test-path "$GIT_INSTALL_ROOT\mingw32\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw32\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw32\bin"
+  } elseif ((test-path "$GIT_INSTALL_ROOT\mingw64\bin") -and -not ($env:path -match "$GIT_INSTALL_ROOT_ESC\\mingw64\\bin")) {
+      $env:path = "$env:path;$GIT_INSTALL_ROOT\mingw64\bin"
+  }
 }

 $gitLoaded = $false
@ -88,42 +79,25 @@ function checkGit($Path) {
    }
 }

+try {
+    # Check if git is on PATH, i.e. Git already installed on system
+    Get-command -Name "git" -ErrorAction Stop >$null
+} catch {
+    if (test-path "$env:CMDER_ROOT\vendor\git-for-windows") {
+        Configure-Git "$env:CMDER_ROOT\vendor\git-for-windows"
+    }
+}
+
+if ( Get-command -Name "vim" -ErrorAction silentlycontinue) {
+    new-alias -name "vi" -value vim
+}
+
 if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
    Set-PSReadlineOption -ExtraPromptLineCount 1
 }

 # Enhance Path
-$env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT"
-
-#
-# Prompt Section
-#   Users should modify their user-profile.ps1 as it will be safe from updates.
-#
-
-# Pre assign the hooks so the first run of cmder gets a working prompt.
-[ScriptBlock]$PrePrompt = {}
-[ScriptBlock]$PostPrompt = {}
-[ScriptBlock]$CmderPrompt = {
-    $Host.UI.RawUI.ForegroundColor = "White"
-    Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
-    checkGit($pwd.ProviderPath)
-}
-
-<#
-This scriptblock runs every time the prompt is returned.
-Explicitly use functions from MS namespace to protect from being overridden in the user session.
-Custom prompt functions are loaded in as constants to get the same behaviour
-#>
-[ScriptBlock]$Prompt = {
-    $realLASTEXITCODE = $LASTEXITCODE
-    $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
-    PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
-    CmderPrompt
-    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
-    PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
-    $global:LASTEXITCODE = $realLASTEXITCODE
-    return " "
-}
+$env:Path = "$Env:CMDER_ROOT\bin;$Env:CMDER_ROOT\vendor\bin;$env:Path;$Env:CMDER_ROOT"

 # Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
 # to source them at startup.
@ -132,6 +106,11 @@ if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
 }

 pushd $ENV:CMDER_ROOT\config\profile.d
+foreach ($x in Get-ChildItem *.psm1) {
+  # write-host write-host Sourcing $x
+  Import-Module $x
+}
+
 foreach ($x in Get-ChildItem *.ps1) {
  # write-host write-host Sourcing $x
  . $x
@ -142,6 +121,11 @@ popd
 # to source them at startup.  Requires using cmder.exe /C [cmder_user_root_path] argument
 if ($ENV:CMDER_USER_CONFIG -ne "" -and (test-path "$ENV:CMDER_USER_CONFIG\profile.d")) {
    pushd $ENV:CMDER_USER_CONFIG\profile.d
+    foreach ($x in Get-ChildItem *.psm1) {
+      # write-host write-host Sourcing $x
+      Import-Module $x
+    }
+
    foreach ($x in Get-ChildItem *.ps1) {
      # write-host write-host Sourcing $x
      . $x
@ -149,64 +133,84 @@ if ($ENV:CMDER_USER_CONFIG -ne "" -and (test-path "$ENV:CMDER_USER_CONFIG\profil
    popd
 }

+# Renaming to "config\user_profile.ps1" to "user_profile.ps1" for consistency.
+if (test-path "$env:CMDER_ROOT\config\user-profile.ps1") {
+  rename-item  "$env:CMDER_ROOT\config\user-profile.ps1" user_profile.ps1
+}

-
-$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user-profile.ps1"
+$CmderUserProfilePath = Join-Path $env:CMDER_ROOT "config\user_profile.ps1"
 if (Test-Path $CmderUserProfilePath) {
    # Create this file and place your own command in there.
-    . "$CmderUserProfilePath"
-
+    . "$CmderUserProfilePath" # user_profile.ps1 is not a module DO NOT USE import-module
 }

 if ($ENV:CMDER_USER_CONFIG) {
-    $CmderUserProfilePath = Join-Path $ENV:CMDER_USER_CONFIG "user-profile.ps1"
+    # Renaming to "$env:CMDER_USER_CONFIG\user-profile.ps1" to "user_profile.ps1" for consistency.
+    if (test-path "$env:CMDER_USER_CONFIG\user-profile.ps1") {
+      rename-item  "$env:CMDER_USER_CONFIG\user-profile.ps1" user_profile.ps1
+    }
+
+    $env:Path = "$Env:CMDER_USER_CONFIG\bin;$env:Path"
+
+    $CmderUserProfilePath = Join-Path $ENV:CMDER_USER_CONFIG "user_profile.ps1"
+    if (Test-Path $CmderUserProfilePath) {
+      . "$CmderUserProfilePath" # user_profile.ps1 is not a module DO NOT USE import-module
+    }
 }

-if (Test-Path $CmderUserProfilePath) {
-    . "$CmderUserProfilePath"
-} else {
-# This multiline string cannot be indented, for this reason I've not indented the whole block
-
-Write-Host -BackgroundColor Darkgreen -ForegroundColor White "First Run: Creating user startup file: $CmderUserProfilePath"
-
-$UserProfileTemplate = @'
-# Use this file to run your own startup commands
-
-## Prompt Customization
-<#
-.SYNTAX
-    <PrePrompt><CMDER DEFAULT>
-    λ <PostPrompt> <repl input>
-.EXAMPLE
-    <PrePrompt>N:\Documents\src\cmder [master]
-    λ <PostPrompt> |
-#>
-
-[ScriptBlock]$PrePrompt = {
-
+if (! (Test-Path $CmderUserProfilePath) ) {
+    Write-Host -BackgroundColor Darkgreen -ForegroundColor White "First Run: Creating user startup file: $CmderUserProfilePath"
+    Copy-Item "$env:CMDER_ROOT\vendor\user_profile.ps1.default" -Destination $CmderUserProfilePath
 }

-# Replace the cmder prompt entirely with this.
-# [ScriptBlock]$CmderPrompt = {}
+#
+# Prompt Section
+#   Users should modify their user_profile.ps1 as it will be safe from updates.
+#

-[ScriptBlock]$PostPrompt = {
+# Only set the prompt if it is currently set to the default
+# This allows users to configure the prompt in their user_profile.ps1 or config\profile.d\*.ps1
+if ( $(get-command prompt).Definition -match 'PS \$\(\$executionContext.SessionState.Path.CurrentLocation\)\$\(' -and `
+  $(get-command prompt).Definition -match '\(\$nestedPromptLevel \+ 1\)\) ";') {
+  # Pre assign the hooks so the first run of cmder gets a working prompt.
+  [ScriptBlock]$PrePrompt = {}
+  [ScriptBlock]$PostPrompt = {}
+  [ScriptBlock]$CmderPrompt = {
+      $Host.UI.RawUI.ForegroundColor = "White"
+      Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
+      if (get-command git -erroraction silentlycontinue) {
+          checkGit($pwd.ProviderPath)
+      }
+  }

+  <#
+  This scriptblock runs every time the prompt is returned.
+  Explicitly use functions from MS namespace to protect from being overridden in the user session.
+  Custom prompt functions are loaded in as constants to get the same behaviour
+  #>
+  [ScriptBlock]$Prompt = {
+      $realLASTEXITCODE = $LASTEXITCODE
+      $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
+      PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+      CmderPrompt
+      Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
+      PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+      $global:LASTEXITCODE = $realLASTEXITCODE
+      return " "
+  }
+
+
+  # Once Created these code blocks cannot be overwritten
+  # if (-not $(get-command PrePrompt).Options -match 'Constant') {Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant}
+  # if (-not $(get-command CmderPrompt).Options -match 'Constant') {Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant}
+  # if (-not $(get-command PostPrompt).Options -match 'Constant') {Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant}
+
+  Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant
+  Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant
+  Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant
+
+  # Functions can be made constant only at creation time
+  # ReadOnly at least requires `-force` to be overwritten
+  # if (!$(get-command Prompt).Options -match 'ReadOnly') {Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly}
+  Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
 }
-
-## <Continue to add your own>
-
-
-'@
-
-New-Item -ItemType File -Path $CmderUserProfilePath -Value $UserProfileTemplate > $null
-
-}
-
-# Once Created these code blocks cannot be overwritten
-Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant
-Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant
-Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant
-
-# Functions can be made constant only at creation time
-# ReadOnly at least requires `-force` to be overwritten
-Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
--- a/vendor/sources.json
+++ b/vendor/sources.json
@ -1,8 +1,8 @@
 [
    {
        "name": "git-for-windows",
-        "version": "v2.17.1.windows.2",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.17.1.windows.2/PortableGit-2.17.1.2-64-bit.7z.exe"
+        "version": "v2.21.0.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-64-bit.7z.exe"
    },
    {
        "name": "clink",
@ -11,8 +11,8 @@
    },
    {
        "name": "conemu-maximus5",
-        "version": "180528",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.05.28/ConEmuPack.180528.7z"
+        "version": "180626",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v18.06.26/ConEmuPack.180626.7z"
    },
    {
        "name": "clink-completions",
--- a/vendor/user_aliases.cmd.default
+++ b/vendor/user_aliases.cmd.default
@ -9,7 +9,7 @@ gl=git log --oneline --all --graph --decorate  $*
 ls=ls --show-control-chars -F --color $*
 pwd=cd
 clear=cls
-history=cat "%CMDER_ROOT%\config\.history"
+history=cat -n "%CMDER_ROOT%\config\.history"
 unalias=alias /d $1
 vi=vim $*
 cmderr=cd /d "%CMDER_ROOT%"
--- a/vendor/user_profile.cmd.default
+++ b/vendor/user_profile.cmd.default
@ -0,0 +1,19 @@
+:: use this file to run your own startup commands
+:: use in front of the command to prevent printing the command
+
+:: uncomment this to have the ssh agent load when cmder starts
+:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-agent.cmd" /k exit
+
+:: uncomment the next two lines to use pageant as the ssh authentication agent
+:: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock
+:: call "%GIT_INSTALL_ROOT%/cmd/start-ssh-pageant.cmd"
+
+:: you can add your plugins to the cmder path like so
+:: set "PATH=%CMDER_ROOT%\vendor\whatever;%PATH%"
+
+:: arguments in this batch are passed from init.bat, you can quickly parse them like so:
+:: more useage can be seen by typing "cexec /?"
+
+:: %ccall% "/customOption" "command/program"
+
+@echo off
--- a/vendor/user_profile.ps1.default
+++ b/vendor/user_profile.ps1.default
@ -0,0 +1,41 @@
+# Use this file to run your own startup commands
+
+## Prompt Customization
+<#
+.SYNTAX
+    <PrePrompt><CMDER DEFAULT>
+    λ <PostPrompt> <repl input>
+.EXAMPLE
+    <PrePrompt>N:\Documents\src\cmder [master]
+    λ <PostPrompt> |
+#>
+
+[ScriptBlock]$PrePrompt = {
+
+}
+
+# Replace the cmder prompt entirely with this.
+# [ScriptBlock]$CmderPrompt = {}
+
+[ScriptBlock]$PostPrompt = {
+
+}
+
+## <Continue to add your own>
+
+# # Delete default powershell aliases that conflict with bash commands
+# if (get-command git) {
+#     del -force alias:cat
+#     del -force alias:clear
+#     del -force alias:cp
+#     del -force alias:diff
+#     del -force alias:echo
+#     del -force alias:kill
+#     del -force alias:ls
+#     del -force alias:mv
+#     del -force alias:ps
+#     del -force alias:pwd
+#     del -force alias:rm
+#     del -force alias:sleep
+#     del -force alias:tee
+# }
--- a/vendor/user_profile.sh.default
+++ b/vendor/user_profile.sh.default
@ -0,0 +1,7 @@
+# use this file to run your own startup commands for msys2 bash'
+
+# To add a new vendor to the path, do something like:
+# export PATH=${CMDER_ROOT}/vendor/whatever:${PATH}
+
+# Uncomment this to have the ssh agent load with the first bash terminal
+# . "${CMDER_ROOT}/vendor/lib/start-ssh-agent.sh"