diff --git a/bash_it.sh b/bash_it.sh
index 9d1f0bed..0aba05fa 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Initialize Bash It
 
 # Reload Library
diff --git a/custom/custom.bash b/custom/custom.bash
index 11761926..caae8638 100644
--- a/custom/custom.bash
+++ b/custom/custom.bash
@@ -1,2 +1,4 @@
+#!/bin/bash
+
 # Your Custom Bash alias', functions, etc.
 #
\ No newline at end of file
diff --git a/functions/base.bash b/functions/base.bash
index c7dc909d..bbb6f2f6 100644
--- a/functions/base.bash
+++ b/functions/base.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function rh {
   history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head
 }
diff --git a/functions/git.bash b/functions/git.bash
index 17e8a709..50f44596 100644
--- a/functions/git.bash
+++ b/functions/git.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function git_remote {
   echo "Running: git remote add origin ${GIT_HOSTING}:$1.git"
   git remote add origin $GIT_HOSTING:$1.git
diff --git a/functions/javascript.bash b/functions/javascript.bash
index 9f1d52e0..f37859dd 100644
--- a/functions/javascript.bash
+++ b/functions/javascript.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function rails_jquery {
   curl -o public/javascripts/rails.js http://github.com/rails/jquery-ujs/raw/master/src/rails.js
 }
diff --git a/functions/nginx.bash b/functions/nginx.bash
index 702c0d86..7aa1653c 100644
--- a/functions/nginx.bash
+++ b/functions/nginx.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function nginx_reload() {
   FILE="${NGINX_PATH}/logs/nginx.pid"
   if [ -e $FILE ]; then
diff --git a/lib/aliases.bash b/lib/aliases.bash
index d58a7236..50acc51c 100644
--- a/lib/aliases.bash
+++ b/lib/aliases.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # List directory contents
 alias sl=ls
 alias ls='ls -G'        # Compact view, show colors
diff --git a/lib/appearance.bash b/lib/appearance.bash
index cde1af9c..69ca55e6 100644
--- a/lib/appearance.bash
+++ b/lib/appearance.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # colored grep
 export GREP_OPTIONS='--color=auto'
 export GREP_COLOR='1;33'
@@ -5,8 +7,5 @@ export GREP_COLOR='1;33'
 # colored ls
 export LSCOLORS='Gxfxcxdxdxegedabagacad'
 
-# Apply theming defaults
-PS1="%n@%m:%~%# "
-
 # Load the theme
 source "$BASH/themes/$BASH_THEME/$BASH_THEME.bash"
\ No newline at end of file
diff --git a/lib/grep.bash b/lib/grep.bash
deleted file mode 100644
index 5cb69831..00000000
--- a/lib/grep.bash
+++ /dev/null
@@ -1,2 +0,0 @@
-export GREP_OPTIONS='--color=auto'
-export GREP_COLOR='1;32'
\ No newline at end of file
diff --git a/lib/history.bash b/lib/history.bash
index 23731c5f..3d489e92 100644
--- a/lib/history.bash
+++ b/lib/history.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # append to bash_history if Terminal.app quits
 shopt -s histappend
 
diff --git a/plugins/base.bash b/plugins/base.bash
index a39b37fd..c256247f 100644
--- a/plugins/base.bash
+++ b/plugins/base.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Desktop Programs
 alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"
 alias photoshop="open -a '/Applications/Adobe Photoshop CS3/Adobe Photoshop.app'"
diff --git a/plugins/git.bash b/plugins/git.bash
index 2e4a6c74..d62edc6a 100644
--- a/plugins/git.bash
+++ b/plugins/git.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Aliases
 alias g='git'
 alias gst='git status'
diff --git a/plugins/osx.bash b/plugins/osx.bash
index fce88c79..a2ad79b5 100644
--- a/plugins/osx.bash
+++ b/plugins/osx.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 function tab() {
   osascript 2>/dev/null <<EOF
     tell application "System Events"
diff --git a/plugins/rails.bash b/plugins/rails.bash
index 08d7f855..056e2a3f 100644
--- a/plugins/rails.bash
+++ b/plugins/rails.bash
@@ -1,11 +1,4 @@
-#
-# These is some Alias' for Rails
-#
-
-alias ss='script/server'
-alias sc='script/console'
-alias restart_app='touch tmp/restart.txt'
-
+#!/bin/bash
 
 # Rails Commands
 alias r='rails'
@@ -18,4 +11,7 @@ alias rp='rails plugin'
 alias ra='rails application'
 alias rd='rails destroy'
 
+alias ss='script/server'
+alias sc='script/console'
+alias restart_app='touch tmp/restart.txt'
 alias devlog='tail -f log/development.log'
\ No newline at end of file
diff --git a/plugins/ruby.bash b/plugins/ruby.bash
index 8936e0a1..203fb99c 100644
--- a/plugins/ruby.bash
+++ b/plugins/ruby.bash
@@ -1,3 +1,4 @@
+#!/bin/bash
 function remove_gem {
   gem list | grep $1 | awk '{ print $1; }' | xargs sudo gem uninstall
 }
\ No newline at end of file
diff --git a/plugins/rvm.bash b/plugins/rvm.bash
index de49b389..020bb3fa 100644
--- a/plugins/rvm.bash
+++ b/plugins/rvm.bash
@@ -1,3 +1,4 @@
+#!/bin/bash
 switch () {
   rvm $1
   local v=$(rvm_version)
diff --git a/plugins/subversion.bash b/plugins/subversion.bash
index 50a28dc5..83c9b17c 100644
--- a/plugins/subversion.bash
+++ b/plugins/subversion.bash
@@ -1,3 +1,4 @@
+#!/bin/bash
 rm_svn(){
   find $1 -name .svn -print0 | xargs -0 rm -rf
 }
diff --git a/plugins/textmate.bash b/plugins/textmate.bash
index d640090b..4aa494a4 100644
--- a/plugins/textmate.bash
+++ b/plugins/textmate.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Textmate
 alias e='mate . &'
 alias et='mate app config db lib public script test spec config.ru Gemfile Rakefile README &'
diff --git a/plugins/vim.bash b/plugins/vim.bash
index 0e7aa10f..28681b0d 100644
--- a/plugins/vim.bash
+++ b/plugins/vim.bash
@@ -1,2 +1,4 @@
+#!/bin/bash
+
 # VIM
 alias v='mvim --remote-silent'
\ No newline at end of file
diff --git a/themes/base.bash b/themes/base.bash
index cfa4896b..77869579 100644
--- a/themes/base.bash
+++ b/themes/base.bash
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Some Colors
 BGREEN='\[\033[1;32m\]'
 GREEN='\[\033[0;32m\]'
diff --git a/themes/bobby/bobby.bash b/themes/bobby/bobby.bash
index a85efe44..9dbf1478 100644
--- a/themes/bobby/bobby.bash
+++ b/themes/bobby/bobby.bash
@@ -1 +1,2 @@
+#!/bin/bash
 export PS1='\[\033[1;34m\]$(prompt_char)\[\033[1;32m\] $(parse_git_branch) ${ORANGE}\h ${D}in ${GREEN}\w ${D}→ '
\ No newline at end of file