diff --git a/tmux/.tmux/osiris-theme.conf b/tmux/.tmux/osiris-theme.conf
index 76a6874..6170478 100644
--- a/tmux/.tmux/osiris-theme.conf
+++ b/tmux/.tmux/osiris-theme.conf
@@ -38,10 +38,6 @@ set -g status-left-length 20
 set -g status-left ''
 set -g status-interval 2
 
-set -g status-right "#{cpu_bg_color}#{cpu_fg_color}  CPU:#{cpu_percentage}  #{ram_fg_color}#{ram_bg_color}  RAM:#{ram_percentage}  #[fg=default]#[bg=default]  %a %h-%d %H:%M"
-set -g status-right-length 55
-
-
 # Messages
 set -g message-style bold,fg=colour232,bg=colour81
 
@@ -49,26 +45,8 @@ set -g message-style bold,fg=colour232,bg=colour81
 
 
 # Window Status
-set -g window-status-separator ''
-
-setw -g window-status-current-style bold,bg=colour238,fg=colour46
-setw -g window-status-current-format "    #W    "
-
-setw -g window-status-style none,bg=colour235,fg=colour138
-setw -g window-status-format "   #W   "
-
 set -g status-style fg=colour137,bg=colour234,dim
 
-setw -g window-status-current-style fg=colour81,bg=colour238,bold
-setw -g window-status-current-format '   #W   '
-
-setw -g window-status-style fg=colour138,bg=colour235
-setw -g window-status-format '   #W   '
-
-setw -g window-status-bell-style fg=colour255,bg=colour1,bold
-# Bells
-setw -g window-status-bell-style bold,fg=colour255,bg=colour1
-
 set-option -g visual-activity off
 set-option -g visual-bell off
 set-option -g visual-silence off
@@ -82,7 +60,30 @@ setw -g mode-style bg=colour6,fg=colour0,bold,fg=colour46,bg=colour238
 
 
 # Panes
-set -g pane-border-style fg=black,bg=colour232,fg=colour237
-set -g pane-active-border-style fg=brightred,bg=colour232,fg=colour46
+set -g pane-border-style bg=colour236,fg=colour237
+set -g pane-active-border-style bg=colour236,fg=colour80
+
+setw -g clock-mode-colour cyan
+
+set -g mode-style bg=brightcyan,fg=black
+set -g message-style bg=brightblack,fg=cyan
+set -g message-command-style bg=brightblack,fg=cyan
+
+set -g status-style fg=white,bg=black
+set -g status-left '#{?pane_synchronized, ¤ ,}#{?window_zoomed_flag, ↕ ,}'
+set -g status-right '#H'
+
+set -g status-right "#{cpu_bg_color}#{cpu_fg_color} CPU:#{cpu_percentage}  #{fg=black}$right_alt_sep#{ram_fg_color}#{ram_bg_color}  RAM:#{ram_percentage} #{ram_bg_color} #[fg=black]$right_sep#[fg=default]#[bg=default] #H"
+set -g status-right-length 55
+
+
+set -g pane-border-style fg=brightblack,bg=black
+set -g pane-active-border-style fg=colour104,bg=black
+
+set-window-option -g window-status-style bg=default,fg=default
+set-window-option -g window-status-current-style bg=default,fg=cyan
+set-window-option -g window-status-activity-style bg=default,fg=yellow
+set-window-option -g window-status-separator-style fg=brightblack
+set-window-option -g window-status-separator "$left_alt_sep"
 
 # Custom styling, http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
diff --git a/vim/.vim/prefs/leader.vim b/vim/.vim/prefs/leader.vim
index 342c32c..b2318ab 100644
--- a/vim/.vim/prefs/leader.vim
+++ b/vim/.vim/prefs/leader.vim
@@ -83,18 +83,14 @@ nnoremap <leader><space> :nohlsearch<CR>
 
 " --------- CLIPBOARD MAPPINGS ---------
 " Paste from OS clipboard
-map <leader>v i<ESC> :r!xclip -o<CR>
-vmap <leader>v c<ESC> :r!xclip -o<CR>
-imap <leader>v <ESC> :r!xclip -o<CR>
-" map <leader>v    i<ESC>"+pa<ESC>
-" vmap <leader>v   c<ESC>"+p<ESC>
-" imap <leader>v    <ESC>"+pa
-"
+map <leader>v    i<ESC>"+pa<ESC>
+vmap <leader>v   c<ESC>"+p<ESC>
+imap <leader>v    <ESC>"+pa
 
 " Copy to OS clipboard
- vnoremap <silent><Leader>y "yy <Bar> :call system('xclip', @y)<CR>
-" map <leader>y !xclip -selection clipboard
-" vmap <leader>y !xclip -selection clipboard<cr>
+ " vnoremap <silent><Leader>y "yy <Bar> :call system('xclip', @y)<CR>
+map <leader>y !xclip -selection clipboard
+vmap <leader>y !xclip -selection clipboard<cr>
 " map <leader>y   "+Y
 " vmap <leader>y  "+y
 
diff --git a/vim/.vim/prefs/plugins.vim b/vim/.vim/prefs/plugins.vim
index 6135e67..8fa6aee 100644
--- a/vim/.vim/prefs/plugins.vim
+++ b/vim/.vim/prefs/plugins.vim
@@ -20,6 +20,7 @@ Plug 'junegunn/fzf.vim'
 Plug 'vim-airline/vim-airline'         " ...
 Plug 'nathanaelkane/vim-indent-guides'
 Plug 'Konfekt/vim-scratchpad'
+Plug 'guns/xterm-color-table.vim'
 " Plug 'kyazdani42/nvim-web-devicons'
 " Plug 'ryanoasis/vim-devicons'
 
diff --git a/vim/.vimrc b/vim/.vimrc
index da639a7..b5b8c47 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -61,7 +61,18 @@ set scrolloff=3    " Minumum lines to keep above and below cursor
 " makes sure that when opening, files are normal, i.e. not folded.
 set nofoldenable
 
-" set clipboard=unnamed
+let g:clipboard = #{
+      \   name: 'xsel',
+      \   copy: {
+      \     '+': ['xclip', '--nodetach', '-i', '-b'],
+      \     '*': ['xclip', '--nodetach', '-i', '-p'],
+      \   },
+      \   paste: {
+      \     '+': ['xclip', '-o', '-b'],
+      \     '*': ['xclip', '-o', '-p'],
+      \   },
+      \   cache_enabled: 1,
+      \ }
 set shortmess=A
 
 set updatetime=100
diff --git a/zsh/.aliases.sh b/zsh/.aliases.sh
index a6c0ee7..26fac20 100644
--- a/zsh/.aliases.sh
+++ b/zsh/.aliases.sh
@@ -101,6 +101,11 @@ restart_gms() {
     adb shell am broadcast -a com.google.android.gms.INITIALIZE
 }
 
+objfs_cp() {
+    tmp=$(mktemp) && \
+    fileutil cp -f $1 $tmp && unzip $tmp $2 && unlink $tmp
+}
+
 alias acid=/google/bin/releases/mobile-devx-platform/acid/acid
 alias apido='/google/data/ro/teams/oneplatform/apido'
 alias bugs=/google/data/rw/users/mk/mkannan/www/bin/bugs