diff --git a/.bashrc b/.bashrc
index 5358a8f..d81ff03 100644
--- a/.bashrc
+++ b/.bashrc
@@ -62,17 +62,10 @@ export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a"
 #--------------------------------------------------------------------------------
 
 #--------------------------------------------------------------------------------
-# OS X aliases
-#--------------------------------------------------------------------------------
-if [ $(uname -s) = "Darwin" ]; then
-    alias top='top -u'
-    alias ll='ls -l'
-fi
-#--------------------------------------------------------------------------------
-
-#--------------------------------------------------------------------------------
-# Git aliases
+# Command aliases
 #--------------------------------------------------------------------------------
+alias ll='ls -l'
+[[ -x $(which htop) ]] && alias top='htop'
 alias gitx='open -a GitX .'
 #--------------------------------------------------------------------------------
 
diff --git a/bin/software-install.sh b/bin/software-install.sh
index e1f7a84..d951d61 100755
--- a/bin/software-install.sh
+++ b/bin/software-install.sh
@@ -7,6 +7,7 @@ fi
 xargs brew install <<EOF
     git
     coreutils
+    htop
     python3
     vim
 EOF