diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27ce4138e..4b8a58452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
+
+## [0.25.0] - 2022-02-22
 * Fix: replace the library with the dependency problem (https://github.com/zellij-org/zellij/pull/1001)
 * Fix: crash when opening pane in non-existent cwd (https://github.com/zellij-org/zellij/pull/995)
 * Feature: add `copy-command` option (https://github.com/zellij-org/zellij/pull/996)
diff --git a/assets/plugins/status-bar.wasm b/assets/plugins/status-bar.wasm
index 2fcfccd0f..1027aa321 100755
Binary files a/assets/plugins/status-bar.wasm and b/assets/plugins/status-bar.wasm differ
diff --git a/example/default.yaml b/example/default.yaml
index 131769737..ba3a89163 100644
--- a/example/default.yaml
+++ b/example/default.yaml
@@ -22,6 +22,8 @@ keybinds:
           key: [Ctrl: 'o',]
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [Quit,]
           key: [Ctrl: 'q',]
         - action: [NewPane: ]
@@ -62,6 +64,8 @@ keybinds:
           key: [Ctrl: 'o',]
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [Quit]
           key: [Ctrl: 'q']
         - action: [Resize: Left,]
@@ -113,6 +117,8 @@ keybinds:
           key: [Ctrl: 'o',]
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [Quit,]
           key: [Ctrl: 'q',]
         - action: [MoveFocus: Left,]
@@ -137,6 +143,10 @@ keybinds:
           key: [Char: 'f',]
         - action: [TogglePaneFrames, SwitchToMode: Normal,]
           key: [Char: 'z',]
+        - action: [ToggleFloatingPanes, SwitchToMode: Normal,]
+          key: [Char: 'w']
+        - action: [TogglePaneEmbedOrFloating, SwitchToMode: Normal,]
+          key: [Char: 'e']
         - action: [NewPane: ,]
           key: [ Alt: 'n',]
         - action: [MoveFocus: Left,]
@@ -219,6 +229,8 @@ keybinds:
           key: [Ctrl: 's']
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [SwitchToMode: Session,]
           key: [Ctrl: 'o',]
         - action: [SwitchToMode: RenameTab, TabNameInput: [0],]
@@ -286,6 +298,8 @@ keybinds:
           key: [Ctrl: 'p',]
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [SwitchToMode: Session,]
           key: [Ctrl: 'o',]
         - action: [SwitchToMode: Resize,]
@@ -385,6 +399,8 @@ keybinds:
           key: [Ctrl: 'p',]
         - action: [SwitchToMode: Move,]
           key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tmux,]
+          key: [Ctrl: 'b',]
         - action: [SwitchToMode: Tab,]
           key: [Ctrl: 't',]
         - action: [SwitchToMode: Normal,]
@@ -415,6 +431,65 @@ keybinds:
           key: [ Alt: '+']
         - action: [Resize: Decrease,]
           key: [ Alt: '-']
+    tmux:
+        - action: [SwitchToMode: Locked,]
+          key: [Ctrl: 'g']
+        - action: [SwitchToMode: Resize,]
+          key: [Ctrl: 'n',]
+        - action: [SwitchToMode: Pane,]
+          key: [Ctrl: 'p',]
+        - action: [SwitchToMode: Move,]
+          key: [Ctrl: 'h',]
+        - action: [SwitchToMode: Tab,]
+          key: [Ctrl: 't',]
+        - action: [SwitchToMode: Normal,]
+          key: [Ctrl: 'o', Char: "\n", Char: ' ', Esc]
+        - action: [SwitchToMode: Scroll,]
+          key: [Ctrl: 's']
+        - action: [Quit,]
+          key: [Ctrl: 'q',]
+        - action: [NewPane: Down, SwitchToMode: Normal,]
+          key: [Char: "\"",]
+        - action: [NewPane: Right, SwitchToMode: Normal,]
+          key: [Char: '%',]
+        - action: [ToggleFocusFullscreen, SwitchToMode: Normal,]
+          key: [Char: 'z',]
+        - action: [NewTab: , SwitchToMode: Normal,]
+          key: [ Char: 'c',]
+        - action: [SwitchToMode: RenameTab, TabNameInput: [0],]
+          key: [Char: ',']
+        - action: [GoToPreviousTab, SwitchToMode: Normal,]
+          key: [ Char: 'p']
+        - action: [GoToNextTab, SwitchToMode: Normal,]
+          key: [ Char: 'n']
+        - action: [MoveFocus: Left, SwitchToMode: Normal,]
+          key: [ Left,]
+        - action: [MoveFocus: Right, SwitchToMode: Normal,]
+          key: [ Right,]
+        - action: [MoveFocus: Down, SwitchToMode: Normal,]
+          key: [ Down,]
+        - action: [MoveFocus: Up, SwitchToMode: Normal,]
+          key: [ Up,]
+        - action: [NewPane: ,]
+          key: [ Alt: 'n',]
+        - action: [MoveFocus: Left,]
+          key: [ Alt: 'h',]
+        - action: [MoveFocus: Right,]
+          key: [ Alt: 'l',]
+        - action: [MoveFocus: Down,]
+          key: [ Alt: 'j',]
+        - action: [MoveFocus: Up,]
+          key: [ Alt: 'k',]
+        - action: [FocusPreviousPane,]
+          key: [ Alt: '[',]
+        - action: [FocusNextPane,]
+          key: [ Alt: ']',]
+        - action: [Resize: Increase,]
+          key: [ Alt: '=']
+        - action: [Resize: Increase,]
+          key: [ Alt: '+']
+        - action: [Resize: Decrease,]
+          key: [ Alt: '-']
 plugins:
     - path: tab-bar
       tag: tab-bar
@@ -438,7 +513,7 @@ plugins:
 
 # Choose the path to the default shell that zellij will use for opening new panes
 # Default: $SHELL
-#default_shell: fish
+# default_shell: fish
 
 # Toggle between having pane frames around the panes
 # Options:
@@ -468,3 +543,20 @@ plugins:
 # Valid values: positive integers
 # Default value: 10000
 #scroll_buffer_size: 10000
+
+# Provide a command to execute when copying text. The text will be piped to
+# the stdin of the program to perform the copy. This can be used with
+# terminal emulators which do not support the OSC 52 ANSI control sequence
+# that will be used by default if this option is not set.
+# Examples:
+#copy_command: "xclip -selection clipboard" # x11
+#copy_command: "wl-copy"                    # wayland
+#copy_command: "pbcopy"                     # osx
+
+# Choose the destination for copied text
+# Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
+# Does not apply when using copy_command.
+# Options:
+#   - system (default)
+#   - primary
+# copy_clipboard: primary