diff --git a/colorschemes/colorscheme.sh b/colorschemes/colorscheme.sh
index 1521986c..9ea960ab 100644
--- a/colorschemes/colorscheme.sh
+++ b/colorschemes/colorscheme.sh
@@ -44,9 +44,10 @@ function powerline.prompt.templates() {
 	bashit.colorsscheme "$@"
 }
 
-powerline.prompt.git.default
-powerline.prompt.left   scm ruby cwd
-powerline.prompt.right  go clock battery
+powerline.prompt.git.max
+
+powerline.prompt.left   aws ruby haskell go scm cwd
+powerline.prompt.right  user_info clock battery
 
 bashit.colorscheme dark
 
diff --git a/colorschemes/light.colorscheme.bash b/colorschemes/light.colorscheme.bash
index 99b3877f..1f9a10ec 100644
--- a/colorschemes/light.colorscheme.bash
+++ b/colorschemes/light.colorscheme.bash
@@ -2,7 +2,7 @@ CLOCK_THEME_PROMPT_COLOR=214
 CWD_THEME_PROMPT_COLOR=123
 HOST_THEME_PROMPT_COLOR=9
 RUBY_THEME_PROMPT_COLOR=202
-SCM_THEME_PROMPT_CLEAN_COLOR=560
+SCM_THEME_PROMPT_CLEAN_COLOR=177
 SCM_THEME_PROMPT_DIRTY_COLOR=220
 SCM_THEME_PROMPT_STAGED_COLOR=1251
 SCM_THEME_PROMPT_UNSTAGED_COLOR=209
diff --git a/themes/powerline/powerline.helpers.bash b/themes/powerline/powerline.helpers.bash
index 439ff880..b5a6f85b 100644
--- a/themes/powerline/powerline.helpers.bash
+++ b/themes/powerline/powerline.helpers.bash
@@ -352,17 +352,17 @@ function powerline.default() {
 }
 
 function powerline.prompt.alternative-symbols() {
-	export SCM_GIT_CHAR=" Ⓖ "
-	export USER_INFO_SSH_CHAR="🔐 "
-	export PYTHON_VENV_CHAR="ⓟ "
-	export CONDA_PYTHON_VENV_CHAR="ⓒⓟ "
-	export NODE_CHAR="ⓝ  "
-	export RUBY_CHAR="ⓡ  "
-	export GO_CHAR="ⓖ  "
-	export TERRAFORM_CHAR="ⓣ  "
+	export SCM_GIT_CHAR=" ᛋ "
+	export USER_INFO_SSH_CHAR=" 🔐 "
+	export PYTHON_VENV_CHAR=" 🐍  "
+	export CONDA_PYTHON_VENV_CHAR=" 🐍 "
+	export NODE_CHAR=" 🅽  "
+	export RUBY_CHAR=" 🔻 "
+	export GO_CHAR=" 🅶  "
+	export TERRAFORM_CHAR=" 🆃 "
 	export KUBERNETES_CONTEXT_THEME_CHAR="⎈ "
-	export AWS_PROFILE_CHAR="«aws» "
-	export BATTERY_AC_CHAR="⚡"
+	export AWS_PROFILE_CHAR=" ☁️  "
+	export BATTERY_AC_CHAR=" 🔋 "
 	export IN_VIM_THEME_PROMPT_TEXT="ⓥ "
 	export SHLVL_THEME_PROMPT_CHAR="ⓢ "
 	export COMMAND_NUMBER_THEME_PROMPT_CHAR="↳"