diff --git a/home/applications/foot/tokyonight_night.nix b/home/applications/foot/tokyonight_night.nix
index 81131fa..e2316bd 100644
--- a/home/applications/foot/tokyonight_night.nix
+++ b/home/applications/foot/tokyonight_night.nix
@@ -1,6 +1,6 @@
 {
   cursor = {
-    color = "c0caf5 283457";
+    color = "283457 c0caf5";
   };
 
   colors = {
diff --git a/home/applications/tmux/default.nix b/home/applications/tmux/default.nix
index 1fb7281..e5e311b 100644
--- a/home/applications/tmux/default.nix
+++ b/home/applications/tmux/default.nix
@@ -4,6 +4,7 @@
 
   xdg.configFile."tmux/tmux.conf".text = ''
     run-shell ${pkgs.tmuxPlugins.sensible.rtp}
+    run-shell ${pkgs.tmuxPlugins.prefix-highlight.rtp}
 
     set-option    -s default-terminal  "tmux-256color"
 
@@ -25,7 +26,5 @@
     bind-key -r -N "Resize the pane down by 5"                   J resize-pane -D 5
     bind-key -r -N "Resize the pane up by 5"                     K resize-pane -U 5
     bind-key -r -N "Resize the pane right by 5"                  L resize-pane -R 5
-
-    new-session
-  '';
+  '' + builtins.readFile ./tokyonight_night.tmux;
 }
diff --git a/home/applications/tmux/tokyonight_night.tmux b/home/applications/tmux/tokyonight_night.tmux
new file mode 100644
index 0000000..a2eb8a4
--- /dev/null
+++ b/home/applications/tmux/tokyonight_night.tmux
@@ -0,0 +1,34 @@
+set -g mode-style "fg=#7aa2f7,bg=#3b4261"
+
+set -g message-style "fg=#7aa2f7,bg=#3b4261"
+set -g message-command-style "fg=#7aa2f7,bg=#3b4261"
+
+set -g pane-border-style "fg=#3b4261"
+set -g pane-active-border-style "fg=#7aa2f7"
+
+set -g status "on"
+set -g status-justify "left"
+
+set -g status-style "fg=#7aa2f7,bg=#16161e"
+
+set -g status-left-length "100"
+set -g status-right-length "100"
+
+set -g status-left-style NONE
+set -g status-right-style NONE
+
+set -g status-left "#[fg=#15161e,bg=#7aa2f7,bold] #S #[fg=#7aa2f7,bg=#16161e,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#16161e] #{prefix_highlight} #[fg=#3b4261,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#15161e,bg=#7aa2f7,bold] #h "
+if-shell '[ "$(tmux show-option -gqv "clock-mode-style")" == "24" ]' {
+  set -g status-right "#[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#16161e] #{prefix_highlight} #[fg=#3b4261,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#15161e,bg=#7aa2f7,bold] #h "
+}
+
+setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#16161e"
+setw -g window-status-separator ""
+setw -g window-status-style "NONE,fg=#a9b1d6,bg=#16161e"
+setw -g window-status-format "#[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#16161e,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#16161e,nobold,nounderscore,noitalics]"
+
+# tmux-plugins/tmux-prefix-highlight support
+set -g @prefix_highlight_output_prefix "#[fg=#e0af68]#[bg=#16161e]#[fg=#16161e]#[bg=#e0af68]"
+set -g @prefix_highlight_output_suffix ""