From 8e91c1578c4b556d446060e91f3fa2340eed720c Mon Sep 17 00:00:00 2001
From: Uco Mesdag <uco.mesdag@allyourco.de>
Date: Mon, 20 Apr 2020 23:16:01 +0200
Subject: [PATCH] Rebased on the current verion of the powerline theme

---
 themes/powerline-blue/README.md               |   7 -
 .../powerline-blue/powerline-blue.base.bash   | 205 ------------------
 .../powerline-blue/powerline-blue.theme.bash  |  69 ------
 .../powerline-multiline-blue.base.bash        | 143 +-----------
 .../powerline-multiline-blue.theme.bash       |  70 ++----
 5 files changed, 19 insertions(+), 475 deletions(-)
 delete mode 100644 themes/powerline-blue/README.md
 delete mode 100644 themes/powerline-blue/powerline-blue.base.bash
 delete mode 100644 themes/powerline-blue/powerline-blue.theme.bash

diff --git a/themes/powerline-blue/README.md b/themes/powerline-blue/README.md
deleted file mode 100644
index acb46c69..00000000
--- a/themes/powerline-blue/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Powerline Theme (Blue)
-
-A clone of the Powerline Theme with a few tweaks.
-
-**IMPORTANT:** This theme requires that [a font with the Powerline symbols](https://github.com/powerline/fonts) needs to be used in your terminal emulator, otherwise the prompt won't be displayed correctly, i.e. some of the additional icons and characters will be missing. Please follow your operating system's instructions to install one of the fonts from the above link and select it in your terminal emulator.
-
-Please see the original Powerline Theme for more information.
diff --git a/themes/powerline-blue/powerline-blue.base.bash b/themes/powerline-blue/powerline-blue.base.bash
deleted file mode 100644
index 80e004e1..00000000
--- a/themes/powerline-blue/powerline-blue.base.bash
+++ /dev/null
@@ -1,205 +0,0 @@
-# Define this here so it can be used by all of the Powerline themes
-THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
-
-function set_color {
-  set +u
-  if [[ "${1}" != "-" ]]; then
-    fg="38;5;${1}"
-  fi
-  if [[ "${2}" != "-" ]]; then
-    bg="48;5;${2}"
-    [[ -n "${fg}" ]] && bg=";${bg}"
-  fi
-  echo -e "\[\033[${fg}${bg}m\]"
-}
-
-function __powerline_user_info_prompt {
-  local user_info=""
-  local color=${USER_INFO_THEME_PROMPT_COLOR}
-
-  if [[ "${THEME_CHECK_SUDO}" = true ]]; then
-    if sudo -n uptime 2>&1 | grep -q "load"; then
-      color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
-    fi
-  fi
-
-  case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
-    "sudo")
-      if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
-        user_info="!"
-      fi
-      ;;
-    *)
-      if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
-        user_info="${USER_INFO_SSH_CHAR}${USER}"
-      else
-        user_info="${USER}"
-      fi
-      ;;
-  esac
-  [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
-}
-
-function __powerline_ruby_prompt {
-  local ruby_version=""
-
-  if _command_exists rvm; then
-    ruby_version="$(rvm_version_prompt)"
-  elif _command_exists rbenv; then
-    ruby_version=$(rbenv_version_prompt)
-  fi
-
-  [[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_k8s_context_prompt {
-  local kubernetes_context=""
-
-  if _command_exists kubectl; then
-    kubernetes_context="$(k8s_context_prompt)"
-  fi
-
-  [[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_python_venv_prompt {
-  set +u
-  local python_venv=""
-
-  if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-    python_venv="${CONDA_DEFAULT_ENV}"
-    PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
-  elif [[ -n "${VIRTUAL_ENV}" ]]; then
-    python_venv=$(basename "${VIRTUAL_ENV}")
-  fi
-
-  [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_scm_prompt {
-  local color=""
-  local scm_prompt=""
-
-  scm_prompt_vars
-
-  if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
-    if [[ "${SCM_DIRTY}" -eq 3 ]]; then
-      color=${SCM_THEME_PROMPT_STAGED_COLOR}
-    elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
-      color=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
-    elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
-      color=${SCM_THEME_PROMPT_DIRTY_COLOR}
-    else
-      color=${SCM_THEME_PROMPT_CLEAN_COLOR}
-    fi
-    if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    elif [[ "${SCM_P4_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    elif [[ "${SCM_HG_CHAR}" == "${SCM_CHAR}" ]]; then
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
-    fi
-    echo "$(eval "echo ${scm_prompt}")${scm}|${color}"
-  fi
-}
-
-function __powerline_cwd_prompt {
-  local cwd=$(pwd | sed "s|^${HOME}|~|")
-
-  echo "${cwd}|${CWD_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_hostname_prompt {
-    echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_wd_prompt {
-  echo "\W|${CWD_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_clock_prompt {
-  echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_battery_prompt {
-  local color=""
-  local battery_status="$(battery_percentage 2> /dev/null)"
-
-  if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
-    true
-  else
-    if [[ "$((10#${battery_status}))" -le 5 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
-    elif [[ "$((10#${battery_status}))" -le 25 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
-    else
-      color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
-    fi
-    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
-    echo "${battery_status}%|${color}"
-  fi
-}
-
-function __powerline_in_vim_prompt {
-  if [ -n "$VIMRUNTIME" ]; then
-    echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
-  fi
-}
-
-function __powerline_aws_profile_prompt {
-  if [[ -n "${AWS_PROFILE}" ]]; then
-    echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}"
-  fi
-}
-
-function __powerline_left_segment {
-  local OLD_IFS="${IFS}"; IFS="|"
-  local params=( $1 )
-  IFS="${OLD_IFS}"
-  local separator_char="${POWERLINE_LEFT_SEPARATOR}"
-  local separator=""
-
-  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
-    separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
-  fi
-  LEFT_PROMPT+="${separator}$(set_color ${FG_COLOR} ${params[1]}) ${params[0]} ${normal}"
-  LAST_SEGMENT_COLOR=${params[1]}
-  (( SEGMENTS_AT_LEFT += 1 ))
-}
-
-function __powerline_last_status_prompt {
-  # [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
-  [[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ! $(set_color ${HOST_THEME_PROMPT_COLOR} ${CWD_THEME_PROMPT_COLOR})${separator_char}${normal}"
-}
-
-function __powerline_prompt_command {
-  local last_status="$?" ## always the first
-  local separator_char="${POWERLINE_PROMPT_CHAR}"
-
-  LEFT_PROMPT=""
-  SEGMENTS_AT_LEFT=0
-  LAST_SEGMENT_COLOR=""
-
-
-  if [[ -n "${POWERLINE_PROMPT_DISTRO_LOGO}" ]]; then
-      LEFT_PROMPT+="$(set_color ${PROMPT_DISTRO_LOGO_COLOR} ${PROMPT_DISTRO_LOGO_COLORBG})${PROMPT_DISTRO_LOGO}$(set_color - -)"
-  fi
-
-  ## left prompt ##
-  [[ "${last_status}" -ne 0 ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)$(__powerline_last_status_prompt ${last_status})${normal}"
-
-  for segment in $POWERLINE_PROMPT; do
-    local info="$(__powerline_${segment}_prompt)"
-    [[ -n "${info}" ]] && __powerline_left_segment "${info}"
-  done
-
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
-
-  PS1="${LEFT_PROMPT} "
-
-  ## cleanup ##
-  unset LAST_SEGMENT_COLOR \
-        LEFT_PROMPT \
-        SEGMENTS_AT_LEFT
-}
-
diff --git a/themes/powerline-blue/powerline-blue.theme.bash b/themes/powerline-blue/powerline-blue.theme.bash
deleted file mode 100644
index 02f22b67..00000000
--- a/themes/powerline-blue/powerline-blue.theme.bash
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-. "$BASH_IT/themes/powerline-blue/powerline-blue.base.bash"
-
-PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
-POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
-
-USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-USER_INFO_THEME_PROMPT_COLOR=32
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
-
-PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
-CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=35
-
-SCM_NONE_CHAR=""
-SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
-SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
-SCM_THEME_PROMPT_CLEAN=""
-SCM_THEME_PROMPT_DIRTY=""
-# SCM_THEME_PROMPT_CLEAN_COLOR=2
-# SCM_THEME_PROMPT_DIRTY_COLOR=214
-# SCM_THEME_PROMPT_STAGED_COLOR=99
-# SCM_THEME_PROMPT_UNSTAGED_COLOR=220
-SCM_THEME_PROMPT_CLEAN_COLOR=2
-SCM_THEME_PROMPT_DIRTY_COLOR=2
-SCM_THEME_PROMPT_STAGED_COLOR=2
-SCM_THEME_PROMPT_UNSTAGED_COLOR=2
-SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
-SCM_GIT_SHOW_DETAILS=false
-SCM_GIT_SHOW_REMOTE_INFO=false
-
-RVM_THEME_PROMPT_PREFIX=""
-RVM_THEME_PROMPT_SUFFIX=""
-RBENV_THEME_PROMPT_PREFIX=""
-RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
-RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
-
-KUBERNETES_CONTEXT_THEME_CHAR=${POWERLINE_KUBERNETES_CONTEXT_CHAR:="⎈ "}
-KUBERNETES_CONTEXT_THEME_PROMPT_COLOR=26
-
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
-
-CWD_THEME_PROMPT_COLOR=39
-
-LAST_STATUS_THEME_PROMPT_COLOR=196
-
-CLOCK_THEME_PROMPT_COLOR=240
-
-BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
-
-THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
-
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
-
-HOST_THEME_PROMPT_COLOR=0
-
-FG_COLOR=0
-
-# POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby cwd"}
-POWERLINE_PROMPT=${POWERLINE_LEFT_PROMPT:="cwd scm python_venv ruby"}
-
-safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/powerline-multiline-blue/powerline-multiline-blue.base.bash b/themes/powerline-multiline-blue/powerline-multiline-blue.base.bash
index 33bd1b58..182a4a8a 100644
--- a/themes/powerline-multiline-blue/powerline-multiline-blue.base.bash
+++ b/themes/powerline-multiline-blue/powerline-multiline-blue.base.bash
@@ -1,84 +1,7 @@
 # Define this here so it can be used by all of the Powerline themes
-THEME_CHECK_SUDO=${THEME_CHECK_SUDO:=true}
 
-function set_color {
-  set +u
-  if [[ "${1}" != "-" ]]; then
-    fg="38;5;${1}"
-  fi
-  if [[ "${2}" != "-" ]]; then
-    bg="48;5;${2}"
-    [[ -n "${fg}" ]] && bg=";${bg}"
-  fi
-  echo -e "\[\033[${fg}${bg}m\]"
-}
-
-function __powerline_user_info_prompt {
-  local user_info=""
-  local color=${USER_INFO_THEME_PROMPT_COLOR}
-
-  if [[ "${THEME_CHECK_SUDO}" = true ]]; then
-    if sudo -n uptime 2>&1 | grep -q "load"; then
-      color=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
-    fi
-  fi
-
-  case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
-    "sudo")
-      if [[ "${color}" = "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
-        user_info="!"
-      fi
-      ;;
-    *)
-      if [[ -n "${SSH_CLIENT}" ]] || [[ -n "${SSH_CONNECTION}" ]]; then
-        user_info="${USER_INFO_SSH_CHAR}${USER}"
-      else
-        user_info="${USER}"
-      fi
-      ;;
-  esac
-  [[ -n "${user_info}" ]] && echo "${user_info}|${color}"
-}
-
-function __powerline_ruby_prompt {
-  local ruby_version=""
-
-  if _command_exists rvm; then
-    ruby_version="$(rvm_version_prompt)"
-  elif _command_exists rbenv; then
-    ruby_version=$(rbenv_version_prompt)
-  fi
-
-  [[ -n "${ruby_version}" ]] && echo "${RUBY_CHAR}${ruby_version}|${RUBY_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_k8s_context_prompt {
-  local kubernetes_context=""
-
-  if _command_exists kubectl; then
-    kubernetes_context="$(k8s_context_prompt)"
-  fi
-
-  [[ -n "${kubernetes_context}" ]] && echo "${KUBERNETES_CONTEXT_THEME_CHAR}${kubernetes_context}|${KUBERNETES_CONTEXT_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_python_venv_prompt {
-  set +u
-  local python_venv=""
-  local python_version=""
-
-  if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-    python_venv="${CONDA_DEFAULT_ENV}"
-    PYTHON_VENV_CHAR=${CONDA_PYTHON_VENV_CHAR}
-  elif [[ -n "${VIRTUAL_ENV}" ]]; then
-    python_venv=$(basename "${VIRTUAL_ENV}")
-  fi
-
-  python_version="$(python -V 2>&1 | grep -o -E '[0-9\.]+' | cut -d'.' -f1,2)"
-
-  # [[ -n "${python_venv}" ]] && echo "${PYTHON_VENV_CHAR}${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
-  [[ -n "${python_venv}" ]] && echo "Py${python_version}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
-}
+. "$BASH_IT/themes/powerline-multiline/powerline-multiline.theme.bash"
+. "$BASH_IT/themes/powerline-multiline/powerline-multiline.base.bash"
 
 function __powerline_scm_prompt {
   local color=""
@@ -96,7 +19,7 @@ function __powerline_scm_prompt {
       scm_prompt+="${SCM_CHAR}${SCM_BRANCH} ✚"
     elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
       color=${SCM_THEME_PROMPT_DIRTY_COLOR}
-      scm_prompt+="${SCM_CHAR}${SCM_BRANCH} ⋯" # …
+      scm_prompt+="${SCM_CHAR}${SCM_BRANCH} ⋯"
     else
       color=${SCM_THEME_PROMPT_CLEAN_COLOR}
       scm_prompt+="${SCM_CHAR}${SCM_BRANCH}"
@@ -107,32 +30,23 @@ function __powerline_scm_prompt {
 
 function __powerline_cwd_prompt {
   local pwd=${PWD//$HOME/\~}
-  #pwd_list=(${pwd//\// })
   IFS='/' read -a pwd_list <<< "${pwd}"
   list_len=${#pwd_list[@]}
 
   if [[ $list_len -le 1 ]]; then
     cwd=$pwd
-  else 
-    if [[ ${pwd_list[0]} != '~' ]]; then
-      cwd='/'
-    fi
-
+  else
     firstchar=$(echo ${pwd_list[0]} | cut -c1)
     if [[ $firstchar == '.' ]] ; then
       firstchar=$(echo ${pwd_list[0]} | cut -c1,2)
     fi
-
     cwd=${cwd}$firstchar
-
     for ((i=1; i < $list_len; i++)) do
       if [[ $((i + 1 )) != ${list_len} ]]; then
-
         firstchar=$(echo ${pwd_list[$i]} | cut -c1)
         if [[ $firstchar == '.' ]] ; then
           firstchar=$(echo ${pwd_list[$i]} | cut -c1,2)
         fi
-
         cwd=${cwd}/$firstchar
       else
         cwd=${cwd}/${pwd_list[$i]}
@@ -143,49 +57,6 @@ function __powerline_cwd_prompt {
   echo "${cwd}|${CWD_THEME_PROMPT_COLOR}"
 }
 
-function __powerline_hostname_prompt {
-    echo "$(hostname -s)|${HOST_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_wd_prompt {
-  echo "\W|${CWD_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_clock_prompt {
-  echo "$(date +"${THEME_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
-}
-
-function __powerline_battery_prompt {
-  local color=""
-  local battery_status="$(battery_percentage 2> /dev/null)"
-
-  if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
-    true
-  else
-    if [[ "$((10#${battery_status}))" -le 5 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
-    elif [[ "$((10#${battery_status}))" -le 25 ]]; then
-      color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
-    else
-      color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
-    fi
-    ac_adapter_connected && battery_status="${BATTERY_AC_CHAR}${battery_status}"
-    echo "${battery_status}%|${color}"
-  fi
-}
-
-function __powerline_in_vim_prompt {
-  if [ -n "$VIMRUNTIME" ]; then
-    echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
-  fi
-}
-
-function __powerline_aws_profile_prompt {
-  if [[ -n "${AWS_PROFILE}" ]]; then
-    echo "${AWS_PROFILE_CHAR}${AWS_PROFILE}|${AWS_PROFILE_PROMPT_COLOR}"
-  fi
-}
-
 function __powerline_last_status_prompt {
   # [[ "$1" -ne 0 ]] && echo "${1}|${LAST_STATUS_THEME_PROMPT_COLOR}"
   [[ "$1" -ne 0 ]] && echo "$(set_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ! $(set_color ${HOST_THEME_PROMPT_COLOR} ${CWD_THEME_PROMPT_COLOR})${separator_char}${normal}"
@@ -201,7 +72,7 @@ function __powerline_left_segment {
   if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
     separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
   fi
-  LEFT_PROMPT+="${separator}$(set_color ${FG_COLOR} ${params[1]}) ${params[0]} ${normal}"
+  LEFT_PROMPT+="${separator}$(set_color ${POWERLINE_TEXT_COLOR} ${params[1]}) ${params[0]} ${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
   (( SEGMENTS_AT_LEFT += 1 ))
 }
@@ -249,10 +120,9 @@ function __powerline_prompt_command {
 
   ## right prompt ##
   if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
-    # LEFT_PROMPT+="${move_cursor_rightmost}"
     if [[ ${POWERLINE_RIGHT_PROMPT} == *"date"* ]]; then
       clock="$(date +"${THEME_CLOCK_FORMAT}")$([[ $(echo "${POWERLINE_RIGHT_PROMPT}" | wc -w) -gt 1 ]] && echo " ")"
-      RIGHT_PROMPT+="$(set_color ${CLOCK_COLOR} -)${clock}${normal}"
+      RIGHT_PROMPT+="$(set_color ${CLOCK_THEME_PROMPT_COLOR} -)${clock}${normal}"
       RIGHT_PROMPT_LENGTH=${#clock}
     fi
     for segment in $POWERLINE_RIGHT_PROMPT; do
@@ -265,7 +135,6 @@ function __powerline_prompt_command {
     LEFT_PROMPT+="\033[${RIGHT_PROMPT_LENGTH}D"
   fi
 
-  #PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n${PROMPT_CHAR} "
   PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n${PROMPT_CHAR} "
 
   ## cleanup ##
diff --git a/themes/powerline-multiline-blue/powerline-multiline-blue.theme.bash b/themes/powerline-multiline-blue/powerline-multiline-blue.theme.bash
index 278c400f..e4e0a33b 100644
--- a/themes/powerline-multiline-blue/powerline-multiline-blue.theme.bash
+++ b/themes/powerline-multiline-blue/powerline-multiline-blue.theme.bash
@@ -2,67 +2,23 @@
 
 . "$BASH_IT/themes/powerline-multiline-blue/powerline-multiline-blue.base.bash"
 
-PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
-POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
-POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""}
-POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""}
-POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
-POWERLINE_PADDING=${POWERLINE_PADDING:=2}
-
-USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-USER_INFO_THEME_PROMPT_COLOR=32
-USER_INFO_THEME_PROMPT_COLOR_SUDO=202
-
-PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:=""}
-CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-PYTHON_VENV_THEME_PROMPT_COLOR=220 #35
-
-SCM_NONE_CHAR=""
-SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
-SCM_HG_CHAR=${POWERLINE_SCM_HG_CHAR:="☿ "}
-SCM_THEME_PROMPT_CLEAN=""
-SCM_THEME_PROMPT_DIRTY=""
-SCM_THEME_PROMPT_CLEAN_COLOR=2
-SCM_THEME_PROMPT_DIRTY_COLOR=2 #214
-SCM_THEME_PROMPT_STAGED_COLOR=2 #99
-SCM_THEME_PROMPT_UNSTAGED_COLOR=2 #220
-SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
+POWERLINE_TEXT_COLOR=0
+POWERLINE_CWD_COLOR=39
+POWERLINE_LAST_STATUS_COLOR=196
+POWERLINE_SCM_CLEAN_COLOR=2
+POWERLINE_SCM_DIRTY_COLOR=2
+POWERLINE_SCM_STAGED_COLOR=2
+POWERLINE_SCM_UNSTAGED_COLOR=2
 SCM_GIT_SHOW_DETAILS=false
 SCM_GIT_SHOW_REMOTE_INFO=false
 
-RVM_THEME_PROMPT_PREFIX=""
-RVM_THEME_PROMPT_SUFFIX=""
-RBENV_THEME_PROMPT_PREFIX=""
-RBENV_THEME_PROMPT_SUFFIX=""
-RUBY_THEME_PROMPT_COLOR=161
-RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
+POWERLINE_PYTHON_VENV_CHAR=""
+PYTHON_VENV_THEME_PROMPT_COLOR=220
 
-AWS_PROFILE_CHAR="${POWERLINE_AWS_PROFILE_CHAR:=❲aws❳ }"
-AWS_PROFILE_PROMPT_COLOR=208
+CLOCK_THEME_PROMPT_COLOR=220
+THEME_CLOCK_FORMAT="%a %b %d %H:%M:%S %Y"
 
-CWD_THEME_PROMPT_COLOR=39
-
-LAST_STATUS_THEME_PROMPT_COLOR=196
-
-CLOCK_THEME_PROMPT_COLOR=240
-CLOCK_COLOR=220
-
-BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
-BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
-BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
-BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
-
-THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%a %b %d %H:%M:%S %Y"}
-
-IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_THEME_PROMPT_TEXT="vim"
-
-HOST_THEME_PROMPT_COLOR=0
-
-FG_COLOR=0
-
-POWERLINE_LEFT_PROMPT=${POWERLINE_LEFT_PROMPT:="cwd scm python_venv ruby"}
-#POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="in_vim clock battery user_info"}
-POWERLINE_RIGHT_PROMPT=${POWERLINE_RIGHT_PROMPT:="date"}
+POWERLINE_LEFT_PROMPT="cwd scm python_venv terraform ruby node"
+POWERLINE_RIGHT_PROMPT="date"
 
 safe_append_prompt_command __powerline_prompt_command