diff --git a/src/Frontend/Jp.AdminUI/.vscode/launch.json b/src/Frontend/Jp.AdminUI/.vscode/launch.json
index c8db865f..4f798068 100644
--- a/src/Frontend/Jp.AdminUI/.vscode/launch.json
+++ b/src/Frontend/Jp.AdminUI/.vscode/launch.json
@@ -4,7 +4,18 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Program",
+      "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
+      "args":["${workspaceFolder}/e2e/protractor.conf.js"],
+      "preLaunchTask": "npm: e2e",
+      "outFiles": [
+        "${workspaceFolder}/dist/out-tsc/**/*.js"
+      ]
+    },
+
         {
             "type": "chrome",
             "request": "launch",
@@ -13,4 +24,4 @@
             "webRoot": "${workspaceFolder}"
           }
     ]
-}
\ No newline at end of file
+}
diff --git a/src/Frontend/Jp.AdminUI/.vscode/tasks.json b/src/Frontend/Jp.AdminUI/.vscode/tasks.json
new file mode 100644
index 00000000..b80b5a20
--- /dev/null
+++ b/src/Frontend/Jp.AdminUI/.vscode/tasks.json
@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "e2e",
+            "problemMatcher": []
+        },
+        {
+          "type": "npm",
+          "script": "start",
+          "problemMatcher": []
+      },
+    ]
+}
diff --git a/src/Frontend/Jp.AdminUI/e2e/app.e2e-spec.ts b/src/Frontend/Jp.AdminUI/e2e/app.e2e-spec.ts
index ce748401..b194eeb5 100644
--- a/src/Frontend/Jp.AdminUI/e2e/app.e2e-spec.ts
+++ b/src/Frontend/Jp.AdminUI/e2e/app.e2e-spec.ts
@@ -11,7 +11,7 @@ describe("jpproject WebApp", function () {
 
   it("should display sign-in page", () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual("SIGN IN TO CONTINUE.");
+    expect(page.getButtonText()).toEqual("Login");
     expect(page.getUrl()).toContain("/login");
   });
 });
diff --git a/src/Frontend/Jp.AdminUI/e2e/app.po.ts b/src/Frontend/Jp.AdminUI/e2e/app.po.ts
index 647d0297..330d3672 100644
--- a/src/Frontend/Jp.AdminUI/e2e/app.po.ts
+++ b/src/Frontend/Jp.AdminUI/e2e/app.po.ts
@@ -9,7 +9,7 @@ export class JpProjectWebAppPage {
         return browser.getCurrentUrl();
     }
 
-    getParagraphText() {
-        return element(by.css("login-container text-center py-2")).getText();
+    getButtonText() {
+        return element(by.css(".login-container .card-body .mt-3")).getText();
     }
 }
diff --git a/src/Frontend/Jp.AdminUI/protractor.conf.js b/src/Frontend/Jp.AdminUI/e2e/protractor.conf.js
similarity index 92%
rename from src/Frontend/Jp.AdminUI/protractor.conf.js
rename to src/Frontend/Jp.AdminUI/e2e/protractor.conf.js
index 7ee3b5ee..d8e4c9b7 100644
--- a/src/Frontend/Jp.AdminUI/protractor.conf.js
+++ b/src/Frontend/Jp.AdminUI/e2e/protractor.conf.js
@@ -4,9 +4,9 @@
 const { SpecReporter } = require('jasmine-spec-reporter');
 
 exports.config = {
-  allScriptsTimeout: 11000,
+  allScriptsTimeout: 30000,
   specs: [
-    './e2e/**/*.e2e-spec.ts'
+    './*.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'
diff --git a/src/Frontend/Jp.AdminUI/e2e/tsconfig.e2e.json b/src/Frontend/Jp.AdminUI/e2e/tsconfig.e2e.json
index 1d9e5edf..890914a2 100644
--- a/src/Frontend/Jp.AdminUI/e2e/tsconfig.e2e.json
+++ b/src/Frontend/Jp.AdminUI/e2e/tsconfig.e2e.json
@@ -2,6 +2,8 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
+    "mapRoot": "../out-tsc/e2e",
+    "sourceMap": true,
     "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",
diff --git a/src/Frontend/Jp.AdminUI/karma.conf.js b/src/Frontend/Jp.AdminUI/karma.conf.js
index 02645a02..8e61e10c 100644
--- a/src/Frontend/Jp.AdminUI/karma.conf.js
+++ b/src/Frontend/Jp.AdminUI/karma.conf.js
@@ -3,14 +3,14 @@
 
 module.exports = function (config) {
   config.set({
-    basePath: './',
-    frameworks: ['jasmine', '@angular/cli'],
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
@@ -18,23 +18,18 @@ module.exports = function (config) {
     files: [
       { pattern: './src/test.ts', watched: false },
       { pattern: 'src/assets/**/*', watched: false, included: false, served: true },
+      { pattern: 'src/assets/i18n/*.json', watched: false, included: false, served: true },
     ],
     proxies: {
       '/assets/': '/base/src/assets/'
     },
-    preprocessors: {
-      './src/test.ts': ['@angular/cli']
-    },
-    mime: {
-      'text/x-typescript': ['ts','tsx']
+    angularCli: {
+      environment: 'dev'
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
-    angularCli: {
-      environment: 'dev'
-    },
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
@@ -42,9 +37,6 @@ module.exports = function (config) {
     autoWatch: true,
     browsers: ['Chrome'],
     singleRun: false,
-    captureTimeout: 60000, // it was already there
-    browserDisconnectTimeout : 60000,
-    browserDisconnectTolerance : 1,
-    browserNoActivityTimeout : 60000 //by default 10000
+    restartOnFileChange: true
   });
 };
diff --git a/src/Frontend/Jp.AdminUI/package-lock.json b/src/Frontend/Jp.AdminUI/package-lock.json
index f935129c..03fd43b0 100644
--- a/src/Frontend/Jp.AdminUI/package-lock.json
+++ b/src/Frontend/Jp.AdminUI/package-lock.json
@@ -15702,9 +15702,9 @@
       }
     },
     "webdriver-manager": {
-      "version": "12.1.5",
-      "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.5.tgz",
-      "integrity": "sha512-f1apDjMpZ8SHlXtXGzqBxOjV+WQcDRz5PN7pWScgjXS7vhUIFcM3V89Shetf4A04n8DDR2MxiVQq6JproFcRZw==",
+      "version": "12.1.7",
+      "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz",
+      "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
       "dev": true,
       "requires": {
         "adm-zip": "^0.4.9",
diff --git a/src/Frontend/Jp.AdminUI/package.json b/src/Frontend/Jp.AdminUI/package.json
index fefcead9..3c4adf27 100644
--- a/src/Frontend/Jp.AdminUI/package.json
+++ b/src/Frontend/Jp.AdminUI/package.json
@@ -11,6 +11,7 @@
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
+    "lintfix": "ng lint --fix=true",
     "modernizr": "modernizr -c modernizr-config.json -d src/modernizr.js",
     "postinstall": "node ./node_modules/protractor/bin/webdriver-manager update",
     "e2e": "ng e2e",
@@ -116,6 +117,6 @@
     "ts-node": "^8.3.0",
     "tslint": "^5.14.0",
     "typescript": ">=3.4.0 <3.5.0",
-    "webdriver-manager": "12.1.5"
+    "webdriver-manager": "12.1.7"
   }
 }
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.spec.ts b/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.spec.ts
index 75a8d4e7..cc52e65e 100644
--- a/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.spec.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.spec.ts
@@ -3,12 +3,14 @@
 import { TestBed, async, inject } from "@angular/core/testing";
 import { SettingsService } from "./settings.service";
 import { HttpClientModule } from "@angular/common/http";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Service: Settings", () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [SettingsService]
+      imports: [HttpClientModule, OAuthModule.forRoot()],
+      providers: [SettingsService, VersionService]
     });
   });
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts b/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts
index bbd6e425..35ee0677 100644
--- a/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts
@@ -12,7 +12,7 @@ declare var $: any;
 @Injectable()
 export class SettingsService {
 
-    private user: UserProfile;
+    public user: UserProfile;
     public app: any;
     public layout: any;
     userProfileObservable: Observable<object>;
diff --git a/src/Frontend/Jp.AdminUI/src/app/core/translator/translator.service.ts b/src/Frontend/Jp.AdminUI/src/app/core/translator/translator.service.ts
index 676eb327..acff90fc 100644
--- a/src/Frontend/Jp.AdminUI/src/app/core/translator/translator.service.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/core/translator/translator.service.ts
@@ -15,6 +15,7 @@ export class TranslatorService {
         { code: "ru", text: "Russian" },
         { code: "zh-cn", text: "Chinese Simplified" },
         { code: "zh-tw", text: "Chinese Traditional" },
+        { code: "el", text: "Greek"}
     ];
 
     constructor(public translate: TranslateService) {
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.html b/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.html
index ec6feba9..d8db9d8a 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.html
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.html
@@ -107,7 +107,7 @@ <h4><button class="btn btn-info btn-xs" (click)="selectedScope = null"><i class=
                                     'apiResource.scope.Emphasize' | translate }} <i class="fa fa-comment-dots"></i></label>
                                 <div class="col-xl-8">
                                     <label class="switch m-0">
-                                        <input type="checkbox" disabled="disabled" [(ngModel)]="selectedScope.Emphasize" />
+                                        <input type="checkbox" disabled="disabled" [(ngModel)]="selectedScope.emphasize" />
                                         <span></span>
                                     </label>
                                 </div>
@@ -240,4 +240,4 @@ <h3>{{ resourceName }}</h3>
         <div *ngFor="let error of errors; let i = index"><strong>{{i+1}}</strong> {{error}}</div>
     </alert>
 </div>
-<toaster-container [toasterconfig]="toasterconfig"></toaster-container>
\ No newline at end of file
+<toaster-container [toasterconfig]="toasterconfig"></toaster-container>
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.ts
index b547c5ad..a4c7b077 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/scope/api-scopes.component.ts
@@ -5,7 +5,7 @@ import { ProblemDetails } from '@shared/viewModel/default-response.model';
 import { Scope } from '@shared/viewModel/scope.model';
 import { StandardClaims } from '@shared/viewModel/standard-claims.model';
 import { ToasterConfig, ToasterService } from 'angular2-toaster';
-import { Observable } from 'rxjs';
+import { throwError } from 'rxjs';
 import { flatMap, map, tap } from 'rxjs/operators';
 
 import { ApiResourceService } from '../api-resource.service';
@@ -50,7 +50,7 @@ export class ApiResourceScopesComponent implements OnInit {
             .pipe(map(p => p["resource"]))
             .pipe(flatMap(m => this.apiResourceService.getScopes(m.toString())))
             .subscribe(result => this.apiScopes = result);
-            
+
         this.errors = [];
         this.model = new Scope();
         this.showButtonLoading = false;
@@ -104,7 +104,7 @@ export class ApiResourceScopesComponent implements OnInit {
             this.errors = [];
             this.errors.push("Unknown error while trying to save");
             this.showButtonLoading = false;
-            return Observable.throw("Unknown error while trying to save");
+            return throwError("Unknown error while trying to save");
         }
     }
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/emails/edit/email.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/emails/edit/email.component.ts
index 336439d1..c8c48b7f 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/emails/edit/email.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/emails/edit/email.component.ts
@@ -16,7 +16,7 @@ import { Observable, Subject } from 'rxjs';
     encapsulation: ViewEncapsulation.None
 })
 export class EmailComponent implements OnInit {
-    
+
     public toasterconfig: ToasterConfig = new ToasterConfig({
         positionClass: 'toast-top-right',
         showCloseButton: true,
@@ -26,7 +26,7 @@ export class EmailComponent implements OnInit {
     editorConfig: AngularEditorConfig = {
         editable: true,
         sanitize: false
-    }    
+    };
 
     emailTypes$: Observable<Array<any>>;
     showButtonLoading: boolean;
@@ -35,7 +35,8 @@ export class EmailComponent implements OnInit {
     @ViewChild('editor', { static: true }) editor: any;
     instance: any;
     linkForThemes: any = null;
-    editorThemes = ['3024-day', '3024-night', 'ambiance-mobile', 'ambiance', 'base16-dark', 'base16-light', 'blackboard', 'cobalt', 'eclipse', 'elegant', 'erlang-dark', 'lesser-dark', 'mbo', 'mdn-like', 'midnight', 'monokai', 'neat', 'neo', 'night', 'paraiso-dark', 'paraiso-light', 'pastel-on-dark', 'rubyblue', 'solarized', 'the-matrix', 'tomorrow-night-eighties', 'twilight', 'vibrant-ink', 'xq-dark', 'xq-light'];
+    editorThemes = ['3024-day', '3024-night', 'ambiance-mobile', 'ambiance', 'base16-dark', 'base16-light', 'blackboard', 'cobalt', 'eclipse',
+     'elegant', 'erlang-dark', 'lesser-dark', 'mbo', 'mdn-like', 'midnight', 'monokai', 'neat', 'neo', 'night', 'paraiso-dark', 'paraiso-light', 'pastel-on-dark', 'rubyblue', 'solarized', 'the-matrix', 'tomorrow-night-eighties', 'twilight', 'vibrant-ink', 'xq-dark', 'xq-light'];
     editorOpts = {
         mode: 'htmlmixed',
         lineNumbers: true,
@@ -75,7 +76,7 @@ export class EmailComponent implements OnInit {
 
     createCSS(path) {
         let link = document.createElement('link');
-        link.href = path
+        link.href = path;
         link.type = 'text/css';
         link.rel = 'stylesheet';
         link.id = 'cm_theme';
@@ -131,6 +132,6 @@ export class EmailComponent implements OnInit {
             this.linkForThemes.setAttribute('href', themesBase + this.editorOpts.theme + '.css');
         }
         this.instance.setOption('theme', this.editorOpts.theme);
-    };
+    }
 
 }
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/settings/emails/email-settings.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/settings/emails/email-settings.component.ts
index 8f055781..1d2bb4c4 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/settings/emails/email-settings.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/settings/emails/email-settings.component.ts
@@ -54,8 +54,8 @@ export class EmailSettingsComponent implements OnInit {
 
     
     public updateSettings() {
-        this.errors.splice(0,this.errors.length);
-        var configurations = new Array<GlobalSettings>();
+        this.errors.splice(0, this.errors.length);
+        let configurations = new Array<GlobalSettings>();
         configurations.push(this.settings.username);
         configurations.push(this.settings.password);
         configurations.push(this.settings.sendMail);
@@ -83,11 +83,11 @@ export class EmailSettingsComponent implements OnInit {
         });
     }
 
-    public changeUseSsl(){
+    public changeUseSsl() {
         this.settings.useSsl.value = this.useSsl.toString();
     }
 
-    public changeSendEmail(){
+    public changeSendEmail() {
         this.settings.sendMail.value = this.sendMail.toString();
     }
 }
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/users/edit/user-edit.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/users/edit/user-edit.component.ts
index 3a767456..1fb339de 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/users/edit/user-edit.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/users/edit/user-edit.component.ts
@@ -7,7 +7,7 @@ import { ResetPassword } from '@shared/viewModel/reset-password.model';
 import { UserProfile } from '@shared/viewModel/userProfile.model';
 import { ToasterConfig, ToasterService } from 'angular2-toaster';
 import * as jsonpatch from 'fast-json-patch';
-import { Observable } from 'rxjs';
+import { throwError } from 'rxjs';
 import { flatMap, tap } from 'rxjs/operators';
 
 
@@ -80,7 +80,7 @@ export class UserEditComponent implements OnInit {
             this.errors = [];
             this.errors.push("Unknown error while trying to update");
             this.showButtonLoading = false;
-            return Observable.throw("Unknown error while trying to update");
+            return throwError("Unknown error while trying to update");
         }
     }
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/users/logins/user-logins.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/users/logins/user-logins.component.ts
index d2355686..e188ec45 100644
--- a/src/Frontend/Jp.AdminUI/src/app/panel/users/logins/user-logins.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/panel/users/logins/user-logins.component.ts
@@ -5,7 +5,7 @@ import { UserService } from '@shared/services/user.service';
 import { ProblemDetails } from '@shared/viewModel/default-response.model';
 import { UserLogin } from '@shared/viewModel/user-login.model';
 import { ToasterConfig, ToasterService } from 'angular2-toaster';
-import { Observable } from 'rxjs';
+import { throwError } from 'rxjs';
 import { debounceTime, flatMap, map, tap } from 'rxjs/operators';
 
 
@@ -74,7 +74,7 @@ export class UserLoginsComponent implements OnInit {
             this.errors = [];
             this.errors.push("Unknown error while trying to remove");
             this.showButtonLoading = false;
-            return Observable.throw("Unknown error while trying to remove");
+            return throwError("Unknown error while trying to remove");
         }
 
     }
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.spec.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.spec.ts
index 0cf4765a..bbc56bb6 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.spec.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/layout/footer/footer.component.spec.ts
@@ -5,13 +5,15 @@ import { FooterComponent } from "./footer.component";
 
 import { SettingsService } from "@core/settings/settings.service";
 import { HttpClientModule } from "@angular/common/http";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Component: Footer", () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientModule],
-            providers: [SettingsService]
+            imports: [HttpClientModule, OAuthModule.forRoot()],
+            providers: [SettingsService, VersionService]
         }).compileComponents();
     });
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts
index f4d080a7..b1f40133 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts
@@ -15,7 +15,12 @@ export class NotificationsComponent implements OnInit {
     constructor(private http: HttpClient) { }
 
     ngOnInit() {
-        //this.notifications = of<Array<NotificationViewModel>>( JSON.parse('{"notifications":[{"icon":"text-info fas fa-kiwi-bird","title":"Session","description":"2019-05 UI Session improvements"},{"icon":"text-warning fab fa-docker","title":"Docker","description":"2019-04 Docker Ready"},{"icon":"text-info fas fa-code-branch","title":"NET Core 2.2","description":"2019-03 Updated to ASP.NET Core 2.2"},{"icon":"text-success fas fa-id-card","title":"ID4","description":"2019-03 IdentityServer4 2.4 Components"},{"icon":"text-info fas fa-rocket","title":"Launch","description":"2018-10 first release"}]}').notifications);
+        // this.notifications = of<Array<NotificationViewModel>>(
+        //  JSON.parse('{"notifications":[{"icon":"text-info fas fa-kiwi-bird","title":"Session","description":"2019-05 UI Session improvements"},
+        // {"icon":"text-warning fab fa-docker","title":"Docker","description":"2019-04 Docker Ready"},
+        // {"icon":"text-info fas fa-code-branch","title":"NET Core 2.2","description":"2019-03 Updated to ASP.NET Core 2.2"},
+        // {"icon":"text-success fas fa-id-card","title":"ID4","description":"2019-03 IdentityServer4 2.4 Components"},
+        // {"icon":"text-info fas fa-rocket","title":"Launch","description":"2018-10 first release"}]}').notifications);
         this.notifications$ = this.http.get<NotificationViewModel[]>('https://my-json-server.typicode.com/brunohbrito/JPProject.IdentityServer4.AdminUI/notifications');
     }
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/offsidebar/offsidebar.component.spec.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/offsidebar/offsidebar.component.spec.ts
index 1d3f870f..2afce974 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/layout/offsidebar/offsidebar.component.spec.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/layout/offsidebar/offsidebar.component.spec.ts
@@ -10,6 +10,8 @@ import { ThemesService } from "@core/themes/themes.service";
 import { TranslatorService } from "@core/translator/translator.service";
 import { SharedModule } from "@shared/shared.module";
 import { createTranslateLoader } from "../../../app.module";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Component: Offsidebar", () => {
 
@@ -24,9 +26,10 @@ describe("Component: Offsidebar", () => {
                     }
                 }),
                 HttpClientModule,
-                SharedModule
+                SharedModule,
+                OAuthModule.forRoot()
             ],
-            providers: [SettingsService, ThemesService, TranslatorService]
+            providers: [SettingsService, ThemesService, TranslatorService, VersionService]
         }).compileComponents();
     });
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/sidebar.component.spec.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/sidebar.component.spec.ts
index 12b70f1c..3b8c9510 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/sidebar.component.spec.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/sidebar.component.spec.ts
@@ -6,6 +6,8 @@ import { RouterModule, Router } from "@angular/router";
 import { MenuService } from "@core/menu/menu.service";
 import { SettingsService } from "@core/settings/settings.service";
 import { HttpClientModule } from "@angular/common/http";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Component: Sidebar", () => {
     let mockRouter = {
@@ -13,11 +15,12 @@ describe("Component: Sidebar", () => {
     };
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientModule],
+            imports: [HttpClientModule, OAuthModule.forRoot()],
             providers: [
                 MenuService,
                 SettingsService,
-                { provide: Router, useValue: mockRouter }
+                { provide: Router, useValue: mockRouter },
+                VersionService
             ]
         }).compileComponents();
     });
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/userblock/userblock.component.spec.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/userblock/userblock.component.spec.ts
index a310fed5..eea3b1be 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/userblock/userblock.component.spec.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/layout/sidebar/userblock/userblock.component.spec.ts
@@ -8,6 +8,8 @@ import { SettingsService } from "@core/settings/settings.service";
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from "@angular/platform-browser-dynamic/testing";
 import { AppComponent } from "../../../../app.component";
 import { HttpClientModule } from "@angular/common/http";
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { VersionService } from '@shared/services/version.service';
 
 describe("Component: Userblock", () => {
 
@@ -17,8 +19,8 @@ describe("Component: Userblock", () => {
             platformBrowserDynamicTesting());
 
         TestBed.configureTestingModule({
-            imports: [HttpClientModule],
-            providers: [UserblockService, SettingsService]
+            imports: [HttpClientModule, OAuthModule.forRoot()],
+            providers: [UserblockService, SettingsService, VersionService]
         });
     });
 
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/default-response.model.ts b/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/default-response.model.ts
index 9244a52a..01024790 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/default-response.model.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/default-response.model.ts
@@ -1,3 +1,9 @@
+
+export class KeyValuePair {
+  constructor(public key: string,
+      public value: string) { }
+}
+
 export class ProblemDetails {
 
     public success: boolean;
@@ -14,9 +20,9 @@ export class ProblemDetails {
                 }
                 if (Array.isArray(err.error.errors)) { return err.error.errors.map((element, i) => new KeyValuePair(i, element.message)); }
 
-                var mappedErrors = [];
+                let mappedErrors = [];
                 Object.keys(err.error.errors).map(function (key, index) {
-                    mappedErrors.push(new KeyValuePair(key, err.error.errors[key]))
+                    mappedErrors.push(new KeyValuePair(key, err.error.errors[key]));
                 });
                 return mappedErrors;
             }
@@ -30,7 +36,3 @@ export class ProblemDetails {
     }
 }
 
-export class KeyValuePair {
-    constructor(public key: string,
-        public value: string) { }
-}
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/email.model.ts b/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/email.model.ts
index 9cd7ad5a..31d328ce 100644
--- a/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/email.model.ts
+++ b/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/email.model.ts
@@ -1,5 +1,15 @@
+
+export class Bcc {
+  recipients: string[];
+}
+
+export class Sender {
+  address: string;
+  name:    string;
+}
+
 export class Email {
-    public constructor(){
+    public constructor() {
         this.bcc = new Bcc();
         this.sender = new Sender();
         this.content = "";
@@ -10,12 +20,3 @@ export class Email {
     bcc:     Bcc;
     sender:  Sender;
 }
-
-export class Bcc {
-    recipients: string[];
-}
-
-export class Sender {
-    address: string;
-    name:    string;
-}
diff --git a/src/Frontend/Jp.AdminUI/src/assets/i18n/el.json b/src/Frontend/Jp.AdminUI/src/assets/i18n/el.json
new file mode 100644
index 00000000..b6739374
--- /dev/null
+++ b/src/Frontend/Jp.AdminUI/src/assets/i18n/el.json
@@ -0,0 +1,475 @@
+{
+    "menu": {
+        "users": "Χρήστες",
+        "roles": "Ρόλοι",
+        "ssoSettings": "Ρυθμίσεις SSO",
+        "configuration": "Παραμετροποίηση",
+        "email-templates": "Πρότυπα",
+        "settings": "Ρυθμίσεις"
+    },
+    "general": {
+        "add": "Προσθήκη",
+        "api-resource": "Προστατευμένοι Πόροι",
+        "clients": "Εφαρμογές Πελάτη",
+        "copy": "Αντιγραφή",
+        "details": "Λεπτομέρειες",
+        "edit": "Επεξεργασία",
+        "empty": "Άδειο",
+        "goback": "Πίσω",
+        "identity-resource": "Πόροι Identity",
+        "loading": "Παρακαλώ περίμενετε να φορτωθεί!",
+        "persisted-grants": "Ενεργές Εξουσιοδοτήσεις",
+        "remove": "Διαγραφή",
+        "revoke": "Ανακάλεσε",
+        "roles": "Ρόλοι",
+        "users": "Χρήστες",
+        "emails": "Διευθύνσεις email",
+        "list": "Λίστα",
+        "settings": "Καθολικές ρυθμίσεις SSO"
+    },
+    "header": {
+        "search": {
+            "PLACEHOLDER": "Πληκτρολογήστε και πατήστε το πλήκτρο enter.."
+        }
+    },
+    "apiResource": {
+        "add": {
+            "description": "Περιγραφή",
+            "description-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "displayName": "Εμφανιζόμενο όνομα",
+            "displayName-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "enabled": "Ενεργό",
+            "enabled-tooltip": "Υποδεικνύει ότι αυτός ο πόρος είναι ενεργός και μπορεί να ζητηθεί. Η προεπιλογή είναι αληθές",
+            "name": "Όνομα",
+            "name-tooltip": "Μοναδικό όνομα του API. Η τιμή χρησιμοποιείται για αυθεντικοποίηση με ενδοσκόπηση και θα προστεθεί στην τιμή του audience του εξερχόμενου token πρόσβασης ",
+            "userClaims": "Αξιώσεις χρηστών",
+            "userClaims-tooltip": "Λίστα με τις σχετικές αξιώσεις χρηστών που μπορούν να συμπεριληφθούν στο token πρόσβασης."
+        },
+        "description": "Οι πόροι είναι κάτι το οποίο θέλουμε να προστατεύσουμε με τον IdentityServer (τα δεδομένα θα είναι επίσης προστατευμένα). Για να αποκτήσετε πρόσβαση στα περιεχόμενα της βάσης θα πρέπει να γίνει μέσω ενός API.",
+        "edit": {
+            "description": "Περιγραφή",
+            "description-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "displayName": "Εμφανιζόμενο όνομα",
+            "displayName-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "enabled": "Ενεργό",
+            "enabled-tooltip": "Υποδεικνύει ότι αυτός ο πόρος είναι ενεργός και μπορεί να ζητηθεί. Η προεπιλογή είναι αληθές",
+            "name": "Όνομα",
+            "name-tooltip": "Μοναδικό όνομα του API. Η τιμή χρησιμοποιείται για αυθεντικοποίηση με ενδοσκόπηση και θα προστεθεί στην τιμή του audience του εξερχόμενου token πρόσβασης ",
+            "scope": "Πεδίο εφαρμογής Api",
+            "scope-tooltip": "Το API έχει τουλάχιστον ένα πεδίο εφαρμογής. Κάθε πεδίο εφαρμογής μπορεί να έχει διαφορετικές ρυθμίσεις.",
+            "secrets": "Ιδιωτικά κλειδιά Api",
+            "secrets-tooltip": "Το ιδιωτικό κλειδί API χρησιμοποιείται για το τελικό σημείο πρόσβασης ενδοσκόπησης. Το API μπορεί να αυθεντικοποιηθεί με ενδοσκόπηση χρησιμοποιώντας το όνομα του API και το ιδιωτικό κλειδί.",
+            "userClaims": "Αξιώσεις χρηστών",
+            "userClaims-tooltip": "Λίστα με τις σχετικές αξιώσεις χρηστών που μπορούν να συμπεριληφθούν στο token πρόσβασης."
+        },
+        "list": {
+            "description": "Περιγραφή",
+            "name": "Όνομα"
+        },
+        "new-api": "Νέος προστατευμένος πόρος",
+        "remove": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": "Ο πόρος σου είναι ασφαλής :)",
+            "confirmButtonText": "Ναι, διεγραψέ το!",
+            "deleted": "Ο πόρος έχει διαγραφεί.",
+            "text": "Δε θα μπορέσετε να το ανακτήσετε!",
+            "title": "Είσαι σίγουρος"
+        },
+        "scope": {
+            "Emphasize": "Έμφαση",
+            "Emphasize-tooltip": "Καθορίζει εάν η σελίδα συγκατάθεσης θα δώσει έμφαση σε αυτό το πεδίο εφαρμογής (εάν θέλουμε να εμφανίσουμε αυτήν την δυνατότητα στην σελίδα συγκατάθεσης). Χρησιμοποίησε αυτήν την ρύθμιση για ευαίσθητα ή για σημαντικά πεδία εφαρμογής. Η προεπιλογή είναι ψευδές.",
+            "description": "Περιγραφή",
+            "description-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "displayName": "Εμφανιζόμενο όνομα",
+            "displayName-tooltip": "Αυτή η τιμή μπορεί να χρησιμοποιθεί π.χ. στην σελίδα συγκατάθεσης",
+            "name": "Όνομα",
+            "name-tooltip": "Μοναδικό όνομα του API. Η τιμή χρησιμοποιείται για αυθεντικοποίηση με ενδοσκόπηση και θα προστεθεί στην τιμή του audience του εξερχόμενου token πρόσβασης.",
+            "required": "Απαιτούμενο",
+            "required-tooltip": "Καθορίζει εάν ο χρήστης αποεπιλέξει το πεδίο εφαρμογής στην σελίδα συγκατάθεσης. Η προεπιλογή είναι ψευδές.",
+            "showInDiscoveryDocument": "Εμφάνιση στην σελίδα ανακάλυψης",
+            "showInDiscoveryDocument-tooltip": "Καθορίζει εάν το πεδίο εφαρμογής εμφανίζεται στην σελίδα ανακάλυψης. Η προεπιλογή είναι αληθές",
+            "userClaims": "Αξιώσεις χρηστών",
+            "userClaims-tooltip": "Λίστα με τις σχετικές αξιώσεις χρηστών που μπορούν να συμπεριληφθούν στο token πρόσβασης."
+        },
+        "secret-description": "Το ιδιωτικό κλειδί API χρησιμοποιείται για το τελικό σημείο πρόσβασης ενδοσκόπησης. Το API μπορεί να αυθεντικοποιηθεί με ενδοσκόπηση χρησιμοποιώντας το όνομα του API και το ιδιωτικό κλειδί API."
+    },
+    "client": {
+        "ClaimDescription": "Ρυθμίσεις για τις αξιώσεις εφαρμογών πελάτη (θα συμπεριληφθούν στο token αυθεντικοποίησης)",
+        "ClientDescription": "Η εφαρμογή πελάτη αναπαριστά μία εφαρμογή πελάτη OpenID Connect ή OAuth 2.0 - π.χ. μία native εφαρμογή, μία εφαρμογή web ή μία εφαρμογή JS",
+        "Image": "Εικόνα",
+        "PropertiesDescription": "Dictionary που κρατά τιμές συγκεκριμένα ανά εφαρμογή πελάτη",
+        "SecretDescription": "Σε συγκεκριμένες περιπτώσεις, οι εφαρμογές πελάτη πρέπει να αυθεντικοποιηθούν με τον identityserver, π.χ.: <br>1- απόρρητες εφαρμογές (δλδ εφαρμογές πελάτη) που αιτούνται token στο τελικό σημείο πρόσβασης. <br>2- API που επικυρώνουν τα token αναφοράς στο τελικό σημείο πρόσβασης ενδοσκόπησης",
+        "TableClientName": "Όνομα εφαρμογής πελάτη",
+        "claims": {
+            "type": "Τύπος",
+            "type-tooltip": "Τύπος",
+            "value": "Τιμή",
+            "value-tooltip": "Τιμή"
+        },
+        "clone": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": ":)",
+            "cloned": "Η εφαρμογή πελάτη έχει αντιγραφεί.",
+            "confirmButtonText": "Ναι, αντέγραψε το!",
+            "text": "Είσαι σίγουρος?",
+            "title": "Αντιγραφή"
+        },
+        "details": {
+            "absoluteRefreshTokenLifetime": "Απόλυτος χρόνος ζωής του Token Ανανέωσης",
+            "absoluteRefreshTokenLifetime-tooltip": "Μέγιστος χρόνος ζωής του token ανανέωσης σε δυτερόλεπτα. Η προεπιλογή είναι 2592000 δευτερόλεπτα / 30 ημέρες",
+            "accessTokenLifetime": "Χρόνος ζωής του Token Αυθεντικοποίησης",
+            "accessTokenLifetime-tooltip": "Χρόνος ζωής του token αυθεντικοποίησης σε δευτερόλεπτα (προεπιλογή: 3600 δευτερόλεπτα / 1 ώρα)",
+            "accessTokenTypes": "Τύπος Token Αυθεντικοποίησης",
+            "accessTokenTypes-tooltip": "Καθορίζει εάν το token αυθεντικοποίησης είναι token αναφοράς ή αυτάρκης token JWT (προεπιλογή: Jwt)",
+            "allowAccessTokensViaBrowser": "Επιτρέπει Token αυθεντικοποίησης μέσω περιηγητή ιστού",
+            "allowAccessTokensViaBrowser-tooltip": "Καθορίζει εάν η εφαρμογή πελάτη επιτρέπεται να έχει πρόσβαση σε token αυθεντικοποίησης μέσω περιηγητή ιστού. Αυτό είναι χρήσιμο για την ενίσχυση των ροών οι οποίες επιτρέπουν πολλαπλούς τύπους απαντήσεων (π.χ. μη επιτρέποντας μια υβριδική ροή εφαρμογής πελάτη που υποτίθεται ότι χρησιμοποιεί κωδικό id_token για να προσθέσει στον τύπο απάντησης του token και ως αποτέλεσμα να διαρεύσει το token στον περιηγητή ιστού.",
+            "allowOfflineAccess": "Επιτρέπει την offline σύνδεση",
+            "allowOfflineAccess-tooltip": "Specifies whether this client can request refresh tokens (be requesting the offline_access scope)",
+            "allowPlainTextPkce": "Allow Plain Text Pkce",
+            "allowPlainTextPkce-tooltip": "Specifies whether clients using PKCE can use a plain text code challenge (not recommended - and default to false)",
+            "allowRememberConsent": "Remember Consent",
+            "allowRememberConsent-tooltip": "Specifies whether user can choose to store consent decisions. Defaults to true.",
+            "allowedCorsOrigins": "Allowed Cors Origins",
+            "allowedCorsOrigins-tooltip": "If specified, will be used by the default CORS policy service implementations (In-Memory and EF) to build a CORS policy for JavaScript clients.",
+            "allowedGrantTypes": "Allowed Grant Types",
+            "allowedGrantTypes-tooltip": "Specifies the grant types the client is allowed to use. Use the GrantTypes class for common combinations. List of default grants: Implicit Grant - (implicit), Client Credentials Grant - (client_credentials), Authorization Code Grant - (authorization_code), Hybrid grant - (hybrid), Resource Owner Password Credentials Grant - (password)",
+            "allowedScopes": "Allowed Scopes",
+            "allowedScopes-tooltip": "By default a client has no access to any resources - specify the allowed resources by adding the corresponding scopes names",
+            "alwaysIncludeUserClaimsInIdToken": "Always Include Αξιώσεις χρηστών In IdToken",
+            "alwaysIncludeUserClaimsInIdToken-tooltip": "When requesting both an id token and access token, should the user claims always be added to the id token instead of requring the client to use the userinfo endpoint. Default is false",
+            "alwaysSendClientClaims": "Always Send Client Claims",
+            "alwaysSendClientClaims-tooltip": "If set, the client claims will be sent for every flow. If not, only for client credentials flow (default is false) ",
+            "auth": "Authentication",
+            "authorizationCodeLifetime": "Authorization Code Lifetime",
+            "authorizationCodeLifetime-tooltip": "Lifetime of authorization code in seconds (defaults to 300 seconds / 5 minutes)",
+            "backChannelLogoutSessionRequired": "Back Channel Logout Session",
+            "backChannelLogoutSessionRequired-tooltip": "Specifies if the user’s session id should be sent in the request to the BackChannelLogoutUri. Defaults to true",
+            "backChannelLogoutUri": "Back Channel Logout Uri",
+            "backChannelLogoutUri-tooltip": "Specifies logout URI at client for HTTP based back-channel logout. See the OIDC Back-Channel spec for more details",
+            "basic": "Basic",
+            "claims": "Claims",
+            "claims-tooltip": "Allows settings claims for the client (will be included in the access token)",
+            "clientClaimsPrefix": "Client Claims Prefix",
+            "clientClaimsPrefix-tooltip": "If set, the prefix client claim types will be prefixed with. Defaults to client_. The intent is to make sure they don’t accidentally collide with user claims.",
+            "clientId": "ClientId",
+            "clientId-tooltip": "Unique ID of the client",
+            "clientSecrets": "Client Secrets",
+            "clientSecrets-tooltip": "List of client secrets - credentials to access the token endpoint.",
+            "clientUri": "Client Uri",
+            "clientUri-tooltip": "URI to further information about client (used on consent screen)",
+            "description": "Περιγραφή",
+            "description-tooltip": "Client Description.",
+            "deviceCodeLifetime": "Device Code Lifetime",
+            "deviceCodeLifetime-tooltip": "Lifetime to device code in seconds (defaults to 300 seconds / 5 minutes)",
+            "deviceFlow": "Device Flow",
+            "enabled": "Ενεργό",
+            "enabled-tooltip": "Specifies if client is enabled. Defaults to true.",
+            "frontChannelLogoutSessionRequired": "Front Channel Logout Session",
+            "frontChannelLogoutSessionRequired-tooltip": "Specifies if the user’s session id should be sent to the FrontChannelLogoutUri. Defaults to true",
+            "frontChannelLogoutUri": "Front Channel Logout Uri",
+            "frontChannelLogoutUri-tooltip": "Specifies logout URI at client for HTTP based front-channel logout. See the OIDC Front-Channel spec for more details",
+            "identityProviderRestrictions": "Identity Provider Restrictions",
+            "identityProviderRestrictions-tooltip": "Specifies which external IdPs can be used with this client (if list is empty all IdPs are allowed). Defaults to empty.",
+            "identityTokenLifetime": "Identity Token Lifetime",
+            "identityTokenLifetime-tooltip": "Lifetime to identity token in seconds (defaults to 300 seconds / 5 minutes)",
+            "includeJwtId": "Include Jwt Id",
+            "includeJwtId-tooltip": "Specifies whether JWT access tokens should have an embedded unique ID (via the jti claim).",
+            "logoUri": "Logo Uri (Https)",
+            "logoUri-tooltip": "URI to client logo (used on consent screen). Must be Https",
+            "name": "Όνομα",
+            "name-tooltip": "Client display name (used for logging and consent screen)",
+            "pairWiseSubjectSalt": "Pair Wise Subject Salt",
+            "pairWiseSubjectSalt-tooltip": "Salt value used in pair-wise subjectId generation for users of this client.",
+            "properties": "Properties",
+            "properties-tooltip": "Dictionary to hold any custom client-specific values as needed.",
+            "protocolType": "Protocol Type",
+            "protocolType-tooltip": "Default is OpenID Connect protocol",
+            "redirectUris": "Redirect Uri's",
+            "redirectUris-tooltip": "Specifies the allowed URIs to return tokens or authorization codes to",
+            "refreshTokenExpiration": "Refresh Token Expiration",
+            "refreshTokenExpiration-tooltip": "Absolute the refresh token will expire on a fixed point in time (specified by the AbsoluteRefreshTokenLifetime) Sliding when refreshing the token, the lifetime of the refresh token will be renewed (by the amount specified in SlidingRefreshTokenLifetime). The lifetime will not exceed AbsoluteRefreshTokenLifetime.",
+            "refreshTokenUsage": "Refresh Token Usage",
+            "refreshTokenUsage-tooltip": "ReUse the refresh token handle will stay the same when refreshing tokens OneTime the refresh token handle will be updated when refreshing tokens",
+            "requireClientSecret": "Require Client Secret",
+            "requireClientSecret-tooltip": "Specifies whether this client needs a secret to request tokens from the token endpoint (defaults to true)",
+            "requireConsent": "Require Consent Screen",
+            "requireConsent-tooltip": "Specifies whether a consent screen is required. Defaults to true.",
+            "requirePkce": "Require Pkce",
+            "requirePkce-tooltip": "Specifies whether clients using an authorization code based grant type must send a proof key",
+            "settings": "Settings",
+            "slidingRefreshTokenLifetime": "Sliding Refresh Token Lifetime",
+            "slidingRefreshTokenLifetime-tooltip": "Sliding lifetime of a refresh token in seconds. Defaults to 1296000 seconds / 15 days",
+            "token": "Token",
+            "updateAccessTokenClaimsOnRefresh": "Update Access Token Claims On Refresh",
+            "updateAccessTokenClaimsOnRefresh-tooltip": "Gets or sets a value indicating whether the access token (and its claims) should be updated on a refresh token request",
+            "userCodeType": "User Code Type",
+            "userCodeType-tooltip": "Specifies the type of user code to use for the client. Otherwise falls back to default",
+            "postLogoutRedirectUris": "Logout Url",
+            "postLogoutRedirectUris-tooltip": "Specifies allowed URIs to redirect to after logout",
+            "enableLocalLogin": "Enable Local Login",
+            "enableLocalLogin-tooltip": "Specifies if this client can use local accounts, or external Providers only. E.g: Facebook, Google. Defaults to true",
+            "userSsoLifetime": "User Sso Lifetime",
+            "userSsoLifetime-tooltip": "The maximum duration (in seconds) since the last time the user authenticated. Defaults to null. You can adjust the lifetime of a session token to control when and how often a user is required to reenter credentials instead of being silently authenticated, when using a web application"
+        },
+        "property": {
+            "key": "Key",
+            "key-tooltip": "Key",
+            "value": "Τιμή",
+            "value-tooltip": "Τιμή"
+        },
+        "remove": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": "Your Client is safe :)",
+            "confirmButtonText": "Ναι, διεγραψέ το!",
+            "deleted": "Client has been deleted.",
+            "text": "Δε θα μπορέσετε να το ανακτήσετε!",
+            "title": "Είσαι σίγουρος"
+        }
+    },
+    "home": {
+        "CLIENTDESCRIPTION": "Manage your clients.",
+        "DESCRIPTION": "This is IdentityServer4 Admin Panel. Here you can manage your IS4 settings.",
+        "WELCOME": "Welcome"
+    },
+    "identityResource": {
+        "add": {
+            "description": "Περιγραφή",
+            "description-tooltip": "This value will be used e.g. on the consent screen.",
+            "displayName": "Εμφανιζόμενο όνομα",
+            "displayName-tooltip": "This value will be used e.g. on the consent screen.",
+            "emphasize": "Εμφαση",
+            "emphasize-tooltip": "Specifies whether the consent screen will emphasize this scope (if the consent screen wants to implement such a feature). Use this setting for sensitive or important scopes. Defaults to false.",
+            "enabled": "Ενεργό",
+            "enabled-tooltip": "Υποδεικνύει ότι αυτός ο πόρος είναι ενεργός και μπορεί να ζητηθεί. Η προεπιλογή είναι αληθές",
+            "name": "Όνομα",
+            "name-tooltip": "The unique name of the identity resource. This is the value a client will use for the scope parameter in the authorize request.",
+            "required": "Απαιτούμενο",
+            "required-tooltip": "Specifies whether the user can de-select the scope on the consent screen (if the consent screen wants to implement such a feature). Defaults to false.",
+            "showInDiscoveryDocument": "Show In Discovery Document",
+            "showInDiscoveryDocument-tooltip": "Specifies whether this scope is shown in the discovery document. Defaults to true.",
+            "userClaims": "Αξιώσεις χρηστών",
+            "userClaims-tooltip": "List of associated user claim types that should be included in the identity token."
+        },
+        "description": "Identity resources are data like user ID, name, or email address of a user. An identity resource has a unique name, and you can assign arbitrary claim types to it. These claims will then be included in the identity token for the user.",
+        "edit": {
+            "description": "Περιγραφή",
+            "description-tooltip": "This value will be used e.g. on the consent screen.",
+            "displayName": "Εμφανιζόμενο όνομα",
+            "displayName-tooltip": "This value will be used e.g. on the consent screen.",
+            "emphasize": "Εμφαση",
+            "emphasize-tooltip": "Specifies whether the consent screen will emphasize this scope (if the consent screen wants to implement such a feature). Use this setting for sensitive or important scopes. Defaults to false.",
+            "enabled": "Ενεργό",
+            "enabled-tooltip": "Υποδεικνύει ότι αυτός ο πόρος είναι ενεργός και μπορεί να ζητηθεί. Η προεπιλογή είναι αληθές",
+            "name": "Όνομα",
+            "name-tooltip": "The unique name of the identity resource. This is the value a client will use for the scope parameter in the authorize request.",
+            "required": "Απαιτούμενο",
+            "required-tooltip": "Specifies whether the user can de-select the scope on the consent screen (if the consent screen wants to implement such a feature). Defaults to false.",
+            "showInDiscoveryDocument": "Show In Discovery Document",
+            "showInDiscoveryDocument-tooltip": "Specifies whether this scope is shown in the discovery document. Defaults to true.",
+            "userClaims": "Αξιώσεις χρηστών",
+            "userClaims-tooltip": "List of associated user claim types that should be included in the identity token."
+        },
+        "list": {
+            "description": "Περιγραφή",
+            "name": "Όνομα"
+        },
+        "newIr": "New Identity Resource",
+        "remove": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": "Ο πόρος σου είναι ασφαλής :)",
+            "confirmButtonText": "Ναι, διεγραψέ το!",
+            "deleted": "Ο πόρος έχει διαγραφεί.",
+            "text": "Δε θα μπορέσετε να το ανακτήσετε!",
+            "title": "Είσαι σίγουρος"
+        }
+    },
+    "offsidebar": {
+        "setting": {
+            "SETTINGS": "Settings"
+        }
+    },
+    "persistedGrant": {
+        "description": "description",
+        "list": {
+            "clientId": "Client",
+            "creationTime": "CreationTime",
+            "email": "Email",
+            "expiration": "Expiration",
+            "key": "Key",
+            "picture": "Picture",
+            "scopes": "Scopes",
+            "type": "Τύπος"
+        },
+        "remove": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": "Grant is safe :)",
+            "confirmButtonText": "Ναι, διεγραψέ το!",
+            "deleted": "Grant has been deleted.",
+            "text": "Δε θα μπορέσετε να το ανακτήσετε!",
+            "title": "Είσαι σίγουρος"
+        }
+    },
+    "roles": {
+        "add": {
+            "roleName": "Όνομα",
+            "roleName-tooltip": "Gets or sets the role name."
+        },
+        "description": "Represents a role in the identity system",
+        "edit": {
+            "roleName": "Όνομα",
+            "roleName-tooltip": "Gets or sets the role name."
+        },
+        "list": {
+            "email": "Email",
+            "name": "Όνομα",
+            "picture": "Picture"
+        },
+        "name": "Όνομα",
+        "new-role": "New role",
+        "selectedRole": "Selected Role"
+    },
+    "secrets": {
+        "description": "Περιγραφή",
+        "description-tooltip": "Set description",
+        "expiration": "Expiration",
+        "expiration-tooltip": "Set expiration",
+        "hashType": "Hash Type",
+        "hashType-tooltip": "Set the hash of Secret Value",
+        "secretType": "Secret Type",
+        "secretType-tooltip": "The type of the client secret",
+        "secretValue": "Secret Value",
+        "secretValue-tooltip": "Specifies the secret of client"
+    },
+    "sidebar": {
+        "WELCOME": "Welcome",
+        "heading": {
+            "HEADER": "Menu Heading"
+        },
+        "nav": {
+            "SINGLEVIEW": "Single View"
+        }
+    },
+    "toasterMessages": {
+        "message-success": "Well done!",
+        "title-success": "Success"
+    },
+    "users": {
+        "claims": {
+            "type": "Τύπος",
+            "type-tooltip": "Τύπος",
+            "value": "Τιμή",
+            "value-tooltip": "Τιμή"
+        },
+        "description": "A user is a person or robot that can access resources and clients.",
+        "edit": {
+            "accessFailedCount": "Access Failed Count",
+            "accessFailedCount-tooltip": "Gets or sets the number of failed login attempts for the current user",
+            "change-password": "Change password",
+            "claims": "Claims",
+            "claims-tooltip": "Allows settings claims for the user (will be included in the access token)",
+            "confirmPassword": "Confirm password",
+            "confirmPassword-tooltip": "Confirm password",
+            "email": "Email",
+            "email-tooltip": "Gets or sets the email address for this user",
+            "emailConfirmed": "Email Confirmed",
+            "emailConfirmed-tooltip": "Gets or sets a flag indicating if a user has confirmed their email address",
+            "externalLogins": "External Logins",
+            "externalLogins-tooltip": "Manage user external login. e.g Google, Facebook",
+            "lockoutEnabled": "lockout Enabled",
+            "lockoutEnabled-tooltip": "Gets or sets a flag indicating if the user could be locked out",
+            "lockoutEnd": "Lockout End",
+            "lockoutEnd-tooltip": "Gets or sets the date and time, in UTC, when any user lockout ends",
+            "name": "Εμφανιζόμενο όνομα",
+            "name-tooltip": "Gets or sets the user name",
+            "password": "Password",
+            "password-tooltip": "Password",
+            "phoneNumber": "Phone Number",
+            "phoneNumber-tooltip": "Gets or sets a telephone number for the user",
+            "phoneNumberConfirmed": "Phone Number Confirmed",
+            "phoneNumberConfirmed-tooltip": "Gets or sets a flag indicating if a user has confirmed their telephone address",
+            "roles": "Roles",
+            "roles-tooltip": "Allows settings roles for the user (will be included in the access token)",
+            "twoFactorEnabled": "TwoFactor Enabled",
+            "twoFactorEnabled-tooltip": "Gets or sets a flag indicating if two factor authentication is enabled for this user",
+            "user-data": "User Data",
+            "userName": "UserName",
+            "userName-tooltip": "Gets or sets the user name for this user."
+        },
+        "list": {
+            "email": "Email",
+            "info": "User information",
+            "log-tooltip": "Show events",
+            "name": "Όνομα",
+            "picture": "Picture",
+            "username": "Username"
+        },
+        "logins": {
+            "loginProvider": "Provider",
+            "nologins": "There is no available logins",
+            "providerDisplayName": "Όνομα",
+            "providerKey": "Key"
+        },
+        "new-user": "New User",
+        "remove": {
+            "cancelButtonText": "Όχι, ακύρωσε το σε παρακαλώ!",
+            "cancelled": "User is safe :)",
+            "confirmButtonText": "Ναι, διεγραψέ το!",
+            "deleted": "User has been deleted.",
+            "text": "Δε θα μπορέσετε να το ανακτήσετε!",
+            "title": "Είσαι σίγουρος"
+        },
+        "roles": {
+            "name": "Όνομα",
+            "role": "Role",
+            "role-tooltip": "Select user role"
+        },
+        "events": {
+
+        }
+    },
+    "emails": {
+        "description": "Email templates for SSO.",
+        "edit": {
+            "type": "Email type",
+            "type-tooltip": "Type of communication with the user",
+            "subject": "Subject",
+            "subject-tooltip": "Email subject",
+            "bcc": "Bcc",
+            "bcc-tooltip": "Blind Carbon Copy - Blind copy someone",
+            "senderName": "Sender Όνομα",
+            "senderName-tooltip": "The name of who will send the e-mail.",
+            "senderAddress": "Sender Address",
+            "senderAddress-tooltip": "Address from who will send the e-mail",
+            "editor": "Editor",
+            "code": "HTML Code Editor",
+            "variables": "Variables",
+            "variables-description": "A list of variables which will be replaced before send to User.",
+            "variables-name": "The name of user",
+            "variables-picture": "Url of user profile picture",
+            "variables-username": "Username choosen by user",
+            "variables-code": "Generated code for user for him confirm E-mail",
+            "variables-provider": "When user are using Federation login. It'll be the provider name (E.G: Google | Facebook)",
+            "variables-phoneNumber": "Provided phone number",
+            "variables-email": "User e-mail",
+            "variables-url": "Unique url generate for user to confirm e-mail"
+        }
+    },
+    "settings": {
+        "description": "Global settings to manage your SSO configuration",
+        "emails": {
+            "description": "SMTP Settings for e-mail services.",
+            "server": "Server",
+            "server-tooltip": "Server address uri",
+            "password": "Password",
+            "password-tooltip": "SMTP Password",
+            "username": "Username",
+            "username-tooltip": "SMTP Username",
+            "port": "Port",
+            "port-tooltip": "SMTP Port",
+            "useSsl": "SSL",
+            "useSsl-tooltip": "Use ssl",
+            "sendEmail": "Send e-mail",
+            "sendEmail-tooltip": "SSO should send e-mail?"
+        }
+    }
+}
diff --git a/src/Frontend/Jp.AdminUI/src/assets/i18n/en.json b/src/Frontend/Jp.AdminUI/src/assets/i18n/en.json
index 913245b5..0302dcc2 100644
--- a/src/Frontend/Jp.AdminUI/src/assets/i18n/en.json
+++ b/src/Frontend/Jp.AdminUI/src/assets/i18n/en.json
@@ -472,4 +472,4 @@
             "sendEmail-tooltip": "SSO should send e-mail?"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Frontend/Jp.AdminUI/src/main.ts b/src/Frontend/Jp.AdminUI/src/main.ts
index c88ec975..c0cccd08 100644
--- a/src/Frontend/Jp.AdminUI/src/main.ts
+++ b/src/Frontend/Jp.AdminUI/src/main.ts
@@ -10,5 +10,5 @@ if (environment.production)
 
 // platformBrowserDynamic().bootstrapModule(AppModule);
 let p = platformBrowserDynamic().bootstrapModule(AppModule);
-p.then(() => { (<any>window).appBootstrap && (<any>window).appBootstrap(); })
+p.then(() => { (<any>window).appBootstrap && (<any>window).appBootstrap(); });
 // .catch(err => console.error(err));
diff --git a/src/Frontend/Jp.AdminUI/src/modernizr.js b/src/Frontend/Jp.AdminUI/src/modernizr.js
index 6fd35afe..a0101665 100644
--- a/src/Frontend/Jp.AdminUI/src/modernizr.js
+++ b/src/Frontend/Jp.AdminUI/src/modernizr.js
@@ -1,6 +1,6 @@
 /*!
- * modernizr v3.3.1
- * Build http://modernizr.com/download?-bgpositionshorthand-bgpositionxy-bgrepeatspace_bgrepeatround-bgsizecover-borderradius-cssanimations-csscalc-csstransforms-csstransforms3d-csstransitions-flexboxtweener-fontface-inlinesvg-localstorage-multiplebgs-preserve3d-sessionstorage-smil-svg-svgasimg-svgclippaths-svgfilters-svgforeignobject-websqldatabase-setclasses-dontmin
+ * modernizr v3.7.1
+ * Build https://modernizr.com/download?-bgpositionshorthand-bgpositionxy-bgrepeatspace_bgrepeatround-bgsizecover-borderradius-cssanimations-csscalc-csstransforms-csstransforms3d-csstransitions-flexboxtweener-fontface-inlinesvg-localstorage-multiplebgs-preserve3d-sessionstorage-smil-svg-svgasimg-svgclippaths-svgfilters-svgforeignobject-websqldatabase-setclasses-dontmin
  *
  * Copyright (c)
  *  Faruk Ates
@@ -10,6 +10,7 @@
  *  Patrick Kettner
  *  Stu Cox
  *  Richard Herrera
+ *  Veeck
 
  * MIT License
  */
@@ -23,20 +24,19 @@
 */
 
 ;(function(window, document, undefined){
+
   var tests = [];
   
 
   /**
-   *
    * ModernizrProto is the constructor for Modernizr
    *
    * @class
    * @access public
    */
-
   var ModernizrProto = {
     // The current version, dummy
-    _version: '3.3.1',
+    _version: '3.7.1',
 
     // Any settings that don't work as separate modules
     // can go in here as configuration.
@@ -95,20 +95,20 @@
    * @function is
    * @param {*} obj - A thing we want to check the type of
    * @param {string} type - A string to compare the typeof against
-   * @returns {boolean}
+   * @returns {boolean} true if the typeof the first parameter is exactly the specified type, false otherwise
    */
-
   function is(obj, type) {
     return typeof obj === type;
   }
+
   ;
 
   /**
    * Run through all tests and detect their support in the current UA.
    *
    * @access private
+   * @returns {void}
    */
-
   function testRunner() {
     var featureNames;
     var feature;
@@ -143,7 +143,6 @@
         // Run the test, or use the raw value if it's not a function
         result = is(feature.fn, 'function') ? feature.fn() : feature.fn;
 
-
         // Set each of the names on the Modernizr object
         for (nameIdx = 0; nameIdx < featureNames.length; nameIdx++) {
           featureName = featureNames[nameIdx];
@@ -159,7 +158,6 @@
             Modernizr[featureNameSplit[0]] = result;
           } else {
             // cast to a Boolean, if not one already
-            /* jshint -W053 */
             if (Modernizr[featureNameSplit[0]] && !(Modernizr[featureNameSplit[0]] instanceof Boolean)) {
               Modernizr[featureNameSplit[0]] = new Boolean(Modernizr[featureNameSplit[0]]);
             }
@@ -180,7 +178,6 @@
    * @access private
    * @returns {HTMLElement|SVGElement} The root element of the document
    */
-
   var docElement = document.documentElement;
   
 
@@ -190,8 +187,8 @@
    * @access private
    * @returns {boolean}
    */
-
   var isSVG = docElement.nodeName.toLowerCase() === 'svg';
+
   
 
   /**
@@ -201,7 +198,6 @@
    * @function setClasses
    * @param {string[]} classes - Array of class names
    */
-
   // Pass in an and array of class names, e.g.:
   //  ['no-webp', 'borderradius', ...]
   function setClasses(classes) {
@@ -221,10 +217,15 @@
 
     if (Modernizr._config.enableClasses) {
       // Add the new classes
-      className += ' ' + classPrefix + classes.join(' ' + classPrefix);
-      isSVG ? docElement.className.baseVal = className : docElement.className = className;
+      if (classes.length > 0) {
+        className += ' ' + classPrefix + classes.join(' ' + classPrefix);
+      }
+      if (isSVG) {
+        docElement.className.baseVal = className;
+      } else {
+        docElement.className = className;
+      }
     }
-
   }
 
   ;
@@ -239,7 +240,6 @@
    * @function createElement
    * @returns {HTMLElement|SVGElement} An HTML or SVG element
    */
-
   function createElement() {
     if (typeof document.createElement !== 'function') {
       // This is the case in IE7, where the type of createElement is "object".
@@ -263,7 +263,7 @@
     "name": "MDN Docs",
     "href": "https://developer.mozilla.org/en/CSS/background-position"
   }, {
-    "name": "W3 Spec",
+    "name": "W3C Spec",
     "href": "https://www.w3.org/TR/css3-background/#background-position"
   }, {
     "name": "Demo",
@@ -273,7 +273,7 @@
 !*/
 /* DOC
 Detects if you can use the shorthand method to define multiple parts of an
-element's background-position simultaniously.
+element's background-position simultaneously.
 
 eg `background-position: right 10px bottom 10px`
 */
@@ -288,12 +288,12 @@ eg `background-position: right 10px bottom 10px`
 
 
   /**
-   * If the browsers follow the spec, then they would expose vendor-specific style as:
+   * If the browsers follow the spec, then they would expose vendor-specific styles as:
    *   elem.style.WebkitBorderRadius
-   * instead of something like the following, which would be technically incorrect:
+   * instead of something like the following (which is technically incorrect):
    *   elem.style.webkitBorderRadius
 
-   * Webkit ghosts their properties in lowercase but Opera & Moz do not.
+   * WebKit ghosts their properties in lowercase but Opera & Moz do not.
    * Microsoft uses a lowercase `ms` instead of the correct `Ms` in IE8+
    *   erik.eae.net/archives/2008/03/10/21.48.10/
 
@@ -302,7 +302,6 @@ eg `background-position: right 10px bottom 10px`
    * @access private
    * @returns {string} The string representing the vendor-specific style properties
    */
-
   var omPrefixes = 'Moz O ms Webkit';
   
 
@@ -310,7 +309,6 @@ eg `background-position: right 10px bottom 10px`
   ModernizrProto._cssomPrefixes = cssomPrefixes;
   
 
-
   /**
    * contains checks to see if a string contains another string
    *
@@ -318,9 +316,8 @@ eg `background-position: right 10px bottom 10px`
    * @function contains
    * @param {string} str - The string we want to check for substrings
    * @param {string} substr - The substring we want to search the first string for
-   * @returns {boolean}
+   * @returns {boolean} true if and only if the first string 'str' contains the second string 'substr'
    */
-
   function contains(str, substr) {
     return !!~('' + str).indexOf(substr);
   }
@@ -332,7 +329,6 @@ eg `background-position: right 10px bottom 10px`
    *
    * @access private
    */
-
   var modElem = {
     elem: createElement('modernizr')
   };
@@ -365,7 +361,6 @@ eg `background-position: right 10px bottom 10px`
    * @returns {HTMLElement|SVGElement} Returns the real body of a document, or an
    * artificially created element that stands in for the body
    */
-
   function getBody() {
     // After page load injecting a fake body doesn't work so check if body exists
     var body = document.body;
@@ -387,12 +382,11 @@ eg `background-position: right 10px bottom 10px`
    * @access private
    * @function injectElementWithStyles
    * @param {string} rule - String representing a css rule
-   * @param {function} callback - A function that is used to test the injected element
+   * @param {Function} callback - A function that is used to test the injected element
    * @param {number} [nodes] - An integer representing the number of additional nodes you want injected
    * @param {string[]} [testnames] - An array of strings that are used as ids for the additional nodes
-   * @returns {boolean}
+   * @returns {boolean} the result of the specified callback test
    */
-
   function injectElementWithStyles(rule, callback, nodes, testnames) {
     var mod = 'modernizr';
     var style;
@@ -444,13 +438,13 @@ eg `background-position: right 10px bottom 10px`
       body.parentNode.removeChild(body);
       docElement.style.overflow = docOverflow;
       // Trigger layout so kinetic scrolling isn't disabled in iOS6+
+      // eslint-disable-next-line
       docElement.offsetHeight;
     } else {
       div.parentNode.removeChild(div);
     }
 
     return !!ret;
-
   }
 
   ;
@@ -464,12 +458,50 @@ eg `background-position: right 10px bottom 10px`
    * @param {string} name - String name of camelCase prop we want to convert
    * @returns {string} The kebab-case version of the supplied name
    */
-
   function domToCSS(name) {
     return name.replace(/([A-Z])/g, function(str, m1) {
       return '-' + m1.toLowerCase();
     }).replace(/^ms-/, '-ms-');
   }
+
+  ;
+
+
+  /**
+   * wrapper around getComputedStyle, to fix issues with Firefox returning null when
+   * called inside of a hidden iframe
+   *
+   * @access private
+   * @function computedStyle
+   * @param {HTMLElement|SVGElement} elem - The element we want to find the computed styles of
+   * @param {string|null} [pseudo] - An optional pseudo element selector (e.g. :before), of null if none
+   * @param {string} prop - A CSS property
+   * @returns {CSSStyleDeclaration} the value of the specified CSS property
+   */
+  function computedStyle(elem, pseudo, prop) {
+    var result;
+
+    if ('getComputedStyle' in window) {
+      result = getComputedStyle.call(window, elem, pseudo);
+      var console = window.console;
+
+      if (result !== null) {
+        if (prop) {
+          result = result.getPropertyValue(prop);
+        }
+      } else {
+        if (console) {
+          var method = console.error ? 'error' : 'log';
+          console[method].call(console, 'getComputedStyle returning null, its possible modernizr test results are inaccurate');
+        }
+      }
+    } else {
+      result = !pseudo && elem.currentStyle && elem.currentStyle[prop];
+    }
+
+    return result;
+  }
+
   ;
 
   /**
@@ -482,12 +514,11 @@ eg `background-position: right 10px bottom 10px`
    * @param {string} value - A string representing the value we want to check via @supports
    * @returns {boolean|undefined} A boolean when @supports exists, undefined otherwise
    */
-
   // Accepts a list of property names and a single value
   // Returns `undefined` if native detection not available
   function nativeTestProps(props, value) {
     var i = props.length;
-    // Start with the JS API: http://www.w3.org/TR/css3-conditional/#the-css-interface
+    // Start with the JS API: https://www.w3.org/TR/css3-conditional/#the-css-interface
     if ('CSS' in window && 'supports' in window.CSS) {
       // Try every prefixed variant of the property
       while (i--) {
@@ -506,7 +537,7 @@ eg `background-position: right 10px bottom 10px`
       }
       conditionText = conditionText.join(' or ');
       return injectElementWithStyles('@supports (' + conditionText + ') { #modernizr { position: absolute; } }', function(node) {
-        return getComputedStyle(node, null).position == 'absolute';
+        return computedStyle(node, null, 'position') === 'absolute';
       });
     }
     return undefined;
@@ -522,12 +553,12 @@ eg `background-position: right 10px bottom 10px`
    * @param {string} name - String name of kebab-case prop we want to convert
    * @returns {string} The camelCase version of the supplied name
    */
-
   function cssToDOM(name) {
     return name.replace(/([a-z])-([a-z])/g, function(str, m1, m2) {
       return m1 + m2.toUpperCase();
     }).replace(/^-/, '');
   }
+
   ;
 
   // testProps is a generic CSS / DOM property test.
@@ -563,8 +594,9 @@ eg `background-position: right 10px bottom 10px`
     // inside of an SVG element, in certain browsers, the `style` element is only
     // defined for valid tags. Therefore, if `modernizr` does not have one, we
     // fall back to a less used element and hope for the best.
-    var elems = ['modernizr', 'tspan'];
-    while (!mStyle.style) {
+    // for strict XHTML browsers the hardly used samp element is used
+    var elems = ['modernizr', 'tspan', 'samp'];
+    while (!mStyle.style && elems.length) {
       afterInit = true;
       mStyle.modElem = createElement(elems.shift());
       mStyle.style = mStyle.modElem.style;
@@ -604,16 +636,16 @@ eg `background-position: right 10px bottom 10px`
           // supported. If `value` is empty string, it'll fail here (because
           // it hasn't changed), which matches how browsers have implemented
           // CSS.supports()
-          if (mStyle.style[prop] != before) {
+          if (mStyle.style[prop] !== before) {
             cleanElems();
-            return prefixed == 'pfx' ? prop : true;
+            return prefixed === 'pfx' ? prop : true;
           }
         }
         // Otherwise just return true, or the property name if this is a
         // `prefixed()` call
         else {
           cleanElems();
-          return prefixed == 'pfx' ? prop : true;
+          return prefixed === 'pfx' ? prop : true;
         }
       }
     }
@@ -626,7 +658,7 @@ eg `background-position: right 10px bottom 10px`
   /**
    * List of JavaScript DOM values used for tests
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr._domPrefixes
    * @optionName Modernizr._domPrefixes
    * @optionProp domPrefixes
@@ -640,7 +672,6 @@ eg `background-position: right 10px bottom 10px`
    * Modernizr._domPrefixes === [ "Moz", "O", "ms", "Webkit" ];
    * ```
    */
-
   var domPrefixes = (ModernizrProto._config.usePrefixes ? omPrefixes.toLowerCase().split(' ') : []);
   ModernizrProto._domPrefixes = domPrefixes;
   
@@ -650,11 +681,10 @@ eg `background-position: right 10px bottom 10px`
    *
    * @access private
    * @function fnBind
-   * @param {function} fn - a function you want to change `this` reference to
-   * @param {object} that - the `this` you want to call the function with
-   * @returns {function} The wrapped version of the supplied function
+   * @param {Function} fn - a function you want to change `this` reference to
+   * @param {Object} that - the `this` you want to call the function with
+   * @returns {Function} The wrapped version of the supplied function
    */
-
   function fnBind(fn, that) {
     return function() {
       return fn.apply(that, arguments);
@@ -669,9 +699,10 @@ eg `background-position: right 10px bottom 10px`
    *
    * @access private
    * @function testDOMProps
-   * @param {array.<string>} props - An array of properties to test for
-   * @param {object} obj - An object or Element you want to use to test the parameters again
-   * @param {boolean|object} elem - An Element to bind the property lookup again. Use `false` to prevent the check
+   * @param {Array<string>} props - An array of properties to test for
+   * @param {Object} obj - An object or Element you want to use to test the parameters again
+   * @param {boolean|Object} elem - An Element to bind the property lookup again. Use `false` to prevent the check
+   * @returns {false|*} returns false if the prop is unsupported, otherwise the value that is supported
    */
   function testDOMProps(props, obj, elem) {
     var item;
@@ -688,7 +719,7 @@ eg `background-position: right 10px bottom 10px`
 
         // let's bind a function
         if (is(item, 'function')) {
-          // bind to obj unless overriden
+          // bind to obj unless overridden
           return fnBind(item, elem || obj);
         }
 
@@ -710,15 +741,16 @@ eg `background-position: right 10px bottom 10px`
    * @access private
    * @function testPropsAll
    * @param {string} prop - A string of the property to test for
-   * @param {string|object} [prefixed] - An object to check the prefixed properties on. Use a string to skip
+   * @param {string|Object} [prefixed] - An object to check the prefixed properties on. Use a string to skip
    * @param {HTMLElement|SVGElement} [elem] - An element used to test the property and value against
    * @param {string} [value] - A string of a css value
    * @param {boolean} [skipValueTest] - An boolean representing if you want to test if value sticks when set
+   * @returns {false|string} returns the string version of the property, or false if it is unsupported
    */
   function testPropsAll(prop, prefixed, elem, value, skipValueTest) {
 
     var ucProp = prop.charAt(0).toUpperCase() + prop.slice(1),
-    props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
+      props = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
 
     // did they call .prefixed('boxSizing') or are we just testing a prop?
     if (is(prefixed, 'string') || is(prefixed, 'undefined')) {
@@ -743,7 +775,7 @@ eg `background-position: right 10px bottom 10px`
   /**
    * testAllProps determines whether a given CSS property is supported in the browser
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr.testAllProps
    * @optionName Modernizr.testAllProps()
    * @optionProp testAllProps
@@ -752,6 +784,7 @@ eg `background-position: right 10px bottom 10px`
    * @param {string} prop - String naming the property to test (either camelCase or kebab-case)
    * @param {string} [value] - String of the value to test
    * @param {boolean} [skipValueTest=false] - Whether to skip testing that the value is supported when using non-native detection
+   * @returns {false|string} returns the string version of the property, or false if it is unsupported
    * @example
    *
    * testAllProps determines whether a given CSS property, in some prefixed form,
@@ -776,11 +809,12 @@ eg `background-position: right 10px bottom 10px`
    * testAllProps('shapeOutside', 'content-box', true);
    * ```
    */
-
   function testAllProps(prop, value, skipValueTest) {
     return testPropsAll(prop, undefined, undefined, value, skipValueTest);
   }
+
   ModernizrProto.testAllProps = testAllProps;
+
   
 /*!
 {
@@ -840,7 +874,7 @@ Detects the ability to use round and space as properties for background-repeat
   "tags": ["css"],
   "builderAliases": ["css_backgroundsizecover"],
   "notes": [{
-    "name" : "MDN Docs",
+    "name": "MDN Docs",
     "href": "https://developer.mozilla.org/en/CSS/background-size"
   }]
 }
@@ -874,8 +908,8 @@ Detects the ability to use round and space as properties for background-repeat
   "tags": ["css"],
   "warnings": ["Android < 4 will pass this test, but can only animate a single property at a time"],
   "notes": [{
-    "name" : "Article: 'Dispelling the Android CSS animation myths'",
-    "href": "https://goo.gl/OGw5Gm"
+    "name": "Article: 'Dispelling the Android CSS animation myths'",
+    "href": "https://web.archive.org/web/20180602074607/https://daneden.me/2011/12/14/putting-up-with-androids-bullshit/"
   }]
 }
 !*/
@@ -888,9 +922,9 @@ Detects whether or not elements can be animated using CSS
 
   /**
    * List of property values to set for css tests. See ticket #21
-   * http://git.io/vUGl4
+   * https://github.com/modernizr/modernizr/issues/21
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr._prefixes
    * @optionName Modernizr._prefixes
    * @optionProp prefixes
@@ -917,8 +951,9 @@ Detects whether or not elements can be animated using CSS
    * rule === 'display:flex; display:-webkit-flex; display:-moz-flex; display:-o-flex; display:-ms-flex; display:flex'
    * ```
    */
-
-  var prefixes = (ModernizrProto._config.usePrefixes ? ' -webkit- -moz- -o- -ms- '.split(' ') : []);
+  // we use ['',''] rather than an empty array in order to allow a pattern of .`join()`ing prefixes to test
+  // values in feature detects to continue to work
+  var prefixes = (ModernizrProto._config.usePrefixes ? ' -webkit- -moz- -o- -ms- '.split(' ') : ['','']);
 
   // expose these for the plugin API. Look in the source for how to join() them against your input
   ModernizrProto._prefixes = prefixes;
@@ -965,71 +1000,11 @@ Method of allowing calculated values for length units. For example:
 
   Modernizr.addTest('csstransforms', function() {
     // Android < 3.0 is buggy, so we sniff and blacklist
-    // http://git.io/hHzL7w
+    // https://github.com/Modernizr/Modernizr/issues/903
     return navigator.userAgent.indexOf('Android 2.') === -1 &&
            testAllProps('transform', 'scale(1)', true);
   });
 
-
-  /**
-   * testStyles injects an element with style element and some CSS rules
-   *
-   * @memberof Modernizr
-   * @name Modernizr.testStyles
-   * @optionName Modernizr.testStyles()
-   * @optionProp testStyles
-   * @access public
-   * @function testStyles
-   * @param {string} rule - String representing a css rule
-   * @param {function} callback - A function that is used to test the injected element
-   * @param {number} [nodes] - An integer representing the number of additional nodes you want injected
-   * @param {string[]} [testnames] - An array of strings that are used as ids for the additional nodes
-   * @returns {boolean}
-   * @example
-   *
-   * `Modernizr.testStyles` takes a CSS rule and injects it onto the current page
-   * along with (possibly multiple) DOM elements. This lets you check for features
-   * that can not be detected by simply checking the [IDL](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Interface_development_guide/IDL_interface_rules).
-   *
-   * ```js
-   * Modernizr.testStyles('#modernizr { width: 9px; color: papayawhip; }', function(elem, rule) {
-   *   // elem is the first DOM node in the page (by default #modernizr)
-   *   // rule is the first argument you supplied - the CSS rule in string form
-   *
-   *   addTest('widthworks', elem.style.width === '9px')
-   * });
-   * ```
-   *
-   * If your test requires multiple nodes, you can include a third argument
-   * indicating how many additional div elements to include on the page. The
-   * additional nodes are injected as children of the `elem` that is returned as
-   * the first argument to the callback.
-   *
-   * ```js
-   * Modernizr.testStyles('#modernizr {width: 1px}; #modernizr2 {width: 2px}', function(elem) {
-   *   document.getElementById('modernizr').style.width === '1px'; // true
-   *   document.getElementById('modernizr2').style.width === '2px'; // true
-   *   elem.firstChild === document.getElementById('modernizr2'); // true
-   * }, 1);
-   * ```
-   *
-   * By default, all of the additional elements have an ID of `modernizr[n]`, where
-   * `n` is its index (e.g. the first additional, second overall is `#modernizr2`,
-   * the second additional is `#modernizr3`, etc.).
-   * If you want to have more meaningful IDs for your function, you can provide
-   * them as the fourth argument, as an array of strings
-   *
-   * ```js
-   * Modernizr.testStyles('#foo {width: 10px}; #bar {height: 20px}', function(elem) {
-   *   elem.firstChild === document.getElementById('foo'); // true
-   *   elem.lastChild === document.getElementById('bar'); // true
-   * }, 2, ['foo', 'bar']);
-   * ```
-   *
-   */
-
-  var testStyles = ModernizrProto.testStyles = injectElementWithStyles;
-  
 /*!
 {
   "name": "CSS Supports",
@@ -1038,14 +1013,14 @@ Method of allowing calculated values for length units. For example:
   "tags": ["css"],
   "builderAliases": ["css_supports"],
   "notes": [{
-    "name": "W3 Spec",
-    "href": "http://dev.w3.org/csswg/css3-conditional/#at-supports"
+    "name": "W3C Spec",
+    "href": "https://dev.w3.org/csswg/css3-conditional/#at-supports"
   },{
     "name": "Related Github Issue",
-    "href": "github.com/Modernizr/Modernizr/issues/648"
+    "href": "https://github.com/Modernizr/Modernizr/issues/648"
   },{
-    "name": "W3 Info",
-    "href": "http://dev.w3.org/csswg/css3-conditional/#the-csssupportsrule-interface"
+    "name": "W3C Spec",
+    "href": "https://dev.w3.org/csswg/css3-conditional/#the-csssupportsrule-interface"
   }]
 }
 !*/
@@ -1061,56 +1036,27 @@ Method of allowing calculated values for length units. For example:
   "caniuse": "transforms3d",
   "tags": ["css"],
   "warnings": [
-    "Chrome may occassionally fail this test on some systems; more info: https://code.google.com/p/chromium/issues/detail?id=129004"
+    "Chrome may occasionally fail this test on some systems; more info: https://bugs.chromium.org/p/chromium/issues/detail?id=129004"
   ]
 }
 !*/
 
   Modernizr.addTest('csstransforms3d', function() {
-    var ret = !!testAllProps('perspective', '1px', true);
-    var usePrefix = Modernizr._config.usePrefixes;
-
-    // Webkit's 3D transforms are passed off to the browser's own graphics renderer.
-    //   It works fine in Safari on Leopard and Snow Leopard, but not in Chrome in
-    //   some conditions. As a result, Webkit typically recognizes the syntax but
-    //   will sometimes throw a false positive, thus we must do a more thorough check:
-    if (ret && (!usePrefix || 'webkitPerspective' in docElement.style)) {
-      var mq;
-      var defaultStyle = '#modernizr{width:0;height:0}';
-      // Use CSS Conditional Rules if available
-      if (Modernizr.supports) {
-        mq = '@supports (perspective: 1px)';
-      } else {
-        // Otherwise, Webkit allows this media query to succeed only if the feature is enabled.
-        // `@media (transform-3d),(-webkit-transform-3d){ ... }`
-        mq = '@media (transform-3d)';
-        if (usePrefix) {
-          mq += ',(-webkit-transform-3d)';
-        }
-      }
-
-      mq += '{#modernizr{width:7px;height:18px;margin:0;padding:0;border:0}}';
-
-      testStyles(defaultStyle + mq, function(elem) {
-        ret = elem.offsetWidth === 7 && elem.offsetHeight === 18;
-      });
-    }
-
-    return ret;
+    return !!testAllProps('perspective', '1px', true);
   });
 
 /*!
 {
   "name": "CSS Transform Style preserve-3d",
   "property": "preserve3d",
-  "authors": ["edmellum"],
+  "authors": ["denyskoch", "aFarkas"],
   "tags": ["css"],
   "notes": [{
     "name": "MDN Docs",
     "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/transform-style"
   },{
     "name": "Related Github Issue",
-    "href": "https://github.com/Modernizr/Modernizr/issues/762"
+    "href": "https://github.com/Modernizr/Modernizr/issues/1748"
   }]
 }
 !*/
@@ -1118,7 +1064,30 @@ Method of allowing calculated values for length units. For example:
 Detects support for `transform-style: preserve-3d`, for getting a proper 3D perspective on elements.
 */
 
-  Modernizr.addTest('preserve3d', testAllProps('transformStyle', 'preserve-3d'));
+  Modernizr.addTest('preserve3d', function() {
+    var outerAnchor, innerAnchor;
+    var CSS = window.CSS;
+    var result = false;
+
+    if (CSS && CSS.supports && CSS.supports('(transform-style: preserve-3d)')) {
+      return true;
+    }
+
+    outerAnchor = createElement('a');
+    innerAnchor = createElement('a');
+
+    outerAnchor.style.cssText = 'display: block; transform-style: preserve-3d; transform-origin: right; transform: rotateY(40deg);';
+    innerAnchor.style.cssText = 'display: block; width: 9px; height: 1px; background: #000; transform-origin: right; transform: rotateY(40deg);';
+
+    outerAnchor.appendChild(innerAnchor);
+    docElement.appendChild(outerAnchor);
+
+    result = innerAnchor.getBoundingClientRect();
+    docElement.removeChild(outerAnchor);
+
+    result = result.width && result.width < 4;
+    return result;
+  });
 
 /*!
 {
@@ -1147,6 +1116,64 @@ Detects support for `transform-style: preserve-3d`, for getting a proper 3D pers
 
   Modernizr.addTest('flexboxtweener', testAllProps('flexAlign', 'end', true));
 
+
+  /**
+   * testStyles injects an element with style element and some CSS rules
+   *
+   * @memberOf Modernizr
+   * @name Modernizr.testStyles
+   * @optionName Modernizr.testStyles()
+   * @optionProp testStyles
+   * @access public
+   * @function testStyles
+   * @param {string} rule - String representing a css rule
+   * @param {function} callback - A function that is used to test the injected element
+   * @param {number} [nodes] - An integer representing the number of additional nodes you want injected
+   * @param {string[]} [testnames] - An array of strings that are used as ids for the additional nodes
+   * @returns {boolean}
+   * @example
+   *
+   * `Modernizr.testStyles` takes a CSS rule and injects it onto the current page
+   * along with (possibly multiple) DOM elements. This lets you check for features
+   * that can not be detected by simply checking the [IDL](https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Interface_development_guide/IDL_interface_rules).
+   *
+   * ```js
+   * Modernizr.testStyles('#modernizr { width: 9px; color: papayawhip; }', function(elem, rule) {
+   *   // elem is the first DOM node in the page (by default #modernizr)
+   *   // rule is the first argument you supplied - the CSS rule in string form
+   *
+   *   addTest('widthworks', elem.style.width === '9px')
+   * });
+   * ```
+   *
+   * If your test requires multiple nodes, you can include a third argument
+   * indicating how many additional div elements to include on the page. The
+   * additional nodes are injected as children of the `elem` that is returned as
+   * the first argument to the callback.
+   *
+   * ```js
+   * Modernizr.testStyles('#modernizr {width: 1px}; #modernizr2 {width: 2px}', function(elem) {
+   *   document.getElementById('modernizr').style.width === '1px'; // true
+   *   document.getElementById('modernizr2').style.width === '2px'; // true
+   *   elem.firstChild === document.getElementById('modernizr2'); // true
+   * }, 1);
+   * ```
+   *
+   * By default, all of the additional elements have an ID of `modernizr[n]`, where
+   * `n` is its index (e.g. the first additional, second overall is `#modernizr2`,
+   * the second additional is `#modernizr3`, etc.).
+   * If you want to have more meaningful IDs for your function, you can provide
+   * them as the fourth argument, as an array of strings
+   *
+   * ```js
+   * Modernizr.testStyles('#foo {width: 10px}; #bar {height: 20px}', function(elem) {
+   *   elem.firstChild === document.getElementById('foo'); // true
+   *   elem.lastChild === document.getElementById('bar'); // true
+   * }, 2, ['foo', 'bar']);
+   * ```
+   */
+  var testStyles = ModernizrProto.testStyles = injectElementWithStyles;
+  
 /*!
 {
   "name": "@font-face",
@@ -1155,7 +1182,7 @@ Detects support for `transform-style: preserve-3d`, for getting a proper 3D pers
   "tags": ["css"],
   "knownBugs": [
     "False Positive: WebOS https://github.com/Modernizr/Modernizr/issues/342",
-    "False Postive: WP7 https://github.com/Modernizr/Modernizr/issues/538"
+    "False Positive: WP7 https://github.com/Modernizr/Modernizr/issues/538"
   ],
   "notes": [{
     "name": "@font-face detection routine by Diego Perini",
@@ -1178,11 +1205,9 @@ Detects support for `transform-style: preserve-3d`, for getting a proper 3D pers
 
   var blacklist = (function() {
     var ua = navigator.userAgent;
-    var wkvers = ua.match(/applewebkit\/([0-9]+)/gi) && parseFloat(RegExp.$1);
     var webos = ua.match(/w(eb)?osbrowser/gi);
     var wppre8 = ua.match(/windows phone/gi) && ua.match(/iemobile\/([0-9])+/gi) && parseFloat(RegExp.$1) >= 9;
-    var oldandroid = wkvers < 533 && ua.match(/android/gi);
-    return webos || oldandroid || wppre8;
+    return webos || wppre8;
   }());
   if (blacklist) {
     Modernizr.addTest('fontface', false);
@@ -1256,7 +1281,7 @@ Detects support for SVG in `<embed>` or `<object>` elements.
   
 
 
-   // _l tracks listeners for async tests, as well as tests that execute after the initial run
+  // _l tracks listeners for async tests, as well as tests that execute after the initial run
   ModernizrProto._l = {};
 
   /**
@@ -1264,12 +1289,13 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    * asynchronous, they may not finish before your scripts run. As a result you
    * will get a possibly false negative `undefined` value.
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr.on
    * @access public
    * @function on
    * @param {string} feature - String name of the feature detect
-   * @param {function} cb - Callback function returning a Boolean - true if feature is supported, false if not
+   * @param {Function} cb - Callback function returning a Boolean - true if feature is supported, false if not
+   * @returns {void}
    * @example
    *
    * ```js
@@ -1282,7 +1308,6 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    * });
    * ```
    */
-
   ModernizrProto.on = function(feature, cb) {
     // Create the list of listeners if it doesn't exist
     if (!this._l[feature]) {
@@ -1305,15 +1330,15 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    * _trigger is the private function used to signal test completion and run any
    * callbacks registered through [Modernizr.on](#modernizr-on)
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr._trigger
    * @access private
    * @function _trigger
    * @param {string} feature - string name of the feature detect
-   * @param {function|boolean} [res] - A feature detection function, or the boolean =
+   * @param {Function|boolean} [res] - A feature detection function, or the boolean =
    * result of a feature detection function
+   * @returns {void}
    */
-
   ModernizrProto._trigger = function(feature, res) {
     if (!this._l[feature]) {
       return;
@@ -1337,20 +1362,22 @@ Detects support for SVG in `<embed>` or `<object>` elements.
   /**
    * addTest allows you to define your own feature detects that are not currently
    * included in Modernizr (under the covers it's the exact same code Modernizr
-   * uses for its own [feature detections](https://github.com/Modernizr/Modernizr/tree/master/feature-detects)). Just like the offical detects, the result
+   * uses for its own [feature detections](https://github.com/Modernizr/Modernizr/tree/master/feature-detects)).
+   * Just like the official detects, the result
    * will be added onto the Modernizr object, as well as an appropriate className set on
    * the html element when configured to do so
    *
-   * @memberof Modernizr
+   * @memberOf Modernizr
    * @name Modernizr.addTest
    * @optionName Modernizr.addTest()
    * @optionProp addTest
    * @access public
    * @function addTest
-   * @param {string|object} feature - The string name of the feature detect, or an
+   * @param {string|Object} feature - The string name of the feature detect, or an
    * object of feature detect names and test
-   * @param {function|boolean} test - Function returning true if feature is supported,
+   * @param {Function|boolean} test - Function returning true if feature is supported,
    * false if not. Otherwise a boolean representing the results of a feature detection
+   * @returns {Object} the Modernizr object to allow chaining
    * @example
    *
    * The most common way of creating your own feature detects is by calling
@@ -1375,7 +1402,7 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    *  in a statement that will return a boolean value works just fine.
    *
    * ```js
-   * Modernizr.addTest('hasJquery', 'jQuery' in window);
+   * Modernizr.addTest('hasjquery', 'jQuery' in window);
    * ```
    *
    * Just like before, when the above runs `Modernizr.hasjquery` will be true if
@@ -1402,10 +1429,9 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    * There is really no difference between the first methods and this one, it is
    * just a convenience to let you write more readable code.
    */
-
   function addTest(feature, test) {
 
-    if (typeof feature == 'object') {
+    if (typeof feature === 'object') {
       for (var key in feature) {
         if (hasOwnProp(feature, key)) {
           addTest(key, feature[ key ]);
@@ -1418,11 +1444,11 @@ Detects support for SVG in `<embed>` or `<object>` elements.
       var last = Modernizr[featureNameSplit[0]];
 
       // Again, we don't check for parent test existence. Get that right, though.
-      if (featureNameSplit.length == 2) {
+      if (featureNameSplit.length === 2) {
         last = last[featureNameSplit[1]];
       }
 
-      if (typeof last != 'undefined') {
+      if (typeof last !== 'undefined') {
         // we're going to quit if you're trying to overwrite an existing test
         // if we were to allow it, we'd do this:
         //   var re = new RegExp("\\b(no-)?" + feature + "\\b");
@@ -1431,14 +1457,13 @@ Detects support for SVG in `<embed>` or `<object>` elements.
         return Modernizr;
       }
 
-      test = typeof test == 'function' ? test() : test;
+      test = typeof test === 'function' ? test() : test;
 
       // Set the value (this is the magic, right here).
-      if (featureNameSplit.length == 1) {
+      if (featureNameSplit.length === 1) {
         Modernizr[featureNameSplit[0]] = test;
       } else {
         // cast to a Boolean, if not one already
-        /* jshint -W053 */
         if (Modernizr[featureNameSplit[0]] && !(Modernizr[featureNameSplit[0]] instanceof Boolean)) {
           Modernizr[featureNameSplit[0]] = new Boolean(Modernizr[featureNameSplit[0]]);
         }
@@ -1447,9 +1472,7 @@ Detects support for SVG in `<embed>` or `<object>` elements.
       }
 
       // Set a single class (either `feature` or `no-feature`)
-      /* jshint -W041 */
-      setClasses([(!!test && test != false ? '' : 'no-') + featureNameSplit.join('-')]);
-      /* jshint +W041 */
+      setClasses([(!!test && test !== false ? '' : 'no-') + featureNameSplit.join('-')]);
 
       // Trigger the event
       Modernizr._trigger(feature, test);
@@ -1469,12 +1492,13 @@ Detects support for SVG in `<embed>` or `<object>` elements.
 {
   "name": "SVG as an <img> tag source",
   "property": "svgasimg",
-  "caniuse" : "svg-img",
+  "caniuse": "svg-img",
   "tags": ["svg"],
+  "aliases": ["svgincss"],
   "authors": ["Chris Coyier"],
   "notes": [{
     "name": "HTML5 Spec",
-    "href": "http://www.w3.org/TR/html5/embedded-content-0.html#the-img-element"
+    "href": "https://www.w3.org/TR/html5/embedded-content-0.html#the-img-element"
   }]
 }
 !*/
@@ -1484,7 +1508,7 @@ Detects support for SVG in `<embed>` or `<object>` elements.
   // https://gist.github.com/chriscoyier/8774501
 
   // Now a Sync test based on good results here
-  // http://codepen.io/chriscoyier/pen/bADFx
+  // https://codepen.io/chriscoyier/pen/bADFx
 
   // Note http://www.w3.org/TR/SVG11/feature#Image is *supposed* to represent
   // support for the `<image>` tag in SVG, not an SVG file linked from an `<img>`
@@ -1501,7 +1525,6 @@ Detects support for SVG in `<embed>` or `<object>` elements.
    * @function toStringFn
    * @returns {function} An abstracted toString function
    */
-
   var toStringFn = ({}).toString;
   
 /*!
@@ -1546,7 +1569,7 @@ See [this discussion](https://github.com/Modernizr/Modernizr/issues/213) regardi
     var result = false;
     try {
       result = 'SVGFEColorMatrixElement' in window &&
-        SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_SATURATE == 2;
+        SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_SATURATE === 2;
     }
     catch (e) {}
     return result;
@@ -1596,7 +1619,7 @@ Detects support for inline SVG in HTML (not within XHTML).
   Modernizr.addTest('inlinesvg', function() {
     var div = createElement('div');
     div.innerHTML = '<svg/>';
-    return (typeof SVGRect != 'undefined' && div.firstChild && div.firstChild.namespaceURI) == 'http://www.w3.org/2000/svg';
+    return (typeof SVGRect !== 'undefined' && div.firstChild && div.firstChild.namespaceURI) === 'http://www.w3.org/2000/svg';
   });
 
 /*!
@@ -1606,7 +1629,7 @@ Detects support for inline SVG in HTML (not within XHTML).
   "caniuse": "svg-smil",
   "tags": ["svg"],
   "notes": [{
-  "name": "W3C Synchronised Multimedia spec",
+  "name": "W3C Spec",
   "href": "https://www.w3.org/AudioVideo/"
   }]
 }
@@ -1624,9 +1647,6 @@ Detects support for inline SVG in HTML (not within XHTML).
   "property": "localstorage",
   "caniuse": "namevalue-storage",
   "tags": ["storage"],
-  "knownBugs": [],
-  "notes": [],
-  "warnings": [],
   "polyfills": [
     "joshuabell-polyfill",
     "cupcake",
@@ -1640,9 +1660,12 @@ Detects support for inline SVG in HTML (not within XHTML).
   // In FF4, if disabled, window.localStorage should === null.
 
   // Normally, we could not test that directly and need to do a
-  //   `('localStorage' in window) && ` test first because otherwise Firefox will
+  //   `('localStorage' in window)` test first because otherwise Firefox will
   //   throw bugzil.la/365772 if cookies are disabled
 
+  // Similarly, in Chrome with "Block third-party cookies and site data" enabled,
+  // attempting to access `window.sessionStorage` will throw an exception. crbug.com/357625
+
   // Also in iOS5 Private Browsing mode, attempting to use localStorage.setItem
   // will throw the exception:
   //   QUOTA_EXCEEDED_ERROR DOM Exception 22.
@@ -1746,4 +1769,4 @@ Detects support for inline SVG in HTML (not within XHTML).
 
 ;
 
-})(window, document);
\ No newline at end of file
+})(window, document);
diff --git a/src/Frontend/Jp.AdminUI/src/tsconfig.spec.json b/src/Frontend/Jp.AdminUI/src/tsconfig.spec.json
index 63d89ff2..70fdb233 100644
--- a/src/Frontend/Jp.AdminUI/src/tsconfig.spec.json
+++ b/src/Frontend/Jp.AdminUI/src/tsconfig.spec.json
@@ -1,17 +1,15 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "baseUrl": "./",
-    "module": "commonjs",
-    "target": "es5",
+    "extends": "../tsconfig.json",
+    "compilerOptions": {
+    "outDir": "./out-tsc/spec",
     "types": [
       "jasmine",
       "node"
     ]
   },
   "files": [
-    "test.ts"
+    "test.ts",
+    "polyfills.ts"
   ],
   "include": [
     "**/*.spec.ts",
diff --git a/src/Frontend/Jp.AdminUI/tsconfig.json b/src/Frontend/Jp.AdminUI/tsconfig.json
index 39fdfca7..0631d6d6 100644
--- a/src/Frontend/Jp.AdminUI/tsconfig.json
+++ b/src/Frontend/Jp.AdminUI/tsconfig.json
@@ -1,34 +1,40 @@
 {
-    "compileOnSave": false,
-    "compilerOptions": {
-        "baseUrl": "./",
-        "outDir": "./dist/out-tsc",
-        "sourceMap": true,
-        "declaration": false,
-        "moduleResolution": "node",
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "target": "es5",
-        "typeRoots": [
-            "node_modules/@types"
-        ],
-        "lib": [
-            "es2017",
-            "dom"
-        ],
-        "paths": {
-            "@shared/*": [
-                "src/app/shared/*"
-            ],
-            "@app/*": [
-                "src/app/panel/*"
-            ],
-            "@core/*": [
-                "src/app/core/*"
-            ],
-            "@env/*": [
-                "src/environments/*"
-            ]
-        }
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "paths": {
+      "@shared/*": [
+          "src/app/shared/*"
+      ],
+      "@app/*": [
+          "src/app/panel/*"
+      ],
+      "@core/*": [
+          "src/app/core/*"
+      ],
+      "@env/*": [
+          "src/environments/*"
+      ]
     }
-}
\ No newline at end of file
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}