diff --git a/source/_components/default_config.markdown b/source/_components/default_config.markdown
new file mode 100644
index 00000000000..852d8803c6e
--- /dev/null
+++ b/source/_components/default_config.markdown
@@ -0,0 +1,16 @@
+---
+layout: page
+title: "Default Config"
+description: "The default config component will initate a default configuration for Home Assistant."
+date: 2019-02-15 20:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: home-assistant.png
+ha_category: Other
+ha_release: 0.88
+featured: false
+---
+
+This component is a meta-component and configures a default set of components for Home Assistant to load. The components that will be loaded can be found [here](https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/default_config/__init__.py).
diff --git a/source/_components/ebusd.markdown b/source/_components/ebusd.markdown
index fcc02daa8e6..b203e051d0a 100644
--- a/source/_components/ebusd.markdown
+++ b/source/_components/ebusd.markdown
@@ -11,6 +11,8 @@ logo: ebusd.png
 ha_category: Sensor
 ha_iot_class: "Local Polling"
 ha_release: "0.88"
+redirect_from:
+  - /components/sensor.ebusd/
 ---
 
 Integration between [ebusd](https://github.com/john30/ebusd/) daemon for communication with eBUS heating systems, and Home Assistant using sensor component.
@@ -31,7 +33,7 @@ host:
   description: This is the IP address of your ebus daemon, e.g., `127.0.0.1`.
   required: true
   type: string
-circuit: 
+circuit:
   description: The heating circuit name to monitor, e.g., 700.
   required: true
   type: string
@@ -40,7 +42,7 @@ port:
   type: integer
   required: false
   default: 8888
-name: 
+name:
   description: The name to use when displaying this ebusd instance.
   type: string
   required: false
diff --git a/source/_components/weather.ipma.markdown b/source/_components/ipma.markdown
similarity index 96%
rename from source/_components/weather.ipma.markdown
rename to source/_components/ipma.markdown
index 68f4cf67a88..943650cf320 100644
--- a/source/_components/weather.ipma.markdown
+++ b/source/_components/ipma.markdown
@@ -11,6 +11,8 @@ logo: ipma.png
 ha_category: Weather
 ha_release: 0.72
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/weather.ipma/
 ---
 
 The `ipma` weather platform uses the [Instituto Português do Mar e Atmosfera](http://www.ipma.pt) as a source for current and forecast meteorological data.
diff --git a/source/_components/velux.markdown b/source/_components/velux.markdown
index 68468b6b08d..af87b167cd1 100644
--- a/source/_components/velux.markdown
+++ b/source/_components/velux.markdown
@@ -15,6 +15,7 @@ ha_release: 0.49
 ha_iot_class: "Local Polling"
 redirect_from:
   - /components/scene.velux/
+  - /components/cover.velux/
 ---
 
 [Velux](http://www.velux.com) integration for Home Assistant allows you to connect to a Velux KLF 200 interface, to control [io-homecontrol](http://www.io-homecontrol.com) devices like windows and blinds. The module allows you to start scenes configured within KLF 200.
diff --git a/source/_components/xs1.markdown b/source/_components/xs1.markdown
index 1bf230dbb3b..99951e6ae2c 100644
--- a/source/_components/xs1.markdown
+++ b/source/_components/xs1.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: xs1.jpg
-ha_category: 
+ha_category:
   - Hub
   - Climate
   - Sensor
@@ -16,6 +16,10 @@ ha_category:
 ha_release: 0.88
 featured: false
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/climate.xs1/
+  - /components/sensor.xs1/
+  - /components/switch.xs1/
 ---
 
 The [EZcontrol XS1](http://www.ezcontrol.de/content/view/36/28/) integration for Home Assistant allows you to observe and control devices configured on the XS1 Gateway. Please have a look at the official docs for using this gateway [Bedienungsanleitung v3.0.0.0](http://www.ezcontrol.de/support/downloads/XS1/xs1manual/Bedienungsanleitung_EZcontrol_XS1_3.0.0.0-2.pdf).
@@ -78,8 +82,8 @@ If you are using climate devices the "current temp" sensor will be automatically
 | `switch`      | Yes       |                                                  |
 | `dimmer`      | Partly    | Dimmers are currently handled like switches so actual dimming is not supported :(|
 | `temperature` | Yes       |                                                  |
- 
- 
+
+
 ### {% linkable_title Climate Actuator/Sensor%}
 
 Home Assistant can combine temperature sensors and climate actuators into a single device. The XS1 gateway does not allow this, but a sensor and actuator can be configured separately. To make Home Assistant register them in the same climate device just prefix the **sensor** name with the actuator name on the XS1 gateway configuration, f.ex: