diff --git a/custom.el b/custom.el
index 078ec1d..8af7555 100644
--- a/custom.el
+++ b/custom.el
@@ -30,9 +30,9 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-    (ace-window winum spaceline powerline use-package kv lispy ibuffer-vc ag string-inflection tiny powershell diffview ivy-hydra php-mode swiper mode-line-bell htmlize cython-mode blacken dired-narrow lua-mode browse-kill-ring clipmon free-keys org-link-minor-mode js2-mode js2-refactor xref-js2 python-django visual-regexp-steroids pcre2el vimrc-mode iedit transient magit dracula-theme flycheck elpy ein better-defaults ssh-config-mode yaml-mode apache-mode web-mode undo-tree)))
+    (ace-window winum spaceline use-package kv lispy ibuffer-vc ag string-inflection tiny powershell diffview ivy-hydra php-mode swiper mode-line-bell htmlize cython-mode blacken dired-narrow lua-mode browse-kill-ring clipmon free-keys org-link-minor-mode js2-mode js2-refactor xref-js2 python-django visual-regexp-steroids pcre2el vimrc-mode iedit transient magit dracula-theme flycheck elpy ein better-defaults ssh-config-mode yaml-mode apache-mode web-mode undo-tree)))
  '(reb-re-syntax (quote string))
- '(tramp-use-ssh-controlmaster-options nil nil (tramp)))
+ '(tramp-use-ssh-controlmaster-options nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/settings.org b/settings.org
index c51917b..f04c1f8 100644
--- a/settings.org
+++ b/settings.org
@@ -101,26 +101,29 @@
 * Tramp configuration
 ** Tramp append plist to connection properties
 #+BEGIN_SRC emacs-lisp
-(require 'kv)
-(defun rlbr/add-config-to-tramp (matches-regexp config-plist)
-  (let ((config-alist (kvplist->alist config-plist)))
-    (dolist (pair config-alist)
-      (let ((config (list
-		     matches-regexp
-		     (car pair)
-		     (cdr pair))))
-	(add-to-list
-	 'tramp-connection-properties
-	 config)))))
+  (use-package kv
+    :config
+    (defun rlbr/add-config-to-tramp (matches-regexp config-plist)
+      (let ((config-alist (kvplist->alist config-plist)))
+	(dolist (pair config-alist)
+	  (let ((config (list
+			 matches-regexp
+			 (car pair)
+			 (cdr pair))))
+	    (add-to-list
+	     'tramp-connection-properties
+	     config))))))
 #+END_SRC
 ** Android
 #+BEGIN_SRC emacs-lisp
-(let ((android-config (let ((default-directory "/data/data/com.termux/files"))
-			(list "tmpdir" (expand-file-name "home/temp/")
-			      "remote-shell" (expand-file-name "usr/bin/sh")
-			      "remote-process-environment" (append (list (concat "PREFIX=" default-directory "usr")) tramp-remote-process-environment)
-			      "remote-path" (append (mapcar 'expand-file-name '("home/.local/bin" "usr/bin" "usr/bin/applets")) '("/sbin" "/vendor/bin" "/system/sbin" "/system/bin" "/system/xbin"))))))
-  (rlbr/add-config-to-tramp "/ssh:termux.*:" android-config))
+  (use-package tramp
+    :config
+    (let ((android-config (let ((default-directory "/data/data/com.termux/files"))
+					     (list "tmpdir" (expand-file-name "home/temp/")
+						   "remote-shell" (expand-file-name "usr/bin/sh")
+						   "remote-process-environment" (append (list (concat "PREFIX=" default-directory "usr")) tramp-remote-process-environment)
+						   "remote-path" (append (mapcar 'expand-file-name '("home/.local/bin" "usr/bin" "usr/bin/applets")) '("/sbin" "/vendor/bin" "/system/sbin" "/system/bin" "/system/xbin"))))))
+		       (rlbr/add-config-to-tramp "/ssh:termux.*:" android-config)))
 #+END_SRC
 * Major modes
 ** Java