diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 8bb8e69..d1e20a7 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -5,7 +5,7 @@ set -g prefix C-a
 bind C-a send-prefix
 
 ## Default is 'screen'
-set -sg default-terminal 'screen-256color'
+set -sg default-terminal 'xterm-256color'
 set -sg escape-time 1
 set -sg set-clipboard on
 set -g history-limit 100000
@@ -22,21 +22,12 @@ set -g status-justify left
 set -g status-interval 1
 set -g status-left-length 20
 set -g status-right-length 30
-set -g status-right '#[fg=black, bg=yellow] #h '
-#set -g status-right '#(eval ~/bin/tmux-airline `tmux display -p "#{client_width}"`)'
-set -g status-left ''
 
 set -g set-titles on
 set -g set-titles-string '#T'
 setw -g allow-rename off
 setw -g automatic-rename on
 setw -g automatic-rename-format '#T'
-setw -g window-status-format ' #I  #{=120:window_name} '
-setw -g window-status-current-format '#[fg=black, bg=yellow] #I  #{=120:window_name} #[fg=yellow, bg=black]'
-#set-window-option -g window-status-current-attr bold
-#setw -g window-status-format '/ #I:#P #{=120:window_name} |#F \'
-#setw -g window-status-current-format '/ #I:#P #{=120:window_name} |#F \'
-setw -g window-status-separator ''
 
 set -g bell-action current
 #set -g bell-on-alert off
@@ -46,30 +37,14 @@ set -g visual-bell off
 
 set -g mouse on
 
-#set -g status-keys vi
-#setw -g mode-keys vi
-
-#setw -g xterm-keys on
-
-## Mouse Keybindings
-# Faster Scrolling
-#bind -t vi-copy    WheelUpPane   page-up
-#bind -t vi-copy    WheelDownPane page-down
-#bind -t emacs-copy WheelUpPane   page-up
-#bind -t emacs-copy WheelDownPane page-down
-
 ## Keyboard keybindings
 bind -n 'S-Down' resize-pane -D 1
 bind -n 'S-Up' resize-pane -U 1
 bind -n 'S-Left' resize-pane -L 1
 bind -n 'S-Right' resize-pane -R 1
 
-bind -n End send-key C-e
-bind -n Home send-key C-a
-
-# copypaste
-#bind-key -n -t emacs-copy C-x copy-pipe "xclip -i -sel p -f | xclip -i -sel c "
-#bind-key -n C-y run "xclip -o | tmux load-buffer - ; tmux paste-buffer"
+#bind -n End send-key C-e
+#bind -n Home send-key C-a
 
 # Splitscreen mit Alt+Arrow wechseln
 bind -n M-Left select-pane -L
@@ -104,46 +79,89 @@ bind k \
 
 set-window-option -g xterm-keys on
 
-#### COLOUR (Solarized 256)
-
-# default statusbar colors
-set-option -g status-style fg=colour136,bg=colour235 #yellow and base02
-
-# default window title colors
-set-window-option -g window-status-style fg=colour244,bg=default #base0 and default
-#set-window-option -g window-status-style dim
-
-# active window title colors
-set-window-option -g window-status-current-style fg=colour166,bg=default #orange and default
-#set-window-option -g window-status-current-style bright
-
-# pane border
-set-option -g pane-border-style fg=colour235 #base02
-set-option -g pane-active-border-style fg=colour240 #base01
-
-# message text
-set-option -g message-style fg=colour166,bg=colour235 #orange and base02
-
-# pane number display
-set-option -g display-panes-active-colour colour33 #blue
-set-option -g display-panes-colour colour166 #orange
-
-# clock
-set-window-option -g clock-mode-colour colour64 #green
-
-# bell
-set-window-option -g window-status-bell-style fg=colour235,bg=colour160 #base02, red
-
 ## TPM
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'wfxr/tmux-power'
-set -g @plugin 'tmux-plugins/tmux-sidebar'
+set -g @plugin 'ofirgall/tmux-window-name'
+#set -g @plugin 'wfxr/tmux-power'
+#set -g @plugin 'tmux-plugins/tmux-sidebar'
 set -g @plugin 'nhdaly/tmux-better-mouse-mode'
+#set -g @plugin "janoamaral/tokyo-night-tmux"
 
-set -g @tmux_power_theme 'forest'
+#set -g @tmux_power_theme 'forest'
 #set -g @tmux_power_theme '#483D8B'
 
+#
+# Tokyonight theme
+#
+
+# Status update interval
+set -g status-interval 1
+
+#
+# Colors
+#
+tmux_status_bg=#232433
+tmux_status_fg=colour7
+
+#first set of side status
+tmux_status_bg_1=colour8
+tmux_status_fg_1=colour4
+
+#second set of side status
+tmux_status_bg_2=colour4
+tmux_status_fg_2=colour0
+
+tmux_accent=colour1
+tmux_current_title_fg=colour2
+tmux_activity_color=colour3
+
+# Basic status bar colors
+set -g status-style bg=$tmux_status_bg
+
+# Left side of status bar
+set -g status-left-style bg=colour233,fg=colour243
+set -g status-left-length 40
+set -g status-left ""
+
+# Right side of status bar
+set -g status-right-style bg=colour233,fg=colour243
+set -g status-right-length 150
+
+# Left Window Status
+set -g window-status-format "#[fg=$tmux_status_bg_1,bg=default]#[fg=$tmux_status_fg_1,bg=$tmux_status_bg_1] #I #[fg=default,bg=default] #W #[default]"
+set -g window-status-current-format "#[fg=$tmux_status_bg_1,bg=default]#[fg=$tmux_accent,bg=$tmux_status_bg_1]  #[fg=$tmux_current_title_fg,bold] #W #[fg=$tmux_status_bg_1,bg=default]"
+
+# Right Window Status
+set-option -g status-right "#[fg=$tmux_status_bg_1,bg=default]#[fg=$tmux_status_fg_1,bg=$tmux_status_bg_1] %H:%M:%S #[fg=$tmux_status_bg_1,bg=default]"
+set-option -ag status-right "#[fg=$tmux_status_bg_1,bg=default]#[fg=$tmux_status_fg_1,bg=$tmux_status_bg_1] %a %d.%m.%Y #[fg=$tmux_status_bg_1,bg=default]"
+
+# Current window status
+set -g window-status-current-style none
+
+# Window with activity status
+set -g window-status-activity-style bg="$tmux_status_bg",fg="$tmux_activity_color"
+
+# Window separator
+set -g window-status-separator ""
+
+# Window status alignment
+set -g status-justify left
+
+# Pane border
+set -g pane-border-style bg=default,fg="$tmux_status_bg"
+
+# Active pane border
+set -g pane-active-border-style bg=default,fg="$tmux_status_bg_2"
+
+# Pane number indicator
+set -g display-panes-colour "$tmux_status_bg_2"
+set -g display-panes-active-colour "$tmux_accent"
+
+# Clock mode
+set -g clock-mode-colour "$tmux_status_bg_2"
+set -g clock-mode-style 24
+
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'