diff --git a/configuration.org b/configuration.org
index 61faf1b..1dd9402 100644
--- a/configuration.org
+++ b/configuration.org
@@ -3036,62 +3036,73 @@ Because that’s still my favourite language.
    (if prefix
        'isearch-backward-regexp
      'isearch-forward-regexp)))
-#+end_src
 
-#+begin_src emacs-lisp
+(defvar gpolonkai/transpose-map (make-sparse-keymap)
+  "Map for transpose commands.")
+(define-prefix-command 'gpolonkai/transpose-map)
+
+(defvar gpolonkai/org-clock-map (make-sparse-keymap)
+  "Map for Org clocking commands.")
+(define-prefix-command 'gpolonkai/org-clock-map)
+
 (bind-keys
  :map global-map
  ("<C-return>" . wted/open-line-below)
  ("<C-S-return>" . wted/open-line-above)
- ("M-t" . nil) ;; Remove the old keybinding
- ("M-t c" . transpose-chars)
- ("M-t w" . transpose-words)
- ("M-t l" . transpose-lines)
- ("M-t e" . transpose-sexps)
- ("M-t s" . transpose-sentences)
- ("M-t p" . transpose-paragraphs)
- ("M-t W" . gpolonkai/transpose-windows)
+ ("C-~" . gpolonkai/toggle-char-case)
  ("C-a" . gpolonkai/move-to-beginning-of-line)
  ("C-e" . gpolonkai/move-to-end-of-line)
- ("M-q" . sachachua/fill-or-unfill-paragraph)
- ("C-c r" . gpolonkai/round-number-at-point-to-decimals)
- ("C-s" . consult-line)
- ("C-r" . gpolonkai/isearch-regexp)
- ("C-M-s" . isearch-forward)
- ("C-M-r" . isearch-backward)
- ("C-~" . gpolonkai/toggle-char-case)
- ("C-z" .  nil)
- ("M-g SPC" . gpolonkai/goto-next-char)
  ("M-F" . gpolonkai/beginning-of-next-word)
  ("C-h C-l" . find-library)
  ("C-h C-f" . find-function)
  ("C-h C-k" . find-function-on-key)
  ("C-h C-v" . find-variable)
+ ("M-q" . sachachua/fill-or-unfill-paragraph)
+ ("C-r" . gpolonkai/isearch-regexp)
+ ("C-M-r" . isearch-backward)
+ ("C-s" . consult-line)
+ ("C-M-s" . isearch-forward)
+ ("M-t" . gpolonkai/transpose-map)
+ ("C-z" . nil)
+ :map mode-specific-map
+ ("r" . gpolonkai/round-number-at-point-to-decimals)
+ :map gpolonkai/transpose-map
+ ("c" . transpose-chars)
+ ("e" . transpose-sexps)
+ ("l" . transpose-lines)
+ ("p" . transpose-paragraphs)
+ ("s" . transpose-sentences)
+ ("w" . transpose-words)
+ ("W" . gpolonkai/transpose-windows)
+ :map gpolonkai/org-clock-map
+ ("g" . org-clock-goto)
+ ("i" . org-clock-in)
+ ("I" . org-clock-in-last)
+ ("o" . org-clock-out)
+ :map gpolonkai/pers-map
+ ("c" . gpolonkai/org-clock-map)
+ ("C-c" . calc)
+ ("M-C" . clean-buffer-list)
+ ("h" . hidden-mode-line-mode)
+ ("i" .  string-inflection-all-cycle)
+ ("C-i e" . "gergely@polonkai.eu")
+ ("C-i w" . "http://gergely.polonkai.eu/")
+ ("M-o" . mbork/insert-current-file-name-at-point)
+ ("u" . browse-url-at-point)
  :map ctl-x-map
- ("C-y" . duplicate-line)
  ("_" . maximize-window)
- ("C-r" . wted/rename-current-buffer-file)
- ("C-d" . wted/delete-current-buffer-file)
  ("|" . gpolonkai/toggle-window-split)
- ("k" . kill-this-buffer)
- ("C-b" . bury-buffer)
  ("/" . repeat)
+ ("C-b" . bury-buffer)
+ ("C-d" . wted/delete-current-buffer-file)
+ ("k" . kill-this-buffer)
+ ("C-r" . wted/rename-current-buffer-file)
+ ("C-y" . duplicate-line)
  :map isearch-mode-map
  ("<C-return>" . ep/isearch-exit-other-end)
  ("<S-return>" . e-se/isearch-exit-mark-match)
- :map gpolonkai/pers-map
- ("h" . hidden-mode-line-mode)
- ("C-i e" . "gergely@polonkai.eu")
- ("C-i w" . "http://gergely.polonkai.eu/")
- ("u" . browse-url-at-point)
- ("M-C" . clean-buffer-list)
- ("C-c" . calc)
- ("c i" . org-clock-in)
- ("c I" . org-clock-in-last)
- ("c o" . org-clock-out)
- ("c g" . org-clock-goto)
- ("M-o" . mbork/insert-current-file-name-at-point)
- ("i" .  string-inflection-all-cycle))
+ :map goto-map
+ ("SPC" . gpolonkai/goto-next-char))
 #+end_src
 
 * Custom commands and functions