diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 04bf705..de695aa 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -109,7 +109,7 @@ font:
     style: Medium Italic
 
   # Point size
-  size: 16.0
+  size: 14.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@@ -307,7 +307,7 @@ shell:
   program: /bin/zsh
   args:
     - -c
-    - tmux
+    - tmux -l
 
 # Key bindings
 #
@@ -388,8 +388,8 @@ shell:
 #   - ~AppKeypad
 #   - AppKeypad
 key_bindings:
-  - { key: V,        mods: Control|Shift,    action: Paste               }
-  - { key: C,        mods: Control|Shift,    action: Copy                }
+  - { key: V,        mods: Command|Shift,    action: Paste               }
+  - { key: C,        mods: Command|Shift,    action: Copy                }
   - { key: Paste,                   action: Paste                        }
   - { key: Copy,                    action: Copy                         }
   - { key: Q,        mods: Command, action: Quit                         }
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 17ec87c..2359d2b 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,2 +1,54 @@
-set -g default-terminal "screen-256color"
+# set default terminal
+set -g default-terminal "tmux-256color"
+# set mouse/history stuff
 set -g mouse on
+set -g history-limit 20000
+
+# rebind prefix
+set -g prefix C-a
+
+# always renumber windows
+set -g renumber-windows on
+
+# tile all windows
+unbind =
+bind = select-layout tiled
+
+# make window/pane index start with 1
+set -g base-index 1
+setw -g pane-base-index 1
+
+# Set titles
+set-option -g set-titles on
+set-option -g set-titles-string "#T - #W"
+
+# Set status bar
+set -g status-bg black
+set -g status-fg white
+######################
+#### Key Bindings ####
+######################
+
+# synchronize all panes in window
+bind y setw synchronize-panes
+
+# pane movement shortcuts
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# vim-like copy-mode
+setw -g mode-keys vi
+unbind [
+bind Escape copy-mode
+unbind p
+bind p paste-buffer
+bind -Tcopy-mode-vi 'v' send -X begin-selection
+bind -Tcopy-mode-vi 'y' send -X copy-pipe-and-cancel "tmux save-buffer - | reattach-to-user-namespace pbcopy"
+
+# split-windows
+bind | split-window -h -c "#{pane_current_path}"
+bind - split-window -v -c "#{pane_current_path}"
+
+set -s escape-time 0
diff --git a/vim/vimrc b/vim/vimrc
index 20edc90..65577c1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -8,9 +8,17 @@ set number
 set relativenumber
 set tabstop=4
 set shiftwidth=4
+set smarttab
 set hidden
 set showtabline=1
 set termguicolors
+set ttyfast
+set wildmenu
+set title
+set list
+set listchars=tab:→\ ,eol:¬,trail:⋅,extends:❯,precedes:❮
+set showbreak=↪
+
 
 if has('nvim')
 	set inccommand=split