diff --git a/bashrc b/bashrc
index 2a766ce..3a6ea1b 100644
--- a/bashrc
+++ b/bashrc
@@ -8,4 +8,5 @@
 . ~/dotfiles/aliases
 
 # Set prompt
-PS1="\[\e[0;33m\]\u@\h\[\e[m\]: \[\e[0;34m\]\w\[\e[m\] \$ "
\ No newline at end of file
+PS1="\[\e[0;33m\]\u@\h\[\e[m\]: \[\e[0;34m\]\w\[\e[m\] \$ "
+[ -f ~/.bashrc_local ] && . ~/.bashrc.local
\ No newline at end of file
diff --git a/emacs.d/init.el b/emacs.d/init.el
index d56d8eb..5c873ca 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -24,6 +24,8 @@
 (load "evil-bindings.el")
 (when (file-readable-p "~/.emacs.d/loadins/private.el")
   (load "private.el"))
+(when (file-readable-p "~/.emacs.d/local.el")
+  (load "local.el"))
 (load "org-vars.el")
 (load "backups.el")
 (load "autoinsert-options.el")
diff --git a/profilevars b/profilevars
index 89088c6..59e7e3f 100644
--- a/profilevars
+++ b/profilevars
@@ -1,13 +1,8 @@
 # this and included scripts should be written in portable shell.
 PATH=$HOME/.bin:$PATH
-EDITOR="emacsclient -n"
-GIT_EDITOR="emacsclient"
-BROWSER="firefox"
+EDITOR="emacs -nw"
 PAGER=most
 LC_ALL=en_US.UTF-8
-if [ -z "SSH_AGENT_PID" ] ; then
-   eval `ssh-agent`
-fi
 # Platorm Specific Vars
 case $OSTYPE in
     darwin*)
@@ -21,3 +16,4 @@ case $OSTYPE in
 	;;
 esac
 export PATH EDITOR GIT_EDITOR PAGER BROSWER LC_ALL
+[ -f ~/.profilesvars.local ] && . ~/.profilevars.local
\ No newline at end of file
diff --git a/xprofile b/xprofile
index 3208365..5046cd2 100644
--- a/xprofile
+++ b/xprofile
@@ -1 +1,4 @@
-. ~/dotfiles/profilevars
\ No newline at end of file
+. ~/dotfiles/profilevars
+if [ -z "SSH_AGENT_PID" ] ; then
+   eval `ssh-agent`
+fi
\ No newline at end of file
diff --git a/zlogin b/zlogin
index 68625c6..cbcaecd 100644
--- a/zlogin
+++ b/zlogin
@@ -2,12 +2,14 @@
 # Load additions
 case $OSTYPE in
     darwin*)
-	[-f ~/.dotfiles/zlogin_mac ] && . ~/.dotfiles/zlogin_mac
+	[ -f ~/.dotfiles/zlogin_mac ] && . ~/.dotfiles/zlogin_mac
 	;;
     freebsd*)
-	[-f ~/.dotfiles/zlogin_bsd ] && . ~/.dotfiles/zlogin_bsd
+	[ -f ~/.dotfiles/zlogin_bsd ] && . ~/.dotfiles/zlogin_bsd
 	;;
     linux-gnu)
-	[-f ~/.dotfiles/zlogin_linux ] && . ~/.dotfiles/zlogin_linux
+	[ -f ~/.dotfiles/zlogin_linux ] && . ~/.dotfiles/zlogin_linux
 	;;
 esac
+
+[ -f ~/.zlogin_local ] && . ~/.zlogin.local
\ No newline at end of file
diff --git a/zshrc b/zshrc
index f644621..87bc0af 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,3 @@
-. ~/dotfiles/profilevars
 HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
@@ -24,3 +23,4 @@ case $OSTYPE in
 	[ -f ~/dotfiles/zshrc_linux ] && . ~/dotfiles/zshrc_linux
 	;;
 esac
+[ -f ~/.zshrc_local ] && . ~/.zshrc.local
\ No newline at end of file