diff --git a/readme.md b/readme.md
index 1aa8ffc..358a2ce 100644
--- a/readme.md
+++ b/readme.md
@@ -44,6 +44,7 @@
 |-----------------------------------------|--------------------------------------------------------------------|
 | `<Alt><Shift><Up,Down,Left,Right>`      | Navigate to the pane in the respective direction                   |
 | `<Alt>N` and `<Alt>P`                   | Switch to the next and previous window                             |
+| `<Ctrl><Alt>N` and `<Ctrl><Alt>P`       | Swap the current window with the next and previous window          |
 | `Alt-[0-9]`                             | Switch to the window with the respective index                     |
 
 ### Copy Mode
diff --git a/tmux.normal.conf b/tmux.normal.conf
index 7869cbc..a0810a6 100644
--- a/tmux.normal.conf
+++ b/tmux.normal.conf
@@ -73,7 +73,7 @@ bind -r + rotate-window -D
 bind S swap-pane
 #
 # , to swap the current window with another
-bind , command-prompt "swap-window -t '%%'"
+bind , command-prompt "swap-window -d -t '%%'"
 #
 # # to rename the current window
 bind "#" command-prompt -I '#W' "rename-window '%%'"
@@ -86,7 +86,7 @@ bind C-Space last-pane
 bind ` set-window-option synchronize-panes \; display "synchronize-panes: toggled"
 #
 # r to reload /etc/tmux.conf
-bind r source-file /etc/tmux.conf
+bind r source-file /etc/tmux.conf \; display "configuration reloaded"
 #
 # ? and / to show keyboard and command help
 bind ? list-keys
@@ -117,6 +117,10 @@ bind -n M-S-Right select-pane -R
 bind -n M-N next-window
 bind -n M-P previous-window
 #
+# (without prefix) <ctrl><alt> + N and P to swap with the next and previous windows
+bind -n C-M-N swap-window -d -t +
+bind -n C-M-P swap-window -d -t -
+#
 # (without prefix) <alt>[0-9] to switch directly to the window with the respective index
 bind -n M-1 select-window -t 1
 bind -n M-2 select-window -t 2
diff --git a/tmux.powerline.conf b/tmux.powerline.conf
index c5508cb..afed2eb 100644
--- a/tmux.powerline.conf
+++ b/tmux.powerline.conf
@@ -73,7 +73,7 @@ bind -r + rotate-window -D
 bind S swap-pane
 #
 # , to swap the current window with another
-bind , command-prompt "swap-window -t '%%'"
+bind , command-prompt "swap-window -d -t '%%'"
 #
 # # to rename the current window
 bind "#" command-prompt -I '#W' "rename-window '%%'"
@@ -86,7 +86,7 @@ bind C-Space last-pane
 bind ` set-window-option synchronize-panes \; display "synchronize-panes: toggled"
 #
 # r to reload /etc/tmux.conf
-bind r source-file /etc/tmux.conf
+bind r source-file /etc/tmux.conf \; display "configuration reloaded"
 #
 # ? and / to show keyboard and command help
 bind ? list-keys
@@ -117,6 +117,10 @@ bind -n M-S-Right select-pane -R
 bind -n M-N next-window
 bind -n M-P previous-window
 #
+# (without prefix) <ctrl><alt> + N and P to swap with the next and previous windows
+bind -n C-M-N swap-window -d -t +
+bind -n C-M-P swap-window -d -t -
+#
 # (without prefix) <alt>[0-9] to switch directly to the window with the respective index
 bind -n M-1 select-window -t 1
 bind -n M-2 select-window -t 2