diff --git a/src/Ombi.Api.Github/GithubApi.cs b/src/Ombi.Api.Github/GithubApi.cs
index 287908b07..f7b3fbcbf 100644
--- a/src/Ombi.Api.Github/GithubApi.cs
+++ b/src/Ombi.Api.Github/GithubApi.cs
@@ -19,7 +19,7 @@ namespace Ombi.Api.Github
 
         public async Task<List<CakeThemes>> GetCakeThemes()
         {
-            var request = new Request("repos/tidusjar/layer.Cake/contents/ombi/themes", BaseUrl, HttpMethod.Get);
+            var request = new Request("repos/leram84/layer.Cake/contents/ombi/themes", BaseUrl, HttpMethod.Get);
             request.AddHeader("Accept", "application/vnd.github.v3+json");
             request.AddHeader("User-Agent", "Ombi");
             return await _api.Request<List<CakeThemes>>(request);
diff --git a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
index bac7af2b8..7924bdd6b 100644
--- a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
@@ -19,7 +19,19 @@ namespace Ombi.Core.Rule.Rules.Search
 
         public async Task<RuleResult> Execute(SearchViewModel obj)
         {
-            var item = await EmbyContentRepository.Get(obj.ImdbId);
+            EmbyContent item = null;
+            if (obj.Type == RequestType.Movie)
+            {
+                item = await EmbyContentRepository.Get(obj.ImdbId);
+                if (item == null)
+                {
+                    item = await EmbyContentRepository.Get(obj.TheMovieDbId);
+                }
+            }
+            else
+            {
+                item = await EmbyContentRepository.Get(obj.TheTvDbId);
+            }
             if (item != null)
             {
                 obj.Available = true;
diff --git a/src/Ombi.Store/Entities/EmbyContent.cs b/src/Ombi.Store/Entities/EmbyContent.cs
index 4d98c2d2b..d9d6e6983 100644
--- a/src/Ombi.Store/Entities/EmbyContent.cs
+++ b/src/Ombi.Store/Entities/EmbyContent.cs
@@ -35,6 +35,7 @@ namespace Ombi.Store.Entities
     public class EmbyContent : Entity
     {
         public string Title { get; set; }
+
         public string ProviderId { get; set; }
         public string EmbyId { get; set; }
         public EmbyMediaType Type { get; set; }
diff --git a/src/Ombi/ClientApp/app/settings/customization/customization.component.ts b/src/Ombi/ClientApp/app/settings/customization/customization.component.ts
index 46b76f549..b827d7469 100644
--- a/src/Ombi/ClientApp/app/settings/customization/customization.component.ts
+++ b/src/Ombi/ClientApp/app/settings/customization/customization.component.ts
@@ -33,6 +33,7 @@ export class CustomizationComponent implements OnInit {
 
                 if(x.hasPresetTheme) {
                     this.themes.unshift({displayName: x.presetThemeDisplayName, fullName: x.presetThemeName, url: "", version: x.presetThemeVersion});
+                    this.themes.unshift({displayName: "None", fullName: "None", url: "", version: ""});
                 } else {
                     this.themes.unshift({displayName: "Please Select", fullName: "-1", url: "-1", version: ""});
                 }
@@ -55,12 +56,18 @@ export class CustomizationComponent implements OnInit {
         const selectedThemeFullName = <string>event.target.value;
         const selectedTheme = this.themes.filter((val) => {
             return val.fullName === selectedThemeFullName;
-        });
+        })[0];
 
-        if(selectedTheme[0].fullName === this.settings.presetThemeName) {
+        if(selectedTheme.fullName === this.settings.presetThemeName) {
             return;
         }
         
+        if(selectedTheme.fullName === "None" || selectedTheme.fullName === "-1") {
+            this.settings.presetThemeName = "";
+            this.settings.presetThemeContent = "";
+            return;
+        }
+
         this.settings.presetThemeName = selectedThemeFullName;
         this.settingsService.getThemeContent(selectedTheme[0].url).subscribe(x => {
             this.settings.presetThemeContent = x;