diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..7039f29
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,2 @@
+((git-commit-mode
+  (git-commit-major-mode . git-commit-elisp-text-mode)))
diff --git a/.gitmodules b/.gitmodules
index 34cd876..3262351 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [borg]
 	pushDefault = locutus
 	collective = emacsg
-[submodule "apiwrap"]
-	path = lib/apiwrap
-	url = git@github.com:vermiculus/apiwrap.el.git
 [submodule "auto-compile"]
 	path = lib/auto-compile
 	url = git@github.com:emacscollective/auto-compile.git
@@ -33,12 +30,12 @@
 [submodule "fill-column-indicator"]
 	path = lib/fill-column-indicator
 	url = git@github.com:alpaker/Fill-Column-Indicator.git
+[submodule "forge"]
+	path = lib/forge
+	url = git@github.com:magit/forge.git
 [submodule "ghub"]
 	path = lib/ghub
 	url = git@github.com:magit/ghub.git
-[submodule "ghub+"]
-	path = lib/ghub+
-	url = git@github.com:vermiculus/ghub-plus.git
 [submodule "git-modes"]
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
@@ -65,9 +62,6 @@
 [submodule "magit-tbdiff"]
 	path = lib/magit-tbdiff
 	url = git@github.com:magit/magit-tbdiff.git
-[submodule "magithub"]
-	path = lib/magithub
-	url = git@github.com:vermiculus/magithub.git
 [submodule "markdown-mode"]
 	path = lib/markdown-mode
 	url = git@github.com:jrblevin/markdown-mode.git
@@ -101,9 +95,6 @@
 [submodule "rainbow-mode"]
 	path = lib/rainbow-mode
 	url = git@github.com:emacsmirror/rainbow-mode.git
-[submodule "s"]
-	path = lib/s
-	url = git@github.com:magnars/s.el.git
 [submodule "treepy"]
 	path = lib/treepy
 	url = git@github.com:volrath/treepy.el.git
diff --git a/init.el b/init.el
index 21539b7..9b0e389 100644
--- a/init.el
+++ b/init.el
@@ -81,6 +81,9 @@
   (global-diff-hl-mode)
   (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
 
+(use-package diff-hl-flydiff
+  :config (diff-hl-flydiff-mode))
+
 (use-package dim-autoload
   :config (global-dim-autoload-cookies-mode))
 
@@ -103,6 +106,9 @@
   (add-hook 'emacs-lisp-mode-hook 'fci-mode)
   (add-hook 'git-commit-setup-hook 'fci-mode))
 
+(use-package forge
+  :after magit)
+
 (use-package git-commit
   :defer t
   :config
@@ -215,15 +221,7 @@
 
 (use-package magit-wip
   :after magit
-  :config
-  (magit-wip-before-change-mode)
-  (magit-wip-after-apply-mode)
-  (magit-wip-after-save-mode))
-
-(use-package magithub
-  :after magit
-  :config
-  (magithub-feature-autoinject t))
+  :config (magit-wip-mode))
 
 (use-package man
   :defer t
diff --git a/lib/apiwrap b/lib/apiwrap
deleted file mode 160000
index e4c9c57..0000000
--- a/lib/apiwrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e4c9c57d6620a788ec8a715ff1bb50542edea3a6
diff --git a/lib/forge b/lib/forge
new file mode 160000
index 0000000..fd33db0
--- /dev/null
+++ b/lib/forge
@@ -0,0 +1 @@
+Subproject commit fd33db0bc72c45af4321e8aca7c3e10174a676dd
diff --git a/lib/ghub+ b/lib/ghub+
deleted file mode 160000
index 51ebffe..0000000
--- a/lib/ghub+
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51ebffe549286b3c0b0565a373f44f4d64fc57af
diff --git a/lib/magithub b/lib/magithub
deleted file mode 160000
index 9d48e74..0000000
--- a/lib/magithub
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d48e74e4ee490ac0e808605b29c01527657af86
diff --git a/lib/s b/lib/s
deleted file mode 160000
index 03410e6..0000000
--- a/lib/s
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03410e6a7a2b11e47e1fea3b7d9899c7df26435e