diff --git a/packages/3dprinting.yaml b/packages/3dprinting.yaml
index 94f73f4..25f1d0b 100644
--- a/packages/3dprinting.yaml
+++ b/packages/3dprinting.yaml
@@ -86,7 +86,7 @@ sensor:
value_template: >
{% set seconds = states('sensor.octoprint_time_remaining')|int %}
{% if now().strftime('%s')|int | timestamp_custom("%A %D") == (now().strftime('%s') |int + seconds) | timestamp_custom("%A %D") %}
- Today at {{- now().strftime('%s')|int | timestamp_custom("%l:%M %p") }}
+ Today at {{- (now().strftime('%s')|int + seconds) | timestamp_custom("%l:%M %p") }}
{% else %}
{{ (now().strftime('%s') |int + seconds) | timestamp_custom("%A %D %l:%M %p") }}
{% endif %}
diff --git a/zwcfg_0xd89c4f0c.xml b/zwcfg_0xd89c4f0c.xml
index c4cf6db..ce7a771 100644
--- a/zwcfg_0xd89c4f0c.xml
+++ b/zwcfg_0xd89c4f0c.xml
@@ -259,9 +259,9 @@
-
+
-
+
@@ -547,9 +547,9 @@
-
+
-
+
@@ -719,7 +719,7 @@
-
+
@@ -728,8 +728,8 @@
-
-
+
+
@@ -1139,7 +1139,7 @@
-
+
@@ -1349,7 +1349,7 @@
-
+
@@ -1357,9 +1357,9 @@
-
+
-
+
@@ -1539,7 +1539,7 @@
-
+