diff --git a/LICENSE b/LICENSE
index 0cf12769..a7231c83 100644
--- a/LICENSE
+++ b/LICENSE
@@ -7,7 +7,7 @@ repository.
 
 The MIT License (MIT)
 
-Copyright (c) 2017 Orange
+Copyright (c) 2018 Orange
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/NOTICE.txt b/NOTICE.txt
index 745367c5..d8a957a3 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,10 +1,10 @@
 Parts list under Orange SA Copyright
-Copyright (C) 2017 Orange SA All rights reserved
+Copyright (C) 2018 Orange SA All rights reserved
 
 The following parts are proprietary information of Orange.
-You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software 
+You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software
 or displayed on this website (http://boosted.orange.com) and owned by Orange SA and its subsidiaries,
-in whole or part of, in any medium, except as required for reasonable and customary use in describing the origin of the software 
+in whole or part of, in any medium, except as required for reasonable and customary use in describing the origin of the software
 and reproducing the content of the NOTICE and DOCUMENTATION files.
 Any use or displaying shall constitute an infringement under intellectual property laws of France and international conventions.
 
diff --git a/README.md b/README.md
index c82f6ed9..96fe2d8d 100644
--- a/README.md
+++ b/README.md
@@ -42,4 +42,4 @@ npm start
 
 ## Copyright and license
 
-Code and documentation copyright 2017 Orange SA. Code released under [the MIT license](LICENSE). Docs released under [Creative Commons Attribution](docs/LICENSE).
+Code and documentation copyright 2018 Orange SA. Code released under [the MIT license](LICENSE). Docs released under [Creative Commons Attribution](docs/LICENSE).
diff --git a/docs/app/app.component.html b/docs/app/app.component.html
index 685b996d..1164c699 100644
--- a/docs/app/app.component.html
+++ b/docs/app/app.component.html
@@ -20,7 +20,7 @@ <h1 class="sr-only">footer - site map & informations</h1>
     <div class="o-footer-bottom">
         <div class="container">
             <ul class="nav">
-                <li class="nav-item"><span class="nav-link">© Orange 2017</span></li>
+                <li class="nav-item"><span class="nav-link">© Orange 2018</span></li>
                 <li class="nav-item"><span class="nav-link">v{{version}}</span></li>
                 <li class="nav-item"><span class="nav-link">Code licensed under</span><a class="nav-link" href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/LICENSE">MIT license</a></li>
                 <li class="nav-item"><span class="nav-link">Documentation licensed under</span><a class="nav-link" href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE">CC BY 3.0</a></li>
diff --git a/docs/app/demos/o-toggle.component.html b/docs/app/demos/o-toggle.component.html
index 5d94bfac..6c6af952 100644
--- a/docs/app/demos/o-toggle.component.html
+++ b/docs/app/demos/o-toggle.component.html
@@ -1,24 +1,24 @@
-<div [(ngModel)]="model" ngbRadioGroup name="radioBasic" class="o-switch btn-group">
-  <label ngbButtonLabel class="btn btn-secondary">
+<div class="btn-group btn-group-toggle o-switch" ngbRadioGroup name="radioBasic" [(ngModel)]="model">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="1"> 1
   </label>
-  <label ngbButtonLabel class="btn btn-secondary">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="2"> 2
   </label>
-  <label ngbButtonLabel class="btn btn-secondary">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="3"> 3
   </label>
 </div>
 
 <h4>Without Outline</h4>
-<div [(ngModel)]="model2" ngbRadioGroup name="radioBasic2" class="o-switch btn-group no-outline">
-  <label ngbButtonLabel class="btn btn-secondary">
+<div class="btn-group btn-group-toggle o-switch no-outline" ngbRadioGroup name="radioBasic2" [(ngModel)]="model2">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="1"> 1
   </label>
-  <label ngbButtonLabel class="btn btn-secondary">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="2"> 2
   </label>
-  <label ngbButtonLabel class="btn btn-secondary">
+  <label ngbButtonLabel class="btn-secondary">
     <input ngbButton type="radio" [value]="3"> 3
   </label>
 </div>
\ No newline at end of file
diff --git a/docs/app/docs.component.html b/docs/app/docs.component.html
index 8cc3b475..ef7c0f66 100644
--- a/docs/app/docs.component.html
+++ b/docs/app/docs.component.html
@@ -11,22 +11,22 @@ <h2>{{ component }}</h2>
             <div class="o-nav-local" [ngbCollapse]="isCollapsed" id="collapseExample">
                 <nav class="container">
                     <ul class="nav">
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/collapse">Collapse</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/accordion">Accordion</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/modal">Modal</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/alert">Alert</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/carousel">Carousel</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/collapse">Collapse</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/dropdown">Dropdown</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/tabs">Tabs</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/modal">Modal</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/o-navbar">Navbar</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/pagination">Pagination</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/tooltip">Tooltip</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/popover">Popover</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/alert">Alert</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/carousel">Carousel</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/swiper">Swiper</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/progress">Progress</a></li>
-                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/o-navbar">Navbar</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/o-scroll-top">Scroll Top</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/swiper">Swiper</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/o-switch">Switch</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/tabs">Tabs</a></li>
                         <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/o-toggle">Toggle</a></li>
+                        <li class="nav-item"><a class="nav-link" routerLinkActive="active" routerLink="/documentation/tooltip">Tooltip</a></li>
                     </ul>
                 </nav>
             </div>
diff --git a/docs/app/start.component.html b/docs/app/start.component.html
index 2ebccc76..a70d9713 100644
--- a/docs/app/start.component.html
+++ b/docs/app/start.component.html
@@ -53,6 +53,6 @@ <h2>Building this documentation</h2>
 
     <h2>Copyright and license</h2>
 
-    <p>Code and documentation copyright 2017 Orange SA. Code released under <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/LICENSE">the MIT license</a>. Docs released under <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE">Creative Commons Attribution</a>.
+    <p>Code and documentation copyright 2018 Orange SA. Code released under <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/LICENSE">the MIT license</a>. Docs released under <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE">Creative Commons Attribution</a>.
     </p>
 </div>
diff --git a/package-dist.json b/package-dist.json
index fa9fa7c4..817c376b 100644
--- a/package-dist.json
+++ b/package-dist.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-boosted",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Orange Boosted with Angular",
   "keywords": [
     "boosted",
diff --git a/package.json b/package.json
index f6bad546..1e518ca9 100644
--- a/package.json
+++ b/package.json
@@ -31,16 +31,15 @@
     "webpack": "webpack"
   },
   "dependencies": {
-    "@angular/common": "4.1.2",
-    "@angular/compiler": "4.1.2",
-    "@angular/compiler-cli": "4.1.2",
-    "@angular/core": "4.1.2",
-    "@angular/forms": "4.1.2",
-    "@angular/http": "4.1.2",
-    "@angular/platform-browser": "4.1.2",
-    "@angular/platform-browser-dynamic": "4.1.2",
-    "@angular/platform-server": "4.1.2",
-    "@angular/router": "4.1.2",
+    "@angular/common": "5.0.2",
+    "@angular/compiler": "5.0.2",
+    "@angular/compiler-cli": "5.0.2",
+    "@angular/core": "5.0.2",
+    "@angular/forms": "5.0.2",
+    "@angular/http": "5.0.2",
+    "@angular/platform-browser": "5.0.2",
+    "@angular/platform-browser-dynamic": "5.0.2",
+    "@angular/router": "5.0.2",
     "@angularclass/conventions-loader": "^1.0.2",
     "@angularclass/hmr": "^1.2.2",
     "@angularclass/hmr-loader": "^3.0.2",
@@ -48,10 +47,10 @@
     "core-js": "^2.4.1",
     "reflect-metadata": "^0.1.3",
     "http-server": "^0.9.0",
-    "rxjs": "^5.1.0",
+    "rxjs": "^5.5.0",
     "zone.js": "^0.8.10",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
-    "boosted": "4.0.0-beta.2",
+    "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.9",
+    "boosted": "4.0.0-beta.3",
     "swiper": "^3.4.1"
   },
   "devDependencies": {
@@ -63,7 +62,7 @@
     "angular2-router-loader": "^0.3.4",
     "angular2-template-loader": "^0.6.0",
     "awesome-typescript-loader": "^3.0.3",
-    "codelyzer": "^2.0.1",
+    "codelyzer": "^4.0.0",
     "copy-webpack-plugin": "^4.0.0",
     "css-loader": "^0.26.0",
     "exports-loader": "^0.6.3",
@@ -96,8 +95,8 @@
     "to-string-loader": "^1.1.4",
     "ts-helpers": "^1.1.2",
     "ts-node": "^1.7.0",
-    "tslint": "^4.4.2",
-    "tslint-loader": "3.3.0",
+    "tslint": "^5.0.0",
+    "tslint-loader": "3.5.3",
     "typescript": "^2.2.1",
     "url-loader": "^0.5.7",
     "v8-lazy-parse-webpack-plugin": "^0.3.0",
diff --git a/src/index.ts b/src/index.ts
index c2155d2b..7fbbf520 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,14 +1,14 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - index.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
 
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { RouterModule }   from '@angular/router';
+import { RouterModule } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { ScrollTopComponent } from './scroll-top/scroll-top.component';
diff --git a/src/o-carousel/o-carousel-container.component.ts b/src/o-carousel/o-carousel-container.component.ts
index 04fe1b3b..4dcefbb2 100644
--- a/src/o-carousel/o-carousel-container.component.ts
+++ b/src/o-carousel/o-carousel-container.component.ts
@@ -1,7 +1,7 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - o-carousel.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * src: https://github.com/ksachdeva/angular2-swiper/blob/master/src/ks-swiper.ts
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
diff --git a/src/o-carousel/o-carousel.component.spec.ts b/src/o-carousel/o-carousel.component.spec.ts
index ab77d36a..33719ec6 100644
--- a/src/o-carousel/o-carousel.component.spec.ts
+++ b/src/o-carousel/o-carousel.component.spec.ts
@@ -1,14 +1,14 @@
 /**
  * --------------------------------------------------------------------------
  * Ng-boosted - o-carousel.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
 
 import { TestBed } from '@angular/core/testing';
-import { By }              from '@angular/platform-browser';
-import { DebugElement }    from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
 import { OCarouselComponent } from './o-carousel.component';
 
diff --git a/src/o-carousel/o-carousel.component.ts b/src/o-carousel/o-carousel.component.ts
index 7c25f365..9125a8e0 100644
--- a/src/o-carousel/o-carousel.component.ts
+++ b/src/o-carousel/o-carousel.component.ts
@@ -1,7 +1,7 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - o-carousel.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * src: https://github.com/ksachdeva/angular2-swiper/blob/master/src/ks-swiper.ts
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
diff --git a/src/o-dropdown/o-dropdown.component.ts b/src/o-dropdown/o-dropdown.component.ts
index 1389880a..59f6eec1 100644
--- a/src/o-dropdown/o-dropdown.component.ts
+++ b/src/o-dropdown/o-dropdown.component.ts
@@ -1,7 +1,7 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - o-dropdown.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
diff --git a/src/o-navbar/o-navbar.component.spec.ts b/src/o-navbar/o-navbar.component.spec.ts
index 43d1947c..1b0a5c30 100644
--- a/src/o-navbar/o-navbar.component.spec.ts
+++ b/src/o-navbar/o-navbar.component.spec.ts
@@ -1,14 +1,14 @@
 /**
  * --------------------------------------------------------------------------
  * Ng-boosted - o-navbar.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
 
 import { TestBed } from '@angular/core/testing';
-import { By }              from '@angular/platform-browser';
-import { DebugElement }    from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
 import { ONavbarComponent } from './o-navbar.component';
 
diff --git a/src/o-navbar/o-navbar.component.ts b/src/o-navbar/o-navbar.component.ts
index b8e1d444..58f8fcf5 100644
--- a/src/o-navbar/o-navbar.component.ts
+++ b/src/o-navbar/o-navbar.component.ts
@@ -1,7 +1,7 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - o-navbar.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
diff --git a/src/o-switch/o-switch.component.specs.ts b/src/o-switch/o-switch.component.specs.ts
index 3af9fe0f..9716de6e 100644
--- a/src/o-switch/o-switch.component.specs.ts
+++ b/src/o-switch/o-switch.component.specs.ts
@@ -6,8 +6,8 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { By }              from '@angular/platform-browser';
-import { DebugElement }    from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
 import { OSwitchComponent } from './o-switch.component';
 
diff --git a/src/scroll-top/scroll-top.component.spec.ts b/src/scroll-top/scroll-top.component.spec.ts
index 0328ea24..4922f8b4 100644
--- a/src/scroll-top/scroll-top.component.spec.ts
+++ b/src/scroll-top/scroll-top.component.spec.ts
@@ -1,14 +1,14 @@
 /**
  * --------------------------------------------------------------------------
  * Ng-boosted - scroll-top.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */
 
 import { TestBed } from '@angular/core/testing';
-import { By }              from '@angular/platform-browser';
-import { DebugElement }    from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
 import { ScrollTopComponent } from './scroll-top.component';
 
diff --git a/src/scroll-top/scroll-top.component.ts b/src/scroll-top/scroll-top.component.ts
index b6b1114c..70b9723b 100644
--- a/src/scroll-top/scroll-top.component.ts
+++ b/src/scroll-top/scroll-top.component.ts
@@ -1,7 +1,7 @@
 /*!
  * --------------------------------------------------------------------------
  * Ng-boosted - scroll-top.component.ts
- * copyright 2017 Orange SA
+ * copyright 2018 Orange SA
  * Licensed under MIT (https://github.com/Orange-OpenSource/ng-boosted/blob/master/LICENSE)
  * --------------------------------------------------------------------------
  */