diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 853505e9..283dd1d3 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -14,6 +14,8 @@ SCM_THEME_COMMIT_PREFIX='commit:'
 SCM_THEME_REMOTE_PREFIX=''
 
 CLOCK_CHAR='☆'
+CLOCK_CHECK=${CLOCK_CHECK:=true}
+BATTER_PERCENTAGE_CHECK=${BATTER_PERCENTAGE_CHECK:=true}
 
 SCM_GIT_SHOW_DETAILS=${SCM_GIT_SHOW_DETAILS:=true}
 
@@ -294,14 +296,28 @@ function prompt_char {
 }
 
 function clock_char {
-    echo -e "$CLOCK_CHAR"
+    if [[ "${CLOCK_CHECK}" = true ]]; then
+        DATE_STRING=$(date +"%Y-%m-%d %H:%M:%S")
+        echo -e "${bold_cyan}$DATE_STRING ${red}$CLOCK_CHAR"
+    fi
+}
+
+function battery_char {
+    if [[ "${BATTER_PERCENTAGE_CHECK}" = true ]]; then
+        echo -e "${bold_red}$(battery_percentage)%"
+    fi
 }
 
 if [ ! -e $BASH_IT/plugins/enabled/battery.plugin.bash ]; then
-# if user has installed battery plugin, skip this...
+    # if user has installed battery plugin, skip this...
     function battery_charge (){
-		# no op
-			echo -n
+	# no op
+	echo -n
+    }
+
+    function battery_char (){
+	# no op
+	echo -n
     }
 fi
 
diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash
index eab8a0ec..e0011759 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${bold_cyan}\T ${red}$(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_char) ${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
 }
 
 PROMPT_COMMAND=prompt_command;