diff --git a/gitignore b/gitignore
index 7ab3fe2..08c0c01 100644
--- a/gitignore
+++ b/gitignore
@@ -1,2 +1,3 @@
 .ropeproject
 rol_mails/
+.idea
diff --git a/ohmyzshrc b/ohmyzshrc
index b65807d..27fd42a 100644
--- a/ohmyzshrc
+++ b/ohmyzshrc
@@ -1,8 +1,9 @@
 export TERM=xterm-256color
-export ZSH_TMUX_AUTOSTART=true
+export ZSH_TMUX_AUTOSTART=${ZSH_TMUX_AUTOSTART:-true}
 export ZSH_TMUX_FIXTERM=false
 
-export PATH=~/.npm-global/bin:$PATH
+# export PATH=~/.npm-global/bin:$PATH
+export PATH="$(yarn global bin):~/.local/bin:$PATH"
 
 # Path to your oh-my-zsh installation.
 export ZSH=~/.oh-my-zsh
diff --git a/tmux.conf b/tmux.conf
index 4748555..5b82936 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -13,7 +13,7 @@ bind-key C-a last-window
 bind c new-window -c "#{pane_current_path}"
 
 # basic settings
-set -g history-limit 30000
+set -g history-limit 3000
 set-option -g default-shell /usr/bin/zsh
 # set-window-option -g utf8 on
 set -g base-index 1
@@ -47,8 +47,7 @@ set-option -g status-left-length 0
 set-option -g status-right-length 80
 set-option -g status-left ''
 set-option -g status-right '#[fg=blue,bold]#H #[fg=green,bold]|#[fg=black,bold]#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g ) #[fg=green,bold]| #[fg=blue,bold]%d.%m.%y %H:%M'
-set-window-option -g window-status-current-fg black
-set-window-option -g window-status-current-bg green
+set -g window-status-current-style bg=black,fg=green
 
 # clock
 set-window-option -g clock-mode-colour cyan
diff --git a/tmux.server.conf b/tmux.server.conf
index 20fd37c..734624a 100644
--- a/tmux.server.conf
+++ b/tmux.server.conf
@@ -6,52 +6,26 @@ setw -g aggressive-resize on
 # command prefix
 unbind C-b
 set -g prefix C-s
-bind s send-prefix
+bind a send-prefix
 bind-key C-s last-window
 
 # new window with current pwd
 bind c new-window -c "#{pane_current_path}"
 
 # basic settings
-set -g history-limit 30000
+set -g history-limit 3000
 set-option -g default-shell /usr/bin/zsh
-set-window-option -g utf8 on
+# set-window-option -g utf8 on
 set -g base-index 1
 
-# vi mode
-set-window-option -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
-
 # escape mode
 unbind [
 bind Escape copy-mode
 set -s escape-time 0
 
-# switch windows
-bind -r j previous-window
-bind -r k next-window
-bind -r h swap-window -t -1
-bind -r l swap-window -t +1
-
 # fixes redraw bugs
 set -g default-terminal screen-256color
 
-# splitting
-unbind %
-unbind '"'
-bind = split-window -h
-bind - split-window -v
-bind -r C-h run "tmux select-pane -L"
-bind -r C-j run "tmux select-pane -D"
-bind -r C-k run "tmux select-pane -U"
-bind -r C-l run "tmux select-pane -R"
-bind [ resize-pane -L 5
-bind ] resize-pane -R 5
-bind < resize-pane -D 5
-bind > resize-pane -U 5
-bind-key b command-prompt -p "create pane from:"  "join-pane -s ':%%'"
-bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 
 # window title
 set-option -g set-titles on
@@ -64,8 +38,7 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-bind-key z set -g status
-set-option -g status-utf8 on
+# set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
@@ -74,8 +47,7 @@ set-option -g status-left-length 0
 set-option -g status-right-length 80
 set-option -g status-left ''
 set-option -g status-right '#[fg=blue,bold]#H #[fg=green,bold]|#[fg=black,bold]#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g ) #[fg=green,bold]| #[fg=blue,bold]%d.%m.%y %H:%M'
-set-window-option -g window-status-current-fg black
-set-window-option -g window-status-current-bg green
+set -g window-status-current-style bg=black,fg=green
 
 # clock
 set-window-option -g clock-mode-colour cyan