diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a6bb9c64a..cde1d3de3 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -36,7 +36,7 @@ CURRENT_BG='NONE'
   local LC_ALL="" LC_CTYPE="en_US.UTF-8"
   # NOTE: This segment separator character is correct.  In 2012, Powerline changed
   # the code points they use for their special characters. This is the new code point.
-  # If this is not working for you, you probably have an old version of the
+  # If this is not working for you, you probably have an old version of the 
   # Powerline-patched fonts installed. Download and install the new version.
   # Do not submit PRs to change this unless you have reviewed the Powerline code point
   # history and have new information.
@@ -118,7 +118,7 @@ prompt_git() {
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
-    zstyle ':vcs_info:*' unstagedstr '●'
+    zstyle ':vcs_info:git:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
@@ -188,6 +188,15 @@ prompt_status() {
   [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
 }
 
+# Node version
+prompt_nvm() {
+  local nvm_node=''
+  if which node &> /dev/null; then
+    nvm_node="$(node -v)"
+  fi
+  prompt_segment green black "$nvm_node"
+}
+
 ## Main prompt
 build_prompt() {
   RETVAL=$?
@@ -195,6 +204,7 @@ build_prompt() {
   prompt_virtualenv
   prompt_context
   prompt_dir
+  prompt_nvm
   prompt_git
   prompt_hg
   prompt_end