diff --git a/setup.sh b/setup.sh
index 24d8916..ba8c3dd 100755
--- a/setup.sh
+++ b/setup.sh
@@ -31,5 +31,10 @@ mkdir -p ~/.vim/bundle 2>/dev/null
 
 vim -c ":PluginInstall" -c ":q" -c ":q"
 
+
+# Tmux Plugin Manager
+mkdir -p ~/.tmux/plugins 2>/dev/null
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
 grep -qE "^source.*$(pwd)/bashrc" ~/.bashrc || echo "source $(pwd)/bashrc" >> ~/.bashrc
 echo Done
diff --git a/tmux.conf b/tmux.conf
index 58e46a7..94fcd6a 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,4 +1,4 @@
-## Options
+# Options
 # Set Prefix to Ctrl+a (screen like)
 unbind C-b
 set -g prefix C-a
@@ -32,7 +32,7 @@ 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 ' #I  #{=120:window_name} #[fg=yellow, bg=black]'
+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 \'
@@ -53,10 +53,10 @@ set -g mouse 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
+#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
@@ -65,8 +65,8 @@ bind -n 'S-Left' resize-pane -L 1
 bind -n 'S-Right' resize-pane -R 1
 
 # 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-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"
 
 # Splitscreen mit Alt+Arrow wechseln
 bind -n M-Left select-pane -L
@@ -99,36 +99,46 @@ bind k \
   set -g mouse off \;\
   display 'Mouse: OFF'
 
-#### COLOUR (Solarized dark)
+#### COLOUR (Solarized 256)
+
 # default statusbar colors
-set-option -g status-bg black #base02
-set-option -g status-fg yellow
-set-option -g status-attr default
+set-option -g status-style fg=colour136,bg=colour235 #yellow and base02
 
 # default window title colors
-set-window-option -g window-status-fg white
-set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
+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-fg black
-set-window-option -g window-status-current-bg yellow
-#set-window-option -g window-status-current-attr bright
+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-fg green #base02
-set-option -g pane-active-border-fg brightgreen #base01
+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-bg black #base02
-set-option -g message-fg brightred #orange
+set-option -g message-style fg=colour166,bg=colour235 #orange and base02
 
 # pane number display
-set-option -g display-panes-active-colour green #blue
-set-option -g display-panes-colour brightred #orange
+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 green #green
+set-window-option -g clock-mode-colour colour64 #green
 
 # bell
-set-window-option -g window-status-bell-style fg=black,bg=red #base02, red
+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 'nhdaly/tmux-better-mouse-mode'
+
+set -g @tmux_power_theme 'forest'
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'
+
diff --git a/vimrc b/vimrc
index f9e2d8f..0eea29c 100644
--- a/vimrc
+++ b/vimrc
@@ -54,9 +54,10 @@ hi Search guibg=lightRed
 " Press Space to turn off highlighting and clear any message already displayed.
 :nnoremap <silent> <Space> :nohlsearch<Bar>:echo<CR>
 " ------------------------------------ Colors / Theme -------------------------------------------
-let g:solarized_visibility = "high"
-let g:solarized_contrast = "high"
+"let g:solarized_visibility = "high"
+"let g:solarized_contrast = "low"
 "let g:solarized_termcolors = 256
+let g:airline_solarized_bg='dark'
 colorscheme solarized
 
 augroup CursorLine