diff --git a/completion/available/kontena.completion.bash b/completion/available/kontena.completion.bash
new file mode 100644
index 00000000..a1d24b3c
--- /dev/null
+++ b/completion/available/kontena.completion.bash
@@ -0,0 +1 @@
+which kontena > /dev/null && . "$( kontena whoami --bash-completion-path )"
diff --git a/lib/helpers.bash b/lib/helpers.bash
index eb546db9..2dffe4ab 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -348,19 +348,33 @@ _help-aliases()
     _example '$ alias-help git'
 
     if [ -n "$1" ]; then
-        cat $BASH_IT/aliases/available/$1.aliases.bash | metafor alias | sed "s/$/'/"
+        case $1 in
+            custom)
+                alias_path='custom.aliases.bash'
+            ;;
+            *)
+                alias_path="available/$1.aliases.bash"
+            ;;
+        esac
+        cat $BASH_IT/aliases/$alias_path | metafor alias | sed "s/$/'/"
     else
         typeset f
         for f in $BASH_IT/aliases/enabled/*
         do
-            typeset file=$(basename $f)
-            printf '\n\n%s:\n' "${file%%.*}"
-            # metafor() strips trailing quotes, restore them with sed..
-            cat $f | metafor alias | sed "s/$/'/"
+            _help-list-aliases $f
         done
+        _help-list-aliases $BASH_IT/aliases/custom.aliases.bash
     fi
 }
 
+_help-list-aliases ()
+{
+    typeset file=$(basename $1)
+    printf '\n\n%s:\n' "${file%%.*}"
+    # metafor() strips trailing quotes, restore them with sed..
+    cat $1 | metafor alias | sed "s/$/'/"
+}
+
 _help-plugins()
 {
     _about 'summarize all functions defined by enabled bash-it plugins'
diff --git a/themes/wanelo/wanelo.theme.bash b/themes/wanelo/wanelo.theme.bash
new file mode 100644
index 00000000..e3cb7617
--- /dev/null
+++ b/themes/wanelo/wanelo.theme.bash
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+SCM_THEME_PROMPT_DIRTY=" ${red}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+SCM_THEME_PROMPT_PREFIX=" |"
+SCM_THEME_PROMPT_SUFFIX="${green}|"
+
+GIT_THEME_PROMPT_DIRTY=" ${red}✗"
+GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+GIT_THEME_PROMPT_PREFIX=" ${green}|"
+GIT_THEME_PROMPT_SUFFIX="${green}|"
+
+RVM_THEME_PROMPT_PREFIX="|"
+RVM_THEME_PROMPT_SUFFIX="|"
+
+function prompt_command() {
+    if [ $? -eq 0 ]; then
+      status=❤️
+    else
+      status=💔
+    fi
+    PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w $status \n${bold_cyan} ${blue}|\t|${green}$(scm_prompt_info) ${green}→${reset_color} "
+}
+
+PROMPT_COMMAND=prompt_command;