diff --git a/source/_components/plex.markdown b/source/_components/plex.markdown
index 713c260050a5..4d6ff913dda6 100644
--- a/source/_components/plex.markdown
+++ b/source/_components/plex.markdown
@@ -14,14 +14,17 @@ redirect_from:
 ---
 
 
-The `plex` platform allows you to connect to a [Plex Media Server](https://plex.tv). Once connected, [Plex Clients](https://www.plex.tv/apps-devices/) playing media from the connected Plex Media Server will show up as [Media Players](/components/media_player/) in Home Assistant. It will allow you to control media playback and see the current playing item.
+The `plex` platform allows you to connect to a [Plex Media Server](https://plex.tv). Once connected, [Plex Clients](https://www.plex.tv/apps-devices/) playing media from the connected Plex Media Server will show up as [Media Players](/components/media_player/) or report playback status via a [Sensor](/components/sensor/) in Home Assistant. The Media Players will allow you to control media playback and see the current playing item.
 
 There is currently support for the following device types within Home Assistant:
 
-- [Media Player](#setup---media-player)
+- [Media Player](#media-player)
 - [Sensor](#sensor)
 
-## Setup - Media Player
+If your Plex server has been claimed by a Plex account via the [claim interface](https://plex.tv/claim), Home Assistant will require an authentication token to connect. If you don't know your token, see [Finding your account token / X-Plex-Token](https://support.plex.tv/hc/en-us/articles/204059436).
+
+
+## Media Player
 
 The preferred way to setup the Plex platform is by enabling the [discovery component](/components/discovery/) which requires GDM enabled on your Plex server. This can be found on your Plex Web App under Settings > (server Name) > settings > Network and choose "Enable local network discovery (GDM)".
 
@@ -47,55 +50,33 @@ media_player:
   - platform: plex
 ```
 
-In the event that [discovery](/components/discovery/) does not work (GDM disabled or non-local Plex server), you can manually create a `plex.conf` file manually and place it in your [configuration directory ](/docs/configuration/) or `/config/` if you are running Hass.io. The following is an example of `plex.conf`:
-
-```json
-{"IP_ADDRESS:PORT": {"token": "TOKEN", "ssl": false, "verify": true}}
-```
-
 {% configuration %}
-IP_ADDRESS:
-  description: IP address of the Plex Media Server.
-  required: true
+host:
+  description: The IP address or hostname of your Plex server.
+  required: false
+  default: localhost
   type: string
-PORT:
-  description: Port where Plex is listening.
-  required: true
+port:
+  description: The port of your Plex Server.
+  required: false
   default: 32400
   type: integer
-TOKEN:
-  description: Only if authentication is required. Set to `null` (without quotes) otherwise.
+token:
+  description: A valid X-Plex-Token for your Plex server.
   required: false
   type: string
 ssl:
-  description: Whether to use SSL/TLS or not.
+  description: Use HTTPS to connect to Plex server, **NOTE:** host **must not** be an IP when this option is enabled.
   required: false
-  default: "`false`"
+  default: false
   type: boolean
-verify:
-  description: Perform a verification of the certificate. To allow invalid or self-signed SSL certificates set it to `false`.
+verify_ssl:
+  description: Verify the SSL certificate of your Plex server. You may need to disable this check if your local server enforces secure connections with the default certificate.
   required: false
-  default: "`true`"
+  default: true
   type: boolean
-{% endconfiguration %}
-
-### Customization
-
-You can customize the Plex integration by adding any of the variables below to your configuration:
-
-```yaml
-# Example configuration.yaml entry
-media_player:
-  - platform: plex
-    show_all_controls: false
-    use_episode_art: true
-    remove_unavailable_clients: true
-    client_remove_interval: 600
-```
-
-{% configuration %}
 show_all_controls:
-  description: "Forces all controls to display. Ignores dynamic controls (ex. show volume controls for client A but not for client B) based on detected client capabilities. This option allows you to override this detection if you suspect it to be incorrect."
+  description: Forces all controls to display. Ignores dynamic controls (ex. show volume controls for client A but not for client B) based on detected client capabilities. This option allows you to override this detection if you suspect it to be incorrect.
   required: false
   default: false
   type: boolean
@@ -105,7 +86,7 @@ use_episode_art:
   default: false
   type: boolean
 remove_unavailable_clients:
-  description: Remove stale plex clients from UI after interval.
+  description: Remove stale Plex clients from UI after interval.
   required: false
   default: true
   type: boolean
@@ -175,17 +156,13 @@ Plays a song, playlist, TV episode, or video on a connected client.
   INFO:homeassistant.components.media_player.plex:No server found at: http://192.168.1.10:32400
   ```
 
-  If this occurs, check the setting `Server`>`Network`>`Secure connections` on your Plex Media Server: if it is set to `Preferred` or `Required`, you may need to manually set the `ssl` and `verify` booleans in the `plex.conf` file to, respectively, `true` and `false`. See the **"Setup"** section above for details.
+  If this occurs, check the setting `Server`>`Network`>`Secure connections` on your Plex Media Server: if it is set to `Preferred` or `Required`, you may need to manually set the `ssl` and `verify` booleans to, respectively, `true` and `false`.
 * Movies must be located under 'Movies' section in the Plex library to properly get 'playing' state.
 
 ## Sensor
 
 The `plex` sensor platform will monitor activity on a given [Plex Media Server](https://plex.tv/). It will create a sensor that shows the number of currently watching users as the state. If you click the sensor for more details it will show you who is watching what.
 
-If your Plex server is on the same local network as Home Assistant, all you need to provide in the `configuration.yaml` is the host or IP address. If you want to access a remote Plex server, you must provide the Plex username, password, and optionally the server name of the remote Plex server. If no server name is given it will use the first server listed. If you use the username and password, all servers in that account are monitored.
-
-If you don't know your token, see [Finding your account token / X-Plex-Token](https://support.plex.tv/hc/en-us/articles/204059436).
-
 If you want to enable the plex sensor, add the following lines to your `configuration.yaml`:
 
 ```yaml
@@ -196,7 +173,7 @@ sensor:
 
 {% configuration %}
 host:
-  description: The IP address of your Plex server.
+  description: The IP address or hostname of your Plex server.
   required: false
   default: localhost
   type: string
@@ -210,20 +187,8 @@ name:
   required: false
   default: Plex
   type: string
-username:
-  description: The username for the remote Plex server.
-  required: false
-  type: string
-password:
-  description: The password for your given account on the remote Plex server.
-  required: false
-  type: string
-server:
-  description: The name of your remote Plex server.
-  required: false
-  type: string
 token:
-  description: X-Plex-Token of your remote Plex server.
+  description: A valid X-Plex-Token for your Plex server.
   required: false
   type: string
 ssl: