diff --git a/custom_components/sun2/translations/en.json b/custom_components/sun2/translations/en.json
index fa39597..231a02f 100644
--- a/custom_components/sun2/translations/en.json
+++ b/custom_components/sun2/translations/en.json
@@ -2,7 +2,7 @@
     "title": "Sun2",
     "misc": {
         "above": "Above",
-        "above_horizon": "Above Horizon",
+        "above_horizon": "Above horizon",
         "elevation_at": "Elevation at",
         "minus": "minus",
         "rising": "Rising",
@@ -10,99 +10,255 @@
         "setting": "Setting"
     },
     "entity": {
+        "binary_sensor": {
+            "elevation": {
+                "state_attributes": {
+                    "next_change": {"name": "Next change"}
+                }
+            }
+        },
         "sensor": {
             "astronomical_daylight": {
-                "name": "Astronomical Daylight"
+                "name": "Astronomical daylight",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "astronomical_dawn": {
-                "name": "Astronomical Dawn"
+                "name": "Astronomical dawn",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "astronomical_dusk": {
-                "name": "Astronomical Dusk"
+                "name": "Astronomical dusk",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "astronomical_night": {
-                "name": "Astronomical Night"
-            },
-            "azimuth": {
-                "name": "Azimuth"
+                "name": "Astronomical night",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
+            "azimuth": {"name": "Azimuth"},
             "civil_daylight": {
-                "name": "Civil Daylight"
+                "name": "Civil daylight",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "civil_night": {
-                "name": "Civil Night"
+                "name": "Civil night",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "daylight": {
-                "name": "Daylight"
+                "name": "Daylight",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "dawn": {
-                "name": "Dawn"
+                "name": "Dawn",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "deconz_daylight": {
-                "name": "deCONZ Daylight",
+                "name": "deCONZ daylight",
                 "state": {
                     "dawn": "Dawn",
                     "dusk": "Dusk",
-                    "golden_hour_1": "Golden Hour 1",
-                    "golden_hour_2": "Golden Hour 2",
+                    "golden_hour_1": "Golden hour 1",
+                    "golden_hour_2": "Golden hour 2",
                     "nadir": "Nadir",
-                    "nautical_dawn": "Nautial Dawn",
-                    "nautical_dusk": "Nautial Dusk",
-                    "night_end": "Night End",
-                    "night_start": "Night Start",
-                    "solar_noon": "Solar Noon",
-                    "sunrise_end": "Sunrise End",
-                    "sunrise_start": "Sunrise Start"
+                    "nautical_dawn": "Nautial dawn",
+                    "nautical_dusk": "Nautial dusk",
+                    "night_end": "Night end",
+                    "night_start": "Night start",
+                    "solar_noon": "Solar noon",
+                    "sunrise_end": "Sunrise end",
+                    "sunrise_start": "Sunrise start"
+                },
+                "state_attributes": {
+                    "daylight": {"name": "Daylight"},
+                    "next_change": {"name": "Next change"}
                 }
             },
             "dusk": {
-                "name": "Dusk"
+                "name": "Dusk",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "elevation": {
-                "name": "Elevation"
+                "name": "Elevation",
+                "state_attributes": {
+                    "next_change": {"name": "Next change"}
+                }
+            },
+            "elevation_at_time": {
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "max_elevation": {
-                "name": "Maximum Elevation"
+                "name": "Maximum elevation",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "min_elevation": {
-                "name": "Minimum Elevation"
+                "name": "Minimum elevation",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "nautical_daylight": {
-                "name": "Nautical Daylight"
+                "name": "Nautical daylight",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "nautical_dawn": {
-                "name": "Nautical Dawn"
+                "name": "Nautical dawn",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "nautical_dusk": {
-                "name": "Nautical Dusk"
+                "name": "Nautical dusk",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "nautical_night": {
-                "name": "Nautical Night"
+                "name": "Nautical night",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "night": {
-                "name": "Night"
+                "name": "Night",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "today_hms": {"name": "Today hms"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "tomorrow_hms": {"name": "Tomorrow hms"},
+                    "yesterday": {"name": "Yesterday"},
+                    "yesterday_hms": {"name": "Yesterday hms"}
+                }
             },
             "solar_midnight": {
-                "name": "Solar Midnight"
+                "name": "Solar midnight",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "solar_noon": {
-                "name": "Solar Noon"
+                "name": "Solar noon",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "sun_phase": {
                 "name": "Phase",
                 "state": {
-                    "astronomical_twilight": "Astronomical Twilight",
-                    "civil_twilight": "Civil Twilight",
+                    "astronomical_twilight": "Astronomical twilight",
+                    "civil_twilight": "Civil twilight",
                     "day": "Day",
-                    "nautical_twilight": "Nautical Twilight",
+                    "nautical_twilight": "Nautical twilight",
                     "night": "Night"
+                },
+                "state_attributes": {
+                    "blue_hour": {"name": "Blue hour"},
+                    "golden_hour": {"name": "Golden hour"},
+                    "next_change": {"name": "Next change"},
+                    "rising": {"name": "Rising"}
                 }
             },
             "sunrise": {
-                "name": "Rising"
+                "name": "Rising",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             },
             "sunset": {
-                "name": "Setting"
+                "name": "Setting",
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
+            },
+            "time_at_elevation": {
+                "state_attributes": {
+                    "today": {"name": "Today"},
+                    "tomorrow": {"name": "Tomorrow"},
+                    "yesterday": {"name": "Yesterday"}
+                }
             }
         }
     }
diff --git a/custom_components/sun2/translations/nl.json b/custom_components/sun2/translations/nl.json
index e6a860e..4b3ab46 100644
--- a/custom_components/sun2/translations/nl.json
+++ b/custom_components/sun2/translations/nl.json
@@ -2,7 +2,7 @@
     "title": "Zon2",
     "misc": {
         "above": "Boven",
-        "above_horizon": "Boven Horizon",
+        "above_horizon": "Boven horizon",
         "elevation_at": "Hoogte bij",
         "minus": "min",
         "rising": "Zonsopkomst",
@@ -10,36 +10,96 @@
         "setting": "Zonsondergang"
     },
     "entity": {
+        "binary_sensor": {
+            "elevation": {
+                "state_attributes": {
+                    "next_change": {"name": "Volgende wijziging"}
+                }
+            }
+        },
         "sensor": {
             "astronomical_daylight": {
-                "name": "Astronomisch daglicht"
+                "name": "Astronomisch daglicht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "astronomical_dawn": {
-                "name": "Astronomische dageraad"
+                "name": "Astronomische dageraad",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "astronomical_dusk": {
-                "name": "Astronomische schemer"
+                "name": "Astronomische schemer",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "astronomical_night": {
-                "name": "Astronomische nacht"
-            },
-            "azimuth": {
-                "name": "Azimut"
+                "name": "Astronomische nacht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
+            "azimuth": {"name": "Azimut"},
             "civil_daylight": {
-                "name": "Civiel daglicht"
+                "name": "Civiel daglicht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "civil_night": {
-                "name": "Civiele nacht"
+                "name": "Civiele nacht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "daylight": {
-                "name": "Daglicht"
+                "name": "Daglicht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "dawn": {
-                "name": "Dageraad"
+                "name": "Dageraad",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "deconz_daylight": {
-                "name": "deCONZ Daglicht",
+                "name": "deCONZ daglicht",
                 "state": {
                     "dawn": "Dageraad",
                     "dusk": "Schemer",
@@ -53,40 +113,113 @@
                     "solar_noon": "Middagzon",
                     "sunrise_end": "Zonsopkomsteinde",
                     "sunrise_start": "Zonsopkomstbegin"
+                },
+                "state_attributes": {
+                    "daylight": {"name": "Daglicht"},
+                    "next_change": {"name": "Volgende wijziging"}
                 }
             },
             "dusk": {
-                "name": "Schemer"
+                "name": "Schemer",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "elevation": {
-                "name": "Hoogtehoek"
+                "name": "Hoogtehoek",
+                "state_attributes": {
+                    "next_change": {"name": "Volgende wijziging"}
+                }
+            },
+            "elevation_at_time": {
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "max_elevation": {
-                "name": "Maximale hoogtehoek"
+                "name": "Maximale hoogtehoek",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "min_elevation": {
-                "name": "Minimale hoogtehoek"
+                "name": "Minimale hoogtehoek",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "nautical_daylight": {
-                "name": "Nautisch daglicht"
+                "name": "Nautisch daglicht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "nautical_dawn": {
-                "name": "Nautische dageraad"
+                "name": "Nautische dageraad",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "nautical_dusk": {
-                "name": "Nautische schemer"
+                "name": "Nautische schemer",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "nautical_night": {
-                "name": "Nautische nacht"
+                "name": "Nautische nacht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "night": {
-                "name": "Nacht"
+                "name": "Nacht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "today_hms": {"name": "Vandaag umt"},
+                    "tomorrow": {"name": "Morgen"},
+                    "tomorrow_hms": {"name": "Morgen umt"},
+                    "yesterday": {"name": "Gisteren"},
+                    "yesterday_hms": {"name": "Gisteren umt"}
+                }
             },
             "solar_midnight": {
-                "name": "Zonne-middernacht"
+                "name": "Zonne-middernacht",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "solar_noon": {
-                "name": "Middagzon"
+                "name": "Middagzon",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "sun_phase": {
                 "name": "Fase",
@@ -96,13 +229,36 @@
                     "day": "Dag",
                     "nautical_twilight": "Nautische schemering",
                     "night": "Nacht"
+                },
+                "state_attributes": {
+                    "blue_hour": {"name": "Blauw uur"},
+                    "golden_hour": {"name": "Gouden uur"},
+                    "next_change": {"name": "Volgende wijziging"},
+                    "rising": {"name": "Zonsopkomst"}
                 }
             },
             "sunrise": {
-                "name": "Zonsopkomst"
+                "name": "Zonsopkomst",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             },
             "sunset": {
-                "name": "Zonsondergang"
+                "name": "Zonsondergang",
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
+            },
+            "time_at_elevation": {
+                "state_attributes": {
+                    "today": {"name": "Vandaag"},
+                    "tomorrow": {"name": "Morgen"},
+                    "yesterday": {"name": "Gisteren"}
+                }
             }
         }
     }