diff --git a/catppuccin.tmux b/catppuccin.tmux
index a597d76..24bfb1d 100755
--- a/catppuccin.tmux
+++ b/catppuccin.tmux
@@ -402,9 +402,7 @@ main() {
   #
 
   local pane_format=$( load_modules "pane_default_format")
-  local pane_current_format=$( load_modules "pane_current_format")
-  setw window-status-format "$window_format"
-  setw window-status-current-format "$window_current_format"
+  setw pane-border-format "$pane_format"
 
   # --------=== Modes
   #
diff --git a/pane/pane_current_format.sh b/pane/pane_current_format.sh
deleted file mode 100644
index b5d02ac..0000000
--- a/pane/pane_current_format.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-show_pane_current_format() {
-  local number="#I"
-  local color="$thm_orange"
-  local background="$thm_bg"
-  local text="$(get_tmux_option "@catppuccin_pane_current_text" "#{b:pane_current_path}")" # use #W for application instead of directory
-  local fill="$(get_tmux_option "@catppuccin_pane_current_fill" "number")" # number, all, none
-
-  local current_pane_format=$( build_pane_format "$number" "$color" "$background" "$text" "$fill" )
-
-  echo "$current_pane_format"
-}