diff --git a/docs/app/pages/home/main-info-section/main-info-section.component.ts b/docs/app/pages/home/main-info-section/main-info-section.component.ts
index f7dd21c3..17e95e7a 100644
--- a/docs/app/pages/home/main-info-section/main-info-section.component.ts
+++ b/docs/app/pages/home/main-info-section/main-info-section.component.ts
@@ -34,7 +34,7 @@ export class MainInfoSectionComponent implements OnDestroy {
 
   public get imageUrl(): string {
     return this.forMaterialTheme !== false
-      ? 'assets/img/ngx-admin-material.png'
+      ? 'assets/img/ngx-admin-material.jpg'
       : 'assets/img/ngx-admin.png';
   }
 
diff --git a/docs/articles/index.md b/docs/articles/index.md
index 85100a34..53733c39 100644
--- a/docs/articles/index.md
+++ b/docs/articles/index.md
@@ -1,6 +1,6 @@
 # What is ngx-admin?
 
-ngx-admin is a front-end admin dashboard template based on Angular 8+, Bootstrap 4+ and <a href="https://hubs.ly/H0n5PMl0" target="_blank">Nebular</a>. That means all the data you can see on graphs, charts and tables is mocked in Javascript so you can use the backend of your choice with no limitations.
+ngx-admin is a front-end admin dashboard template based on Angular 9+, Bootstrap 4+ and <a href="https://hubs.ly/H0n5PMl0" target="_blank">Nebular</a>. That means all the data you can see on graphs, charts and tables is mocked in Javascript so you can use the backend of your choice with no limitations.
 <hr>
 
 ## How can it help me?
@@ -17,7 +17,7 @@ You can also use ngx-admin for the purpose of learning Angular.
 
 ## List of features
 
-- Angular 8+ & Typescript
+- Angular 9+ & Typescript
 - Bootstrap 4+ & SCSS
 - Responsive layout
 - RTL support
diff --git a/docs/assets/img/material-dark-theme.png b/docs/assets/img/material-dark-theme.png
index a61e22ef..be144f9d 100644
Binary files a/docs/assets/img/material-dark-theme.png and b/docs/assets/img/material-dark-theme.png differ
diff --git a/docs/assets/img/material-light-theme.png b/docs/assets/img/material-light-theme.png
index 9135ec3d..1de279cd 100644
Binary files a/docs/assets/img/material-light-theme.png and b/docs/assets/img/material-light-theme.png differ
diff --git a/docs/assets/img/ngx-admin-material.jpg b/docs/assets/img/ngx-admin-material.jpg
new file mode 100644
index 00000000..585c13c3
Binary files /dev/null and b/docs/assets/img/ngx-admin-material.jpg differ
diff --git a/docs/assets/img/ngx-admin-material.png b/docs/assets/img/ngx-admin-material.png
deleted file mode 100644
index 86dc22b0..00000000
Binary files a/docs/assets/img/ngx-admin-material.png and /dev/null differ
diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss
index 4c7001bb..fa009b51 100644
--- a/src/app/@theme/styles/styles.scss
+++ b/src/app/@theme/styles/styles.scss
@@ -25,6 +25,8 @@
 // install the framework and custom global styles
 @include nb-install() {
 
+  @include angular-material();
+
   // framework global styles
   @include nb-theme-global();
   @include nb-auth-global();
@@ -33,8 +35,6 @@
   // loading progress bar
   @include ngx-pace-theme();
 
-  @include angular-material();
-
   @include nb-overrides();
   @include material-overrides();
 };
diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss
index 0be07815..8c8917ee 100644
--- a/src/app/@theme/styles/themes.scss
+++ b/src/app/@theme/styles/themes.scss
@@ -105,6 +105,7 @@ $nb-themes: nb-register-theme((
   card-header-with-select-padding-bottom: 0.5rem,
 
   select-min-width: 6rem,
+  option-list-border-radius: 0,
 
   slide-out-background: linear-gradient(270deg, #e0e0e0 0%, #ebebeb 100%),
   slide-out-shadow-color: 0 4px 14px 0 #ebebeb,
@@ -126,6 +127,7 @@ $nb-themes: nb-register-theme((
   card-header-with-select-padding-bottom: 0.5rem,
 
   select-min-width: 6rem,
+  option-list-border-radius: 0,
 
   slide-out-background: linear-gradient(270deg, #1f1f1f 0%, #292929 100%),
   slide-out-shadow-color: 0 4px 14px 0 #292929,
diff --git a/src/app/themes-screen/starter.component.html b/src/app/themes-screen/starter.component.html
index e96ce223..87fd28cf 100644
--- a/src/app/themes-screen/starter.component.html
+++ b/src/app/themes-screen/starter.component.html
@@ -38,7 +38,7 @@
         <nb-card (click)="navigate(theme.value)">
           <nb-card-header>{{theme.name}}</nb-card-header>
           <nb-card-body>
-            <img src="assets/images/{{theme.value}}-theme.png"
+            <img src="assets/images/{{theme.value}}-theme.jpg"
                  class="theme-preview"
                  alt="{{theme.name}} Theme"/>
           </nb-card-body>
diff --git a/src/assets/images/corporate-theme.jpg b/src/assets/images/corporate-theme.jpg
new file mode 100644
index 00000000..d6da1cfd
Binary files /dev/null and b/src/assets/images/corporate-theme.jpg differ
diff --git a/src/assets/images/corporate-theme.png b/src/assets/images/corporate-theme.png
deleted file mode 100644
index e64efab7..00000000
Binary files a/src/assets/images/corporate-theme.png and /dev/null differ
diff --git a/src/assets/images/cosmic-theme.jpg b/src/assets/images/cosmic-theme.jpg
new file mode 100644
index 00000000..fc880377
Binary files /dev/null and b/src/assets/images/cosmic-theme.jpg differ
diff --git a/src/assets/images/cosmic-theme.png b/src/assets/images/cosmic-theme.png
deleted file mode 100644
index aad37875..00000000
Binary files a/src/assets/images/cosmic-theme.png and /dev/null differ
diff --git a/src/assets/images/dark-theme.jpg b/src/assets/images/dark-theme.jpg
new file mode 100644
index 00000000..0fa0322d
Binary files /dev/null and b/src/assets/images/dark-theme.jpg differ
diff --git a/src/assets/images/dark-theme.png b/src/assets/images/dark-theme.png
deleted file mode 100644
index b59c5d9e..00000000
Binary files a/src/assets/images/dark-theme.png and /dev/null differ
diff --git a/src/assets/images/default-theme.jpg b/src/assets/images/default-theme.jpg
new file mode 100644
index 00000000..24ed913f
Binary files /dev/null and b/src/assets/images/default-theme.jpg differ
diff --git a/src/assets/images/default-theme.png b/src/assets/images/default-theme.png
deleted file mode 100644
index 935d5202..00000000
Binary files a/src/assets/images/default-theme.png and /dev/null differ
diff --git a/src/assets/images/material-dark-theme.jpg b/src/assets/images/material-dark-theme.jpg
new file mode 100644
index 00000000..1696d715
Binary files /dev/null and b/src/assets/images/material-dark-theme.jpg differ
diff --git a/src/assets/images/material-dark-theme.png b/src/assets/images/material-dark-theme.png
deleted file mode 100644
index 947f1c23..00000000
Binary files a/src/assets/images/material-dark-theme.png and /dev/null differ
diff --git a/src/assets/images/material-light-theme.jpg b/src/assets/images/material-light-theme.jpg
new file mode 100644
index 00000000..5257b28a
Binary files /dev/null and b/src/assets/images/material-light-theme.jpg differ
diff --git a/src/assets/images/material-light-theme.png b/src/assets/images/material-light-theme.png
deleted file mode 100644
index ceae9e15..00000000
Binary files a/src/assets/images/material-light-theme.png and /dev/null differ
diff --git a/src/index.html b/src/index.html
index c234dcef..55d75094 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
+
   <title>Ngx-admin e-commerce dashboard on Angular 9+ and Nebular.</title>
   <meta name="description" content="Free Angular 8 Bootstrap admin dashboard template.">
   <meta name="keywords" content="admin,dashboard,template,angular 8,bootstrap,panel,html,css,javascript">