diff --git a/init.el b/init.el
index 6ebd89b..4d39ad4 100644
--- a/init.el
+++ b/init.el
@@ -203,25 +203,21 @@
                           'replace)
   ;;
   ;; Diff buffer settings
-  (setq magit-diff-refine-hunk 'all)
-  ;;
-  ;; Load extensions
-  (require 'magit-rockstar)
-  (require 'magit-wip))
+  (setq magit-diff-refine-hunk 'all))
 
 (use-package magit-rockstar
-  :defer t
+  :after magit
   :functions (magit-define-popup-action)
   :config
   (magit-define-popup-action 'magit-commit-popup
     ?n "Reshelve" 'magit-reshelve)
   (magit-define-popup-action 'magit-rebase-popup
     ?R "Rockstar" 'magit-rockstar)
-  (magit-define-popup-action 'magit-pull-and-fetch-popup
-    ?P "pull request" 'magit-branch-pull-request))
+  (magit-define-popup-action 'magit-branch-popup
+    ?p "Create from pull-request" 'magit-branch-pull-request))
 
 (use-package magit-wip
-  :defer t
+  :after magit
   :config
   (magit-wip-before-change-mode)
   (magit-wip-after-apply-mode)
diff --git a/lib/magit-rockstar b/lib/magit-rockstar
index bccce1a..9261f70 160000
--- a/lib/magit-rockstar
+++ b/lib/magit-rockstar
@@ -1 +1 @@
-Subproject commit bccce1ac8e012f52e29470c1c7d815f9bb1a192b
+Subproject commit 9261f70d72dae21ec1ba63a96b6903f9cf30ad50
diff --git a/lib/orgit b/lib/orgit
index cbce587..c91e662 160000
--- a/lib/orgit
+++ b/lib/orgit
@@ -1 +1 @@
-Subproject commit cbce5871fe267fef725631b0b7365952c35ae401
+Subproject commit c91e662ace7e3ce992269cbf755f378bc6742511