diff --git a/.emacs.d/lisp/init-evil-transmission.el b/.emacs.d/lisp/init-evil-transmission.el
index cf11c312..0ade1c90 100644
--- a/.emacs.d/lisp/init-evil-transmission.el
+++ b/.emacs.d/lisp/init-evil-transmission.el
@@ -2,6 +2,7 @@
 
 (evil-set-initial-state 'transmission-mode 'motion)
 (evil-define-key 'motion transmission-mode-map
+  ;; motion
   (kbd "SPC") 'scroll-up-command
   (kbd "S-SPC") 'scroll-down-command
   (kbd "<delete>") 'scroll-down-command
@@ -9,21 +10,20 @@
   ;; sort
   "s" 'tabulated-list-sort
 
-  ;; "D" 'transmission-delete ; TODO: useless with `transmission-remove'?
-  "a" 'transmission-add
-  "p" 'transmission-move
-  "d" 'transmission-remove
-
   (kbd "<return>") 'transmission-files
-  "e" 'transmission-peers
+  "p" 'transmission-peers
   "i" 'transmission-info
 
-  "x" 'transmission-toggle ; TODO: Match EMMS' pause.
-  "A" 'transmission-trackers-add
-  "c" 'transmission-verify
+  "a" 'transmission-add
+  ;; "D" 'transmission-delete ; Useless with `transmission-remove'?
+  "p" 'transmission-move
+  "d" 'transmission-remove
+  "x" 'transmission-toggle ; EMMS has "x" for pause.
+  "t" 'transmission-trackers-add
+  "c" 'transmission-verify ; "c" for "[c]heck".
   "D" 'transmission-set-download
   "U" 'transmission-set-upload
-  "R" 'transmission-set-ratio
+  "S" 'transmission-set-ratio ; "S" for "[S]eed"
   "P" 'transmission-set-bandwidth-priority
 
   ;; mark
@@ -36,7 +36,7 @@
 
   ;; quit
   "q" 'transmission-quit
-  "ZQ" 'transmission-quit
+  "ZQ" 'evil-quit
   "ZZ" 'transmission-quit)
 
 (evil-set-initial-state 'transmission-files-mode 'motion)
@@ -48,46 +48,46 @@
   ;; sort
   "s" 'tabulated-list-sort
 
-  "e" 'transmission-peers
+  "p" 'transmission-peers
   "i" 'transmission-info
 
-  (kbd "<return>") 'transmission-find-file
-  (kbd "S-<return>") 'transmission-display-file
-  "!" 'transmission-files-command
-  ;; "X" 'transmission-files-command
-  "A" 'transmission-browse-url-of-file
-  "o" 'transmission-find-file-other-window
-  "O" 'transmission-view-file
-
-  "p" 'transmission-move
+  "R" 'transmission-move
   "u" 'transmission-files-unwant
   "U" 'transmission-files-want
   "P" 'transmission-files-priority
+  (kbd "<return>") 'transmission-find-file
+  (kbd "S-<return>") 'transmission-display-file
+  "o" 'transmission-find-file-other-window
+  "O" 'transmission-view-file
+  "!" 'transmission-files-command
+  ;; "X" 'transmission-files-command
+  "t" 'transmission-trackers-add
+  "T" 'transmission-trackers-remove
+
+  ;; goto URL
+  "gu" 'transmission-browse-url-of-file ; See mu4e.
 
   ;; quit
-  "q" 'quit-window
-  "ZQ" 'transmission-quit
+  "q" 'transmission-quit
+  "ZQ" 'evil-quit
   "ZZ" 'transmission-quit)
 
 (evil-set-initial-state 'transmission-info-mode 'motion)
 (evil-define-key 'motion transmission-info-mode-map
-  "e" 'transmission-peers
-
-  "A" 'transmission-trackers-add
-  "r" 'transmission-trackers-remove ; TODO: Add to the main view as well? Bad binding.
+  "p" 'transmission-peers
 
+  "t" 'transmission-trackers-add
+  "T" 'transmission-trackers-remove
   "D" 'transmission-set-torrent-download
   "U" 'transmission-set-torrent-upload
-  "R" 'transmission-set-torrent-ratio
+  "S" 'transmission-set-torrent-ratio ; "S" for "[S]eed"
   "P" 'transmission-set-bandwidth-priority
-
-  "c" 'transmission-copy-magnet ; TODO: Should be `transmission-verify' like in the main view?
-
-  "p" 'transmission-move
+  "gy" 'transmission-copy-magnet ; TODO: Use "ym"?
+  "R" 'transmission-move
 
   ;; quit
   "q" 'quit-window
-  "ZQ" 'quit-window
+  "ZQ" 'evil-quit
   "ZZ" 'quit-window)
 
 (evil-set-initial-state 'transmission-peers-mode 'motion)
@@ -99,7 +99,7 @@
 
   ;; quit
   "q" 'quit-window
-  "ZQ" 'quit-window
+  "ZQ" 'evil-quit
   "ZZ" 'quit-window)
 
 (provide 'init-evil-transmission)