diff --git a/CSS/themes/emby/aquamarine.css b/CSS/themes/emby/aquamarine.css
index 68fd2855..aef4e58e 100644
--- a/CSS/themes/emby/aquamarine.css
+++ b/CSS/themes/emby/aquamarine.css
@@ -12,12 +12,51 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* EMBY AQUAMARINE THEME */
-@import url(https://theme-park.dev/CSS/themes/jellyfin/jellyfin-base.css);
+@import url("https://theme-park.dev/CSS/themes/emby/emby-base.css");
 :root {
-  --main-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --button-color: hsla(0,0%,100%,.15);
-  --button-color-hover: hsla(0,0%,100%,.30);
-  --accent-color:  hsla(0,0%,100%,.85);
-  --accent-color-hover: hsla(0,0%,100%,.95);
+    --theme-primary-color: #009688;
+    --theme-text-color: #eee;
+    --theme-text-color-opaque: #fff;
+    --theme-accent-text-color: #009688;
+    --theme-primary-color-lightened: rgba(0, 150, 135, 0.2);
+    --theme-icon-focus-background: rgba(0, 150, 135, 0.2);
+
+    --theme-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+    
+    --header-background: var(--theme-background);
+    --theme-body-secondary-text-color: rgba(255, 255, 255, .6);
+    --line-background: rgba(255, 255, 255, .08);
+    --line-size: .08em;
+    --scrollbar-thumb-background: rgba(255,255,255,.3);
+}
+
+@media (pointer: fine) {
+    :not(.layout-tv):root {
+        --theme-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
+        --header-blur-background: rgba(20,20,20,0.66);
+        --drawer-background: #2C2C2E;
+        --docked-drawer-background: rgba(0, 0, 0, 0.25);
+        --button-background: #1f1f1f;
+        --card-background: rgba(0, 0, 0, 0.15);
+        --footer-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+        --footer-blur-background: rgba(29,29,31,0.66);
+    }
+}
+
+.layout-tv:root {
+    --theme-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(ellipse at center, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
 }
\ No newline at end of file
diff --git a/CSS/themes/emby/dark.css b/CSS/themes/emby/dark.css
index a10cfaf5..e072b1e7 100644
--- a/CSS/themes/emby/dark.css
+++ b/CSS/themes/emby/dark.css
@@ -12,12 +12,52 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* EMBY DARK THEME */
-@import url(https://theme-park.dev/CSS/themes/jellyfin/jellyfin-base.css);
+@import url("https://theme-park.dev/CSS/themes/emby/emby-base.css");
+
 :root {
-  --main-bg-color: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
-  --button-color: #cc7b19;
-  --button-color-hover: #e59029;
-  --accent-color:  #e5a00d;
-  --accent-color-hover: #ffc107;
-  }
\ No newline at end of file
+    --theme-primary-color: #646464;
+    --theme-text-color: #eee;
+    --theme-text-color-opaque: #fff;
+    --theme-accent-text-color: #646464;
+    --theme-primary-color-lightened: rgba(100, 100, 100, 0.8);
+    --theme-icon-focus-background: rgba(100, 100, 100, 0.2);
+
+    --theme-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+    
+    --header-background: var(--theme-background);
+    --theme-body-secondary-text-color: rgba(255, 255, 255, .6);
+    --line-background: rgba(255, 255, 255, .08);
+    --line-size: .08em;
+    --scrollbar-thumb-background: rgba(255,255,255,.3);
+}
+
+@media (pointer: fine) {
+    :not(.layout-tv):root {
+        --theme-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
+        --header-blur-background: rgba(20,20,20,0.66);
+        --drawer-background: #2C2C2E;
+        --docked-drawer-background: rgba(0, 0, 0, 0.25);
+        --button-background: #1f1f1f;
+        --card-background: rgba(0, 0, 0, 0.15);
+        --footer-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;;
+        --footer-blur-background: rgba(29,29,31,0.66);
+    }
+}
+
+.layout-tv:root {
+    --theme-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(circle, #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+}
\ No newline at end of file
diff --git a/CSS/themes/emby/emby-base.css b/CSS/themes/emby/emby-base.css
index 0578e844..add943e9 100644
--- a/CSS/themes/emby/emby-base.css
+++ b/CSS/themes/emby/emby-base.css
@@ -48,7 +48,7 @@ html {
 }
 
 .pageTitleWithDefaultLogo {
-    background-image: url(http://192.168.1.34:8055/web/modules/themes/logodark.png)
+    background-image: url(https://theme-park.dev/Resources/emby/logowhite.png)
 }
 
 .backgroundContainer,.dialog,html {
@@ -502,7 +502,7 @@ html {
 }
 
 .drawerLogo {
-    background-image: url(../logowhite.png);
+    background-image: url(https://theme-park.dev/Resources/emby/logowhite.png);
     border-bottom-color: var(--line-background)
 }
 
@@ -531,4 +531,11 @@ html {
     background: var(--theme-accent-text-color)
 }
 
+
+/* TP CUSTOM */
+@media (hover: hover) and (pointer: fine) {
+.navMenuOption:hover {
+    background: rgb(255 255 255 / 15%) !important;
+}
+}
   
\ No newline at end of file
diff --git a/CSS/themes/emby/hotline.css b/CSS/themes/emby/hotline.css
index e6aeb588..e61126f1 100644
--- a/CSS/themes/emby/hotline.css
+++ b/CSS/themes/emby/hotline.css
@@ -12,12 +12,51 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* EMBY HOTLINE THEME */
-@import url(https://theme-park.dev/CSS/themes/jellyfin/jellyfin-base.css);
+@import url("https://theme-park.dev/CSS/themes/emby/emby-base.css");
 :root {
-  --main-bg-color: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
-  --button-color: hsla(0,0%,100%,.15);
-  --button-color-hover: hsla(0,0%,100%,.30);
-  --accent-color:  hsla(0,0%,100%,.85);
-  --accent-color-hover: hsla(0,0%,100%,.95);
+    --theme-primary-color: #F44336;
+    --theme-text-color: #eee;
+    --theme-text-color-opaque: #fff;
+    --theme-accent-text-color: #F44336;
+    --theme-primary-color-lightened: rgba(244, 67, 54, 0.2);
+    --theme-icon-focus-background: rgba(244, 67, 54, 0.2);
+
+    --theme-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+    
+    --header-background: var(--theme-background);
+    --theme-body-secondary-text-color: rgba(255, 255, 255, .6);
+    --line-background: rgba(255, 255, 255, .08);
+    --line-size: .08em;
+    --scrollbar-thumb-background: rgba(255,255,255,.3);
+}
+
+@media (pointer: fine) {
+    :not(.layout-tv):root {
+        --theme-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
+        --header-blur-background: rgba(20,20,20,0.66);
+        --drawer-background: #2C2C2E;
+        --docked-drawer-background: rgba(0, 0, 0, 0.25);
+        --button-background: #1f1f1f;
+        --card-background: rgba(0, 0, 0, 0.15);
+        --footer-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+        --footer-blur-background: rgba(29,29,31,0.66);
+    }
+}
+
+.layout-tv:root {
+    --theme-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient(ellipse at center, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
 }
\ No newline at end of file
diff --git a/CSS/themes/emby/jellyfin-base.css b/CSS/themes/emby/jellyfin-base.css
deleted file mode 100644
index 6c89aa0d..00000000
--- a/CSS/themes/emby/jellyfin-base.css
+++ /dev/null
@@ -1,584 +0,0 @@
-
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					 */
-
-/*		   		        Made by @gilbN					 */
-/* 			      https://github.com/gilbN/theme.park			 */
-:root {
-    --main-bg-color:  radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
-    --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed; 
-    --button-color: #607D8B;
-    --button-color-hover: #81a6b7;
-    --accent-color: #607D8B;
-    --accent-color-hover: #81a6b7;
-  }
-
-  .skinHeader,
-  html {
-      color: #ddd;
-      color: rgba(255, 255, 255, .8);
-  }
-
-  .wizardStartForm, .ui-corner-all, .ui-shadow {
-    padding: 0 20px 20px
-
-}
-.ui-corner-all,
-.ui-shadow {
-  background-color: rgba(0, 0, 0, .25)  !important;
-}
-.wizardStartForm { background: transparent !important;}
-  
-  
-  .emby-collapsible-button {
-      border-color: #383838;
-      border-color: rgba(255, 255, 255, .135);
-  }
-  
-  .skinHeader-withBackground {
-      background: var(--main-bg-color);
-  }
-  
-  .skinHeader.semiTransparent {
-      -webkit-backdrop-filter: none !important;
-      backdrop-filter: none !important;
-      background-color: rgba(0, 0, 0, .3);
-      background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0)));
-      background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
-      background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
-      background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0));
-  }
-  
-  .pageTitleWithDefaultLogo {
-      background-image: url(../logowhite.png);
-  }
-  
-  .backgroundContainer,
-  .dialog,
-  html {
-      background: var(--main-bg-color) !important;
-  }
-  
-  .backgroundContainer.withBackdrop {
-      background-color: rgba(0, 0, 0, .86);
-  }
-  
-  .paper-icon-button-light:focus {
-      color: var(--button-color) !important;
-      background-color: rgba(255,255,255, .08) !important;
-  }
-  
-  .fab,
-  .raised {
-      background: var(--button-color) !important;
-      color: rgba(255, 255, 255, .87);
-  }
-  
-  .fab:focus,
-  .raised:focus, .fab:hover,.raised:hover {
-      background: var(--button-color-hover) !important;
-  }
-  
-  .button-submit {
-      background: var(--button-color) !important;
-      color: #fff;
-  }
-  
-  .button-submit:focus {
-      background: var(--button-color-hover);
-      color: #fff;
-  }
-  
-  .checkboxLabel {
-      color: inherit;
-  }
-  
-  .checkboxListLabel,
-  .inputLabel,
-  .inputLabelUnfocused,
-  .paperListLabel,
-  .textareaLabelUnfocused {
-      color: #bbb;
-      color: rgba(255, 255, 255, .7);
-  }
-  
-  .inputLabelFocused,
-  .selectLabelFocused,
-  .textareaLabelFocused {
-      color: var(--accent-color) !important;
-  }
-  
-  .checkboxOutline {
-      border-color: currentColor;
-  }
-  
-  .collapseContent,
-  .formDialogFooter:not(.formDialogFooter-clear),
-  .formDialogHeader:not(.formDialogHeader-clear),
-  .paperList,
-  .visualCardBox {
-      background-color: var(--main-bg-color) !important;
-  }
-  
-  .defaultCardBackground1 {
-      background-color: #d2b019;
-  }
-  
-  .defaultCardBackground2 {
-      background-color: #338abb;
-  }
-  
-  .defaultCardBackground3 {
-      background-color: #6b689d;
-  }
-  
-  .defaultCardBackground4 {
-      background-color: #dd452b;
-  }
-  
-  .defaultCardBackground5 {
-      background-color: #5ccea9;
-  }
-  .cardOverlayContainer {
-    background: radial-gradient(farthest-corner at 50% 50%,rgba(50,50,50,.5) 50%,#323232 100%);
-    opacity: 0;
-    transition: opacity .2s;
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    user-select: none;
-    box-shadow: 0 0 0 2px var(--button-color);
-}
-.cardOverlayFab-primary i:hover {
-    border: .07em solid var(--button-color);
-    color: #fff;
-    background: var(--button-color);
-}
-.cardOverlayButtonIcon:hover {
-    background-color: rgba(0,0,0,.7) !important;
-background: var(--button-color) !important;
-border: var(--button-color);
-}
-.selectionCommandsPanel {
-    background: var(--button-color) !important;
-    color: #fff;
-}
-.itemSelectionPanel {
-    border: 1px solid var(--button-color) !important;
-}
-  
-  .cardText-secondary,
-  .fieldDescription,
-  .guide-programNameCaret,
-  .listItem .secondary,
-  .nowPlayingBarSecondaryText,
-  .programSecondaryTitle,
-  .secondaryText {
-      color: #999;
-      color: rgba(255, 255, 255, .5);
-  }
-  
-  .actionsheetDivider {
-      background: #444;
-      background: rgba(255, 255, 255, .14);
-  }
-  
-  .cardFooter-vibrant .cardText-secondary {
-      color: inherit;
-      opacity: .5;
-  }
-  
-  .actionSheetMenuItem:hover {
-      background-color: rgba(255, 255, 255, .08) !important;
-  }
-  
-  .toast {
-      background: #303030;
-      color: #fff;
-      color: rgba(255, 255, 255, .87);
-  }
-  
-  .appfooter {
-      background: #101010;
-      color: #ccc;
-      color: rgba(255, 255, 255, .78);
-  }
-  
-  @supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) {
-      .appfooter-blurred {
-          background: rgba(24, 24, 24, .7);
-          -webkit-backdrop-filter: blur(20px);
-          backdrop-filter: blur(20px);
-      }
-  }
-  
-  .itemSelectionPanel {
-      border: 1px solid #00a4dc;
-  }
-  
-  .selectionCommandsPanel {
-      background: #00a4dc;
-      color: #fff;
-  }
-  
-  .upNextDialog-countdownText {
-      color: #00a4dc;
-  }
-  
-  .alphaPickerButton {
-      color: #999;
-      color: rgba(255, 255, 255, .5);
-      background-color: transparent;
-  }
-  
-  .alphaPickerButton-selected {
-      color: #fff;
-  }
-  
-  .alphaPickerButton-tv:focus {
-      background-color: #00a4dc;
-      color: #fff !important;
-  }
-  
-  .detailTableBodyRow-shaded:nth-child(even) {
-      background: #1c1c1c;
-      background: rgba(30, 30, 30, .9);
-  }
-  
-  .listItem-border {
-      border-color: rgba(255, 255, 255, 0.25) !important;
-  }
-  
-  .listItem:focus {
-      background: #333;
-  }
-  
-  .progressring-spiner {
-      border-color: #00a4dc;
-  }
-  
-  .button-flat-accent,
-  .button-link {
-      color: var(--accent-color) !important;
-  }
-  .button-link:hover {
-    color: var(--accent-color-hover) !important;
-}
-  
-  .mediaInfoText {
-      color: #ddd;
-      background: rgba(170, 170, 190, .2);
-  }
-  
-  .mediaInfoTimerIcon,
-  .starIcon {
-      color: #CB272A;
-  }
-  
-  .emby-input,
-  .emby-textarea {
-      color: inherit;
-      background: #292929;
-      border: .07em solid #292929;
-      -webkit-border-radius: .15em;
-      border-radius: .15em;
-  }
-  
-  .emby-input:focus,
-  .emby-textarea:focus {
-      border-color: transparent !important;
-  }
-  
-  .emby-select-withcolor {
-      color: inherit;
-      background: #292929;
-      border: .07em solid #292929;
-  }
-  
-  .emby-select-withcolor>option {
-      color: inherit;
-      background: #222;
-  }
-  
-  .emby-select-withcolor:focus {
-      border-color: transparent !important;
-  }
-  
-  .emby-select-tv-withcolor:focus {
-      background-color: transparent !important;;
-      color: #fff !important;
-  }
-  
-  .emby-checkbox:checked+span+span+.checkboxOutline {
-      border-color: transparent !important;
-  }
-  
-  .emby-checkbox:focus+span+.emby-checkbox-focushelper {
-      background-color: rgba(0,164,220, .26);
-  }
-  
-  .emby-checkbox:checked+span+span+.checkboxOutline,
-  .itemProgressBarForeground {
-      background-color: var(--button-color) !important;
-  }
-  
-  .itemProgressBarForeground-recording {
-      background-color: #CB272A;
-  }
-  
-  .countIndicator,
-  .fullSyncIndicator,
-  .playedIndicator {
-      background: #00a4dc;
-  }
-  
-  .fullSyncIndicator {
-      color: #fff;
-  }
-
-  @media (min-width: 84em){
-.dashboardDocument .mainDrawer-scrollContainer {
-    margin: auto;
-    background: var(--main-bg-color);
-}
-}
-
-@media (min-width: 40em){
-.dashboardDocument .mainDrawer-scrollContainer {
-    margin-top: 5em !important;
-    background: rgba(0, 0, 0, 0.25);
-}
-}
-@media (min-width: 40em) {
-.dashboardDocument .mainDrawer {
-    background: var(--main-bg-color);
-}
-}
-  .mainDrawer {
-    background-color: rgba(0, 0, 0, 0.95) !important;
-}
-.mainDrawer-scrollContainer {
-    height: 100%;
-}
-.tmla-mask, .touch-menu-la {
-    background: var(--main-bg-color) !important;
-    width: 320px !important;
-}
-  .navMenuOption:hover {
-      background: rgba(255 ,255 ,255 ,0.08) !important;
-  }
-  .navMenuOption-selected:hover {
-    background: var(--button-color) !important;
-}
-  
-  .navMenuOption-selected, .navMenuOption-selected:active, .navMenuOption-selected:focus {
-      background: none !important;
-      background-color: var(--button-color) !important;
-      color: #fff
-  }
-  
-  .emby-button-focusscale:focus {
-      background: #00a4dc;
-      color: #fff;
-  }
-  
-  .emby-tab-button {
-      color: #999;
-      color: rgba(255, 255, 255, .4);
-  }
-  
-  .emby-tab-button-active {
-      color: #fff;
-  }
-  
-  .emby-tab-button-active.emby-button-tv {
-      color: #999;
-      color: rgba(255, 255, 255, .4);
-  }
-  
-  .emby-tab-button.emby-button-tv:focus {
-      color: #fff;
-      background: 0 0;
-  }
-  
-  .channelPrograms,
-  .guide-channelHeaderCell,
-  .programCell {
-      border-color: rgba(255, 255, 255, .05);
-  }
-  
-  .programCell-sports {
-      background: #3949AB !important;
-  }
-  
-  .programCell-movie {
-      background: #5E35B1 !important;
-  }
-  
-  .programCell-kids {
-      background: #039BE5 !important;
-  }
-  
-  .programCell-news {
-      background: #43A047 !important;
-  }
-  
-  .programCell-active {
-      background: #1e1e1e !important;
-  }
-  
-  .guide-channelHeaderCell:focus,
-  .programCell:focus {
-      background-color: #00a4dc !important;
-      color: #fff !important;
-  }
-  
-  .guide-programTextIcon {
-      color: #1e1e1e;
-      background: #555;
-  }
-  
-  .guide-headerTimeslots {
-      color: inherit;
-  }
-  
-  .guide-date-tab-button {
-      color: #555;
-      color: rgba(255, 255, 255, .3);
-  }
-  
-  .guide-date-tab-button.emby-tab-button-active,
-  .guide-date-tab-button:focus {
-      color: #00a4dc;
-  }
-  
-  .guide-date-tab-button.emby-button-tv:focus {
-      background-color: #00a4dc;
-      color: #fff;
-  }
-  
-  .itemBackdropFader {
-      background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(#101010));
-      background: -webkit-linear-gradient(rgba(0, 0, 0, 0), #101010);
-      background: -o-linear-gradient(rgba(0, 0, 0, 0), #101010);
-      background: linear-gradient(rgba(0, 0, 0, 0), #101010);
-  }
-  
-  .infoBanner {
-      color: #ddd;
-      background: rgba(255, 255, 255, 0.15) !important;
-      padding: 1em;
-      -webkit-border-radius: .25em;
-      border-radius: .25em;
-  }
-  
-  .ratingbutton-icon-withrating {
-      color: #c33;
-  }
-  
-  .downloadbutton-icon-complete,
-  .downloadbutton-icon-on {
-      color: #4285F4;
-  }
-  
-  .playstatebutton-icon-played {
-      color: #c33;
-  }
-  
-  .repeatButton-active {
-      color: #4285F4;
-  }
-  
-  .card:focus .card-focuscontent {
-      border-color: #00a4dc;
-  }
-  
-  .layout-desktop ::-webkit-scrollbar {
-    width: 10px !important;
-    height: 1em;
-  }
-  
-  ::-webkit-scrollbar-track {
-      -webkit-box-shadow: none !important;
-      box-shadow: none !important;
-  }
-  
-
-  
-  ::-webkit-scrollbar-thumb:horizontal,
-  ::-webkit-scrollbar-thumb:vertical {
-      -webkit-border-radius: 2px;
-      border-radius: 8px!important;
-      background: center no-repeat hsla(0,0%,100%,.2) !important;
-  }
-  ::-webkit-scrollbar-track-piece {
-    background: #3b3b3b;
-}
-
-/* 
-        ::-webkit-scrollbar {
-            width: 14px !important;
-        }
-        ::-webkit-scrollbar-thumb {
-            min-height: 50px !important;
-            border: 3px solid transparent !important;
-            border-radius: 8px!important;
-            background-color: hsla(0,0%,100%,.2) !important;
-            background-clip: padding-box !important;
-        }
-        ::-webkit-scrollbar-track {
-            background-color: transparent !important;
-        }
-        ::-webkit-scrollbar-thumb:hover {
-            min-height: 50px !important;
-            border: 3px solid transparent !important;
-            border-radius: 8px !important;
-            background-color: hsla(0,0%,100%,.5) !important;
-            background-clip: padding-box !important;
-        }    */
-  
-  .timeslotHeaders-desktop::-webkit-scrollbar {
-      height: .7em;
-  }
-  
-
-  /*Emby css */
-
-  /* Toggle Button */
-
-  .mdl-switch__input:checked + .mdl-switch__label + .mdl-switch__trackContainer > .mdl-switch__thumb {
-    background: var(--button-color) !important;
-    left: 1.466em;
-    box-shadow: 0 3px 0.28em 0 rgba(0, 0, 0, 0.14), 0 3px 3px -2px rgba(0, 0, 0, 0.2), 0 1px 0.56em 0 rgba(0, 0, 0, 0.12);
-}
-.mdl-switch__input:checked + .mdl-switch__label + .mdl-switch__trackContainer > .mdl-switch__track {
-    background: var(--button-color) !important;
-    opacity: .5 !important;
-}
-.mdl-switch__input:checked:focus + .mdl-switch__label + .mdl-switch__trackContainer .mdl-switch__focus-helper {
-    box-shadow: 0 0 0 1.39em rgba(255, 255, 255, 0.08) !important;
-    background-color: rgba(255, 255, 255, 0.08) !important;
-}
-
-/*Settings */
-
-.listItem:hover {
-    background: rgb(255, 255, 255, .08) !important;
-}
-
-/* user icon */
-.listItemIcon:not(.listItemIcon-transparent) {
-    background-color: var(--button-color) !important;
-    color: #fff;
-    padding: .5em;
-    border-radius: 100em;
-    margin: 0 .2em 0 .4em;
-}
diff --git a/CSS/themes/emby/plex.css b/CSS/themes/emby/plex.css
index 85d7ccdd..431c2992 100644
--- a/CSS/themes/emby/plex.css
+++ b/CSS/themes/emby/plex.css
@@ -12,12 +12,51 @@
 /* 			      https://github.com/gilbN/theme.park			 */
 
 /* EMBY PLEX THEME */
-@import url(https://theme-park.dev/CSS/themes/jellyfin/jellyfin-base.css);
+@import url("https://theme-park.dev/CSS/themes/emby/emby-base.css");
 :root {
-  --main-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
-  --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
-  --button-color: #cc7b19;
-  --button-color-hover: #e59029;
-  --accent-color:  #e5a00d;
-  --accent-color-hover: #ffc107;
-  }
\ No newline at end of file
+    --theme-primary-color: #e5a00d;
+    --theme-text-color: #eee;
+    --theme-text-color-opaque: #fff;
+    --theme-accent-text-color: #e5a00d;
+    --theme-primary-color-lightened: rgba(229, 161, 13, 0.2);
+    --theme-icon-focus-background: rgba(229, 161, 13, 0.2);
+
+    --theme-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+    
+    --header-background: var(--theme-background);
+    --theme-body-secondary-text-color: rgba(255, 255, 255, .6);
+    --line-background: rgba(255, 255, 255, .08);
+    --line-size: .08em;
+    --scrollbar-thumb-background: rgba(255,255,255,.3);
+}
+
+@media (pointer: fine) {
+    :not(.layout-tv):root {
+        --theme-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
+        --header-blur-background: rgba(20,20,20,0.66);
+        --drawer-background: #2C2C2E;
+        --docked-drawer-background: rgba(0, 0, 0, 0.25);
+        --button-background: #1f1f1f;
+        --card-background: rgba(0, 0, 0, 0.15);
+        --footer-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;;
+        --footer-blur-background: rgba(29,29,31,0.66);
+    }
+}
+
+.layout-tv:root {
+    --theme-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-light2.png") center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+}
\ No newline at end of file
diff --git a/CSS/themes/emby/space-gray.css b/CSS/themes/emby/space-gray.css
index 34d98d14..e658a49c 100644
--- a/CSS/themes/emby/space-gray.css
+++ b/CSS/themes/emby/space-gray.css
@@ -12,12 +12,51 @@
 /*			      https://github.com/gilbN/theme.park			 */
 
 /* EMBY SPACE GRAY THEME */
-@import url(https://theme-park.dev/CSS/themes/jellyfin/jellyfin-base.css);
+@import url("https://theme-park.dev/CSS/themes/emby/emby-base.css");
 :root {
-  --main-bg-color:  radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
-  --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed; 
-  --button-color: #607D8B;
-  --button-color-hover: #81a6b7;
-  --accent-color: #607D8B;
-  --accent-color-hover: #81a6b7;
+    --theme-primary-color: #81a6b7;
+    --theme-text-color: #eee;
+    --theme-text-color-opaque: #fff;
+    --theme-accent-text-color: #81a6b7;
+    --theme-primary-color-lightened: rgba(129, 166, 183, 0.2);
+    --theme-icon-focus-background: rgba(129, 166, 183, 0.2);
+
+    --theme-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
+    
+    --header-background: var(--theme-background);
+    --theme-body-secondary-text-color: rgba(255, 255, 255, .6);
+    --line-background: rgba(255, 255, 255, .08);
+    --line-size: .08em;
+    --scrollbar-thumb-background: rgba(255,255,255,.3);
+}
+
+@media (pointer: fine) {
+    :not(.layout-tv):root {
+        --theme-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
+        --header-blur-background: rgba(20,20,20,0.66);
+        --drawer-background: #2C2C2E;
+        --docked-drawer-background: rgba(0, 0, 0, 0.25);
+        --button-background: #1f1f1f;
+        --card-background: rgba(0, 0, 0, 0.15);
+        --footer-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;;
+        --footer-blur-background: rgba(29,29,31,0.66);
+    }
+}
+
+.layout-tv:root {
+    --theme-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;
+    --header-blur-background: rgba(20,20,20,0.66);
+    --drawer-background: #2C2C2E;
+    --docked-drawer-background: rgba(0, 0, 0, 0.25);
+    --button-background: #1f1f1f;
+    --card-background: rgba(0, 0, 0, 0.15);
+    --footer-background: radial-gradient( ellipse at center,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed;;
+    --footer-blur-background: rgba(29,29,31,0.66);
 }
\ No newline at end of file
diff --git a/Resources/emby/logowhite.png b/Resources/emby/logowhite.png
new file mode 100644
index 00000000..7e55e044
Binary files /dev/null and b/Resources/emby/logowhite.png differ