diff --git a/source/_components/aqualogic.markdown b/source/_components/aqualogic.markdown
index afc11d4ebb1..f8a578fbcc4 100644
--- a/source/_components/aqualogic.markdown
+++ b/source/_components/aqualogic.markdown
@@ -8,13 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: hayward.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Sensor
+  - Switch
 ha_release: "0.80"
 ha_iot_class: "Local Push"
+redirect_from:
+  - /components/sensor.aqualogic/
+  - /components/switch.aqualogic/
 ---
 
 The AquaLogic component provides connectivity to a Hayward/Goldline AquaLogic/ProLogic pool controller. Note that an RS-485 to Ethernet adapter connected to the pool controller is required.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+- [Switch](#switch)
+
 ## {% linkable_title Configuration %}
 
 To add the AquaLogic component to your installation, add the following to your `configuration.yaml` file:
@@ -22,8 +33,8 @@ To add the AquaLogic component to your installation, add the following to your `
 ```yaml
 # Example configuration.yaml entry
 aqualogic:
-  host: 192.168.1.1
-  port: 23
+  host: IP_ADDRESS
+  port: PORT
 ```
 
 {% configuration %}
@@ -36,3 +47,84 @@ port:
   required: true
   type: int
 {% endconfiguration %}
+
+## {% linkable_title Sensor %}
+
+Once you have enabled the AquaLogic component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: aqualogic
+    monitored_conditions:
+      - pool_temp
+```
+
+{% configuration %}
+monitored_conditions:
+  description: List of items you want to monitor.
+  required: false
+  default: all
+  type: list
+  keys:
+    air_temp:
+      description: The air temperature.
+    pool_temp:
+      description: The pool temperature.
+    spa_temp:
+      description: The spa temperature.
+    pool_chlorinator:
+      description: The pool chlorinator setting.
+    spa_chlorinator:
+      description: The spa chlorinator setting.
+    salt_level:
+      description: The current salt level.
+    pump_speed:
+      description: The current pump speed (Hayward VS pumps only).
+    pump_power:
+      description: The current pump power usage (Hayward VS pumps only).
+    status:
+      description: The current system status.
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+Once you have enabled the AquaLogic component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: aqualogic
+    monitored_conditions:
+      - lights
+      - filter
+```
+
+{% configuration %}
+monitored_conditions:
+  description: List of items you want to monitor/control.
+  required: false
+  default: all
+  type: list
+  keys:
+    filter:
+      description: Controls the filter pump.
+    filter_low_speed:
+      description: Controls low speed mode on the filter pump (multi-speed pumps only).
+    lights:
+      description: Controls the Lights relay.
+    aux_1:
+      description: Controls the Aux 1 relay.
+    aux_2:
+      description: Controls the Aux 2 relay.
+    aux_3:
+      description: Controls the Aux 3 relay.
+    aux_4:
+      description: Controls the Aux 4 relay.
+    aux_5:
+      description: Controls the Aux 5 relay.
+    aux_6:
+      description: Controls the Aux 6 relay.
+    aux_7:
+      description: Controls the Aux 7 relay.
+{% endconfiguration %}
\ No newline at end of file
diff --git a/source/_components/sensor.aqualogic.markdown b/source/_components/sensor.aqualogic.markdown
deleted file mode 100644
index 5c4c7208f0f..00000000000
--- a/source/_components/sensor.aqualogic.markdown
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: page
-title: "AquaLogic Sensor"
-description: "Instructions on how to integrate your AquaLogic devices within Home Assistant."
-date: 2018-09-17 9:16
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hayward.png
-ha_category: Sensor
-ha_release: "0.80"
-ha_iot_class: "Local Push"
----
-
-To get your AquaLogic sensors working within Home Assistant, please follow the instructions for the general [AquaLogic component](/components/aqualogic).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [AquaLogic component](/components/aqualogic), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: aqualogic
-    monitored_conditions:
-      - pool_temp
-```
-
-{% configuration %}
-monitored_conditions:
-  description: List of items you want to monitor.
-  required: false
-  default: all
-  type: list
-  keys:
-    air_temp:
-      description: The air temperature.
-    pool_temp:
-      description: The pool temperature.
-    spa_temp:
-      description: The spa temperature.
-    pool_chlorinator: 
-      description: The pool chlorinator setting.
-    spa_chlorinator: 
-      description: The spa chlorinator setting.
-    salt_level:
-      description: The current salt level.
-    pump_speed:
-      description: The current pump speed (Hayward VS pumps only).
-    pump_power:
-      description: The current pump power usage (Hayward VS pumps only).
-    status:
-      description: The current system status.
-{% endconfiguration %}
diff --git a/source/_components/switch.aqualogic.markdown b/source/_components/switch.aqualogic.markdown
deleted file mode 100644
index 80a0ad625db..00000000000
--- a/source/_components/switch.aqualogic.markdown
+++ /dev/null
@@ -1,58 +0,0 @@
----
-layout: page
-title: "AquaLogic Switch"
-description: "Instructions on how to integrate your AquaLogic devices within Home Assistant."
-date: 2018-09-17 9:16
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hayward.png
-ha_category: Switch
-ha_release: "0.80"
-ha_iot_class: "Local Push"
----
-
-To get your AquaLogic switches working within Home Assistant, please follow the instructions for the general [AquaLogic component](/components/aqualogic).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [AquaLogic component](/components/aqualogic), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: aqualogic
-    monitored_conditions:
-      - lights
-      - filter
-```
-
-{% configuration %}
-monitored_conditions:
-  description: List of items you want to monitor/control.
-  required: false
-  default: all
-  type: list
-  keys:
-    filter:
-      description: Controls the filter pump.
-    filter_low_speed:
-      description: Controls low speed mode on the filter pump (multi-speed pumps only).
-    lights:
-      description: Controls the Lights relay.
-    aux_1:
-      description: Controls the Aux 1 relay.
-    aux_2:
-      description: Controls the Aux 2 relay.
-    aux_3:
-      description: Controls the Aux 3 relay.
-    aux_4:
-      description: Controls the Aux 4 relay.
-    aux_5:
-      description: Controls the Aux 5 relay.
-    aux_6:
-      description: Controls the Aux 6 relay.
-    aux_7:
-      description: Controls the Aux 7 relay.
-{% endconfiguration %}