diff --git a/packages/v2/src/esp-entity-table.ts b/packages/v2/src/esp-entity-table.ts
index c233bd3..c8458fe 100644
--- a/packages/v2/src/esp-entity-table.ts
+++ b/packages/v2/src/esp-entity-table.ts
@@ -285,6 +285,29 @@ class ActionRenderer {
     </div>`;
   }
 
+  private _datetime(
+    entity: entityConfig,
+    type: string,
+    action: string,
+    opt: string,
+    value: string,
+  ) {
+    return html`
+      <input 
+        type="${type}" 
+        name="${entity.unique_id}"
+        id="${entity.unique_id}"
+        value="${value}"
+        @change="${(e: Event) => {
+          const val = (<HTMLTextAreaElement>e.target)?.value;
+          this.actioner?.restAction(
+            entity,
+            `${action}?${opt}=${val}`
+          );
+        }}"
+      />
+    `;
+  }
 
   private _textinput(
     entity: entityConfig,
@@ -411,6 +434,32 @@ class ActionRenderer {
     );
   }
 
+  render_date() {
+    if (!this.entity) return;
+    return html`
+      ${this._datetime(
+        this.entity,
+        "date",
+        "set",
+        "value",
+        this.entity.value,
+      )}
+    `;
+  }
+
+  render_time() {
+    if (!this.entity) return;
+    return html`
+      ${this._datetime(
+        this.entity,
+        "time",
+        "set",
+        "value",
+        this.entity.value,
+      )}
+    `;
+  }
+
   render_text() {
     if (!this.entity) return;
     return this._textinput(
diff --git a/packages/v2/vite.config.ts b/packages/v2/vite.config.ts
index 9159f94..2c75de0 100644
--- a/packages/v2/vite.config.ts
+++ b/packages/v2/vite.config.ts
@@ -87,6 +87,8 @@ export default defineConfig({
       "/climate": proxy_target,
       "/events": proxy_target,
       "/text": proxy_target,
+      "/date": proxy_target,
+      "/time": proxy_target,
     },
   },
 });