diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index cc188190..52727e04 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -20,12 +20,15 @@ You can also override the default variables if you want to use different glyphs
 ### Default theme glyphs
 
 ```bash
-SCM_GIT_CHAR_GITLAB='  '
-SCM_GIT_CHAR_BITBUCKET='  '
-SCM_GIT_CHAR_GITHUB='  '
-SCM_GIT_CHAR_DEFAULT='  '
-SCM_GIT_CHAR_ICON_BRANCH=''
-EXIT_CODE_ICON=' '
+BARBUK_GITLAB_CHAR='  '
+BARBUK_BITBUCKET_CHAR='  '
+BARBUK_GITHUB_CHAR='  '
+BARBUK_GIT_DEFAULT_CHAR='  '
+BARBUK_GIT_BRANCH_ICON=''
+BARBUK_HG_CHAR='☿ '
+BARBUK_SVN_CHAR='⑆ '
+BARBUK_NO_SCM_CHAR=''
+BARBUK_EXIT_CODE_ICON=' '
 ```
 
 ### Customize glyphs
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 39d4995e..ec2ac7b8 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -2,17 +2,17 @@
 # shellcheck disable=2034,2154
 
 # Theme custom glyphs
-SCM_GIT_CHAR_GITLAB=${SCM_GITLAB_CHAR:='  '}
-SCM_GIT_CHAR_BITBUCKET=${SCM_GIT_CHAR_BITBUCKET:='  '}
-SCM_GIT_CHAR_GITHUB=${SCM_GIT_CHAR_GITHUB:='  '}
-SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
-SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
-EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
+SCM_GIT_CHAR_GITLAB=${BARBUK_GITLAB_CHAR:='  '}
+SCM_GIT_CHAR_BITBUCKET=${BARBUK_BITBUCKET_CHAR:='  '}
+SCM_GIT_CHAR_GITHUB=${BARBUK_GITHUB_CHAR:='  '}
+SCM_GIT_CHAR_DEFAULT=${BARBUK_GIT_DEFAULT_CHAR:='  '}
+SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
+SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
+SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
+SCM_NONE_CHAR=${BARBUK_NO_SCM_CHAR:=''}
+EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Bash-it default glyphs customization
-SCM_HG_CHAR='☿ '
-SCM_SVN_CHAR='⑆ '
-SCM_NONE_CHAR=
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"