diff --git a/source/_lovelace/alarm-panel.markdown b/source/_lovelace/alarm-panel.markdown
index 0155f19dcb6..09e25d85f7d 100644
--- a/source/_lovelace/alarm-panel.markdown
+++ b/source/_lovelace/alarm-panel.markdown
@@ -44,6 +44,10 @@ states:
       description: Arm Night
     arm_custom_bypass:
       description: Arm Custom Bypass
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 ## Examples
diff --git a/source/_lovelace/markdown.markdown b/source/_lovelace/markdown.markdown
index f0f0efe6858..87a6e06d5a7 100644
--- a/source/_lovelace/markdown.markdown
+++ b/source/_lovelace/markdown.markdown
@@ -38,6 +38,10 @@ entity_id:
   type: [string, list]
   default: none
   description: "A list of entity IDs so a template in `content:` only reacts to the state changes of these entities. This can be used if the automatic analysis fails to find all relevant entities."
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 ## Example
diff --git a/source/_lovelace/picture-elements.markdown b/source/_lovelace/picture-elements.markdown
index 62feacd31db..6bc830afb59 100644
--- a/source/_lovelace/picture-elements.markdown
+++ b/source/_lovelace/picture-elements.markdown
@@ -34,6 +34,10 @@ state_filter:
   required: false
   description: '[State-based CSS filters](#how-to-use-state_filter)'
   type: map
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 ## Elements
diff --git a/source/_lovelace/picture-entity.markdown b/source/_lovelace/picture-entity.markdown
index 3249ea78265..4c5fac80557 100644
--- a/source/_lovelace/picture-entity.markdown
+++ b/source/_lovelace/picture-entity.markdown
@@ -59,6 +59,10 @@ show_state:
   description: Shows state in footer.
   type: boolean
   default: true
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 tap_action:
   required: false
   description: Action to take on tap
diff --git a/source/_lovelace/picture-glance.markdown b/source/_lovelace/picture-glance.markdown
index 1d71d73605b..c26ce3d3c23 100644
--- a/source/_lovelace/picture-glance.markdown
+++ b/source/_lovelace/picture-glance.markdown
@@ -63,6 +63,10 @@ show_state:
   description: Show entity state-text.
   type: boolean
   default: true
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 tap_action:
   required: false
   description: Action to take on tap
diff --git a/source/_lovelace/picture.markdown b/source/_lovelace/picture.markdown
index 5b9b3a3fb81..6a97fb0e5e4 100644
--- a/source/_lovelace/picture.markdown
+++ b/source/_lovelace/picture.markdown
@@ -20,6 +20,10 @@ image:
   required: true
   description: The URL of an image.
   type: string
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 tap_action:
   required: false
   description: Action to take on tap
diff --git a/source/_lovelace/plant-status.markdown b/source/_lovelace/plant-status.markdown
index 9b357cfe09d..4a51516674a 100644
--- a/source/_lovelace/plant-status.markdown
+++ b/source/_lovelace/plant-status.markdown
@@ -25,6 +25,10 @@ name:
   description: Overwrites Friendly Name
   type: string
   default: Entity Name
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 ## Example
diff --git a/source/_lovelace/shopping-list.markdown b/source/_lovelace/shopping-list.markdown
index f1caa13819b..ac066ceb7a6 100644
--- a/source/_lovelace/shopping-list.markdown
+++ b/source/_lovelace/shopping-list.markdown
@@ -26,6 +26,10 @@ title:
   required: false
   description: Title of Shopping List
   type: string
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 ## Examples
diff --git a/source/_lovelace/weather-forecast.markdown b/source/_lovelace/weather-forecast.markdown
index 651b25d81c4..64354728c2e 100644
--- a/source/_lovelace/weather-forecast.markdown
+++ b/source/_lovelace/weather-forecast.markdown
@@ -25,6 +25,10 @@ name:
   description: Overwrites the friendly name.
   type: string
   default: Entity Name
+theme:
+  required: false
+  description: "Set to any theme within `themes.yaml`"
+  type: string
 {% endconfiguration %}
 
 Example