diff --git a/.gitmodules b/.gitmodules
index 08c639e..952630c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -112,6 +112,9 @@
 [submodule "with-editor"]
 	path = lib/with-editor
 	url = git@github.com:magit/with-editor.git
+[submodule "yaml"]
+	path = lib/yaml
+	url = git@github.com:zkry/yaml.el.git
 [submodule "yaml-mode"]
 	path = lib/yaml-mode
 	url = git@github.com:yoshiki/yaml-mode.git
diff --git a/init.el b/init.el
index a5560aa..a6cc6bf 100644
--- a/init.el
+++ b/init.el
@@ -149,15 +149,18 @@
 (use-package magit
   :defer t
   :commands (magit-add-section-hook)
-  :init
+  ;;
+  ;; Key bindings
+  :bind (("C-c g" . magit-dispatch)
+         ("C-c f" . magit-file-dispatch))
   ;;
   ;; Margin settings
+  :init
   (setq magit-log-margin '(nil age magit-log-margin-width nil 15))
   (setq magit-refs-margin-for-tags t)
-  :config
-  (define-key magit-file-mode-map (kbd "C-c g") 'magit-file-dispatch)
   ;;
   ;; Disable safety nets
+  :config
   (setq magit-commit-squash-confirm nil)
   (setq magit-save-repository-buffers 'dontask)
   (setf (nth 2 (assq 'magit-stash-pop  magit-dwim-selection)) t)
@@ -179,13 +182,10 @@
   (add-to-list 'magit-repository-directories (cons "~/.emacs.d/" 0))
   (add-to-list 'magit-repository-directories (cons "~/.emacs.d/lib/" 1))
   ;;
-  ;; Commit settings
-  (setq magit-commit-extend-override-date nil)
-  (setq magit-commit-reword-override-date nil)
-  ;;
   ;; Branch settings
   (setq magit-branch-adjust-remote-upstream-alist
-        '(("master" "master" "next" "maint")))
+        '(("main"   . ("main" "master" "next" "maint"))
+          ("master" . ("main" "master" "next" "maint"))))
   ;;
   ;; Push settings
   (setq magit-push-current-set-remote-if-missing 'default)
diff --git a/lib/forge b/lib/forge
index b7ed932..9e7d683 160000
--- a/lib/forge
+++ b/lib/forge
@@ -1 +1 @@
-Subproject commit b7ed932fdd40d7443fb13a1206d15cfa9f6f2b52
+Subproject commit 9e7d6835b7eb3283eee84998de99af38cd9a2028
diff --git a/lib/ghub b/lib/ghub
index 5fae5e3..00a77b7 160000
--- a/lib/ghub
+++ b/lib/ghub
@@ -1 +1 @@
-Subproject commit 5fae5e31586a11a2025168030e0eb3876502611c
+Subproject commit 00a77b79c28e22db1b151c3f7857073ccbeff726
diff --git a/lib/libgit b/lib/libgit
index 0ef8b13..77bd28a 160000
--- a/lib/libgit
+++ b/lib/libgit
@@ -1 +1 @@
-Subproject commit 0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a
+Subproject commit 77bd28aeaa2a49962e8f714741f5a69b656a2183
diff --git a/lib/magit-imerge b/lib/magit-imerge
index f4b88f0..cf3b464 160000
--- a/lib/magit-imerge
+++ b/lib/magit-imerge
@@ -1 +1 @@
-Subproject commit f4b88f0c127faa154f138907bf4e98b1baf12fb6
+Subproject commit cf3b4646aa0205e8d7f47e45165fe6403d6440f5
diff --git a/lib/magit-tbdiff b/lib/magit-tbdiff
index e52e8ab..fef1b77 160000
--- a/lib/magit-tbdiff
+++ b/lib/magit-tbdiff
@@ -1 +1 @@
-Subproject commit e52e8ab4906996c410f6c6db890b9bfe0951d4ce
+Subproject commit fef1b7772fe192c434089b67644ff93765e384d4
diff --git a/lib/markdown-mode b/lib/markdown-mode
index 779a4c6..4810cac 160000
--- a/lib/markdown-mode
+++ b/lib/markdown-mode
@@ -1 +1 @@
-Subproject commit 779a4c637719f5a192c128ed60ecffed3ff1760c
+Subproject commit 4810cac10355310ec76cd0946d0af92d595b3b81
diff --git a/lib/orgit b/lib/orgit
index ac9b1a4..f956d80 160000
--- a/lib/orgit
+++ b/lib/orgit
@@ -1 +1 @@
-Subproject commit ac9b1a42863a864fde9d225890ef5464bffdc646
+Subproject commit f956d802f19ea495efa95af6c673588afeb3adc5
diff --git a/lib/yaml b/lib/yaml
new file mode 160000
index 0000000..84b88c9
--- /dev/null
+++ b/lib/yaml
@@ -0,0 +1 @@
+Subproject commit 84b88c9ed178af16da18b230c1f61c57cefedf28