More customization.

Signed-off-by: Mauricio Jost <mauricio.jost@activeeon.com>
Still customizing...

Signed-off-by: Mauricio Jost <mauricio.jost@activeeon.com>