diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js
index 9acf3276c..5ef97c6dc 100644
--- a/@salix/app/src/configroutes.js
+++ b/@salix/app/src/configroutes.js
@@ -17,7 +17,7 @@ function config($stateProvider, $urlRouterProvider) {
     
     core.splitingRegister.registerGraph(deps);
 
-    $urlRouterProvider.otherwise('/client');
+    $urlRouterProvider.otherwise('/clients');
 
 	for (var file in routes)
     routes[file].forEach(function (route) {
diff --git a/@salix/core/src/check/check.mt.html b/@salix/core/src/check/check.mt.html
index 671daf162..66d11f0f1 100644
--- a/@salix/core/src/check/check.mt.html
+++ b/@salix/core/src/check/check.mt.html
@@ -1,4 +1,4 @@
-<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="*[id]*">
-	<input type="checkbox" name="*[name]*" id="*[id]*" class="*[className]*" ng-model="*[model]*" *[enabled]*>
+<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect">
+	<input type="checkbox" name="*[name]*" class="*[className]*" ng-model="*[model]*" *[enabled]*>
 	<span class="mdl-checkbox__label">*[label]*</span>
 </label>
diff --git a/@salix/core/src/searchbar/searchbar.mt.html b/@salix/core/src/searchbar/searchbar.mt.html
index 7034d79d6..bf432de77 100644
--- a/@salix/core/src/searchbar/searchbar.mt.html
+++ b/@salix/core/src/searchbar/searchbar.mt.html
@@ -1,10 +1,10 @@
 <form action="#">
   <div class="mdl-textfield mdl-js-textfield mdl-textfield--expandable">
-    <label class="mdl-button mdl-js-button mdl-button--icon" for="sample6">
+    <label class="mdl-button mdl-js-button mdl-button--icon" for="text-search">
       <i class="material-icons">search</i>
     </label>
     <div class="mdl-textfield__expandable-holder">
-      <input class="mdl-textfield__input" type="text" id="sample6">
+      <input class="mdl-textfield__input" type="text" style="color:black;" id="text-search" bg-panel>
       <label class="mdl-textfield__label" for="sample-expandable">*[text]*</label>
     </div>
   </div>
diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html
index 6dc691c09..297d8053d 100644
--- a/@salix/crud/src/client/addresses/index.html
+++ b/@salix/crud/src/client/addresses/index.html
@@ -1,7 +1,5 @@
 <vn-vertical class="form">
-    <vn-horizontal>
-        <h3 style="margin-top: 0;">Addresses</h3>
-    </vn-horizontal>
+    <h3 style="margin-top: 0;">Addresses</h3>
     <vn-horizontal class="pad-medium-bottom border-dashed-bottom uppercase" style="text-align: center;">
         <vn-empty style="width: 7em;">Default</vn-empty>
         <vn-auto>Consignee</vn-auto>
@@ -9,7 +7,7 @@
     </vn-horizontal>
     <vn-horizontal ng-repeat="i in $ctrl.addresses" class="pad-medium-top" style="align-items: center;">
         <vn-empty style="width: 7em; text-align: center;">
-            <vn-radio name="default"></vn-radio>
+            <input type="radio" name="default"/>
         </vn-empty>
         <vn-auto style="border-radius: .5em;" class="pad-small border-solid">
             <vn-horizontal style="align-items: center;">
@@ -25,7 +23,7 @@
             </vn-horizontal>
         </vn-auto>
         <vn-empty style="width: 7em; text-align: center;">
-            <vn-check name="enabled" model="i.enabled"></vn-check>
+            <input type="checkbox" name="enabled" ng-model="i.enabled"/>
         </vn-empty>
     </vn-horizontal>
 </vn-vertical>
\ No newline at end of file
diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index 38c393958..e5b234c8c 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -27,5 +27,4 @@
             </vn-one>
         </vn-horizontal>
     </vn-vertical>
-</vn-vertical>
 </form>
\ No newline at end of file
diff --git a/@salix/crud/src/client/client.js b/@salix/crud/src/client/client.js
index b67ab2f29..f1b5077cf 100644
--- a/@salix/crud/src/client/client.js
+++ b/@salix/crud/src/client/client.js
@@ -1,9 +1,11 @@
-export {NAME as CLIENT_INDEX,
-	COMPONENT as CLIENT_INDEX_COMPONENT} from './index/index';
+export {NAME as CLIENT_CLIENT,
+	COMPONENT as CLIENT_CLIENT_COMPONENT} from './client/client';
 export {NAME as CLIENT_BASIC_DATA_INDEX,
 	COMPONENT as CLIENT_BASIC_DATA_INDEX_COMPONENT} from './basic-data/index';
 export {NAME as CLIENT_ADDRESSES,
 	COMPONENT as CLIENT_ADDRESSES_COMPONENT} from './addresses/index';
+export {NAME as CLIENTS,
+	COMPONENT as CLIENTS_COMPONENT} from './index/index';
 export {NAME as CLIENT_FISCAL_DATA_INDEX,
 	COMPONENT as CLIENT_FISCAL_DATA_INDEX_COMPONENT} from './fiscal-data/index';
 export {NAME as CLIENT_WEB_ACCESS,
diff --git a/@salix/crud/src/client/client/client.html b/@salix/crud/src/client/client/client.html
new file mode 100644
index 000000000..9dae5e69d
--- /dev/null
+++ b/@salix/crud/src/client/client/client.html
@@ -0,0 +1,11 @@
+<vn-vertical class="full-height">
+    <vn-topbar></vn-topbar>
+    <vn-horizontal class="full-height">
+        <vn-empty class="bg-content" style="width: 18em">
+            <vn-left-menu items="$ctrl.items" descriptor="$ctrl.descriptor"></vn-left-menu>
+        </vn-empty>
+        <vn-auto>
+            <vn-vertical ui-view></vn-vertical>
+        </vn-auto>
+    </vn-horizontal>
+</vn-vertical>
diff --git a/@salix/crud/src/client/client/client.js b/@salix/crud/src/client/client/client.js
new file mode 100644
index 000000000..654c97c44
--- /dev/null
+++ b/@salix/crud/src/client/client/client.js
@@ -0,0 +1,24 @@
+import template from './client.html';
+import {module} from '../../module';
+
+const _NAME = 'clientClient';
+// export const NAME = module.getName(_NAME);
+export const NAME = "vnClientClient";
+export const COMPONENT = {
+    template: template,
+    controller: function() {
+        this.items = [
+            {text: "Datos básicos", image: "person", href: "#/client/basic-data"},
+            {text: "Datos facturación", image: "assignment", href: "#/client/fiscal-data"}, 
+            {text: "Acceso web", image: "language", href: "#/client/web-access"},
+            {text: "Consignatarios", image: "local_shipping", href: "#/client/addresses"},
+            {text: "Notas", image: "insert_drive_file", href: "#/client/notes"}
+        ];
+        this.descriptor = [
+            {text: "Cliente 1231"},
+            {text: "Floristeria Lola"},
+            {text: "987 654 321"}
+        ];
+    }
+};
+module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/fiscal-data/index.html b/@salix/crud/src/client/fiscal-data/index.html
index bbcef4277..d4307346d 100644
--- a/@salix/crud/src/client/fiscal-data/index.html
+++ b/@salix/crud/src/client/fiscal-data/index.html
@@ -1,64 +1,52 @@
 <form ng-submit="$ctrl.submit()">
-<vn-vertical  class="form uppercase">
-    <vn-horizontal>
-        <vn-one>
-            <h3 style="margin-top: 0;">Datos fiscales y de facturación</h3>
-            <hr/>
-        </vn-one>
-    </vn-horizontal>
+<vn-vertical class="form">
+    <h3 style="margin-top: 0;">Datos fiscales y de facturación</h3>
+    <hr/>
+    <vn-vertical class="uppercase">
     <vn-horizontal>
         <vn-check vn-one label="Cliente Activo" name"active" model="$ctrl.model.active"></vn-check>
         <vn-check vn-one label="Facturar" name="invoice" model="$ctrl.model.invoice"></vn-check>
         <vn-check vn-one label="Factura Impresa" name="mail" model="$ctrl.model.mail"></vn-check>
      </vn-horizontal>
      <vn-horizontal>
-          <vn-textfield vn-two label="Domicilio Fiscal" name"Domicilio" model="$ctrl.model.Domicilio"></vn-textfield>
-          <vn-textfield vn-one label="Municipio" name"Poblacion" model="$ctrl.model.dischargeDate"></vn-textfield> 
+        <vn-textfield vn-two label="Domicilio Fiscal" name"Domicilio" model="$ctrl.model.Domicilio"></vn-textfield>
+        <vn-textfield vn-one label="Municipio" name"Poblacion" model="$ctrl.model.dischargeDate"></vn-textfield> 
     </vn-horizontal>
     <vn-horizontal>
-
-            <vn-textfield vn-one label="Codigo Postal" name="codpos" model="$ctrl.model.codpos"></vn-textfield>
-            <vn-combo vn-one label="Provincia" name="province_id" model="$ctrl.model.province_id"></vn-combo>
-            <vn-combo vn-one label="Pais" name="Id_Pais" model="$ctrl.model.Id_Pais">
-                <option value="1">Comercial 1</option>
-                <option value="2">Comercial 2</option>
-            </vn-combo>
+        <vn-textfield vn-one label="Codigo Postal" name="codpos" model="$ctrl.model.codpos"></vn-textfield>
+        <vn-combo vn-one label="Provincia" name="province_id" model="$ctrl.model.province_id"></vn-combo>
+        <vn-combo vn-one label="Pais" name="Id_Pais" model="$ctrl.model.Id_Pais">
+            <option value="1">Comercial 1</option>
+            <option value="2">Comercial 2</option>
+        </vn-combo>
     </vn-horizontal>
     <vn-horizontal>
-            <vn-textfield vn-one label="Telefono Fijo" name="Telefono" model="$ctrl.model.Telefono"></vn-textfield>
-            <vn-textfield vn-one label="Telefono Movil" name="movil" model="$ctrl.model.movil"></vn-textfield>
-            <vn-textfield vn-one label="Email" name="email" model="$ctrl.model.email"></vn-textfield>
+        <vn-textfield vn-one label="Telefono Fijo" name="Telefono" model="$ctrl.model.Telefono"></vn-textfield>
+        <vn-textfield vn-one label="Telefono Movil" name="movil" model="$ctrl.model.movil"></vn-textfield>
+        <vn-textfield vn-one label="Email" name="email" model="$ctrl.model.email"></vn-textfield>
     </vn-horizontal>
     <hr class="border-dashed-top"/>
-    <vn-horizontal>
-        <h5 vn-one style="margin-top: 0;">Información de facturación</h5>
-    </vn-horizontal>
+    <h5 vn-one style="margin-top: 0;">Información de facturación</h5>
      <vn-horizontal>
-            <vn-combo vn-two label="Forma de Pago" name="pay_met_id" model="$ctrl.model.pay_met_id"></vn-combo>
-            <vn-textfield vn-one label="Vencimiento" name="Vencimiento" model="$ctrl.model.Vencimiento"></vn-textfield>
-            <vn-check vn-three label="Recargo de" name"re" model="$ctrl.model.re"></vn-check>
+        <vn-combo vn-two label="Forma de Pago" name="pay_met_id" model="$ctrl.model.pay_met_id"></vn-combo>
+        <vn-textfield vn-one label="Vencimiento" name="Vencimiento" model="$ctrl.model.Vencimiento"></vn-textfield>
+        <vn-check vn-three label="Recargo de" name"re" model="$ctrl.model.re"></vn-check>
     </vn-horizontal>
     <vn-horizontal>
-            <vn-textfield vn-one label="Credito" name="Credito" model="$ctrl.model.Credito"></vn-textfield>
-            <vn-textfield vn-one label="Cyc" name="cyc" model="$ctrl.model.cyc"></vn-textfield>
-            <vn-textfield vn-one label="iae" name"re" model="$ctrl.model.re"></vn-textfield>
-            <vn-textfield vn-three label="iban" name"iban" model="$ctrl.model.iban"></vn-textfield>
+        <vn-textfield vn-one label="Credito" name="Credito" model="$ctrl.model.Credito"></vn-textfield>
+        <vn-textfield vn-one label="Cyc" name="cyc" model="$ctrl.model.cyc"></vn-textfield>
+        <vn-textfield vn-one label="iae" name"re" model="$ctrl.model.re"></vn-textfield>
+        <vn-textfield vn-three label="iban" name"iban" model="$ctrl.model.iban"></vn-textfield>
     </vn-horizontal>
     <hr class="border-dashed-top"/>
+    <h5 style="margin-top: 0;">DOCUMENTACION</h5>
     <vn-horizontal>
-        <vn-one>
-            <h5 style="margin-top: 0;">DOCUMENTACION</h5>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-            <vn-check vn-two label="Recibido core vnh" name"corevnh" model="$ctrl.model.corevnh"></vn-check>
-            <vn-check vn-two label="Recibido core vnl" name="corevnl" model="$ctrl.model.corevnl"></vn-check>
-            <vn-check vn-two label="Recibido B2B vnl" name="sepavnl" model="$ctrl.model.sepavnl"></vn-check>
-    </vn-horizontal>
-    <vn-horizontal class="margin-large-top">
-        <vn-one>
-            <vn-submit class="colored " text="Guardar"></vn-submit>
-        </vn-one>
+        <vn-check vn-two label="Recibido core vnh" name"corevnh" model="$ctrl.model.corevnh"></vn-check>
+        <vn-check vn-two label="Recibido core vnl" name="corevnl" model="$ctrl.model.corevnl"></vn-check>
+        <vn-check vn-two label="Recibido B2B vnl" name="sepavnl" model="$ctrl.model.sepavnl"></vn-check>
     </vn-horizontal>
+    <vn-empty class="margin-large-top">
+        <vn-submit class="colored " text="Guardar"></vn-submit>
+    </vn-empty>
 </vn-vertical>
 </form>
\ No newline at end of file
diff --git a/@salix/crud/src/client/index/index.html b/@salix/crud/src/client/index/index.html
index 9dae5e69d..32eab6c59 100644
--- a/@salix/crud/src/client/index/index.html
+++ b/@salix/crud/src/client/index/index.html
@@ -1,11 +1,42 @@
+<form ng-submit="$ctrl.submit()">
 <vn-vertical class="full-height">
     <vn-topbar></vn-topbar>
-    <vn-horizontal class="full-height">
-        <vn-empty class="bg-content" style="width: 18em">
-            <vn-left-menu items="$ctrl.items" descriptor="$ctrl.descriptor"></vn-left-menu>
-        </vn-empty>
-        <vn-auto>
-            <vn-vertical ui-view></vn-vertical>
-        </vn-auto>
+    <vn-horizontal>
+        <vn-four></vn-four>
+        <vn-eight>
+            <vn-vertical>
+                <vn-horizontal>
+                    <vn-one>
+                        <vn-textfield label="Id Cliente" alias="id" model="$ctrl.model.id"></vn-textfield>
+                        <vn-textfield label="NIF/CIF" alis="nif" model="$ctrl.model.fi"></vn-textfield>
+                    </vn-one>
+                </vn-horizontal>
+                <vn-horizontal>
+                    <vn-one>
+                         <vn-textfield label="Alias" alias="alias" model="$ctrl.model.alias"></vn-textfield>
+                    </vn-one>
+                </vn-horizontal>
+                <vn-horizontal>
+                    <vn-one>
+                        <vn-textfield label="Razon Social" alias="razon" model="$ctrl.model.name"></vn-textfield>
+                    </vn-one>
+                </vn-horizontal>
+                <vn-horizontal>
+                    <vn-one>
+                        <vn-textfield label="Población" alias="poblacion" model="$ctrl.model.city"></vn-textfield>
+                        <vn-textfield label="Código Postal" alias="cp" model="$ctrl.model.cp"></vn-textfield>
+                    </vn-one>
+                </vn-horizontal>
+                <vn-horizontal>
+                    <vn-one>
+                        <vn-textfield label="Email" alias="mail" model="$ctrl.model.email"></vn-textfield>
+                        <vn-textfield label="Teléfono" alias="phone" model="$ctrl.model.phone"></vn-textfield>
+                    </vn-one>
+                </vn-horizontal>
+                <vn-submit text="Buscar"></vn-submit>        
+            </vn-vertical>
+        </vn-eight>
     </vn-horizontal>
+    
 </vn-vertical>
+</form>
\ No newline at end of file
diff --git a/@salix/crud/src/client/index/index.js b/@salix/crud/src/client/index/index.js
index de37b03bf..973188f7c 100644
--- a/@salix/crud/src/client/index/index.js
+++ b/@salix/crud/src/client/index/index.js
@@ -2,23 +2,23 @@ import template from './index.html';
 import {module} from '../../module';
 
 const _NAME = 'clientIndex';
-// export const NAME = module.getName(_NAME);
+//export const NAME = module.core.util.getName(_NAME);
 export const NAME = "vnClientIndex";
 export const COMPONENT = {
     template: template,
-    controller: function() {
-        this.items = [
-            {text: "Datos básicos", image: "person", href: "#/client/basic-data"},
-            {text: "Datos facturación", image: "assignment", href: "#/client/fiscal-data"}, 
-            {text: "Acceso web", image: "language", href: "#/client/web-access"},
-            {text: "Consignatarios", image: "local_shipping", href: "#/client/addresses"},
-            {text: "Notas", image: "insert_drive_file", href: "#/client/notes"}
-        ];
-        this.descriptor = [
-            {text: "Cliente 1231"},
-            {text: "Floristeria Lola"},
-            {text: "987 654 321"}
-        ];
+    controller: function($http){
+        this.submit = function () {
+            var query = {"where": this.model, "fields": {"id": true}};
+            console.log(query);
+            $http.get(`/client/api/Clients/findOne?filter=${JSON.stringify(query)}`).then (
+                function(response){
+                    console.log(response);
+                }, 
+                function(response){
+                    console.log(response);
+                }
+            );
+		};
     }
 };
 module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/routes.js b/@salix/crud/src/client/routes.js
index 26eea0a08..8da7e80a6 100644
--- a/@salix/crud/src/client/routes.js
+++ b/@salix/crud/src/client/routes.js
@@ -1,29 +1,35 @@
-[{
-    url: '/client',
-    state: 'client',
-    template: '<vn-client-index full-height></vn-client-index>',
-    module: 'crud',
-    description: '',
-    image: ''
-}, {
-    url: '/basic-data',
-    state: 'client.basicdata',
-    template: '<vn-client-basic-data full-height></vn-client-basic-data>',
-    module: 'crud'
-}, {
-    url: '/addresses',
-    state: 'client.addresses',
-    template: '<vn-client-addresses full-height></vn-client-addresses>',
-    module: 'crud'
-}, {
-    url: '/fiscal-data',
-    state: 'client.fiscaldata',
-    template: '<vn-client-fiscal-data full-height></vn-client-fiscal-data>',
-    module: 'crud'
-}, {
-    url: '/web-access',
-    state: 'client.webaccess',
-    template: '<vn-client-web-access full-height></vn-client-web-access>',
-    module: 'crud'
-}];
-
+[
+    {
+        url: '/clients',
+        state: 'clients',
+        template: '<vn-client-index full-height></vn-client-index>',
+        module: 'crud',
+        description: '',
+        image: '',
+    },{
+        url: '/client',
+        state: 'client',
+        template: '<vn-client-client full-height></vn-client-client>',
+        module: 'crud',
+    },{
+        url: '/basic-data',
+        state: 'client.basicdata',
+        template: '<vn-client-basic-data full-height></vn-client-basic-data>',
+        module: 'crud'
+    },{
+        url: '/addresses',
+        state: 'client.addresses',
+        template: '<vn-client-addresses full-height></vn-client-addresses>',
+        module: 'crud'
+    },{
+        url: '/fiscal-data',
+        state: 'client.fiscaldata',
+        template: '<vn-client-fiscal-data full-height></vn-client-fiscal-data>',
+        module: 'crud'
+    },{
+        url: '/web-access',
+        state: 'client.webaccess',
+        template: '<vn-client-web-access full-height></vn-client-web-access>',
+        module: 'crud'
+    }
+]
\ No newline at end of file
diff --git a/@salix/crud/src/client/web-access/index.html b/@salix/crud/src/client/web-access/index.html
index f0a1d0b8e..3539f71fb 100644
--- a/@salix/crud/src/client/web-access/index.html
+++ b/@salix/crud/src/client/web-access/index.html
@@ -1,16 +1,18 @@
 <form ng-submit="$ctrl.submit()">
-<vn-vertical  class="form">
+<vn-vertical class="form">
     <vn-one>
-        <h3>Acceso Web</h3>
+        <h3 style="margin-top: 0;">Acceso Web</h3>
     </vn-one>
-    <vn-two>
-        <vn-check label="Acceso web activo"  model="$ctrl.model.active"></vn-check>
-    </vn-two>
-    <vn-three>
-        <vn-textfield label="USUARIO" class="pada-medium-top"  model="$ctrl.model.usuario"></vn-textfield>
-    </vn-three>
-    <vn-four>
+    <vn-vertical>
+        <vn-one>
+            <vn-check label="Acceso web activo"  model="$ctrl.model.active"></vn-check>
+        </vn-one>
+        <vn-one uppercase>
+            <vn-textfield label="Usuario" class="padd-medium-top" model="$ctrl.model.user"></vn-textfield>
+        </vn-one>
+        <vn-one>
             <vn-submit class="colored" text="Guardar"></vn-submit>
-    </vn-four>
+        </vn-one>
+    </vn-vertical>
 </vn-vertical>
 </form>
\ No newline at end of file
diff --git a/@salix/crud/src/crud.js b/@salix/crud/src/crud.js
index 863c65a42..e1e30d8da 100644
--- a/@salix/crud/src/crud.js
+++ b/@salix/crud/src/crud.js
@@ -1,19 +1,6 @@
 export * from './module';
 export * from './client/client';
 
-export {NAME as CUSTOMER_INDEX,
-	COMPONENT as CUSTOMER_INDEX_COMPONENT} from './customer/index';
-export {NAME as CUSTOMER_ADD,
-	COMPONENT as CUSTOMER_ADD_COMPONENT} from './customer/index/add';
-export {NAME as CUSTOMER_LIST,
-	COMPONENT as CUSTOMER_LIST_COMPONENT} from './customer/index/list';
-export {NAME as CUSTOMER_EDIT,
-	COMPONENT as CUSTOMER_EDIT_COMPONENT} from './customer/edit/edit';
-export {NAME as CUSTOMER_DESCRIPTOR,
-	COMPONENT as CUSTOMER_DESCRIPTOR_COMPONENT} from './customer/edit/descriptor';
-export {NAME as CUSTOMER_ACTIONS,
-	COMPONENT as CUSTOMER_ACTIONS_COMPONENT} from './customer/edit/actions';
-
 export {NAME as NAVIGATION_INDEX,
     COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';
 export {NAME as NAVIGATION_ITEM,
diff --git a/@salix/crud/src/customer/edit/actions.html b/@salix/crud/src/customer/edit/actions.html
deleted file mode 100644
index 34f0a9b1d..000000000
--- a/@salix/crud/src/customer/edit/actions.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<vn-horizontal>
-    <ul>
-        <li>Lorem ipsum.</li>
-        <li>Perspiciatis, omnis.</li>
-        <li>Minima, ab.</li>
-        <li>Odit, optio.</li>
-        <li>Facilis, aspernatur!</li>
-    </ul>
-</vn-horizontal>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/actions.js b/@salix/crud/src/customer/edit/actions.js
deleted file mode 100644
index 2ac7c8cfa..000000000
--- a/@salix/crud/src/customer/edit/actions.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import template from './actions.html';
-import {module} from '../../module';
-
-export const NAME = 'customerActions';
-export const COMPONENT = {
-    template: template
-};
-module.component(NAME, COMPONENT);
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/containercard.html b/@salix/crud/src/customer/edit/containercard.html
deleted file mode 100644
index 044ed682a..000000000
--- a/@salix/crud/src/customer/edit/containercard.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<vn-horizontal ui-view="details">
-    
-</vn-horizontal>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/descriptor.html b/@salix/crud/src/customer/edit/descriptor.html
deleted file mode 100644
index 687737290..000000000
--- a/@salix/crud/src/customer/edit/descriptor.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<vn-horizontal style="border: 1px solid black;">
-    descriptor
-</vn-horizontal>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/descriptor.js b/@salix/crud/src/customer/edit/descriptor.js
deleted file mode 100644
index c39b13cc7..000000000
--- a/@salix/crud/src/customer/edit/descriptor.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import template from './descriptor.html';
-import {module} from '../../module';
-
-export const NAME = 'customerDescriptor';
-export const COMPONENT = {
-    template: template
-};
-module.component(NAME, COMPONENT);
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/edit.html b/@salix/crud/src/customer/edit/edit.html
deleted file mode 100644
index 10a7c2578..000000000
--- a/@salix/crud/src/customer/edit/edit.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<vn-horizontal full-height>
-    <vn-three style="border: 1px solid black;" self-scroll pad-small>   
-        <vn-vertical>
-            <customer-descriptor vn-one></customer-descriptor>
-            <customer-actions vn-one></customer-actions>
-        </vn-vertical>   
-    </vn-three>
-    <vn-nine style="border: 1px solid black;" pad-small>content</vn-nine>
-</vn-horizontal> 
\ No newline at end of file
diff --git a/@salix/crud/src/customer/edit/edit.js b/@salix/crud/src/customer/edit/edit.js
deleted file mode 100644
index 92ec21f6a..000000000
--- a/@salix/crud/src/customer/edit/edit.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import template from './edit.html';
-import {module} from '../../module';
-
-export const NAME = 'customerEdit';
-export const COMPONENT = {
-    template: template
-};
-module.component(NAME, COMPONENT);
\ No newline at end of file
diff --git a/@salix/crud/src/customer/index/add.html b/@salix/crud/src/customer/index/add.html
deleted file mode 100644
index abac96439..000000000
--- a/@salix/crud/src/customer/index/add.html
+++ /dev/null
@@ -1 +0,0 @@
-<vn-button text='customer add' ng-click="$ctrl.search()"></vn-button>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/index/add.js b/@salix/crud/src/customer/index/add.js
deleted file mode 100644
index cc38d08b9..000000000
--- a/@salix/crud/src/customer/index/add.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import template from './add.html';
-import {module} from '../../module';
-
-export const NAME = 'customerAdd';
-
-export const COMPONENT = {
-    template: template,
-    bindings: {
-        search: '&'
-    }
-};
-
-module.component(NAME, COMPONENT);
\ No newline at end of file
diff --git a/@salix/crud/src/customer/index/index.html b/@salix/crud/src/customer/index/index.html
deleted file mode 100644
index fa3f9a6c3..000000000
--- a/@salix/crud/src/customer/index/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<customer-add search='$ctrl.search()'></customer-add>
-<customer-list users="$ctrl.users"></customer-list>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/index/index.js b/@salix/crud/src/customer/index/index.js
deleted file mode 100644
index 5e83e661d..000000000
--- a/@salix/crud/src/customer/index/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import template from './index.html';
-import {module} from '../../module';
-
-export const NAME = 'customerIndex';
-export const COMPONENT = {
-    template: template,
-    controller: function($http) {
-        this.users = [{id: 10, name: "xxxx"}];
-        this.search = function() {
-            $http.post('/customer/api/Customers', {name: 'nelo'});
-        };
-    }
-};
-module.component(NAME, COMPONENT);
-//TODO: MOVER EL CONFIG DONDE TOQUE
-module.config(['$httpProvider', function($httpProvider) {
-        $httpProvider.defaults.useXDomain = true;
-        delete $httpProvider.defaults.headers.common['X-Requested-With'];
-    }
-]);
diff --git a/@salix/crud/src/customer/index/list.html b/@salix/crud/src/customer/index/list.html
deleted file mode 100644
index 35ca40283..000000000
--- a/@salix/crud/src/customer/index/list.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div ng-repeat="item in $ctrl.users">
-    <span>{{item.id}}</span>
-    <span>{{item.name}}</span>
-</div>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/index/list.js b/@salix/crud/src/customer/index/list.js
deleted file mode 100644
index 240f43d50..000000000
--- a/@salix/crud/src/customer/index/list.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import template from './list.html';
-import {module} from '../../module';
-
-export const NAME = 'customerList';
-
-export const COMPONENT = {
-    template: template,
-    bindings: {
-        users: '<'
-    }
-};
-
-module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/customer/routes.js b/@salix/crud/src/customer/routes.js
deleted file mode 100644
index 9eed639df..000000000
--- a/@salix/crud/src/customer/routes.js
+++ /dev/null
@@ -1,37 +0,0 @@
-[{
-    url: '/customer',
-    state: 'index',
-    template: '<customer-index></customer-index>',
-    module: 'crud',
-    description: '',
-    image: '',
-},
-{
-    url: '/customer/edit',
-    state: 'edit',
-    template: '<customer-edit vn-one></customer-edit>',
-    module: 'crud',
-    description: '',
-    image: '',
-},
-{
-    url: '/customer/edit/address',
-    state: 'customer-address',
-    view:{
-        'details':{
-            template: '<customer-edit vn-one></customer-edit>',
-        }
-    },    
-    module: 'crud',
-    description: '',
-    image: '',
-},
-{
-    url: '/customer/webclient',
-    state: 'customer-web-client',
-    template: '<customer-web-client vn-one></customer-web-client>',
-    module: 'crud',
-    description: '',
-    image: ''
-}
-]
diff --git a/@salix/crud/src/provider/routes.js b/@salix/crud/src/provider/routes.js
deleted file mode 100644
index f585a8c74..000000000
--- a/@salix/crud/src/provider/routes.js
+++ /dev/null
@@ -1,8 +0,0 @@
-[{
-	url: '/provider',
-	state: 'provider',
-	template: '<provider-index></provider-index>',
-	module: 'crud',
-	description: '',
-	image: '',
-}]
diff --git a/@salix/login/src/login/login.html b/@salix/login/src/login/login.html
index 01d67c10b..814fec138 100755
--- a/@salix/login/src/login/login.html
+++ b/@salix/login/src/login/login.html
@@ -1,10 +1,11 @@
 <div class="vn-login">
 	<div class="box-wrapper">
 	<div class="box">
+	<img src="./logo.svg"/>
 	<form name="form" ng-submit="login.submit()">
 		<vn-textfield label="E-Mail" name="email" model="login.model.email"></vn-textfield>
 		<vn-password label="Password" name="password" model="login.model.password"></vn-password>
-		<vn-check label="Do not close session" name="remember"></vn-check>
+		<vn-check label="Do not close session" name="remember" model="login.model.remember"></vn-check>
 		<div class="footer">
 			<vn-submit></vn-submit>
 			<vn-spinner id="spinner"></vn-spinner>
diff --git a/@salix/login/src/login/login.scss b/@salix/login/src/login/login.scss
index fb2728a95..dbe81d38d 100644
--- a/@salix/login/src/login/login.scss
+++ b/@salix/login/src/login/login.scss
@@ -9,7 +9,7 @@
 	color: #333;
 	font-size: 1.1em;
 	font-weight: normal;
-	background-color: #EEE;
+	background-color: #3c393b;
 
 	.box-wrapper
 	{
@@ -24,12 +24,16 @@
 		position: absolute;
 		top: 50%;
 		width: 100%;
-		height: 20em;
-		margin-top: -10em;
+		margin-top: -13.5em;
 		padding: 2em;
 		background-color: white;
-		box-shadow: 0 0 .3em 0 rgba(1,1,1,.4);
-		border-radius: .1em;
+		box-shadow: 0 0 1em 0 rgba(1,1,1,.6);
+		border-radius: .5em;
+	}
+	img
+	{
+		width: 100%;
+		padding-bottom: 1em;
 	}
 	.footer
 	{
diff --git a/@salix/login/src/login/logo.svg b/@salix/login/src/login/logo.svg
new file mode 100644
index 000000000..a6eae7841
--- /dev/null
+++ b/@salix/login/src/login/logo.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:ns="&amp;#38;ns_sfw;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   width="400"
+   height="168.56424"
+   viewBox="0 0 400 168.56424"
+   enable-background="new 0 0 560 960"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="logo.svg"><defs
+     id="defs43" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview41"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.09"
+     inkscape:cx="200"
+     inkscape:cy="84.28212"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><metadata
+     id="metadata3"><ns:sfw><ns:slices /><ns:sliceSourceBounds
+         height="212.103"
+         width="503.32"
+         y="-235.507"
+         x="28.34"
+         bottomLeftOrigin="true" /></ns:sfw><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><g
+     id="g5"
+     transform="matrix(0.79472445,0,0,0.79472445,-22.522491,-18.600526)"><g
+       id="g7"><path
+         d="M 51.517,90.859 28.34,23.407 l 18.318,0 9.479,34.665 0.776,2.839 c 1.158,4.151 2.041,7.632 2.65,10.44 0.336,-1.372 0.747,-2.992 1.234,-4.854 0.487,-1.862 1.174,-4.306 2.057,-7.328 l 9.942,-35.763 18.22,0 -23.361,67.453 -16.138,0 z"
+         id="path9"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#3e3d3d;fill-rule:evenodd" /><path
+         d="m 523.891,90.859 -16.591,0 c 0.036,-0.791 0.106,-1.614 0.209,-2.466 l 0.354,-2.653 c -2.932,2.285 -5.847,3.974 -8.737,5.071 -2.892,1.096 -5.879,1.644 -8.969,1.644 -4.8,0 -8.23,-1.32 -10.289,-3.957 -2.061,-2.639 -2.463,-6.202 -1.207,-10.688 1.154,-4.121 3.184,-7.47 6.091,-10.048 2.904,-2.577 6.718,-4.385 11.438,-5.423 2.602,-0.548 5.877,-1.144 9.821,-1.788 5.886,-0.915 9.079,-2.258 9.572,-4.027 l 0.337,-1.197 c 0.406,-1.449 0.171,-2.551 -0.706,-3.304 -0.873,-0.754 -2.383,-1.129 -4.521,-1.129 -2.325,0 -4.304,0.476 -5.93,1.43 -1.63,0.953 -2.868,2.353 -3.722,4.201 l -15.015,0 c 2.371,-5.631 5.874,-9.82 10.507,-12.573 4.636,-2.751 10.511,-4.128 17.628,-4.128 4.428,0 8.014,0.535 10.754,1.606 2.739,1.069 4.66,2.69 5.763,4.86 0.753,1.559 1.074,3.417 0.958,5.573 -0.112,2.157 -0.838,5.617 -2.173,10.386 l -5.283,18.874 c -0.633,2.254 -0.926,4.03 -0.884,5.327 0.043,1.295 0.416,2.141 1.118,2.537 l -0.523,1.872 z M 512.532,67.424 c -1.479,0.794 -3.889,1.528 -7.229,2.201 -1.618,0.304 -2.856,0.564 -3.71,0.777 -2.115,0.551 -3.698,1.255 -4.748,2.107 -1.052,0.854 -1.777,2 -2.179,3.435 -0.497,1.771 -0.346,3.199 0.452,4.285 0.801,1.084 2.104,1.626 3.911,1.626 2.787,0 5.284,-0.803 7.496,-2.406 2.208,-1.603 3.677,-3.703 4.402,-6.298 l 1.605,-5.727 z"
+         id="path11"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#a3d131;fill-rule:evenodd" /><path
+         d="m 441.489,90.859 13.951,-49.816 15.682,0 -2.441,8.716 c 2.699,-3.419 5.567,-5.915 8.604,-7.489 3.039,-1.569 6.566,-2.386 10.587,-2.448 l -4.518,16.13 c -0.677,-0.089 -1.354,-0.161 -2.029,-0.206 -0.673,-0.046 -1.315,-0.068 -1.927,-0.068 -2.505,0 -4.682,0.374 -6.525,1.121 -1.843,0.749 -3.471,1.901 -4.886,3.46 -0.902,1.038 -1.758,2.527 -2.558,4.466 -0.803,1.939 -1.808,5.076 -3.026,9.414 l -4.681,16.72 -16.233,0 z"
+         id="path13"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#a3d131;fill-rule:evenodd" /><path
+         d="m 447.466,41.043 -13.947,49.816 -15.961,0 1.923,-6.863 c -2.729,2.77 -5.509,4.812 -8.336,6.121 -2.823,1.309 -5.84,1.962 -9.048,1.962 -5.497,0 -9.239,-1.41 -11.23,-4.23 -1.99,-2.818 -2.208,-7.005 -0.655,-12.554 l 9.591,-34.251 16.325,0 -7.806,27.876 c -1.145,4.097 -1.424,6.917 -0.83,8.461 0.586,1.542 2.146,2.315 4.68,2.315 2.839,0 5.169,-0.94 6.993,-2.818 1.82,-1.881 3.329,-4.945 4.517,-9.194 l 7.459,-26.64 16.325,0 z"
+         id="path15"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#a3d131;fill-rule:evenodd" /><path
+         d="m 361.923,50.894 2.757,-9.85 6.663,0 3.942,-14.073 16.322,0 -3.938,14.073 8.351,0 -2.759,9.85 -8.352,0 -6.042,21.585 c -0.924,3.3 -1.107,5.483 -0.551,6.553 0.559,1.068 2.014,1.603 4.369,1.603 l 1.223,-0.023 0.869,-0.068 -2.914,10.408 c -1.805,0.329 -3.551,0.586 -5.239,0.765 -1.686,0.18 -3.294,0.271 -4.819,0.271 -5.658,0 -9.141,-1.382 -10.447,-4.145 -1.304,-2.763 -0.694,-8.648 1.824,-17.655 l 5.402,-19.293 -6.661,0 z"
+         id="path17"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#a3d131;fill-rule:evenodd" /><path
+         d="m 350.752,90.859 -16.594,0 c 0.037,-0.791 0.106,-1.614 0.21,-2.466 l 0.353,-2.653 c -2.934,2.285 -5.846,3.974 -8.737,5.071 -2.891,1.096 -5.881,1.644 -8.966,1.644 -4.805,0 -8.234,-1.32 -10.292,-3.957 -2.057,-2.639 -2.462,-6.202 -1.204,-10.688 1.152,-4.121 3.184,-7.47 6.088,-10.048 2.909,-2.577 6.72,-4.385 11.442,-5.423 2.599,-0.548 5.872,-1.144 9.818,-1.788 5.885,-0.915 9.077,-2.258 9.573,-4.027 l 0.338,-1.197 c 0.403,-1.449 0.171,-2.551 -0.706,-3.304 -0.873,-0.754 -2.383,-1.129 -4.525,-1.129 -2.324,0 -4.3,0.476 -5.93,1.43 -1.626,0.953 -2.867,2.353 -3.722,4.201 l -15.01,0 c 2.371,-5.631 5.873,-9.82 10.509,-12.573 4.634,-2.751 10.507,-4.128 17.626,-4.128 4.428,0 8.01,0.535 10.749,1.606 2.74,1.069 4.665,2.69 5.765,4.86 0.755,1.559 1.077,3.417 0.961,5.573 -0.117,2.157 -0.837,5.617 -2.178,10.386 l -5.281,18.874 c -0.633,2.254 -0.928,4.03 -0.883,5.327 0.045,1.295 0.417,2.141 1.119,2.537 l -0.523,1.872 z M 339.394,67.424 c -1.48,0.794 -3.893,1.528 -7.233,2.201 -1.616,0.304 -2.853,0.564 -3.71,0.777 -2.115,0.551 -3.696,1.255 -4.746,2.107 -1.052,0.854 -1.777,2 -2.18,3.435 -0.498,1.771 -0.345,3.199 0.456,4.285 0.796,1.084 2.102,1.626 3.908,1.626 2.786,0 5.285,-0.803 7.493,-2.406 2.212,-1.603 3.68,-3.703 4.407,-6.298 l 1.605,-5.727 z"
+         id="path19"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#a3d131;fill-rule:evenodd" /><path
+         d="m 243.068,23.405 -18.893,67.455 -16.32,0 1.835,-6.548 c -2.596,2.712 -5.274,4.716 -8.033,6.011 -2.763,1.297 -5.747,1.946 -8.957,1.946 -6.232,0 -10.613,-2.406 -13.151,-7.215 -2.532,-4.812 -2.708,-11.11 -0.53,-18.896 2.199,-7.851 5.936,-14.246 11.217,-19.196 5.283,-4.947 10.963,-7.421 17.043,-7.421 3.268,0 5.996,0.659 8.181,1.975 2.181,1.316 3.737,3.259 4.668,5.83 l 6.706,-23.94 16.234,0 z m -50.367,42.038 c -1.25,4.457 -1.374,7.868 -0.373,10.234 1.003,2.366 3.062,3.552 6.172,3.552 3.112,0 5.798,-1.169 8.054,-3.505 2.259,-2.335 4.017,-5.764 5.282,-10.281 1.172,-4.181 1.238,-7.416 0.198,-9.706 -1.036,-2.292 -3.097,-3.437 -6.178,-3.437 -2.901,0 -5.534,1.177 -7.901,3.526 -2.367,2.352 -4.117,5.557 -5.254,9.617"
+         id="path21"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#3e3d3d;fill-rule:evenodd" /><path
+         d="m 131.769,90.859 13.949,-49.816 15.682,0 -2.441,8.716 c 2.701,-3.419 5.569,-5.915 8.604,-7.489 3.039,-1.569 13.384,-2.386 17.405,-2.448 l -4.517,16.13 c -0.675,-0.089 -1.351,-0.161 -2.03,-0.206 -0.671,-0.046 -1.315,-0.068 -1.929,-0.068 -2.503,0 -11.494,0.374 -13.339,1.121 -1.845,0.749 -3.471,1.901 -4.886,3.46 -0.902,1.038 -1.756,2.527 -2.556,4.466 -0.803,1.939 -1.812,5.076 -3.029,9.414 l -4.682,16.72 -16.231,0 z"
+         id="path23"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#3e3d3d;fill-rule:evenodd" /><path
+         d="m 114.704,75.192 15.667,0 c -2.994,5.465 -7.055,9.691 -12.186,12.683 -5.126,2.994 -10.866,4.487 -17.218,4.487 -7.727,0 -13.177,-2.345 -16.355,-7.033 -3.176,-4.689 -3.63,-11.081 -1.364,-19.175 2.309,-8.247 6.396,-14.773 12.263,-19.585 5.868,-4.809 12.634,-7.215 20.3,-7.215 7.909,0 13.439,2.446 16.586,7.336 3.151,4.891 3.52,11.644 1.106,20.264 l -0.528,1.813 -0.373,1.079 -33.689,0 c -0.978,3.502 -0.97,6.176 0.027,8.022 0.994,1.843 2.961,2.765 5.895,2.765 2.169,0 4.086,-0.457 5.748,-1.372 1.66,-0.914 3.034,-2.27 4.121,-4.069 m -13.672,-14.543 18.577,-0.043 c 0.834,-3.195 0.687,-5.692 -0.446,-7.489 -1.133,-1.794 -3.116,-2.693 -5.961,-2.693 -2.689,0 -5.083,0.883 -7.183,2.648 -2.1,1.765 -3.759,4.292 -4.987,7.577"
+         id="path25"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#3e3d3d;fill-rule:evenodd" /><path
+         d="m 279.482,91.578 -14.248,-41.467 -14.362,41.467 -16.14,0 21.281,-67.454 18.224,0 9.862,34.664 0.778,2.84 c 1.156,4.151 2.041,7.633 2.65,10.443 l 1.234,-4.857 c 0.487,-1.862 1.172,-4.304 2.057,-7.327 l 9.942,-35.763 18.222,0 -23.364,67.454 -16.136,0 z"
+         id="path27"
+         inkscape:connector-curvature="0"
+         style="fill:#a3d131" /></g><g
+       id="g29"><path
+         d="m 122.886,124.71 c -4.603,-5.205 -9.749,-8.869 -15.438,-10.989 -5.693,-2.117 -12.352,-3.179 -19.98,-3.179 -13.804,0 -23.794,2.605 -29.97,7.81 -6.175,5.208 -9.263,12.169 -9.263,20.888 0,4.359 0.755,8.023 2.271,10.989 1.513,2.969 3.874,5.48 7.083,7.538 3.207,2.061 7.294,3.786 12.26,5.177 4.964,1.393 10.898,2.814 17.8,4.268 7.021,1.453 13.378,3.028 19.072,4.723 5.69,1.697 10.535,3.846 14.531,6.448 3.996,2.605 7.083,5.844 9.263,9.718 2.18,3.876 3.27,8.658 3.27,14.349 0,5.449 -1.09,10.234 -3.27,14.35 -2.18,4.117 -5.268,7.568 -9.263,10.353 -3.996,2.787 -8.81,4.876 -14.44,6.267 -5.631,1.391 -11.897,2.089 -18.799,2.089 -10.293,0 -19.557,-1.604 -27.79,-4.813 -8.236,-3.207 -15.802,-8.143 -22.705,-14.803 l 3.633,-4.541 c 6.054,6.176 12.956,10.838 20.707,13.985 7.748,3.15 16.529,4.723 26.337,4.723 12.107,0 21.643,-2.208 28.607,-6.63 6.961,-4.418 10.444,-11.17 10.444,-20.252 0,-4.601 -0.849,-8.506 -2.543,-11.715 -1.697,-3.207 -4.268,-5.932 -7.719,-8.174 -3.451,-2.239 -7.782,-4.178 -12.987,-5.813 -5.208,-1.635 -11.383,-3.179 -18.527,-4.632 -7.024,-1.453 -13.259,-2.966 -18.708,-4.541 -5.449,-1.572 -10.021,-3.57 -13.713,-5.993 -3.695,-2.421 -6.479,-5.387 -8.355,-8.9 -1.879,-3.511 -2.815,-7.93 -2.815,-13.259 0,-5.69 1.09,-10.745 3.27,-15.167 2.18,-4.419 5.236,-8.111 9.172,-11.08 3.934,-2.966 8.688,-5.236 14.258,-6.812 5.568,-1.572 11.806,-2.361 18.708,-2.361 8.355,0 15.649,1.212 21.887,3.633 6.235,2.424 11.957,6.297 17.165,11.625 l -3.453,4.721 z"
+         id="path31"
+         inkscape:connector-curvature="0"
+         style="fill:#f7931e" /><path
+         d="m 142.321,234.599 55.58,-128.96 5.267,0 55.581,128.96 -6.902,0 -19.072,-44.5 -64.662,0 -19.072,44.5 -6.72,0 z m 58.304,-120.968 -30.696,71.019 60.847,0 -30.151,-71.019 z"
+         id="path33"
+         inkscape:connector-curvature="0"
+         style="fill:#f7931e" /><path
+         d="m 280.18,234.599 0,-128.96 6.175,0 0,123.148 79.192,0 0,5.813 -85.367,0 z"
+         id="path35"
+         inkscape:connector-curvature="0"
+         style="fill:#f7931e" /><path
+         d="m 387.523,234.599 0,-128.779 6.176,0 0,128.779 -6.176,0 z"
+         id="path37"
+         inkscape:connector-curvature="0"
+         style="fill:#f7931e" /><path
+         d="m 420.58,105.639 47.588,60.666 47.77,-60.666 7.266,0 -51.402,65.388 49.949,63.572 -7.266,0 -46.316,-58.85 -46.135,58.85 -7.447,0 49.949,-63.572 -51.402,-65.388 7.446,0 z"
+         id="path39"
+         inkscape:connector-curvature="0"
+         style="fill:#f7931e" /></g></g></svg>
\ No newline at end of file
diff --git a/@salix/package.json b/@salix/package.json
index d2ed1d8ae..bc9c22f59 100644
--- a/@salix/package.json
+++ b/@salix/package.json
@@ -26,12 +26,14 @@
     "eslint-config-angular": "^0.5.0",
     "eslint-config-google": "^0.6.0",
     "eslint-plugin-angular": "^1.4.1",
+    "file-loader": "^0.9.0",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.6.0",
     "gulp-insert": "^0.5.0",
     "gulp-util": "^3.0.7",
     "gulp-wrap": "^0.13.0",
+    "html-loader": "^0.4.4",
     "json-loader": "^0.5.4",
     "node-sass": "^3.11.0",
     "pre-commit": "^1.1.3",
diff --git a/@salix/webpack.config.js b/@salix/webpack.config.js
index 71f3eb6c4..5439d8a67 100644
--- a/@salix/webpack.config.js
+++ b/@salix/webpack.config.js
@@ -26,7 +26,7 @@ var config = {
                 }
             },{
                 test: /\.html$/,
-                loader: 'raw'
+                loader: 'html'
             },{
                 test: /\.json$/,
                 loader: 'json'
@@ -36,6 +36,9 @@ var config = {
             },{
                 test: /\.scss$/,
                 loader: 'style!css!sass'
+            },{
+                test: /\.(svg|png)$/,
+                loader: 'file'
             }
         ]
     },
diff --git a/dev.cmd b/dev.cmd
index f483fb192..c0cb57543 100644
--- a/dev.cmd
+++ b/dev.cmd
@@ -11,7 +11,7 @@ goto caseUsage
 
 :caseStart
     call "%0" stop
-    call echo "################################ Starting services"
+    echo "################################ Starting services"
     call forever start forever.json
     call forever list
     call start /b nginx -c "%nginxConf%" -p "%nginxPrefix%"