4 files changed, 12 insertions, 16 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 148991fec..1d2af3458 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -10,9 +10,14 @@ typeset +H my_orange="$FG[214]"
 
 # separator dashes size
 function afmagic_dashes {
-	[[ -n "${VIRTUAL_ENV-}" && -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" && "$PS1" = \(* ]] \
-		&& echo $(( COLUMNS - ${#VIRTUAL_ENV} - 3 )) \
-		|| echo $COLUMNS
+	local PYTHON_ENV="$VIRTUAL_ENV"
+	[[ -z "$PYTHON_ENV" ]] && PYTHON_ENV="$CONDA_DEFAULT_ENV"
+
+	if [[ -n "$PYTHON_ENV" && "$PS1" = \(* ]]; then
+		echo $(( COLUMNS - ${#PYTHON_ENV} - 3 ))
+	else
+		echo $COLUMNS
+	fi
 }
 
 # primary prompt
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 0261f0ff3..05b3fb212 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -7,7 +7,7 @@ typeset +H _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
 
 PROMPT='
 $(_user_host)${_current_dir} $(git_prompt_info) $(ruby_prompt_info)
-%{%(!.%F{red}.%F{white})%}▶%{$resetcolor%} '
+%{%(!.%F{red}.%F{white})%}▶%{$reset_color%} '
 
 PROMPT2='%{%(!.%F{red}.%F{white})%}◀%{$reset_color%} '
 
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 5679e9f37..d89e25215 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -25,16 +25,12 @@ function box_name {
 }
 
 
-local rvm_ruby='using%{$FG[243]%}$(ruby_prompt_info)'
-local git_info='$(git_prompt_info)'
-
-
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}${git_info} %{$FG[239]%}${rvm_ruby} %D - %*
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}\$(git_prompt_info)\$(ruby_prompt_info) %D - %*
 ╰─$(virtualenv_info)$(prompt_char) "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
-ZSH_THEME_RUBY_PROMPT_PREFIX="‹"
+ZSH_THEME_RUBY_PROMPT_PREFIX=" %{$FG[239]%}using%{$FG[243]%} ‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index cd773e4a4..bd58db5f6 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -22,12 +22,7 @@ prompt_pygmalion_precmd(){
   local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
   local prompt_length=${#exp_nocolor}
 
-  local nl=""
-
-  if [[ $prompt_length -gt 40 ]]; then
-    nl=$'\n%{\r%}';
-  fi
-  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
+  PROMPT="${base_prompt}${gitinfo}${post_prompt}"
 }
 
 prompt_setup_pygmalion