diff --git a/bash_scripts/tmux_start.sh b/bash_scripts/tmux_start.sh
index 85b5b94..b9b5d82 100755
--- a/bash_scripts/tmux_start.sh
+++ b/bash_scripts/tmux_start.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# if called from a tmux session, don't create new session
+# if called from a tmux session, set up panes for dev window
 if [ -n "$TMUX_PANE" ]; then
 	tmux rename-window dev
 	tmux splitw -h
@@ -9,7 +9,13 @@ if [ -n "$TMUX_PANE" ]; then
 	tmux splitw -v -l 15
 	tmux selectp -t 0
 	clear
+# create a new default session
 else
-	tmux new -s dev \; rename-window dev \; splitw -h \; selectp -t 0 \; resizep -x 83 \; splitw -v -l 15 \; selectp -t 0 \;
+	SESSION='default'
+	tmux -2 -C new -s $SESSION
+	tmux -C rename-window -t $SESSION powermate
+	tmux -C new-window -n dev -t $SESSION
+	tmux -C new-window -t $SESSION
+	tmux attach -t $SESSION
 fi
 
diff --git a/dot/.bashrc b/dot/.bashrc
index e74ff31..2e42add 100644
--- a/dot/.bashrc
+++ b/dot/.bashrc
@@ -35,6 +35,7 @@ alias ll='ls -l'                              # long list
 alias grep='grep --color=auto'
 alias tmux='tmux -2'
 alias gdb='gdb -q'
+alias tree='tree -C --dirsfirst'
 
 # Umask
 #
diff --git a/vim/.vimrc b/vim/.vimrc
index 9f707af..825acd9 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -84,6 +84,7 @@ let g:airline_left_alt_sep = ''
 let g:airline_right_sep = ''
 let g:airline_right_altsep = ''
 let g:airline_symbols.maxlinenr = ''
+let g:airline#extensions#tabline#enabled = 1
 
 
 "------------------
@@ -157,6 +158,7 @@ augroup vimrc
 
 	" glsl filetype plugin
 	autocmd! BufNewFile,BufRead *.vs,*.fs set ft=glsl
+
 augroup END