diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index aadfd0c..c8152f1 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -31,4 +31,11 @@ set -g mode-keys vi
 if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
     'set -g mouse on' \
     'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+<<<<<<< HEAD
 #    'set -g mouse on; set -g mouse-utf8 on' \
+=======
+
+bind-key Tab last-window
+bind-key BTab previous-window
+
+>>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50
diff --git a/tmux/.tmux_BACKUP_4958.conf b/tmux/.tmux_BACKUP_4958.conf
new file mode 100644
index 0000000..c8152f1
--- /dev/null
+++ b/tmux/.tmux_BACKUP_4958.conf
@@ -0,0 +1,41 @@
+#change C-b to Ca
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# stop tmux from renaming the window every time you run a command
+set-option -g allow-rename off
+set-option -g pane-active-border-fg blue
+
+# select panes with vim keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# change base from 0 to 1 for reachability
+set -g base-index 1
+
+# set vi modes
+set -g status-keys vi
+set -g mode-keys vi
+
+# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
+# copy/paste: shift+left click to highlight, then shift+middle to past
+if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+    'set -g mouse on' \
+    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+<<<<<<< HEAD
+#    'set -g mouse on; set -g mouse-utf8 on' \
+=======
+
+bind-key Tab last-window
+bind-key BTab previous-window
+
+>>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50
diff --git a/tmux/.tmux_BASE_4958.conf b/tmux/.tmux_BASE_4958.conf
new file mode 100644
index 0000000..1a1dda3
--- /dev/null
+++ b/tmux/.tmux_BASE_4958.conf
@@ -0,0 +1,33 @@
+#change C-b to Ca
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# stop tmux from renaming the window every time you run a command
+set-option -g allow-rename off
+set-option -g pane-active-border-fg blue
+
+# select panes with vim keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# change base from 0 to 1 for reachability
+set -g base-index 1
+
+# set vi modes
+set -g status-keys vi
+set -g mode-keys vi
+
+# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
+# copy/paste: shift+left click to highlight, then shift+middle to past
+if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+    'set -g mouse on; set -g mouse-utf8 on' \
+    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
diff --git a/tmux/.tmux_LOCAL_4958.conf b/tmux/.tmux_LOCAL_4958.conf
new file mode 100644
index 0000000..aadfd0c
--- /dev/null
+++ b/tmux/.tmux_LOCAL_4958.conf
@@ -0,0 +1,34 @@
+#change C-b to Ca
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# stop tmux from renaming the window every time you run a command
+set-option -g allow-rename off
+set-option -g pane-active-border-fg blue
+
+# select panes with vim keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# change base from 0 to 1 for reachability
+set -g base-index 1
+
+# set vi modes
+set -g status-keys vi
+set -g mode-keys vi
+
+# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
+# copy/paste: shift+left click to highlight, then shift+middle to past
+if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+    'set -g mouse on' \
+    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+#    'set -g mouse on; set -g mouse-utf8 on' \
diff --git a/tmux/.tmux_REMOTE_4958.conf b/tmux/.tmux_REMOTE_4958.conf
new file mode 100644
index 0000000..e89d7bc
--- /dev/null
+++ b/tmux/.tmux_REMOTE_4958.conf
@@ -0,0 +1,37 @@
+#change C-b to Ca
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+# split panes using | and -
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# stop tmux from renaming the window every time you run a command
+set-option -g allow-rename off
+set-option -g pane-active-border-fg blue
+
+# select panes with vim keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# change base from 0 to 1 for reachability
+set -g base-index 1
+
+# set vi modes
+set -g status-keys vi
+set -g mode-keys vi
+
+# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
+# copy/paste: shift+left click to highlight, then shift+middle to past
+if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+    'set -g mouse on' \
+    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+
+bind-key Tab last-window
+bind-key BTab previous-window
+
diff --git a/vim/.vim/.netrwhist b/vim/.vim/.netrwhist
new file mode 100644
index 0000000..66efdea
--- /dev/null
+++ b/vim/.vim/.netrwhist
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/home/jon'
+let g:netrw_dirhist_2='/home/jon/.gnome'
+let g:netrw_dirhist_3='/home/jon'
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index d8eb128..e9a7a12 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit d8eb12845f7b01daf471ee222ea63dde410b4150
+Subproject commit e9a7a12d9e1ace3dd0778c375c1b77d2879ba137
diff --git a/vim/.vim/bundle/vim-surround b/vim/.vim/bundle/vim-surround
new file mode 160000
index 0000000..e49d6c2
--- /dev/null
+++ b/vim/.vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313
diff --git a/vim/.vimrc b/vim/.vimrc
index e8faabf..c4269a7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -78,6 +78,7 @@ Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'klen/python-mode'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
+Plugin 'tpope/vim-surround'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
diff --git a/x/.Xresources b/x/.Xresources
index 907ffb6..7b1bf93 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,9 +1,6 @@
 *background: #151B1A
 *foreground: #8FA388
 
-! Alternate foreground
-! !*foreground: #7E9982
-
 *cursorColor: #9E6438
 
 *color0: #2E2B38
@@ -30,4 +27,6 @@ URxvt*shading: 10
 
 URxvt*perl-ext-common:  default,matcher
 URxvt*matcher.button:   1
-URxvt*url-launcher:      /usr/bin/google-chrome
+! URxvt*url-launcher:      /usr/bin/google-chrome
+URxvt*url-launcher:     /home/jon/Downloads/firefox/firefox 
+