diff --git a/.gitignore b/.gitignore
index 67678bb..771fd1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ vendor/*/*
 !vendor/lib/*
 !vendor/*
 !vendor/psmodules/*
+vendor/git-for-windows
 
 config/*
 !config/Readme.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d2fdb..26aeaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 ### Changes
 
 - Update Git for Windows to 2.31.1
-- Update to Clink 1.2.5
+- Update to Clink 1.2.26
+- Update to Conemu 210718
 - Do not rely on having a `%cmder_root%\config\cmder_prompt_config.lua`
 
 ### Adds
diff --git a/vendor/git-for-windows_1.29.1 b/vendor/git-for-windows_1.29.1
new file mode 120000
index 0000000..5f898e1
--- /dev/null
+++ b/vendor/git-for-windows_1.29.1
@@ -0,0 +1 @@
+../../../dtgam/bin/git-2.29.0
\ No newline at end of file
diff --git a/vendor/sources.json b/vendor/sources.json
index d7fd186..b7f55a2 100644
--- a/vendor/sources.json
+++ b/vendor/sources.json
@@ -6,13 +6,13 @@
     },
     {
         "name": "clink",
-        "version": "1.2.22",
-        "url": "https://github.com/chrisant996/clink/releases/download/v1.2.22/clink.1.2.22.890a84.zip"
+        "version": "1.2.26",
+        "url": "https://github.com/chrisant996/clink/releases/download/v1.2.26/clink.1.2.26.3dc58b.zip"
     },
     {
         "name": "conemu-maximus5",
-        "version": "210304",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v21.03.04/ConEmuPack.210304.7z"
+        "version": "210718",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v21.07.18/ConEmuPack.210718.7z"
     },
     {
         "name": "clink-completions",