diff --git a/init.el b/init.el
index d08eb0c..d1c0078 100644
--- a/init.el
+++ b/init.el
@@ -99,6 +99,7 @@
   :config (setq dired-listing-switches "-alh"))
 
 (use-package eldoc
+  :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
 
 (use-package help
@@ -144,6 +145,7 @@
   :config (savehist-mode))
 
 (use-package saveplace
+  :when (version< "25" emacs-version)
   :config (save-place-mode))
 
 (use-package simple
diff --git a/lib/borg b/lib/borg
index 362ae8a..593314b 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit 362ae8aebc69aab81e04427d221717dd6bc1a81d
+Subproject commit 593314b8f1f4542155eb4dae0ff1be375895b83d
diff --git a/lib/dash b/lib/dash
index 528e5a5..c1991d4 160000
--- a/lib/dash
+++ b/lib/dash
@@ -1 +1 @@
-Subproject commit 528e5a51f1af668e3075f2beccd2b39785ccb2ba
+Subproject commit c1991d4c22f356be21df6b3badd7233a94df7937
diff --git a/lib/diff-hl b/lib/diff-hl
index bec9889..9ef21e4 160000
--- a/lib/diff-hl
+++ b/lib/diff-hl
@@ -1 +1 @@
-Subproject commit bec9889de7bf48d28826039880cec9bfad24a628
+Subproject commit 9ef21e4ea2389545417741e20a89d92bfd72d6ff
diff --git a/lib/emacsql b/lib/emacsql
index 616dde3..62d3915 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit 616dde37524f47246bbb161f20d3f5f090f10fbf
+Subproject commit 62d39157370219a1680265fa593f90ccd51457da
diff --git a/lib/ghub b/lib/ghub
index 2962611..f1b647f 160000
--- a/lib/ghub
+++ b/lib/ghub
@@ -1 +1 @@
-Subproject commit 2962611aad56a0f1586383b3e4ba6a65508a3991
+Subproject commit f1b647faf5ce5f033728236b9263e7ecee8f536f
diff --git a/lib/magit b/lib/magit
index 24ce908..4e63708 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit 24ce90832ddff0db86581c1b7e947e83a13fe83e
+Subproject commit 4e637088f297639ac740fc8aa662610958ad38ce
diff --git a/lib/magit-popup b/lib/magit-popup
index 5a2a6f2..ab75385 160000
--- a/lib/magit-popup
+++ b/lib/magit-popup
@@ -1 +1 @@
-Subproject commit 5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2
+Subproject commit ab75385a1fb8c0fba0769d448b13ba8324835261
diff --git a/lib/use-package b/lib/use-package
index 05a4033..8ecb0f1 160000
--- a/lib/use-package
+++ b/lib/use-package
@@ -1 +1 @@
-Subproject commit 05a4033b830bf52c596ceedea10b2cbd91f85fdb
+Subproject commit 8ecb0f1c56eaeb04213b476866eaa6939f735a61