diff --git a/shared/src/components/keyboard/slider/keyboard-slider.component.ts b/shared/src/components/keyboard/slider/keyboard-slider.component.ts
index 8662b7f5..bda086e1 100644
--- a/shared/src/components/keyboard/slider/keyboard-slider.component.ts
+++ b/shared/src/components/keyboard/slider/keyboard-slider.component.ts
@@ -1,18 +1,7 @@
 import {
-    ChangeDetectionStrategy,
-    Component,
-    EventEmitter,
-    Input,
-    OnChanges,
-    Output,
-    SimpleChanges,
-    animate,
-    keyframes,
-    state,
-    style,
-    transition,
-    trigger
+    Component, ChangeDetectionStrategy, Input, Output, EventEmitter, OnChanges, SimpleChanges
 } from '@angular/core';
+import { animate, keyframes, state, style, transition, trigger } from '@angular/animations';
 
 import { Layer } from '../../../config-serializer/config-items/Layer';
 
diff --git a/shared/src/components/macro/item/macro-item.component.ts b/shared/src/components/macro/item/macro-item.component.ts
index 0016b5aa..c255927b 100644
--- a/shared/src/components/macro/item/macro-item.component.ts
+++ b/shared/src/components/macro/item/macro-item.component.ts
@@ -1,17 +1,5 @@
-import {
-    Component,
-    EventEmitter,
-    Input,
-    OnChanges,
-    OnInit,
-    Output,
-    SimpleChanges,
-    animate,
-    state,
-    style,
-    transition,
-    trigger
-} from '@angular/core';
+import { Component, Input, Output, EventEmitter, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
 
 import { KeyModifiers } from '../../../config-serializer/config-items/KeyModifiers';
 import {
@@ -32,7 +20,7 @@ import { MapperService } from '../../../services/mapper.service';
             state('inactive', style({
                 height: '0px'
             })),
-            state('active',   style({
+            state('active', style({
                 height: '*'
             })),
             transition('inactive <=> active', animate('500ms ease-out'))
@@ -152,7 +140,7 @@ export class MacroItemComponent implements OnInit, OnChanges {
         }
 
         if (action.hasScancode()) {
-            const scancode: string = (this.mapper.scanCodeToText(action.scancode) || [ 'Unknown' ]).join(' ');
+            const scancode: string = (this.mapper.scanCodeToText(action.scancode) || ['Unknown']).join(' ');
             if (scancode) {
                 this.title += scancode;
             }
diff --git a/shared/src/components/macro/list/macro-list.component.ts b/shared/src/components/macro/list/macro-list.component.ts
index 06224bcd..c535813d 100644
--- a/shared/src/components/macro/list/macro-list.component.ts
+++ b/shared/src/components/macro/list/macro-list.component.ts
@@ -1,17 +1,5 @@
-import {
-    Component,
-    EventEmitter,
-    Input,
-    Output,
-    QueryList,
-    ViewChildren,
-    animate,
-    forwardRef,
-    state,
-    style,
-    transition,
-    trigger
-} from '@angular/core';
+import { Component, EventEmitter, Input, Output, QueryList, ViewChildren, forwardRef } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
 
 import { DragulaService } from 'ng2-dragula/ng2-dragula';
 
diff --git a/shared/src/components/popover/popover.component.ts b/shared/src/components/popover/popover.component.ts
index 2731cdff..5d987a65 100644
--- a/shared/src/components/popover/popover.component.ts
+++ b/shared/src/components/popover/popover.component.ts
@@ -1,7 +1,7 @@
 import {
-    Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges, ViewChild,
-    animate, keyframes, state, style, transition, trigger
+    Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges, ViewChild
 } from '@angular/core';
+import { animate, keyframes, state, style, transition, trigger } from '@angular/animations';
 
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
diff --git a/shared/src/components/side-menu/side-menu.component.ts b/shared/src/components/side-menu/side-menu.component.ts
index 9aae64f3..87a8707c 100644
--- a/shared/src/components/side-menu/side-menu.component.ts
+++ b/shared/src/components/side-menu/side-menu.component.ts
@@ -1,4 +1,5 @@
-import { Component, Renderer, animate, state, style, transition, trigger } from '@angular/core';
+import { Component, Renderer } from '@angular/core';
+import { animate, state, style, transition, trigger } from '@angular/animations';
 
 import { Store } from '@ngrx/store';
 
diff --git a/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index 4a47911e..d749c1f7 100644
--- a/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/shared/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -1,7 +1,8 @@
 import {
     Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, Renderer,
-    SimpleChange, animate, group, state, style, transition, trigger
+    SimpleChange
 } from '@angular/core';
+import { animate, group, state, style, transition, trigger } from '@angular/animations';
 
 import { Store } from '@ngrx/store';