diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 3472089..846bf08 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -62,6 +62,8 @@ endif
 silent! colorscheme solarized
 " Enable filetype support
 filetype plugin indent on
+" Default ASM syntax for ft support
+let asmsyntax="nasm"
 " Allow file modelines
 set modeline
 " Automatically re-read changed files
diff --git a/dotfiles/zsh_custom/themes/matir.zsh-theme b/dotfiles/zsh_custom/themes/matir.zsh-theme
index c684ef6..684c5ea 100644
--- a/dotfiles/zsh_custom/themes/matir.zsh-theme
+++ b/dotfiles/zsh_custom/themes/matir.zsh-theme
@@ -1,3 +1,7 @@
-PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
+PROMPT='%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[magenta]%}$(virtualenv_prompt_info)%{$fg[blue]%}$(git_prompt_info)%{$fg[white]%}%#%{$reset_color%} '
 ZSH_THEME_GIT_PROMPT_PREFIX=" ("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_VIRTUALENV_PREFIX=" (py:"
+ZSH_THEME_VIRTUALENV_SUFFIX=")"
+
+# vim: set textwidth=0 wrapmargin=0: