diff --git a/source/_docs/blueprint/selectors.markdown b/source/_docs/blueprint/selectors.markdown
index 9b56b713ddf..28b6fee89bf 100644
--- a/source/_docs/blueprint/selectors.markdown
+++ b/source/_docs/blueprint/selectors.markdown
@@ -16,6 +16,7 @@ blueprint easier to use from the UI.
 The following selectors are currently available:
 
 - [Action selector](#action-selector)
+- [Add-on selector](#add-on-selector)
 - [Area selector](#area-selector)
 - [Boolean selector](#boolean-selector)
 - [Device selector](#device-selector)
@@ -43,6 +44,23 @@ This selector does not have any other options; therefore, it only has its key.
 action:
 ```
 
+## Add-on selector
+
+This can only be used on an installation with a Supervisor. For installations
+that do not have that, an error will be displayed.
+
+The add-on selector allows the user to input an add-on slug.
+On the user interface, it will list all installed add-ons and use the slug of the
+selected add-on.
+
+![Screenshot of an Add-on selector](/images/blueprints/selector-addon.png)
+
+This selector does not have any other options; therefore, it only has its key.
+
+```yaml
+addon:
+```
+
 ## Area selector
 
 The area selector shows an area finder that can pick a single area. The value
diff --git a/source/_integrations/faadelays.markdown b/source/_integrations/faadelays.markdown
new file mode 100644
index 00000000000..0defacdac88
--- /dev/null
+++ b/source/_integrations/faadelays.markdown
@@ -0,0 +1,57 @@
+---
+title: FAA Delays
+description: Instructions on how to use FAA Delays data within Home Assistant
+ha_category:
+  - Transport
+ha_release: 2021.3
+ha_iot_class: Cloud Polling
+ha_config_flow: true
+ha_codeowners:
+  - '@ntilley905'
+ha_domain: faadelays
+---
+
+The FAA Delays integration collects and displays information about delays at US Airports based on the
+[FAA's National Airspace System Status](https://www.fly.faa.gov/ois/).
+
+Data measured includes:
+
+- Ground Delays
+- Ground Stops
+- Arrival/Departure Delays
+- Closures
+
+{% include integrations/config_flow.md %}
+
+## Supported Airports
+
+The airport entered must be a valid IATA
+airport code for an airport in the US. You can find this by looking up the 
+FAA Identifier at [Airnav](https://airnav.com/airports/). Officially the FAA
+only supports the airports listed below, but all airports will return data.
+
+Supported airports: BOS, LGA, TEB, EWR, JFK, PHL, PIT, IAD, BWI, DCA, RDU,
+CLT, ATL, MCO, TPA, MCO, FLL, MIA, DTW, CLE, MDW, ORD, IND, CVG, BNA, MEM,
+STL, MCI, MSP, DFW, IAH, DEN, SLC, PHX, LAS, SAN, LAX, SJC, SFO, PDX, SEA
+
+## Additional Delay Information
+
+Each airport added will expose 5 binary sensors, one for each type of delay. Within each sensor there is additional
+information listed as attributes, which depends on the type of delay it is. Each delay type has the attributes
+listed below:
+
+- Ground Delay
+  - Average Delay Time
+  - Delay reason
+- Ground Stop
+  - Expected End Time for stop
+  - Delay reason
+- Arrival/Departure Delay
+  - Minimum delay time
+  - Maximum delay time
+  - Delay trend (increasing/decreasing)
+  - Delay reason
+- Closure
+  - Start of closure (begin)
+  - End of closure (end)
+  - Closure reason
diff --git a/source/_integrations/habitica.markdown b/source/_integrations/habitica.markdown
index 3642b1a29e5..5556797b08e 100644
--- a/source/_integrations/habitica.markdown
+++ b/source/_integrations/habitica.markdown
@@ -15,20 +15,28 @@ This integration allows you to monitor and manage your Habitica profile. This in
 
 There is currently support for the following device types within Home Assistant:
 
-- Sensor - Allows you to view and monitor your player data from [Habitica](https://habitica.com/) in Home Assistant.
+Player data: allows you to view and monitor your player data from [Habitica](https://habitica.com/) in Home Assistant. The following sensors will be available:
 
-The sensors will automatically appear, after setup the Habitica component.
+- Player's name
+- Player's health points
+- Player's max health
+- Player's manna points
+- Player's max manna points
+- Player's experience
+- Player's experience to the next level
+- Player's level
+- Player's gold pieces
+- Player's class
 
-To use the integration you should use this example configuration:
+Tasks: allows you to view and monitor your tasks from [Habitica](https://habitica.com/) in Home Assistant. The following sensors will be available:
 
-```yaml
-# Minimum viable configuration.yaml entry
-habitica:
-  - api_user: YOUR_USER_ID
-    api_key: YOUR_API_KEY
-```
+- Habits
+- Daily tasks
+- Todo tasks
+- Rewards
+
+{% include integrations/config_flow.md %}
 
-You can specify several users, providing `api_user` and `api_key` for each.
 At runtime you will be able to use API for each respective user by their Habitica's username.
 You can override this by passing `name` key, this value will be used instead of the username.
 If you are hosting your own instance of Habitica, you can specify a URL to it in `url` key.
@@ -52,11 +60,6 @@ url:
   required: false
   type: string
   default: https://habitica.com
-sensors:
-  description: List of sensors to generate for this user. If you don't specify this entry then the default (all sensors) will be generated. If you specify this entry empty then no sensors will be generated.
-  required: false
-  type: list
-  default: all (`name`, `hp`, `maxHealth`, `mp`, `maxMP`, `exp`, `toNextLevel`, `lvl`, `gp`, `class`)
 {% endconfiguration %}
 
 ### API Service Parameters
diff --git a/source/_integrations/toon.markdown b/source/_integrations/toon.markdown
index 3eccbaa0919..cd9b8f0a1f1 100644
--- a/source/_integrations/toon.markdown
+++ b/source/_integrations/toon.markdown
@@ -8,7 +8,7 @@ ha_category:
   - Sensor
   - Switch
 ha_release: 0.56
-ha_iot_class: Cloud Polling
+ha_iot_class: Cloud Push
 ha_config_flow: true
 ha_codeowners:
   - '@frenck'
diff --git a/source/_lovelace/entities.markdown b/source/_lovelace/entities.markdown
index c71d7246bf1..964a6c24bcd 100644
--- a/source/_lovelace/entities.markdown
+++ b/source/_lovelace/entities.markdown
@@ -139,12 +139,12 @@ name:
 format:
   required: false
   description: "How the attribute value should be formatted. Currently only supported for timestamp attributes. Valid values are: `relative`, `total`, `date`, `time` and `datetime`."
-  type: string  
+  type: string
 {% endconfiguration %}
 
 ### Button
 
-Row with an (optional) icon, label and a single text button at the end of the row that can trigger a defined action. 
+Row with an (optional) icon, label and a single text button at the end of the row that can trigger a defined action.
 
 {% configuration %}
 type:
@@ -356,6 +356,16 @@ icon:
   description: "Icon to display (e.g., `mdi:home`)."
   type: string
   default: "`mdi:link`"
+new_tab:
+  required: false
+  description: Open link in new tab. If link is external URL or a download link, this will automatically be true. Use if internal URL should be opened in new tab.
+  type: boolean
+  default: false
+download:
+  required: false
+  description: Is link a download?
+  type: boolean
+  default: false
 {% endconfiguration %}
 
 ## Examples
@@ -433,7 +443,7 @@ entities:
     conditions:
       - entity: sun.sun
         state: above_horizon
-    row: 
+    row:
       entity: sun.sun
       type: attribute
       attribute: azimuth
diff --git a/source/images/blueprints/selector-addon.png b/source/images/blueprints/selector-addon.png
new file mode 100644
index 00000000000..e440ce95a03
Binary files /dev/null and b/source/images/blueprints/selector-addon.png differ