diff --git a/sensor/hass_stats.yaml b/sensor/hass_stats.yaml
index 5c4e8f90..931fab17 100755
--- a/sensor/hass_stats.yaml
+++ b/sensor/hass_stats.yaml
@@ -9,5 +9,5 @@
 - platform: template
   sensors:
    ha_last_restart:
-     value_template: '{{ as_timestamp(states.automation.startup_notification.attributes.last_triggered) | timestamp_custom("%b %d %X") }}'
+     value_template: '{{ as_timestamp(states.automation.startup_notification_and_shut_startup_lights.attributes.last_triggered) | timestamp_custom("%b %d %X") }}'
      friendly_name: HA Last Restart
diff --git a/shell_scripts/Jinja Code.py b/shell_scripts/Jinja Code.py
index db36cd31..9e1e0273 100755
--- a/shell_scripts/Jinja Code.py	
+++ b/shell_scripts/Jinja Code.py	
@@ -1,6 +1,5 @@
 You can use this code to quickly create files from the template editor in HA.  I use it mainly for `emulated_hue` and to quickly add in new Customize options to all things HA!
 
-
 For the sandbox.
 {% set trigger = {'entity_id':'sensor.downstairs_thermostat_hvac_state','to_state':'cooling'} %}
 
@@ -22,3 +21,23 @@ Create fast Customize for groups, sensors, covers etc...  Just change that first
 {% endfor -%}
 
 #########################################################
+#This code lists out EVERY possible entity and attribute for that entity.
+# source: https://github.com/skalavala/smarthome/blob/master/Entities.md
+#########################################################
+
+{{ "_".ljust(90, "_") }}
+{%- set domains = [states.light, states.switch, states.automation, states.device_tracker, states.group, states.media_player, states.proximity, states.script, states.zone, states.zwave, states.sensor, states.calendar ] %}
+{{ "Entity ID".ljust(50) }}{{ "Entity Name" }}
+{%- for domain in domains -%}
+{% for item in domain %}
+{{ "_".ljust(90, "_") }}
+{{ item.entity_id.ljust(50) }}{{ item.name }}
+{% for attrib in item.attributes %}
+{%- if attrib is defined %}
+  {{attrib.ljust(50)}}: {{ item.attributes[attrib] }}
+{%- endif %}
+{%- endfor %}
+{%- endfor %}
+{%- endfor %}
+
+#########################################################