diff --git a/source/_components/sensor.wunderground.markdown b/source/_components/sensor.wunderground.markdown
index 669e0cc9f0c..195a43b3cb0 100644
--- a/source/_components/sensor.wunderground.markdown
+++ b/source/_components/sensor.wunderground.markdown
@@ -30,52 +30,15 @@ sensor:
monitored_conditions:
- alerts
- dewpoint_c
- - dewpoint_f
- - dewpoint_string
- - feelslike_c
- - feelslike_f
- - feelslike_string
- - heat_index_c
- - heat_index_f
- - heat_index_string
- - elevation
- - location
- - observation_time
- - precip_1hr_in
- - precip_1hr_metric
- - precip_1hr_string
- - precip_today_in
- - precip_today_metric
- - precip_today_string
- - pressure_in
- - pressure_mb
- - pressure_trend
- - relative_humidity
- - station_id
- - solarradiation
- - temperature_string
- - temp_c
- - temp_f
- - UV
- - visibility_km
- - visibility_mi
- - weather
- - wind_degrees
- - wind_dir
- - wind_gust_kph
- - wind_gust_mph
- - wind_kph
- - wind_mph
- - wind_string
-
```
Configuration variables:
-- **api_key** (Required): See above.
+
+- **api_key** (Required): The API key for Weather Underground. See above for details.
- **pws_id** (Optional): You can enter a Personal Weather Station ID. The current list of Wunderground PWS stations is available [here](https://www.wunderground.com/weatherstation/ListStations.asp). If you do not enter a PWS ID, the current location information (latitude and longitude) from your `configuration.yaml` will be used to display weather conditions.
- **lang** (Optional): Specify the language that the API returns. The current list of all Wunderground language codes is available [here](https://www.wunderground.com/weather/api/d/docs?d=language-support). If not specified, it defaults to English (EN).
-- **latitude** (*Optional*): Latitude coordinate to monitor weather of (required if **longitude** is specificed), defaults to coordinates defined in your `configuration.yaml`
-- **longitude** (*Optional*): Longitude coordinate to monitor weather of (required if **latitude** is specified), defaults to coordinates defined in your `configuration.yaml`
+- **latitude** (*Optional*): Latitude coordinate to monitor weather of (required if **longitude** is specificed). Defaults to coordinates defined in your `configuration.yaml`.
+- **longitude** (*Optional*): Longitude coordinate to monitor weather of (required if **latitude** is specified). Defaults to coordinates defined in your `configuration.yaml`.
- **monitored_conditions** array (*Required*): Conditions to display in the frontend. The following conditions can be monitored.
- **alerts**: Current severe weather advisories
- **dewpoint_c**: Temperature in Celsius below which water droplets begin to condense and dew can form
@@ -138,35 +101,26 @@ Configuration variables:
All the conditions listed above will be updated every 5 minutes.
-### Forecasts
+### {% linkable_title Forecasts %}
_12 hour forecasts_
-Monitored conditions marked above with [12h] are 12 hour
-forecasts. To get a forecast for different period/daytime replace the
-`_1d_` part of the sensor name. e.g. `weather_2n` will give you forecast for
-tomorrow night. Valid values for day are `1` to `4` and
-valid values for daytime are `d` or `n`.
+Monitored conditions marked above with [12h] are 12 hour forecasts. To get a forecast for different period/daytime replace the `_1d_` part of the sensor name. e.g. `weather_2n` will give you forecast for tomorrow night. Valid values for day are `1` to `4` and valid values for daytime are `d` or `n`.
_Daily forecasts_
-Conditions above marked with [1d] are daily forecasts.
-To get forecast for different day, replace the number
-in `_1d_` part of the sensor name. Valid values are from
-`1` to `4`.
+Conditions above marked with [1d] are daily forecasts. To get forecast for different day, replace the number
+in `_1d_` part of the sensor name. Valid values are from `1` to `4`.
_Hourly forecasts_
-Conditions marked with [1h] are hourly forecasts.
-To get forecast for different hour, replace the number
-in the `_1h_` part of the sensor name with `1` to `36`.
-E.g. `weather_24h` will give you weather in 24 hours.
+Conditions marked with [1h] are hourly forecasts. To get forecast for different hour, replace the number
+in the `_1h_` part of the sensor name with `1` to `36`. E.g. `weather_24h` will give you weather in 24 hours.
-Additional examples:
-====================
+### {% linkable_title Additional examples %}
+
+#### Daily forecast
-Daily forecast
---------------
```yaml
sensor:
@@ -183,23 +137,23 @@ sensor:
- weather_4n_metric
group:
- dialy_forecast:
- name: Daily Forecast
- entities:
- - sensor.pws_weather_1d_metric
- - sensor.pws_weather_1n_metric
- - sensor.pws_weather_2d_metric
- - sensor.pws_weather_2n_metric
- - sensor.pws_weather_3d_metric
- - sensor.pws_weather_3n_metric
- - sensor.pws_weather_4d_metric
- - sensor.pws_weather_4n_metric
+ dialy_forecast:
+ name: Daily Forecast
+ entities:
+ - sensor.pws_weather_1d_metric
+ - sensor.pws_weather_1n_metric
+ - sensor.pws_weather_2d_metric
+ - sensor.pws_weather_2n_metric
+ - sensor.pws_weather_3d_metric
+ - sensor.pws_weather_3n_metric
+ - sensor.pws_weather_4d_metric
+ - sensor.pws_weather_4n_metric
```

-Weather overview
-----------------
+#### Weather overview
+
```yaml
sensor:
@@ -218,20 +172,20 @@ sensor:
- alerts
group:
- weather_overview:
- name: Weather overview
- entities:
- - sensor.pws_weather_1d_metric
- - sensor.pws_temp_high_record_c
- - sensor.pws_temp_high_1d_c
- - sensor.pws_temp_c
- - sensor.pws_temp_low_1d_c
- - sensor.pws_temp_low_record_c
- - sensor.pws_precip_1d
- - sensor.pws_precip_1d_mm
- - sensor.pws_wind_kph
- - sensor.pws_wind_1d_kph
- - sensor.pws_alerts
+ weather_overview:
+ name: Weather overview
+ entities:
+ - sensor.pws_weather_1d_metric
+ - sensor.pws_temp_high_record_c
+ - sensor.pws_temp_high_1d_c
+ - sensor.pws_temp_c
+ - sensor.pws_temp_low_1d_c
+ - sensor.pws_temp_low_record_c
+ - sensor.pws_precip_1d
+ - sensor.pws_precip_1d_mm
+ - sensor.pws_wind_kph
+ - sensor.pws_wind_1d_kph
+ - sensor.pws_alerts
```
