diff --git a/keybindings.json b/keybindings.json
index 50e039c..7f65f3c 100644
--- a/keybindings.json
+++ b/keybindings.json
@@ -687,6 +687,18 @@
   },
   //
   // ===========================================================================
+  // MARK: Rewrap Revived
+  // ===========================================================================
+  // Extension:
+  // - https://marketplace.visualstudio.com/items?itemName=dnut.rewrap-revived
+  //
+  { // Toggle auto wrap in current document.
+    "key": "ctrl+c q",
+    "command": "rewrap.toggleAutoWrap",
+    "when": "editorTextFocus"
+  },
+  //
+  // ===========================================================================
   // MARK: Multi-Cursor
   // ===========================================================================
   //
diff --git a/settings.json b/settings.json
index ff0e33c..ac6fe4d 100644
--- a/settings.json
+++ b/settings.json
@@ -319,6 +319,20 @@
   "workbench.editor.defaultBinaryEditor": "hexEditor.hexedit",
   //
   // ===========================================================================
+  // MARK: Rewrap Revived
+  // ===========================================================================
+  // Extension:
+  // - https://marketplace.visualstudio.com/items?itemName=dnut.rewrap-revived
+  //
+  // Enable auto-wrap by default. In programming languages it only applies to
+  // comments.
+  "rewrap.autoWrap.enabled": true,
+  // Only wrap the current paragraph when triggering rewrap with alt+q within a
+  // comment.
+  "rewrap.wholeComment": false,
+  //
+  //
+  // ===========================================================================
   // MARK: Lang: CSS
   // ===========================================================================
   //