diff --git a/config/base.nix b/config/base.nix
index 940cb74..1866893 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -14,6 +14,7 @@
     ./network.nix
     ./programs.nix
     ./system.nix
+	../shared/dunst/default.nix
   ];
   nixpkgs = {
     overlays = [
diff --git a/shared/tmux.nix b/shared/tmux.nix
index 8f10cb4..15f908d 100644
--- a/shared/tmux.nix
+++ b/shared/tmux.nix
@@ -3,19 +3,15 @@
   programs.tmux = {
     enable = true;
     mouse = true;
+    prefix = "C-a";
+    terminal = "st";
+    keyMode = "vi";
+    escapeTime = 0;
+	baseIndex = 1;
     plugins = with pkgs; [
       tmuxPlugins.sensible
       tmuxPlugins.pain-control
       tmuxPlugins.sessionist
-      tmuxPlugins.yank
-      # tmuxPlugins.copycat
-      {
-        plugin = tmuxPlugins.continuum;
-        extraConfig = ''
-          				set -g @continuum-boot 'on'
-          				set -g @continuum-restore 'on'
-          			'';
-      }
       {
         plugin = fw-pkgs.tmuxPlugins.minimal;
         extraConfig = ''
@@ -24,23 +20,23 @@
       }
 
     ];
-    prefix = "C-a";
-    terminal = "st";
-    keyMode = "vi";
-    escapeTime = 0;
     extraConfig = ''
 			set -g set-clipboard on
-			set -g @yank_selection_mouse 'clipboard'
-      		set -g base-index 1
-      		set -g status-keys 'vi'
-      		setw -g pane-base-index 1
+
+			set -g base-index 1
+			set-window-option -g pane-base-index 1
+
+			set-window-option -g mode-keys vi
+
+			bind-key -T copy-mode-vi v send-keys -X begin-selection
+			bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
+			bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -i -f -selection primary | xclip -i -selection clipboard"
+
       		set -g default-terminal "st-256color"                                                                    
       		set -g terminal-overrides "st-256color"                                                                                             
-      		# true colours support                                                                                                              
-      		# set -ga terminal-overrides ",*256col*:Tc"                                                                              
+
       		set -ga terminal-overrides ",xterm-256color:Tc"                                                                         
       		set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'                                                   
-      		# underscore colours - needs tmux-3.0                                                                                               
       		set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'
     '';
   };