diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d8ea3ae0c..50f443e9b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,13 @@ compdef git-svn-dcommit-push=git
 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
+
+function in_git {
+  if $(git status > /dev/null 2>&1); then
+    echo 1
+  fi
+}
+
 #
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
diff --git a/themes/netpunk.zsh-theme b/themes/netpunk.zsh-theme
new file mode 100644
index 000000000..fb985a83a
--- /dev/null
+++ b/themes/netpunk.zsh-theme
@@ -0,0 +1,52 @@
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo 'GIT ☢ ↪' && return
+    hg root >/dev/null 2>/dev/null && echo 'HG ☢ ↪' && return
+    echo ' ☣ ↪'
+}
+function battery_charge() {
+    if [ -e /usr/local/bin/batcharge.py ]
+    then
+        echo `python /usr/local/bin/batcharge.py`
+    else
+        echo '';
+    fi
+}
+
+function hg_prompt_info {
+  if [ $(in_hg) ]; then
+    hg prompt "{rev}:{node|short} on {root|basename}:{branch} {task} {status|modified} {patch|count|unapplied} {incoming changes{incoming|count}} {update}" 2>/dev/null
+  fi
+}
+
+function get_pwd() {
+   echo "${PWD/$HOME/~}"
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('on `basename $VIRTUAL_ENV`') '
+}
+function spacing {
+  local spacing=""
+  for i in {1..$termwidth}; do
+      spacing="${spacing} "
+  done
+  echo $spacing
+}
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+
+if which rbenv &> /dev/null; then
+  PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%} %~ %{$reset_color%}$(hg_prompt_info)$(git_prompt_info)%{$reset_color%}
+   $(prompt_char)  '
+  RPROMPT='using %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}$(virtualenv_info) %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} BAT: $(battery_charge)'
+
+fi
+
+
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%} "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[white]%}%{$bg[red]%} ✖ "
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}%{$bg[magenta]%} ◘ "
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔ "