diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 16fec5a3..bf4ee890 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -17,7 +17,10 @@ SCM_THEME_CURRENT_USER_PREFFIX=' ☺︎ '
 SCM_THEME_CURRENT_USER_SUFFIX=''
 
 CLOCK_CHAR='☆'
-THEME_CLOCK_CHECK=${THEME_CLOCK_CHECK:=true}
+THEME_SHOW_CLOCK=${THEME_CLOCK_CHECK:-true}
+THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%Y-%m-%d %H:%M:%S"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:="${bold_cyan}"}
+
 THEME_BATTERY_PERCENTAGE_CHECK=${THEME_BATTERY_PERCENTAGE_CHECK:=true}
 
 SCM_GIT_SHOW_DETAILS=${SCM_GIT_SHOW_DETAILS:=true}
@@ -370,10 +373,10 @@ function prompt_char {
     scm_char
 }
 
-function clock_char {
-    if [[ "${THEME_CLOCK_CHECK}" = true ]]; then
-        DATE_STRING=$(date +"%Y-%m-%d %H:%M:%S")
-        echo -e "${bold_cyan}$DATE_STRING ${red}$CLOCK_CHAR"
+function clock_prompt {
+    if [[ "${THEME_SHOW_CLOCK}" = true ]]; then
+        DATE_STRING=$(date +"${THEME_CLOCK_FORMAT}")
+        echo -e "${THEME_CLOCK_COLOR}$DATE_STRING ${red}$CLOCK_CHAR"
     fi
 }
 
diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash
index f014e771..6d3873c5 100644
--- a/themes/bobby/bobby.theme.bash
+++ b/themes/bobby/bobby.theme.bash
@@ -14,7 +14,7 @@ RVM_THEME_PROMPT_SUFFIX="|"
 
 function prompt_command() {
     #PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
-    PS1="\n$(battery_char) $(clock_char) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
+    PS1="\n$(battery_char) $(clock_prompt) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 safe_append_prompt_command prompt_command