diff --git a/bash/bash_aliases.symlink b/bash/bash_aliases.symlink
index 71b1e88..9fd8523 100644
--- a/bash/bash_aliases.symlink
+++ b/bash/bash_aliases.symlink
@@ -2,7 +2,7 @@
 # sourced by .bashrc
 
 # enable color support
-alias ls='ls -G'
+alias ls='ls --color'
 
 # some more ls aliases
 alias l.='ls -d .*'

diff --git a/bash/bash_aliases.symlink b/bash/bash_aliases.symlink
index 71b1e88..9fd8523 100644
--- a/bash/bash_aliases.symlink
+++ b/bash/bash_aliases.symlink
@@ -2,7 +2,7 @@
 # sourced by .bashrc
 
 # enable color support
-alias ls='ls -G'
+alias ls='ls --color'
 
 # some more ls aliases
 alias l.='ls -d .*'
diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink
index d6526b3..b3a092b 100644
--- a/bash/bash_exports.symlink
+++ b/bash/bash_exports.symlink
@@ -14,5 +14,8 @@
 export LESS_TERMCAP_ue=$'\E[0m'
 export LESS_TERMCAP_us=$'\E[1;32m'
 
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+if [ -f "/usr/libexec/java_home -v 1.8" ]; then
+    export JAVA_HOME="/usr/libexec/java_home -v 1.8";
+fi
+
 export ANDROID_HOME=/usr/local/opt/android-sdk

diff --git a/bash/bash_aliases.symlink b/bash/bash_aliases.symlink
index 71b1e88..9fd8523 100644
--- a/bash/bash_aliases.symlink
+++ b/bash/bash_aliases.symlink
@@ -2,7 +2,7 @@
 # sourced by .bashrc
 
 # enable color support
-alias ls='ls -G'
+alias ls='ls --color'
 
 # some more ls aliases
 alias l.='ls -d .*'
diff --git a/bash/bash_exports.symlink b/bash/bash_exports.symlink
index d6526b3..b3a092b 100644
--- a/bash/bash_exports.symlink
+++ b/bash/bash_exports.symlink
@@ -14,5 +14,8 @@
 export LESS_TERMCAP_ue=$'\E[0m'
 export LESS_TERMCAP_us=$'\E[1;32m'
 
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+if [ -f "/usr/libexec/java_home -v 1.8" ]; then
+    export JAVA_HOME="/usr/libexec/java_home -v 1.8";
+fi
+
 export ANDROID_HOME=/usr/local/opt/android-sdk
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index b8a0b81..9a0e154 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -11,7 +11,7 @@
 let g:airline_powerline_fonts = 1
 
 " Fonts and encoding
-set guifont=Inconsolata\ for\ Powerline:h16   " set font
+set guifont=Inconsolata\ for\ Powerline       " set font
 set encoding=utf8                             " set encoding to utf8
 
 " Tabs-stop
@@ -63,7 +63,7 @@
 let g:indentLine_char = '│'
 
 " Backups
-set backup
+:set backup
 set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp
 set backupskip=/tmp/*,/private/tmp/*
 set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp