diff --git a/src/app/admin/slide-resolver.service.ts b/src/app/admin/slide-resolver.service.ts
index 0fab2c2..f82fce2 100644
--- a/src/app/admin/slide-resolver.service.ts
+++ b/src/app/admin/slide-resolver.service.ts
@@ -16,7 +16,7 @@ export class SlideResolverService implements Resolve<Slide> {
     return this.getSlide(route.params['id']).toPromise();
   }
 
-  public getSlide(id: Number): Observable<Slide> {
+  public getSlide(id: number): Observable<Slide> {
     return this.httpClient.get<Slide>(`${this.apiEndPoint}/${id}`);
   }
 }
diff --git a/src/app/admin/team-resolver.service.ts b/src/app/admin/team-resolver.service.ts
index 0d6c083..84c2060 100644
--- a/src/app/admin/team-resolver.service.ts
+++ b/src/app/admin/team-resolver.service.ts
@@ -16,7 +16,7 @@ export class TeamResolverService implements Resolve<Team> {
     return this.getTeam(route.params['id']).toPromise();
   }
 
-  public getTeam(id: Number): Observable<Team> {
+  public getTeam(id: number): Observable<Team> {
     return this.httpClient.get<Team>(`${this.apiEndPoint}/${id}`);
   }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 58e1a52..9674678 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -40,8 +40,8 @@ export class AppComponent implements OnInit, OnDestroy {
       this.commitTrackerService.getTeamCommits(this.settings.team.members.map(member => member.signum));
     });
 
-    const timerSS = new Subject();
-    this.slideshowTimer = timerSS.switchMap(period => TimerObservable.create(period))
+    const timerSS = new Subject<number>();
+    this.slideshowTimer = timerSS.switchMap((period: number) => TimerObservable.create(period))
       .subscribe(() => {
         this.changeSlide(timerSS);
       });
@@ -50,7 +50,7 @@ export class AppComponent implements OnInit, OnDestroy {
     this.autoSwitch = false;
     this.router.events
       .filter(event => event instanceof ActivationEnd)
-      .subscribe(event => {
+      .subscribe((event: ActivationEnd) => {
         this.autoSwitch = !!event.snapshot.data.autoSwitchable;
       });
   }
@@ -61,7 +61,7 @@ export class AppComponent implements OnInit, OnDestroy {
     this.slideshowTimer.unsubscribe();
   }
 
-  private changeSlide(timer: Subject) {
+  private changeSlide(timer: Subject<number>) {
     if (this.autoSwitch) {
       console.log('Slide should have changed here');
     }
diff --git a/src/app/display/settings/settings.component.ts b/src/app/display/settings/settings.component.ts
index fd9186d..fbaf8f9 100644
--- a/src/app/display/settings/settings.component.ts
+++ b/src/app/display/settings/settings.component.ts
@@ -12,7 +12,7 @@ export class SettingsComponent implements OnInit {
 
   public teams: Array<Team> = [];
   public selectedTeam: Team;
-  public slideInterval: Number;
+  public slideInterval: number;
 
   constructor(private route: ActivatedRoute,
               private settingsService: SettingsService,
diff --git a/src/app/shared/build.ts b/src/app/shared/build.ts
index 72cff11..828c952 100644
--- a/src/app/shared/build.ts
+++ b/src/app/shared/build.ts
@@ -5,11 +5,11 @@ export class Build {
   build: {
     subBuild: Array<Build>;
   };
-  buildNumber: Number;
+  buildNumber: number;
   duration: String;
   icon: String;
   jobName: String;
-  parentBuildNumber: Number;
+  parentBuildNumber: number;
   parentJobName: String;
   phaseName: String;
   result: Result;
diff --git a/src/app/shared/commit.ts b/src/app/shared/commit.ts
index 999020f..d486ee6 100644
--- a/src/app/shared/commit.ts
+++ b/src/app/shared/commit.ts
@@ -5,40 +5,40 @@ export class Commit {
   change_id: String;
   branch: String;
   owner: String;
-  gerrit_change_number: Number;
+  gerrit_change_number: number;
   gerrit_change_subject: String;
   gerrit_project: String;
-  gerrit_verified: Number;
-  gerrit_code_review: Number;
+  gerrit_verified: number;
+  gerrit_code_review: number;
   gerrit_time: String;
 
-  cfl_id: Number;
-  cfl_build_number: Number;
-  cfl_timestamp: Number;
-  cfl_building: Number;
-  cfl_duration: Number;
+  cfl_id: number;
+  cfl_build_number: number;
+  cfl_timestamp: number;
+  cfl_building: number;
+  cfl_duration: number;
   cfl_result: Result;
   cfl_sub_builds: Build;
 
-  sfl_id: Number;
-  sfl_build_number: Number;
-  sfl_timestamp: Number;
-  sfl_building: Number;
-  sfl_duration: Number;
+  sfl_id: number;
+  sfl_build_number: number;
+  sfl_timestamp: number;
+  sfl_building: number;
+  sfl_duration: number;
   sfl_result: Result;
   sfl_sub_builds: Build;
-  sfl_fail_count: Number;
-  sfl_skip_count: Number;
-  sfl_total_count: Number;
+  sfl_fail_count: number;
+  sfl_skip_count: number;
+  sfl_total_count: number;
 
-  nfl_id: Number;
-  nfl_build_number: Number;
-  nfl_timestamp: Number;
-  nfl_building: Number;
-  nfl_duration: Number;
+  nfl_id: number;
+  nfl_build_number: number;
+  nfl_timestamp: number;
+  nfl_building: number;
+  nfl_duration: number;
   nfl_result: Result;
   nfl_sub_builds: Build;
-  nfl_fail_count: Number;
-  nfl_skip_count: Number;
-  nfl_total_count: Number;
+  nfl_fail_count: number;
+  nfl_skip_count: number;
+  nfl_total_count: number;
 }
diff --git a/src/app/shared/service/self-updater.service.ts b/src/app/shared/service/self-updater.service.ts
index f76ae2f..0e203f0 100644
--- a/src/app/shared/service/self-updater.service.ts
+++ b/src/app/shared/service/self-updater.service.ts
@@ -6,7 +6,7 @@ import { Location } from '@angular/common';
 @Injectable()
 export class SelfUpdaterService {
 
-  private appRevision: Number = 0;
+  private appRevision: number = 0;
   private initFailed = false;
 
   constructor(private httpClient: HttpClient,
@@ -23,8 +23,8 @@ export class SelfUpdaterService {
     );
   }
 
-  private getDeployedRevision(): Observable<Number> {
-    return this.httpClient.get<Number>(this.locationService.prepareExternalUrl('/revision.json'));
+  private getDeployedRevision(): Observable<number> {
+    return this.httpClient.get<number>(this.locationService.prepareExternalUrl('/revision.json'));
   }
 
   public checkAndReloadIfNecessary() {
diff --git a/src/app/shared/service/settings.service.ts b/src/app/shared/service/settings.service.ts
index 8bedb18..01a48c2 100644
--- a/src/app/shared/service/settings.service.ts
+++ b/src/app/shared/service/settings.service.ts
@@ -25,7 +25,7 @@ export class SettingsService {
     localStorage.setItem(SELECTED_TEAM_KEY, JSON.stringify(team));
   }
 
-  get slideInterval(): Number {
+  get slideInterval(): number {
     try {
       const interval = JSON.parse(localStorage.getItem(SLIDE_INTERVAL_KEY));
       return interval !== null ? interval : DEFAULT_SLIDE_INTERVAL;
@@ -34,7 +34,7 @@ export class SettingsService {
     }
   }
 
-  set slideInterval(interval: Number) {
+  set slideInterval(interval: number) {
     localStorage.setItem(SLIDE_INTERVAL_KEY, JSON.stringify(interval));
   }
 }
diff --git a/src/app/shared/slide.ts b/src/app/shared/slide.ts
index 59fa9a7..0b74dd1 100644
--- a/src/app/shared/slide.ts
+++ b/src/app/shared/slide.ts
@@ -1,7 +1,7 @@
 import { Team } from './team';
 
 export class Slide {
-  id: Number = null;
+  id: number = null;
   title: String = '';
   team: Team = null;
   slideData: String = '';
diff --git a/src/app/shared/team.ts b/src/app/shared/team.ts
index 1d14aa0..8664a5d 100644
--- a/src/app/shared/team.ts
+++ b/src/app/shared/team.ts
@@ -1,7 +1,7 @@
 import { Member } from './member';
 
 export class Team {
-  id: Number = null;
+  id: number = null;
   name: String = '';
   members: Array<Member> = [];
   isActive = false;