diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..2cc42078e 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -16,9 +16,8 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
-alias ll='ls -l'
-alias sl=ls # often screw this up
+alias l='ls -1a'
+alias ll='ls -halF'
 
 alias afind='ack-grep -il'
 
diff --git a/lib/padrino.zsh b/lib/padrino.zsh
new file mode 100644
index 000000000..9db47533a
--- /dev/null
+++ b/lib/padrino.zsh
@@ -0,0 +1,8 @@
+alias padpg='padrino g admin_page'
+alias par='padrino rake ar:migrate'
+alias pcon='padrino console'
+alias pdaem='padrino start -d'
+alias pg='padrino gen'
+alias pprod='padrino stop; padrino start -de production'
+alias pstart='padrino start'
+alias pstop='padrino stop'
diff --git a/themes/ocodo.zsh-theme b/themes/ocodo.zsh-theme
new file mode 100644
index 000000000..cf7ce606b
--- /dev/null
+++ b/themes/ocodo.zsh-theme
@@ -0,0 +1,9 @@
+LHOST=$(scutil --get LocalHostName)
+PROMPT='$FG[030][$FG[079]%n@$LHOST$FG[030]][$FG[043]%t$FG[030] $(git_prompt_info)$FG[116]$(rvm_prompt_info)$FG[030]]$reset_color
+$FG[030][$FG[079]%~$FG[030]]$reset_color
+$ '
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[red]($fg_bold[white]"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$fg_bold[red])"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[cyan]*"
diff --git a/themes/squee.zsh-theme b/themes/squee.zsh-theme
new file mode 100644
index 000000000..f1db6edb9
--- /dev/null
+++ b/themes/squee.zsh-theme
@@ -0,0 +1,9 @@
+LHOST=$(scutil --get LocalHostName)
+PROMPT='$fg_bold[magenta][$fg[white]%t$fg_bold[magenta]]$fg_bold[magenta] [$fg[white]%n@$LHOST$fg_bold[magenta]]
+[$fg[white]%~$(git_prompt_info)$fg[white]$(rvm_prompt_info)$fg_bold[magenta]]$reset_color
+$ '
+# git theming                                                                                                                                                                   
+ZSH_THEME_GIT_PROMPT_PREFIX=" $fg_bold[red]($fg_bold[white]"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$fg_bold[red])"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[cyan]*"