   ;; lines must have the same number of columns of groups of non-space characters
   ("C-x |" . modi/align-columns)
   ("C-k" . modi/kill-line)
-  ;; override the binding of `C-o' for `open-line'
+  ;; Override the binding of `C-o' for `open-line'.
   ("C-o" . modi/smart-open-line)
   ("C-j" . modi/pull-up-line)
   ("M-=" . count-words) ; count words in buffer if no region selected
-  ;; override M-backspace to always do `backward-kill-word' using `modi-mode-map'.
+  ;; Override M-backspace to always do `backward-kill-word' using `modi-mode-map'.
   ;; Below is required so that `verilog-mode' does not bind it to `kill-word'.
   ("<M-delete>" . backward-kill-word))
 (bind-to-modi-map "=" #'modi/align-to-equals)
 
-;;; Comment Commander
-;; Usage: Quickly pressing `j' twice will toggle comment on the current line or
-;;        region and proceed the cursor to the next line.
-;;        Now each consecutive pressing of `j', will toggle the comment on that
-;;        line and proceed to the next line. Pressing `p' or `n' will simply
-;;        navigate the cursor to the next or previous line without commenting
-;;        or uncommenting anything.
+(>=e "25.0" ; `comment-line' was added new in emacs 25.1
+    (bind-keys
+     :map modi-mode-map
+      ;; Swap the M-; and C-x C-; bindings
+      ("M-;" . comment-line) ; was `comment-dwim' by default
+      ("C-x C-;" . comment-dwim))) ; was `comment-line' by default
+
+
+(provide 'setup-editing)
+
+;; (1) Commenting
+;; |-------------+-----------------------------------------------------------|
+;; | Binding     | Description                                               |
+;; |-------------+-----------------------------------------------------------|
+;; | M-j / C-M-j | `indent-new-comment-line' (default)                       |
+;; |             | This creates a commented new line; useful when writing    |
+;; |             | multiline comments like this one without having to        |
+;; |             | manually type in the comment characters.                  |
+;; | C-x C-;     | `comment-line' (default) [new in emacs 25.1]              |
+;; |             | Comments line or region and moves point to the next line. |
+;; | M-;         | `comment-dwim' (default)                                  |
+;; |-------------+-----------------------------------------------------------|
 ;;
-;;        jj j j j j j n n n j j p j n
-;;
-;;        Numeric prefixes are supported too:
-;;
-;;        jj 5j 7j 2j j 7n n n j j p j n
-(defhydra hydra-comment (:color red
-                         :columns 4)
-  "comment"
-  ("j" endless/comment-line-or-region "toggle comment")
-  (";" endless/comment-line-or-region "toggle comment")
-  ("p" previous-line                  "prev line")
-  ("n" next-line                      "next line")
-  ("{" backward-paragraph             "backward para")
-  ("P" backward-paragraph             "backward para")
-  ("}" forward-paragraph              "forward para")
-  ("N" forward-paragraph              "forward para")
-  ("m" set-mark-command               "set mark")
-  ("d" mark-defun                     "mark defun")
-  ("k" kill-whole-line                "kill whole line")
-  ("b" backward-sexp                  "backward sexp")
-  ("f" forward-sexp                   "forward sexp")
-  ("q" nil                            "cancel" :color blue))
-(key-chord-define-global "jj" #'hydra-comment/body)
-(bind-key "C-c C-;" #'hydra-comment/body modi-mode-map)
-
-
-(provide 'setup-editing)
-
-;; (1) Commented new line
-;; `M-j'/`C-M-j' - `indent-new-comment-line' (aliased to `comment-indent-new-line')
-;; This creates a commented new line; useful when writing multiline comments
-;; like this one without having to manually type in the comment characters.
-
 ;; (2) Undo
 ;; `C-_' or `C-/'
-
+;;
 ;; (3) Toggle read-only-mode; toggles buffers between editable and read-only states.
 ;; `C-x C-q' or `M-x read-only-mode'
-
+;;
 ;; (4) Backups using prefix args to `save-buffer' (C-x C-s)
 ;;                 C-x C-s -> Makes the prev version into a backup file if
 ;;                            previously requested or if this is the first save.

;;  Tweaking `region-extract-function'
;;  Mouse Copy
;;  Bindings
;;  Comment Commander

;;; Coding System
(setq keyboard-coding-system 'utf-8-unix)

;;  Untabify
;;  Align
;;  Eval and replace last sexp
;;  My modified basic functions
;;    Kill Line
;;    Open Line
