diff --git a/src/app/app.component.scss b/src/app/app.component.scss
deleted file mode 100644
index 89a6d1f22..000000000
--- a/src/app/app.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  
-}
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 215db7b6b..3f844c967 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -28,7 +28,6 @@ new Titlebar({
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
-    styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {
     /** Visibility flag of the "what is new" modal dialog */
@@ -157,9 +156,8 @@ export class AppComponent {
         this.storage.get('version').subscribe((version) => {
             const isNewVersion = semver.gt(actualVersion, version || '0.0.0');
             if (!version || isNewVersion) {
-                this.modals = this.whatsNewService.getModalsByVersion(
-                    actualVersion
-                );
+                this.modals =
+                    this.whatsNewService.getModalsByVersion(actualVersion);
                 this.setDialogVisibility(true);
             }
             this.setVersion(actualVersion);
diff --git a/src/app/home/file-upload/file-upload.component.scss b/src/app/home/file-upload/file-upload.component.scss
index 365517416..8100802ec 100644
--- a/src/app/home/file-upload/file-upload.component.scss
+++ b/src/app/home/file-upload/file-upload.component.scss
@@ -35,6 +35,9 @@
     display: inline-block;
     text-transform: uppercase;
     border-radius: 4px;
+    cursor: pointer;
+    line-height: 35px;
+    padding: 3px 10px;
 }
 
 .input-file:focus + label,
@@ -42,12 +45,6 @@
     background-color: #202b69;
 }
 
-.input-file + label {
-    cursor: pointer;
-    line-height: 35px;
-    padding: 3px 10px;
-}
-
 .upload-icon {
     font-size: 80px;
     width: 80px;
diff --git a/src/app/home/recent-playlists/playlist-info/playlist-info.component.scss b/src/app/home/recent-playlists/playlist-info/playlist-info.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts b/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts
index de57d0d5a..4772f40b8 100644
--- a/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts
+++ b/src/app/home/recent-playlists/playlist-info/playlist-info.component.ts
@@ -15,7 +15,6 @@ import { Playlist } from '../../playlist.interface';
 @Component({
     selector: 'app-playlist-info',
     templateUrl: './playlist-info.component.html',
-    styleUrls: ['./playlist-info.component.scss'],
     providers: [DatePipe],
 })
 export class PlaylistInfoComponent {
diff --git a/src/app/home/recent-playlists/recent-playlists.component.scss b/src/app/home/recent-playlists/recent-playlists.component.scss
index d94c0847f..0532a0869 100644
--- a/src/app/home/recent-playlists/recent-playlists.component.scss
+++ b/src/app/home/recent-playlists/recent-playlists.component.scss
@@ -1,9 +1,11 @@
 mat-list-item {
     cursor: pointer;
 }
+
 .mat-list-base {
     padding-top: 0 !important;
 }
+
 mat-nav-list {
     height: calc(100vh - 192px);
     overflow: auto;
@@ -13,4 +15,4 @@ mat-nav-list {
     font-size: 12px !important;
     color: #666;
     margin-top: 2px !important;
-}
\ No newline at end of file
+}
diff --git a/src/app/home/url-upload/url-upload.component.scss b/src/app/home/url-upload/url-upload.component.scss
index 067df20f3..d3947b453 100644
--- a/src/app/home/url-upload/url-upload.component.scss
+++ b/src/app/home/url-upload/url-upload.component.scss
@@ -4,4 +4,4 @@ form {
 
 button {
     text-transform: uppercase;
-}
\ No newline at end of file
+}
diff --git a/src/app/player/components/channel-list-container/channel-list-container.component.scss b/src/app/player/components/channel-list-container/channel-list-container.component.scss
index b40912871..c43902738 100644
--- a/src/app/player/components/channel-list-container/channel-list-container.component.scss
+++ b/src/app/player/components/channel-list-container/channel-list-container.component.scss
@@ -2,12 +2,6 @@
     background: #ddd;
 }
 
-::ng-deep {
-    .dark-theme .active {
-        background: #000;
-    }
-}
-
 .mat-list-base {
     padding-top: 0;
 }
@@ -39,9 +33,14 @@
 }
 
 ::ng-deep {
+    .dark-theme .active {
+        background: #000;
+    }
+
     .mat-tab-label-content {
         text-transform: uppercase;
     }
+
     .mat-expansion-panel {
         border-radius: 0 !important;
     }
diff --git a/src/app/player/components/epg-list/epg-list-item/epg-list-item.component.scss b/src/app/player/components/epg-list/epg-list-item/epg-list-item.component.scss
index cc2568d05..d2400c378 100644
--- a/src/app/player/components/epg-list/epg-list-item/epg-list-item.component.scss
+++ b/src/app/player/components/epg-list/epg-list-item/epg-list-item.component.scss
@@ -26,4 +26,4 @@
 .description-icon {
     float: right;
     cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/src/app/player/components/html-video-player/html-video-player.component.scss b/src/app/player/components/html-video-player/html-video-player.component.scss
index 7891abef6..69a8cc455 100644
--- a/src/app/player/components/html-video-player/html-video-player.component.scss
+++ b/src/app/player/components/html-video-player/html-video-player.component.scss
@@ -1,4 +1,4 @@
 #video-player {
     width: 100%;
     height: calc(100vh - 100px);
-}
\ No newline at end of file
+}
diff --git a/src/app/player/components/vjs-player/vjs-player.component.scss b/src/app/player/components/vjs-player/vjs-player.component.scss
index fd52baf71..d34c066ac 100644
--- a/src/app/player/components/vjs-player/vjs-player.component.scss
+++ b/src/app/player/components/vjs-player/vjs-player.component.scss
@@ -4,4 +4,4 @@
     position: relative !important;
     width: 100% !important;
     height: calc(100vh - 85px);
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/components/header/header.component.scss b/src/app/shared/components/header/header.component.scss
index bd54c4077..797d7ff7f 100644
--- a/src/app/shared/components/header/header.component.scss
+++ b/src/app/shared/components/header/header.component.scss
@@ -4,11 +4,11 @@
 }
 
 .title {
-    font-size: 1.1em
+    font-size: 1.1em;
 }
 
 .subtitle {
     color: #999;
     font-size: 0.9em;
-    margin-top: 10px
-}
\ No newline at end of file
+    margin-top: 10px;
+}
diff --git a/src/styles.scss b/src/styles.scss
index 9e9182412..564b0c8cf 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,66 +1,25 @@
 $material-icons-font-path: '~material-icons/iconfont/';
+
 /* You can add global styles to this file, and also import other style files */
 @import '~@angular/material/prebuilt-themes/indigo-pink.css';
 @import '~material-icons/iconfont/material-icons.scss';
 @import '~@angular/material/theming';
-@include mat-core();
 @import 'themes/';
 
+@include mat-core();
+
 body,
 html {
     background: #fff;
-    font-family: caption;
     user-select: none;
-}
-
-.mat-toolbar.mat-primary {
-    background: #000000;
-}
-
-html,
-body {
     margin: 0;
     padding: 0;
-
     height: 100%;
     font-family: Arial, Helvetica, sans-serif;
 }
 
-/* CAN (MUST) BE REMOVED ! Sample Global style */
-.container {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .title {
-        color: white;
-        margin: 0;
-        padding: 50px 20px;
-    }
-
-    a {
-        color: #fff !important;
-        text-transform: uppercase;
-        text-decoration: none;
-        background: #ed3330;
-        padding: 20px;
-        border-radius: 5px;
-        display: inline-block;
-        border: none;
-        transition: all 0.4s ease 0s;
-
-        &:hover {
-            background: #fff;
-            color: #ed3330 !important;
-            letter-spacing: 1px;
-            -webkit-box-shadow: 0px 5px 40px -10px rgba(0, 0, 0, 0.57);
-            -moz-box-shadow: 0px 5px 40px -10px rgba(0, 0, 0, 0.57);
-            box-shadow: 5px 40px -10px rgba(0, 0, 0, 0.57);
-            transition: all 0.4s ease 0s;
-        }
-    }
+.mat-toolbar.mat-primary {
+    background: #000;
 }
 
 .full-width {
diff --git a/src/themes/_index.scss b/src/themes/_index.scss
index cecb1f848..81ea56acd 100644
--- a/src/themes/_index.scss
+++ b/src/themes/_index.scss
@@ -1,18 +1,18 @@
 $black: (
-    50: #000000,
-    100: #000000,
-    200: #000000,
-    300: #000000,
-    400: #000000,
-    500: #000000,
-    600: #000000,
-    700: #000000,
-    800: #000000,
-    900: #000000,
-    A100: #000000,
-    A200: #000000,
-    A400: #000000,
-    A700: #000000,
+    50: #000,
+    100: #000,
+    200: #000,
+    300: #000,
+    400: #000,
+    500: #000,
+    600: #000,
+    700: #000,
+    800: #000,
+    900: #000,
+    A100: #000,
+    A200: #000,
+    A400: #000,
+    A700: #000,
     contrast: (
         50: $light-primary-text,
         100: $light-primary-text,
@@ -43,6 +43,7 @@ $angular-default-theme: mat-light-theme(
         ),
     )
 );
-@include angular-material-theme($angular-default-theme);
 
 @import 'dark';
+
+@include angular-material-theme($angular-default-theme);