diff --git a/src/SFM/WebsiteBundle/DependencyInjection/Configuration.php b/src/SFM/WebsiteBundle/DependencyInjection/Configuration.php
old mode 100755
new mode 100644
diff --git a/src/SFM/WebsiteBundle/DependencyInjection/SFMWebsiteExtension.php b/src/SFM/WebsiteBundle/DependencyInjection/SFMWebsiteExtension.php
old mode 100755
new mode 100644
index 847c4fc..c70bf7a
--- a/src/SFM/WebsiteBundle/DependencyInjection/SFMWebsiteExtension.php
+++ b/src/SFM/WebsiteBundle/DependencyInjection/SFMWebsiteExtension.php
@@ -22,7 +22,7 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.xml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
     }
 }
diff --git a/src/SFM/WebsiteBundle/Menu/Builder.php b/src/SFM/WebsiteBundle/Menu/Builder.php
deleted file mode 100644
index 03a1a25..0000000
--- a/src/SFM/WebsiteBundle/Menu/Builder.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace SFM\WebsiteBundle\Menu;
-
-use Knp\Menu\FactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerAware;
-
-class Builder extends ContainerAware
-{
-    public function menuPrincipal(FactoryInterface $factory)
-    {
-        $menu = $factory->createItem('root');
-        $menu->setCurrentUri($this->container->get('request')->getRequestUri());
-
-		    $menu->addChild('Inicio', array('route' => 'inicio'));
-        $menu->addChild('Blog', array('route' => 'blog'));
-        $menu->addChild('Proyectos', array('route' => 'proyectos'));
-        $menu->addChild('Personas', array('route' => 'personas'));
-
-        return $menu;
-    }
-}
diff --git a/src/SFM/WebsiteBundle/Menu/MenuBuilder.php b/src/SFM/WebsiteBundle/Menu/MenuBuilder.php
new file mode 100644
index 0000000..1a00dc8
--- /dev/null
+++ b/src/SFM/WebsiteBundle/Menu/MenuBuilder.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace SFM\WebsiteBundle\Menu;
+
+use Knp\Menu\FactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class MenuBuilder
+{
+    private $factory;
+
+    /**
+     * @param FactoryInterface $factory
+     */
+    public function __construct(FactoryInterface $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    public function createMenuPrincipal(Request $request)
+    {
+        $menu = $this->factory->createItem('root');
+        $menu->setCurrentUri($request->getRequestUri());
+
+		    $menu->addChild('Inicio', array('route' => 'inicio'));
+        $menu->addChild('Blog', array('route' => 'blog'));
+        $menu->addChild('Proyectos', array('route' => 'proyectos'));
+        $menu->addChild('Personas', array('route' => 'personas'));
+
+
+        return $menu;
+    }
+}
diff --git a/src/SFM/WebsiteBundle/Resources/config/services.xml b/src/SFM/WebsiteBundle/Resources/config/services.xml
deleted file mode 100755
index 153ef07..0000000
--- a/src/SFM/WebsiteBundle/Resources/config/services.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <!--
-    <parameters>
-        <parameter key="sfm_website.example.class">SFM\WebsiteBundle\Example</parameter>
-    </parameters>
-
-    <services>
-        <service id="sfm_website.example" class="%sfm_website.example.class%">
-            <argument type="service" id="service_id" />
-            <argument>plain_value</argument>
-            <argument>%parameter_name%</argument>
-        </service>
-    </services>
-    -->
-</container>
diff --git a/src/SFM/WebsiteBundle/Resources/config/services.yml b/src/SFM/WebsiteBundle/Resources/config/services.yml
new file mode 100644
index 0000000..f9b143c
--- /dev/null
+++ b/src/SFM/WebsiteBundle/Resources/config/services.yml
@@ -0,0 +1,13 @@
+services:
+    sfm_website.menu_builder:
+        class: SFM\WebsiteBundle\Menu\MenuBuilder
+        arguments: ["@knp_menu.factory"]
+
+    sfm_website.menu.principal:
+        class: Knp\Menu\MenuItem # the service definition requires setting the class
+        factory_service: sfm_website.menu_builder
+        factory_method: createMenuPrincipal
+        arguments: ["@request"]
+        scope: request # needed as we have the request as a dependency here
+        tags:
+            - { name: knp_menu.menu, alias: principal } # The alias is what is used to retrieve the menu
diff --git a/src/SFM/WebsiteBundle/Resources/views/layout.html.twig b/src/SFM/WebsiteBundle/Resources/views/layout.html.twig
index c61730f..592f266 100755
--- a/src/SFM/WebsiteBundle/Resources/views/layout.html.twig
+++ b/src/SFM/WebsiteBundle/Resources/views/layout.html.twig
@@ -33,7 +33,7 @@
 					</section>
 					<!--start menu-->
 					<nav>
-            {{ knp_menu_render('SFMWebsiteBundle:Builder:menuPrincipal') }}
+            {{ knp_menu_render('principal') }}
 					</nav>
 					<!--end menu-->
 				</header>