diff --git a/aliases b/aliases
index 41d6825..8f1d9f9 100644
--- a/aliases
+++ b/aliases
@@ -46,7 +46,7 @@ if [ $system_name == 'Darwin' ]; then
      x4="$(/usr/bin/arch)"
      echo "${x1} - ${x2} - ${x3} - ${x4}"
   }
-
+  alias ls='ls -G'
   alias m='mate .'
   alias et="m"
   alias o='open .'
@@ -55,4 +55,6 @@ if [ $system_name == 'Darwin' ]; then
   alias showfile='/usr/bin/SetFile -a "v"'
   alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start'
   alias readrails="mate `ruby -rubygems -e "puts( ['rails', 'activerecord', 'activeresource', 'actionpack', 'activesupport'].collect { |gem| gems = Gem.source_index.find_name(gem); gems.last.full_gem_path; }.join(' '))"`"
+else
+  alias ls='ls --color=auto'
 fi
\ No newline at end of file
diff --git a/bashrc b/bashrc
index ada0d78..fbbf5eb 100755
--- a/bashrc
+++ b/bashrc
@@ -8,6 +8,10 @@ source ~/.save-directory
 if [ $system_name == 'Darwin' ]; then
   source ~/.gemdoc
   source ~/.terminal
+else
+  if [ -f /etc/bash_completion ]; then
+      . /etc/bash_completion
+  fi
 fi
 
 export PS1='$(__git_ps1 "\[${COLOR_RED}\](%s)\[${COLOR_NC}\] ")\$ '
diff --git a/exports b/exports
index 5dfdfd2..0188e42 100644
--- a/exports
+++ b/exports
@@ -40,8 +40,6 @@ export CLICOLOR=1
 # sets title of window to be user@host
 export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}"; echo -ne "\007"'
 
-export BASH_COMPLETION='~/.bash_completion'
-
 # export HISTCONTROL=erasedups # I actually want duplicates because of profileme
 export HISTSIZE=1000000