diff --git a/custom_templates/time.jinja b/custom_templates/time.jinja
index 3b6f891..d603fd9 100644
--- a/custom_templates/time.jinja
+++ b/custom_templates/time.jinja
@@ -3,11 +3,15 @@
 {% endmacro %}
 
 {% macro current_time_12hr() %}
-{{ now().strftime("%I:%M %p") }}
+{{ now().strftime("%-I:%M %p") }}
 {% endmacro %}
 
 {% macro input_datetime_12hr(entity) %}
-{{ state_attr(entity,'timestamp') | int | timestamp_custom('%I:%M %p', False) }}
+{{ state_attr(entity,'timestamp') | int | timestamp_custom('%-I:%M %p', False) }}
+{% endmacro %}
+
+{% macro input_datetime_12hr_with_date(entity) %}
+{{ state_attr(entity,'timestamp') | int | timestamp_custom('%-I:%M %p') }}
 {% endmacro %}
 
 {% macro current_date_readout() %}