From eaf0513605c3f8e982c36617ca43555f2ac7a5e4 Mon Sep 17 00:00:00 2001
From: XYZJR <50780760+XYZJR@users.noreply.github.com>
Date: Wed, 17 Mar 2021 00:29:26 +0100
Subject: [PATCH] Core: rewrite of configuration items. Resolves #2114 (#11104)

---
 src/Jackett.Common/Content/custom.css         |   4 +
 src/Jackett.Common/Content/custom.js          |   3 +
 src/Jackett.Common/Content/custom_mobile.css  |   4 +
 src/Jackett.Common/Content/index.html         |   5 +
 src/Jackett.Common/Indexers/Anidex.cs         |  20 +-
 src/Jackett.Common/Indexers/BaseIndexer.cs    |  14 +-
 .../Indexers/CardigannIndexer.cs              |  44 +-
 src/Jackett.Common/Indexers/Cinecalidad.cs    |   5 +-
 src/Jackett.Common/Indexers/DivxTotal.cs      |   6 +-
 src/Jackett.Common/Indexers/GazelleGames.cs   |   4 +-
 src/Jackett.Common/Indexers/HDSpace.cs        |   2 +-
 src/Jackett.Common/Indexers/IPTorrents.cs     |   4 +-
 .../Indexers/InternetArchive.cs               |  16 +-
 src/Jackett.Common/Indexers/Magnetico.cs      |  12 +-
 src/Jackett.Common/Indexers/MejorTorrent.cs   |   6 +-
 src/Jackett.Common/Indexers/MoreThanTV.cs     |  12 +-
 src/Jackett.Common/Indexers/NewPCT.cs         |  16 +-
 src/Jackett.Common/Indexers/PolishTracker.cs  |   4 +-
 src/Jackett.Common/Indexers/RarBG.cs          |   6 +-
 src/Jackett.Common/Indexers/TorrentLeech.cs   |   4 +-
 src/Jackett.Common/Indexers/TorrentNetwork.cs |  12 +-
 src/Jackett.Common/Indexers/XSpeeds.cs        |   6 +-
 src/Jackett.Common/Models/DTO/Indexer.cs      |   2 +-
 .../Bespoke/ConfigurationDataAbnormal.cs      |  96 ++--
 .../Bespoke/ConfigurationDataAniDub.cs        |   5 +-
 .../Bespoke/ConfigurationDataAniLibria.cs     |  10 +-
 .../Bespoke/ConfigurationDataAnimeBytes.cs    |  26 +-
 .../Bespoke/ConfigurationDataBakaBT.cs        |   8 +-
 .../Bespoke/ConfigurationDataEliteTracker.cs  |  16 +-
 .../Bespoke/ConfigurationDataFileList.cs      |   8 +-
 .../ConfigurationDataGazelleTracker.cs        |  34 +-
 .../Bespoke/ConfigurationDataHDBitsApi.cs     |  18 +-
 .../Bespoke/ConfigurationDataMyAnonamouse.cs  |  20 +-
 .../Bespoke/ConfigurationDataNCore.cs         |  30 +-
 .../Bespoke/ConfigurationDataNorbits.cs       |  88 ++--
 .../Bespoke/ConfigurationDataPornolab.cs      |   4 +-
 .../Bespoke/ConfigurationDataRutracker.cs     |  23 +-
 .../Bespoke/ConfigurationDataSceneTime.cs     |   4 +-
 .../Bespoke/ConfigurationDataTVstore.cs       |  12 +-
 .../Bespoke/ConfigurationDataToloka.cs        |   4 +-
 .../Bespoke/ConfigurationDataXthor.cs         |  49 +-
 .../Models/IndexerConfig/ConfigurationData.cs | 421 +++++++++++-------
 .../IndexerConfig/ConfigurationDataAPIKey.cs  |   4 +-
 ...DataAPILoginWithUserAndPasskeyAndFilter.cs |  26 +-
 .../ConfigurationDataBasicLogin.cs            |  14 +-
 .../ConfigurationDataBasicLoginWith2FA.cs     |  16 +-
 .../ConfigurationDataBasicLoginWithEmail.cs   |  14 +-
 .../ConfigurationDataBasicLoginWithFilter.cs  |  25 +-
 .../ConfigurationDataBasicLoginWithPID.cs     |  16 +-
 .../ConfigurationDataBasicLoginWithRSS.cs     |  12 +-
 ...gurationDataBasicLoginWithRSSAndDisplay.cs |  16 +-
 .../ConfigurationDataCaptchaLogin.cs          |  24 +-
 .../IndexerConfig/ConfigurationDataCookie.cs  |  19 +-
 .../IndexerConfig/ConfigurationDataPasskey.cs |   8 +-
 .../ConfigurationDataPinNumber.cs             |   4 +-
 .../ConfigurationDataUserPasskey.cs           |  12 +-
 56 files changed, 693 insertions(+), 604 deletions(-)

diff --git a/src/Jackett.Common/Content/custom.css b/src/Jackett.Common/Content/custom.css
index 5692e2a99..246be5a50 100644
--- a/src/Jackett.Common/Content/custom.css
+++ b/src/Jackett.Common/Content/custom.css
@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputcheckbox label {
     padding: 0 1.5em;
 }
diff --git a/src/Jackett.Common/Content/custom.js b/src/Jackett.Common/Content/custom.js
index 2234d802b..6c13fa383 100644
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -573,6 +573,9 @@ function getConfigModalJson(configForm) {
             case "inputstring":
                 itemEntry.value = $el.find(".setup-item-inputstring input").val();
                 break;
+            case "password":
+                itemEntry.value = $el.find(".setup-item-password input").val();
+                break;
             case "inputbool":
                 itemEntry.value = $el.find(".setup-item-inputbool input").is(":checked");
                 break;
diff --git a/src/Jackett.Common/Content/custom_mobile.css b/src/Jackett.Common/Content/custom_mobile.css
index 3c9fe822a..578880907 100644
--- a/src/Jackett.Common/Content/custom_mobile.css
+++ b/src/Jackett.Common/Content/custom_mobile.css
@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputbool input {
     max-width: 100px;
     height: 20px;
diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html
index eaefcfb71..24213707b 100644
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -235,6 +235,11 @@
             {{/if}}
         </div>
     </script>
+    <script id="setup-item-password" type="text/x-handlebars-template">
+        <div class="setup-item-password">
+            <input class="form-control" type="password" value="{{{value}}}" />
+        </div>
+    </script>
     <script id="setup-item-inputbool" type="text/x-handlebars-template">
         <div class="setup-item-inputbool">
             {{#if value}}
diff --git a/src/Jackett.Common/Indexers/Anidex.cs b/src/Jackett.Common/Indexers/Anidex.cs
index 2d4abfe61..4a376c1f3 100644
--- a/src/Jackett.Common/Indexers/Anidex.cs
+++ b/src/Jackett.Common/Indexers/Anidex.cs
@@ -66,7 +66,7 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(16, TorznabCatType.TVAnime, "Other");
 
             // Configure the language select option
-            var languageSelect = new SelectItem(new Dictionary<string, string>
+            var languageSelect = new SingleSelectConfigurationItem("Language", new Dictionary<string, string>
                 {
                 {"1", "English"},
                 {"2", "Japanese"},
@@ -100,36 +100,36 @@ namespace Jackett.Common.Indexers
                 {"30", "Persian"},
                 {"31", "Malaysian"}
             })
-            { Name = "Language", Value = "1" };
+            { Value = "1" };
             configData.AddDynamic("languageid", languageSelect);
 
             // Configure the sort selects
-            var sortBySelect = new SelectItem(new Dictionary<string, string>
+            var sortBySelect = new SingleSelectConfigurationItem("Sort by", new Dictionary<string, string>
                 {
                 {"upload_timestamp", "created"},
                 {"seeders", "seeders"},
                 {"size", "size"},
                 {"filename", "title"}
             })
-            { Name = "Sort by", Value = "upload_timestamp" };
+            { Value = "upload_timestamp" };
             configData.AddDynamic("sortrequestedfromsite", sortBySelect);
 
-            var orderSelect = new SelectItem(new Dictionary<string, string>
+            var orderSelect = new SingleSelectConfigurationItem("Order", new Dictionary<string, string>
                 {
                     {"desc", "Descending"},
                     {"asc", "Ascending"}
                 })
-            { Name = "Order", Value = "desc" };
+            { Value = "desc" };
             configData.AddDynamic("orderrequestedfromsite", orderSelect);
 
             EnableConfigurableRetryAttempts();
         }
 
-        private string GetLang => ((SelectItem)configData.GetDynamic("languageid")).Value;
+        private string GetLang => ((SingleSelectConfigurationItem)configData.GetDynamic("languageid")).Value;
+        
+        private string GetSortBy => ((SingleSelectConfigurationItem)configData.GetDynamic("sortrequestedfromsite")).Value;
 
-        private string GetSortBy => ((SelectItem)configData.GetDynamic("sortrequestedfromsite")).Value;
-
-        private string GetOrder => ((SelectItem)configData.GetDynamic("orderrequestedfromsite")).Value;
+        private string GetOrder => ((SingleSelectConfigurationItem)configData.GetDynamic("orderrequestedfromsite")).Value;
 
         private Uri GetAbsoluteUrl(string relativeUrl) => new Uri(SiteLink + relativeUrl.TrimStart('/'));
 
diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs
index 801c27f47..b25fbec01 100644
--- a/src/Jackett.Common/Indexers/BaseIndexer.cs
+++ b/src/Jackett.Common/Indexers/BaseIndexer.cs
@@ -182,17 +182,17 @@ namespace Jackett.Common.Indexers
 
             LoadValuesFromJson(jsonConfig, false);
 
-            StringItem passwordPropertyValue = null;
+            StringConfigurationItem passwordPropertyValue = null;
             var passwordValue = "";
 
             try
             {
                 // try dynamic items first (e.g. all cardigann indexers)
-                passwordPropertyValue = (StringItem)configData.GetDynamicByName("password");
+                passwordPropertyValue = (StringConfigurationItem)configData.GetDynamicByName("password");
 
                 if (passwordPropertyValue == null) // if there's no dynamic password try the static property
                 {
-                    passwordPropertyValue = (StringItem)configData.GetType().GetProperty("Password").GetValue(configData, null);
+                    passwordPropertyValue = (StringConfigurationItem)configData.GetType().GetProperty("Password").GetValue(configData, null);
 
                     // protection is based on the item.Name value (property name might be different, example: Abnormal), so check the Name again
                     if (!string.Equals(passwordPropertyValue.Name, "password", StringComparison.InvariantCultureIgnoreCase))
@@ -433,9 +433,9 @@ namespace Jackett.Common.Indexers
                     return DefaultNumberOfRetryAttempts;
                 }
 
-                var configValue = ((SelectItem)configItem).Value;
+                var configValue = ((SingleSelectConfigurationItem)configItem).Value;
 
-                if (int.TryParse(configValue, out int parsedConfigValue) && parsedConfigValue > 0)
+                if (int.TryParse(configValue, out var parsedConfigValue) && parsedConfigValue > 0)
                 {
                     return parsedConfigValue;
                 }
@@ -476,7 +476,8 @@ namespace Jackett.Common.Indexers
         /// </remarks>
         protected void EnableConfigurableRetryAttempts()
         {
-            var attemptSelect = new SelectItem(
+            var attemptSelect = new SingleSelectConfigurationItem(
+                "Number of retries",
                 new Dictionary<string, string>
                 {
                     {"0", "No retries (fail fast)"},
@@ -487,7 +488,6 @@ namespace Jackett.Common.Indexers
                     {"5", "5 retries (8s delay)"}
                 })
             {
-                Name = "Number of retries",
                 Value = DefaultNumberOfRetryAttempts.ToString()
             };
             configData.AddDynamic("retryAttempts", attemptSelect);
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
index 4e750633e..c3042cced 100644
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -120,23 +120,25 @@ namespace Jackett.Common.Indexers
             configData = new ConfigurationData();
             foreach (var Setting in Definition.Settings)
             {
-                Item item;
+                ConfigurationItem item;
+
+                var itemName = Setting.Label ?? Setting.Name;
 
                 if (Setting.Type != null)
                 {
                     switch (Setting.Type)
                     {
                         case "checkbox":
-                            item = new BoolItem { Value = false };
+                            item = new BoolConfigurationItem(itemName) { Value = false };
 
                             if (Setting.Default != null && Setting.Default == "true")
                             {
-                                ((BoolItem)item).Value = true;
+                                ((BoolConfigurationItem)item).Value = true;
                             }
                             break;
                         case "password":
                         case "text":
-                            item = new StringItem { Value = Setting.Default };
+                            item = new StringConfigurationItem(itemName) { Value = Setting.Default };
                             break;
                         case "multi-select":
                             if (Setting.Options == null)
@@ -144,7 +146,7 @@ namespace Jackett.Common.Indexers
                                 throw new Exception("Options must be given for the 'multi-select' type.");
                             }
 
-                            item = new CheckboxItem(Setting.Options) { Values = Setting.Defaults };
+                            item = new MultiSelectConfigurationItem(itemName, Setting.Options) { Values = Setting.Defaults };
                             break;
                         case "select":
                             if (Setting.Options == null)
@@ -152,10 +154,10 @@ namespace Jackett.Common.Indexers
                                 throw new Exception("Options must be given for the 'select' type.");
                             }
 
-                            item = new SelectItem(Setting.Options) { Value = Setting.Default };
+                            item = new SingleSelectConfigurationItem(itemName, Setting.Options) { Value = Setting.Default };
                             break;
                         case "info":
-                            item = new DisplayItem(Setting.Default);
+                            item = new DisplayInfoConfigurationItem(itemName, Setting.Default);
                             break;
                         default:
                             throw new Exception($"Invalid setting type '{Setting.Type}' specified.");
@@ -163,13 +165,9 @@ namespace Jackett.Common.Indexers
                 }
                 else
                 {
-                    item = new StringItem { Value = Setting.Default };
-                    ;
+                    item = new StringConfigurationItem(itemName) { Value = Setting.Default };
                 }
 
-                item.Name = Setting.Label;
-                if (item.Name == null)
-                    item.Name = Setting.Name;
                 configData.AddDynamic(Setting.Name, item);
             }
 
@@ -234,10 +232,10 @@ namespace Jackett.Common.Indexers
             foreach (var setting in Definition.Settings)
                 variables[".Config." + setting.Name] = configData.GetDynamic(setting.Name) switch
                 {
-                    CheckboxItem checkbox => checkbox.Values,
-                    BoolItem boolItem => variables[boolItem.Value ? ".True" : ".False"],
-                    SelectItem selectItem => selectItem.Value,
-                    StringItem stringItem => stringItem.Value,
+                    MultiSelectConfigurationItem checkbox => checkbox.Values,
+                    BoolConfigurationItem boolItem => variables[boolItem.Value ? ".True" : ".False"],
+                    SingleSelectConfigurationItem selectItem => selectItem.Value,
+                    StringConfigurationItem stringItem => stringItem.Value,
                     // Throw exception here to match original functionality.
                     // Currently this will only throw for ImageItem.
                     _ => throw new NotSupportedException()
@@ -617,7 +615,7 @@ namespace Jackett.Common.Indexers
                     var Captcha = Login.Captcha;
                     if (Captcha.Type == "image")
                     {
-                        var CaptchaText = (StringItem)configData.GetDynamic("CaptchaText");
+                        var CaptchaText = (StringConfigurationItem)configData.GetDynamic("CaptchaText");
                         if (CaptchaText != null)
                         {
                             var input = Captcha.Input;
@@ -633,7 +631,7 @@ namespace Jackett.Common.Indexers
                     }
                     if (Captcha.Type == "text")
                     {
-                        var CaptchaAnswer = (StringItem)configData.GetDynamic("CaptchaAnswer");
+                        var CaptchaAnswer = (StringConfigurationItem)configData.GetDynamic("CaptchaAnswer");
                         if (CaptchaAnswer != null)
                         {
                             var input = Captcha.Input;
@@ -689,7 +687,7 @@ namespace Jackett.Common.Indexers
             }
             else if (Login.Method == "cookie")
             {
-                configData.CookieHeader.Value = ((StringItem)configData.GetDynamic("cookie")).Value;
+                configData.CookieHeader.Value = ((StringConfigurationItem)configData.GetDynamic("cookie")).Value;
             }
             else if (Login.Method == "get")
             {
@@ -865,8 +863,8 @@ namespace Jackett.Common.Indexers
                         var CaptchaUrl = resolvePath(captchaElement.GetAttribute("src"), LoginUrl);
                         var captchaImageData = await RequestWithCookiesAsync(
                             CaptchaUrl.ToString(), landingResult.Cookies, referer: LoginUrl.AbsoluteUri);
-                        var CaptchaImage = new ImageItem { Name = "Captcha Image" };
-                        var CaptchaText = new StringItem { Name = "Captcha Text" };
+                        var CaptchaImage = new DisplayImageConfigurationItem("Captcha Image");
+                        var CaptchaText = new StringConfigurationItem("Captcha Text");
 
                         CaptchaImage.Value = captchaImageData.ContentBytes;
 
@@ -885,8 +883,8 @@ namespace Jackett.Common.Indexers
                     {
                         hasCaptcha = true;
 
-                        var CaptchaChallenge = new DisplayItem(captchaElement.TextContent) { Name = "Captcha Challenge" };
-                        var CaptchaAnswer = new StringItem { Name = "Captcha Answer" };
+                        var CaptchaChallenge = new DisplayInfoConfigurationItem("Captcha Challenge", captchaElement.TextContent);
+                        var CaptchaAnswer = new StringConfigurationItem("Captcha Answer");
 
                         configData.AddDynamic("CaptchaChallenge", CaptchaChallenge);
                         configData.AddDynamic("CaptchaAnswer", CaptchaAnswer);
diff --git a/src/Jackett.Common/Indexers/Cinecalidad.cs b/src/Jackett.Common/Indexers/Cinecalidad.cs
index 092bb0aea..182064681 100644
--- a/src/Jackett.Common/Indexers/Cinecalidad.cs
+++ b/src/Jackett.Common/Indexers/Cinecalidad.cs
@@ -55,13 +55,12 @@ namespace Jackett.Common.Indexers
             Language = "es-es";
             Type = "public";
 
-            var language = new SelectItem(new Dictionary<string, string>
+            var language = new SingleSelectConfigurationItem("Select language", new Dictionary<string, string>
                 {
                     {"castellano", "Castilian Spanish"},
                     {"latino", "Latin American Spanish"}
                 })
             {
-                Name = "Select language",
                 Value = "castellano"
             };
             configData.AddDynamic("language", language);
@@ -72,7 +71,7 @@ namespace Jackett.Common.Indexers
         public override void LoadValuesFromJson(JToken jsonConfig, bool useProtectionService = false)
         {
             base.LoadValuesFromJson(jsonConfig, useProtectionService);
-            var language = (SelectItem)configData.GetDynamic("language");
+            var language = (SingleSelectConfigurationItem)configData.GetDynamic("language");
             _language = language?.Value ?? "castellano";
         }
 
diff --git a/src/Jackett.Common/Indexers/DivxTotal.cs b/src/Jackett.Common/Indexers/DivxTotal.cs
index 671b033e6..26b0b2b1f 100644
--- a/src/Jackett.Common/Indexers/DivxTotal.cs
+++ b/src/Jackett.Common/Indexers/DivxTotal.cs
@@ -81,10 +81,10 @@ namespace Jackett.Common.Indexers
             Language = "es-es";
             Type = "public";
 
-            var matchWords = new BoolItem { Name = "Match words in title", Value = true };
+            var matchWords = new BoolConfigurationItem("Match words in title") { Value = true };
             configData.AddDynamic("MatchWords", matchWords);
 
-            configData.AddDynamic("flaresolverr", new DisplayItem("This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."){ Name = "FlareSolverr"});
+            configData.AddDynamic("flaresolverr", new DisplayInfoConfigurationItem("FlareSolverr", "This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."));
 
             AddCategoryMapping(DivxTotalCategories.Peliculas, TorznabCatType.MoviesSD, "Peliculas");
             AddCategoryMapping(DivxTotalCategories.PeliculasHd, TorznabCatType.MoviesHD, "Peliculas HD");
@@ -112,7 +112,7 @@ namespace Jackett.Common.Indexers
 
             var releases = new List<ReleaseInfo>();
 
-            var matchWords = ((BoolItem)configData.GetDynamic("MatchWords")).Value;
+            var matchWords = ((BoolConfigurationItem)configData.GetDynamic("MatchWords")).Value;
             matchWords = newQuery.SearchTerm != "" && matchWords;
 
             // we remove parts from the original query
diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs
index a4193c7d0..7aee89521 100644
--- a/src/Jackett.Common/Indexers/GazelleGames.cs
+++ b/src/Jackett.Common/Indexers/GazelleGames.cs
@@ -48,7 +48,7 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            configData.AddDynamic("searchgroupnames", new BoolItem { Name = "Search Group Names Only", Value = false });
+            configData.AddDynamic("searchgroupnames", new BoolConfigurationItem("Search Group Names Only") { Value = false });
 
             // Apple
             AddCategoryMapping("Mac", TorznabCatType.ConsoleOther, "Mac");
@@ -212,7 +212,7 @@ namespace Jackett.Common.Indexers
             var searchUrl = BrowseUrl;
             var searchString = query.GetQueryString();
 
-            var searchType = ((BoolItem)configData.GetDynamic("searchgroupnames")).Value ? "groupname" : "searchstr";
+            var searchType = ((BoolConfigurationItem)configData.GetDynamic("searchgroupnames")).Value ? "groupname" : "searchstr";
 
             var queryCollection = new NameValueCollection
             {
diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs
index 06605279b..1d28646f2 100644
--- a/src/Jackett.Common/Indexers/HDSpace.cs
+++ b/src/Jackett.Common/Indexers/HDSpace.cs
@@ -58,7 +58,7 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            configData.AddDynamic("flaresolverr", new DisplayItem("This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."){ Name = "FlareSolverr"});
+            configData.AddDynamic("flaresolverr", new DisplayInfoConfigurationItem("FlareSolverr", "This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."));
 
             AddCategoryMapping(15, TorznabCatType.MoviesBluRay, "Movie / Blu-ray");
             AddCategoryMapping(19, TorznabCatType.MoviesHD, "Movie / 1080p");
diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs
index b3ea77d02..0c9bb2ab0 100644
--- a/src/Jackett.Common/Indexers/IPTorrents.cs
+++ b/src/Jackett.Common/Indexers/IPTorrents.cs
@@ -87,7 +87,7 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            configData.AddDynamic("freeleech", new BoolItem { Name = "Search freeleech only", Value = false });
+            configData.AddDynamic("freeleech", new BoolConfigurationItem("Search freeleech only") { Value = false });
 
             AddCategoryMapping(72, TorznabCatType.Movies, "Movies");
             AddCategoryMapping(87, TorznabCatType.Movies3D, "Movie/3D");
@@ -197,7 +197,7 @@ namespace Jackett.Common.Indexers
             foreach (var cat in MapTorznabCapsToTrackers(query))
                 qc.Add(cat, string.Empty);
 
-            if (((BoolItem)configData.GetDynamic("freeleech")).Value)
+            if (((BoolConfigurationItem)configData.GetDynamic("freeleech")).Value)
                 qc.Add("free", "on");
 
             var searchUrl = SearchUrl + "?" + qc.GetQueryString();
diff --git a/src/Jackett.Common/Indexers/InternetArchive.cs b/src/Jackett.Common/Indexers/InternetArchive.cs
index 23c29ecd8..552630be0 100644
--- a/src/Jackett.Common/Indexers/InternetArchive.cs
+++ b/src/Jackett.Common/Indexers/InternetArchive.cs
@@ -68,24 +68,24 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "public";
 
-            var sort = new SelectItem(new Dictionary<string, string>
+            var sort = new SingleSelectConfigurationItem("Sort requested from site", new Dictionary<string, string>
             {
                 {"publicdate", "created"},
                 {"downloads", "downloads"},
                 {"item_size", "size"}
             })
-            { Name = "Sort requested from site", Value = "publicdate" };
+            { Value = "publicdate" };
             configData.AddDynamic("sort", sort);
 
-            var order = new SelectItem(new Dictionary<string, string>
+            var order = new SingleSelectConfigurationItem("Order requested from site", new Dictionary<string, string>
             {
                 {"desc", "desc"},
                 {"asc", "asc"}
             })
-            { Name = "Order requested from site", Value = "desc" };
+            { Value = "desc" };
             configData.AddDynamic("order", order);
 
-            var titleOnly = new BoolItem { Name = "Search only in title", Value = true };
+            var titleOnly = new BoolConfigurationItem("Search only in title") { Value = true };
             configData.AddDynamic("titleOnly", titleOnly);
 
             AddCategoryMapping("audio", TorznabCatType.Audio);
@@ -116,13 +116,13 @@ namespace Jackett.Common.Indexers
         {
             base.LoadValuesFromJson(jsonConfig, useProtectionService);
 
-            var sort = (SelectItem)configData.GetDynamic("sort");
+            var sort = (SingleSelectConfigurationItem)configData.GetDynamic("sort");
             _sort = sort != null ? sort.Value : "publicdate";
 
-            var order = (SelectItem)configData.GetDynamic("order");
+            var order = (SingleSelectConfigurationItem)configData.GetDynamic("order");
             _order = order != null && order.Value.Equals("asc") ? "" : "-";
 
-            var titleOnly = (BoolItem)configData.GetDynamic("titleOnly");
+            var titleOnly = (BoolConfigurationItem)configData.GetDynamic("titleOnly");
             _titleOnly = titleOnly != null && titleOnly.Value;
         }
 
diff --git a/src/Jackett.Common/Indexers/Magnetico.cs b/src/Jackett.Common/Indexers/Magnetico.cs
index af881386f..05a7172ca 100644
--- a/src/Jackett.Common/Indexers/Magnetico.cs
+++ b/src/Jackett.Common/Indexers/Magnetico.cs
@@ -62,22 +62,22 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "semi-private";
 
-            var sort = new ConfigurationData.SelectItem(new Dictionary<string, string>
+            var sort = new ConfigurationData.SingleSelectConfigurationItem("Sort requested from site", new Dictionary<string, string>
                 {
                     {"DISCOVERED_ON", "discovered"},
                     {"TOTAL_SIZE", "size"},
                     {"N_FILES", "files"},
                     {"RELEVANCE", "relevance"}
                 })
-                { Name = "Sort requested from site", Value = "discovered" };
+                { Value = "discovered" };
             configData.AddDynamic("sort", sort);
 
-            var order = new ConfigurationData.SelectItem(new Dictionary<string, string>
+            var order = new ConfigurationData.SingleSelectConfigurationItem("Order requested from site", new Dictionary<string, string>
                 {
                     {"false", "desc"},
                     {"true", "asc"}
                 })
-                { Name = "Order requested from site", Value = "false" };
+                { Value = "false" };
             configData.AddDynamic("order", order);
 
             AddCategoryMapping("1", TorznabCatType.Other);
@@ -101,8 +101,8 @@ namespace Jackett.Common.Indexers
             var qc = new NameValueCollection
             {
                 {"query", query.GetQueryString()},
-                {"orderBy", ((ConfigurationData.SelectItem)configData.GetDynamic("sort")).Value},
-                {"ascending", ((ConfigurationData.SelectItem)configData.GetDynamic("order")).Value},
+                {"orderBy", ((ConfigurationData.SingleSelectConfigurationItem)configData.GetDynamic("sort")).Value},
+                {"ascending", ((ConfigurationData.SingleSelectConfigurationItem)configData.GetDynamic("order")).Value},
                 {"limit", "100"}
             };
             var searchUrl = SearchURl + "?" + qc.GetQueryString();
diff --git a/src/Jackett.Common/Indexers/MejorTorrent.cs b/src/Jackett.Common/Indexers/MejorTorrent.cs
index bf1aadd80..b216c8998 100644
--- a/src/Jackett.Common/Indexers/MejorTorrent.cs
+++ b/src/Jackett.Common/Indexers/MejorTorrent.cs
@@ -78,10 +78,10 @@ namespace Jackett.Common.Indexers
             Language = "es-es";
             Type = "public";
 
-            var matchWords = new BoolItem { Name = "Match words in title", Value = true };
+            var matchWords = new BoolConfigurationItem("Match words in title") { Value = true };
             configData.AddDynamic("MatchWords", matchWords);
 
-            configData.AddDynamic("flaresolverr", new DisplayItem("This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."){ Name = "FlareSolverr"});
+            configData.AddDynamic("flaresolverr", new DisplayInfoConfigurationItem("FlareSolverr", "This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href=\"https://github.com/Jackett/Jackett#configuring-flaresolverr\" target=\"_blank\">FlareSolver</a> to access it."));
 
             AddCategoryMapping(MejorTorrentCatType.Pelicula, TorznabCatType.Movies, "Pelicula");
             AddCategoryMapping(MejorTorrentCatType.Serie, TorznabCatType.TVSD, "Serie");
@@ -104,7 +104,7 @@ namespace Jackett.Common.Indexers
 
         protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            var matchWords = ((BoolItem)configData.GetDynamic("MatchWords")).Value;
+            var matchWords = ((BoolConfigurationItem)configData.GetDynamic("MatchWords")).Value;
             matchWords = query.SearchTerm != "" && matchWords;
 
             // we remove parts from the original query
diff --git a/src/Jackett.Common/Indexers/MoreThanTV.cs b/src/Jackett.Common/Indexers/MoreThanTV.cs
index 5f2401610..486549e3e 100644
--- a/src/Jackett.Common/Indexers/MoreThanTV.cs
+++ b/src/Jackett.Common/Indexers/MoreThanTV.cs
@@ -69,7 +69,7 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            var sort = new SelectItem(new Dictionary<string, string>
+            var sort = new SingleSelectConfigurationItem("Sort requested from site", new Dictionary<string, string>
             {
                 {"time", "time"},
                 {"size", "size"},
@@ -77,15 +77,15 @@ namespace Jackett.Common.Indexers
                 {"seeders", "seeders"},
                 {"leechers", "leechers"},
             })
-            { Name = "Sort requested from site", Value = "time" };
+            { Value = "time" };
             configData.AddDynamic("sort", sort);
 
-            var order = new SelectItem(new Dictionary<string, string>
+            var order = new SingleSelectConfigurationItem("Order requested from site", new Dictionary<string, string>
             {
                 {"desc", "desc"},
                 {"asc", "asc"}
             })
-            { Name = "Order requested from site", Value = "desc" };
+            { Value = "desc" };
             configData.AddDynamic("order", order);
 
             AddCategoryMapping(1, TorznabCatType.Movies);
@@ -203,10 +203,10 @@ namespace Jackett.Common.Indexers
         {
             base.LoadValuesFromJson(jsonConfig, useProtectionService);
 
-            var sort = (SelectItem)configData.GetDynamic("sort");
+            var sort = (SingleSelectConfigurationItem)configData.GetDynamic("sort");
             _sort = sort != null ? sort.Value : "time";
 
-            var order = (SelectItem)configData.GetDynamic("order");
+            var order = (SingleSelectConfigurationItem)configData.GetDynamic("order");
             _order = order != null && order.Value.Equals("asc") ? order.Value : "desc";
         }
 
diff --git a/src/Jackett.Common/Indexers/NewPCT.cs b/src/Jackett.Common/Indexers/NewPCT.cs
index 0653785c7..1058fcc8a 100644
--- a/src/Jackett.Common/Indexers/NewPCT.cs
+++ b/src/Jackett.Common/Indexers/NewPCT.cs
@@ -145,16 +145,16 @@ namespace Jackett.Common.Indexers
             Language = "es-es";
             Type = "public";
 
-            var voItem = new BoolItem { Name = "Include original versions in search results", Value = false };
+            var voItem = new BoolConfigurationItem("Include original versions in search results") { Value = false };
             configData.AddDynamic("IncludeVo", voItem);
 
-            var filterMoviesItem = new BoolItem { Name = "Only full match movies", Value = true };
+            var filterMoviesItem = new BoolConfigurationItem("Only full match movies") { Value = true };
             configData.AddDynamic("FilterMovies", filterMoviesItem);
 
-            var removeMovieAccentsItem = new BoolItem { Name = "Remove accents in movie searches", Value = true };
+            var removeMovieAccentsItem = new BoolConfigurationItem("Remove accents in movie searches") { Value = true };
             configData.AddDynamic("RemoveMovieAccents", removeMovieAccentsItem);
 
-            var removeMovieYearItem = new BoolItem { Name = "Remove year from movie results (enable for Radarr)", Value = false };
+            var removeMovieYearItem = new BoolConfigurationItem("Remove year from movie results (enable for Radarr)") { Value = false };
             configData.AddDynamic("RemoveMovieYear", removeMovieYearItem);
 
             AddCategoryMapping(1, TorznabCatType.Movies);
@@ -212,10 +212,10 @@ namespace Jackett.Common.Indexers
         {
             var releases = new List<ReleaseInfo>();
 
-            _includeVo = ((BoolItem)configData.GetDynamic("IncludeVo")).Value;
-            _filterMovies = ((BoolItem)configData.GetDynamic("FilterMovies")).Value;
-            _removeMovieAccents = ((BoolItem)configData.GetDynamic("RemoveMovieAccents")).Value;
-            _removeMovieYear = ((BoolItem)configData.GetDynamic("RemoveMovieYear")).Value;
+            _includeVo = ((BoolConfigurationItem)configData.GetDynamic("IncludeVo")).Value;
+            _filterMovies = ((BoolConfigurationItem)configData.GetDynamic("FilterMovies")).Value;
+            _removeMovieAccents = ((BoolConfigurationItem)configData.GetDynamic("RemoveMovieAccents")).Value;
+            _removeMovieYear = ((BoolConfigurationItem)configData.GetDynamic("RemoveMovieYear")).Value;
             _dailyNow = DateTime.Now;
             _dailyResultIdx = 0;
             var rssMode = string.IsNullOrEmpty(query.SanitizedSearchTerm);
diff --git a/src/Jackett.Common/Indexers/PolishTracker.cs b/src/Jackett.Common/Indexers/PolishTracker.cs
index d0e0cd820..8adeaf4c1 100644
--- a/src/Jackett.Common/Indexers/PolishTracker.cs
+++ b/src/Jackett.Common/Indexers/PolishTracker.cs
@@ -64,7 +64,7 @@ namespace Jackett.Common.Indexers
             Language = "pl-pl";
             Type = "private";
 
-            configData.AddDynamic("LanguageTitle", new BoolItem { Name = "Add POLISH to title if has Polish language. Use this if you using Sonarr/Radarr", Value = false });
+            configData.AddDynamic("LanguageTitle", new BoolConfigurationItem("Add POLISH to title if has Polish language. Use this if you using Sonarr/Radarr") { Value = false });
 
             AddCategoryMapping(1, TorznabCatType.PC0day, "0-Day");
             AddCategoryMapping(2, TorznabCatType.AudioVideo, "Music Video");
@@ -167,7 +167,7 @@ namespace Jackett.Common.Indexers
                     else if ((bool?)torrent.polish == true)
                         descriptions.Add("Language: pl");
 
-                    if (language == "pl" && (((BoolItem) configData.GetDynamic("LanguageTitle")).Value))
+                    if (language == "pl" && (((BoolConfigurationItem) configData.GetDynamic("LanguageTitle")).Value))
                         title += " POLISH";
 
                     var description = descriptions.Any() ? string.Join("<br />\n", descriptions) : null;
diff --git a/src/Jackett.Common/Indexers/RarBG.cs b/src/Jackett.Common/Indexers/RarBG.cs
index 1f2a72b37..4a9cdabb3 100644
--- a/src/Jackett.Common/Indexers/RarBG.cs
+++ b/src/Jackett.Common/Indexers/RarBG.cs
@@ -69,13 +69,13 @@ namespace Jackett.Common.Indexers
 
             webclient.requestDelay = 2.5; // The api has a 1req/2s limit
 
-            var sort = new SelectItem(new Dictionary<string, string>
+            var sort = new SingleSelectConfigurationItem("Sort requested from site", new Dictionary<string, string>
             {
                 {"last", "created"},
                 {"seeders", "seeders"},
                 {"leechers", "leechers"}
             })
-            { Name = "Sort requested from site", Value = "last" };
+            { Value = "last" };
             configData.AddDynamic("sort", sort);
 
             AddCategoryMapping(4, TorznabCatType.XXX, "XXX (18+)");
@@ -116,7 +116,7 @@ namespace Jackett.Common.Indexers
         {
             base.LoadValuesFromJson(jsonConfig, useProtectionService);
 
-            var sort = (SelectItem)configData.GetDynamic("sort");
+            var sort = (SingleSelectConfigurationItem)configData.GetDynamic("sort");
             _sort = sort != null ? sort.Value : "last";
         }
 
diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs
index 736120511..2aca79aaf 100644
--- a/src/Jackett.Common/Indexers/TorrentLeech.cs
+++ b/src/Jackett.Common/Indexers/TorrentLeech.cs
@@ -67,7 +67,7 @@ namespace Jackett.Common.Indexers
             Language = "en-us";
             Type = "private";
 
-            configData.AddDynamic("freeleech", new BoolItem { Name = "Search freeleech only", Value = false });
+            configData.AddDynamic("freeleech", new BoolConfigurationItem("Search freeleech only") { Value = false });
 
             AddCategoryMapping(1, TorznabCatType.Movies, "Movies");
             AddCategoryMapping(8, TorznabCatType.MoviesSD, "Movies Cam");
@@ -157,7 +157,7 @@ namespace Jackett.Common.Indexers
 
             var searchUrl = SearchUrl;
 
-            if (((BoolItem) configData.GetDynamic("freeleech")).Value)
+            if (((BoolConfigurationItem) configData.GetDynamic("freeleech")).Value)
                 searchUrl += "facets/tags%3AFREELEECH/";
 
             if (query.IsImdbQuery)
diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs
index d18930a9d..3bab4e6b0 100644
--- a/src/Jackett.Common/Indexers/TorrentNetwork.cs
+++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs
@@ -69,8 +69,8 @@ namespace Jackett.Common.Indexers
             Language = "de-de";
             Type = "private";
 
-            configData.AddDynamic("token", new HiddenItem { Name = "token" });
-            configData.AddDynamic("passkey", new HiddenItem { Name = "passkey" });
+            configData.AddDynamic("token", new HiddenStringConfigurationItem("token"));
+            configData.AddDynamic("passkey", new HiddenStringConfigurationItem("passkey"));
 
             AddCategoryMapping(24, TorznabCatType.MoviesSD, "Movies GER/SD");
             AddCategoryMapping(18, TorznabCatType.MoviesHD, "Movies GER/720p");
@@ -126,7 +126,7 @@ namespace Jackett.Common.Indexers
         {
             base.LoadValuesFromJson(jsonConfig, useProtectionService);
 
-            var tokenItem = (HiddenItem)configData.GetDynamic("token");
+            var tokenItem = (HiddenStringConfigurationItem)configData.GetDynamic("token");
             if (tokenItem != null)
             {
                 var token = tokenItem.Value;
@@ -134,7 +134,7 @@ namespace Jackett.Common.Indexers
                     APIHeaders["Authorization"] = token;
             }
 
-            var passkeyItem = (HiddenItem)configData.GetDynamic("passkey");
+            var passkeyItem = (HiddenStringConfigurationItem)configData.GetDynamic("passkey");
             if (passkeyItem != null)
             {
                 passkey = passkeyItem.Value;
@@ -172,10 +172,10 @@ namespace Jackett.Common.Indexers
             if (string.IsNullOrWhiteSpace(curuser.passkey.ToString()))
                 throw new ExceptionWithConfigData("got empty passkey: " + curuser.ToString(), configData);
             passkey = curuser.passkey;
-            var passkeyItem = (HiddenItem)configData.GetDynamic("passkey");
+            var passkeyItem = (HiddenStringConfigurationItem)configData.GetDynamic("passkey");
             passkeyItem.Value = passkey;
 
-            var tokenItem = (HiddenItem)configData.GetDynamic("token");
+            var tokenItem = (HiddenStringConfigurationItem)configData.GetDynamic("token");
             tokenItem.Value = token;
 
             await ConfigureIfOK("", token.Length > 0, () =>
diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs
index 3ec1b5a75..6a5fa9314 100644
--- a/src/Jackett.Common/Indexers/XSpeeds.cs
+++ b/src/Jackett.Common/Indexers/XSpeeds.cs
@@ -153,8 +153,8 @@ namespace Jackett.Common.Indexers
                 var captchaUrl = qCaptchaImg.GetAttribute("src");
                 var captchaImageResponse = await RequestWithCookiesAsync(captchaUrl, loginPage.Cookies, RequestType.GET, LandingUrl);
 
-                var captchaText = new StringItem { Name = "Captcha Text" };
-                var captchaImage = new ImageItem {Name = "Captcha Image", Value = captchaImageResponse.ContentBytes};
+                var captchaText = new StringConfigurationItem("Captcha Text");
+                var captchaImage = new DisplayImageConfigurationItem("Captcha Image") { Value = captchaImageResponse.ContentBytes};
 
                 configData.AddDynamic("CaptchaText", captchaText);
                 configData.AddDynamic("CaptchaImage", captchaImage);
@@ -175,7 +175,7 @@ namespace Jackett.Common.Indexers
                             {"password", configData.Password.Value}
                         };
 
-            var captchaText = (StringItem)configData.GetDynamic("CaptchaText");
+            var captchaText = (StringConfigurationItem)configData.GetDynamic("CaptchaText");
             if (captchaText != null)
                 pairs.Add("imagestring", captchaText.Value);
 
diff --git a/src/Jackett.Common/Models/DTO/Indexer.cs b/src/Jackett.Common/Models/DTO/Indexer.cs
index bee2ef0ab..8c4e15cb2 100644
--- a/src/Jackett.Common/Models/DTO/Indexer.cs
+++ b/src/Jackett.Common/Models/DTO/Indexer.cs
@@ -50,7 +50,7 @@ namespace Jackett.Common.Models.DTO
             configured = indexer.IsConfigured;
             site_link = indexer.SiteLink;
             language = indexer.Language;
-            last_error = indexer.LastError;
+            last_error = indexer.LastError ?? "";
             potatoenabled = indexer.TorznabCaps.Categories.GetTorznabCategoryTree().Any(i => TorznabCatType.Movies.Contains(i));
 
             alternativesitelinks = indexer.AlternativeSiteLinks;
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
index 31ae47f2b..fc9e23fbf 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs
@@ -5,58 +5,58 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataAbnormal : ConfigurationData
     {
-        public HiddenItem AuthKey { get; set; }
-        public HiddenItem TorrentPass { get; set; }
-        public DisplayItem CredentialsWarning { get; private set; }
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public DisplayItem PagesWarning { get; private set; }
-        public StringItem ReplaceMulti { get; private set; }
-        public StringItem Pages { get; private set; }
-        public DisplayItem SecurityWarning { get; private set; }
-        public BoolItem Latency { get; private set; }
-        public BoolItem Browser { get; private set; }
-        public DisplayItem LatencyWarning { get; private set; }
-        public StringItem LatencyStart { get; private set; }
-        public StringItem LatencyEnd { get; private set; }
-        public DisplayItem HeadersWarning { get; private set; }
-        public StringItem HeaderAccept { get; private set; }
-        public StringItem HeaderAcceptLang { get; private set; }
-        public BoolItem HeaderDNT { get; private set; }
-        public BoolItem HeaderUpgradeInsecure { get; private set; }
-        public StringItem HeaderUserAgent { get; private set; }
-        public DisplayItem DevWarning { get; private set; }
-        public BoolItem DevMode { get; private set; }
-        public BoolItem HardDriveCache { get; private set; }
-        public StringItem HardDriveCacheKeepTime { get; private set; }
+        public HiddenStringConfigurationItem AuthKey { get; set; }
+        public HiddenStringConfigurationItem TorrentPass { get; set; }
+        public DisplayInfoConfigurationItem CredentialsWarning { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public DisplayInfoConfigurationItem PagesWarning { get; private set; }
+        public StringConfigurationItem ReplaceMulti { get; private set; }
+        public StringConfigurationItem Pages { get; private set; }
+        public DisplayInfoConfigurationItem SecurityWarning { get; private set; }
+        public BoolConfigurationItem Latency { get; private set; }
+        public BoolConfigurationItem Browser { get; private set; }
+        public DisplayInfoConfigurationItem LatencyWarning { get; private set; }
+        public StringConfigurationItem LatencyStart { get; private set; }
+        public StringConfigurationItem LatencyEnd { get; private set; }
+        public DisplayInfoConfigurationItem HeadersWarning { get; private set; }
+        public StringConfigurationItem HeaderAccept { get; private set; }
+        public StringConfigurationItem HeaderAcceptLang { get; private set; }
+        public BoolConfigurationItem HeaderDNT { get; private set; }
+        public BoolConfigurationItem HeaderUpgradeInsecure { get; private set; }
+        public StringConfigurationItem HeaderUserAgent { get; private set; }
+        public DisplayInfoConfigurationItem DevWarning { get; private set; }
+        public BoolConfigurationItem DevMode { get; private set; }
+        public BoolConfigurationItem HardDriveCache { get; private set; }
+        public StringConfigurationItem HardDriveCacheKeepTime { get; private set; }
 
         public ConfigurationDataAbnormal()
             : base()
         {
-            AuthKey = new HiddenItem { Name = "AuthKey", Value = "" };
-            TorrentPass = new HiddenItem { Name = "TorrentPass", Value = "" };
-            CredentialsWarning = new DisplayItem("<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>Username</b> is your account name on this tracker.</li><li><b>Password</b> is your password associated to your account name.</li></ul>") { Name = "Credentials" };
-            Username = new StringItem { Name = "Username", Value = "" };
-            Password = new StringItem { Name = "Password", Value = "" };
-            PagesWarning = new DisplayItem("<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Max Pages to Process</b> let you specify how many page (max) Jackett can process when doing a search. Setting a value <b>higher than 4 is dangerous</b> for you account ! (<b>Result of too many requests to tracker...that <u>will be suspect</u></b>).</li></ul>") { Name = "Preferences" };
-            Pages = new StringItem { Name = "Max Pages to Process (Required)", Value = "4" };
-            ReplaceMulti = new StringItem() { Name = "Replace MULTI", Value = "MULTI.FRENCH" };
-            SecurityWarning = new DisplayItem("<b>Security Configuration</b> (<i>Read this area carefully !</i>),<br /><br /> <ul><li><b>Latency Simulation</b> will simulate human browsing with Jacket by pausing Jacket for an random time between each request, to fake a real content browsing.</li><li><b>Browser Simulation</b> will simulate a real human browser by injecting additionals headers when doing requests to tracker.</li></ul>") { Name = "Security" };
-            Latency = new BoolItem() { Name = "Latency Simulation (Optional)", Value = false };
-            Browser = new BoolItem() { Name = "Browser Simulation (Optional)", Value = true };
-            LatencyWarning = new DisplayItem("<b>Latency Configuration</b> (<i>Required if latency simulation enabled</i>),<br /><br/> <ul><li>By filling this range, <b>Jackett will make a random timed pause</b> <u>between requests</u> to tracker <u>to simulate a real browser</u>.</li><li>MilliSeconds <b>only</b></li></ul>") { Name = "Simulate Latency" };
-            LatencyStart = new StringItem { Name = "Minimum Latency (ms)", Value = "1589" };
-            LatencyEnd = new StringItem { Name = "Maximum Latency (ms)", Value = "3674" };
-            HeadersWarning = new DisplayItem("<b>Browser Headers Configuration</b> (<i>Required if browser simulation enabled</i>),<br /><br /> <ul><li>By filling these fields, <b>Jackett will inject headers</b> with your values <u>to simulate a real browser</u>.</li><li>You can get <b>your browser values</b> here: <a href='https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending' target='blank'>www.whatismybrowser.com</a></li></ul><br /><i><b>Note that</b> some headers are not necessary because they are injected automatically by this provider such as Accept_Encoding, Connection, Host or X-Requested-With</i>") { Name = "Injecting headers" };
-            HeaderAccept = new StringItem { Name = "Accept", Value = "" };
-            HeaderAcceptLang = new StringItem { Name = "Accept-Language", Value = "" };
-            HeaderDNT = new BoolItem { Name = "DNT", Value = false };
-            HeaderUpgradeInsecure = new BoolItem { Name = "Upgrade-Insecure-Requests", Value = false };
-            HeaderUserAgent = new StringItem { Name = "User-Agent", Value = "" };
-            DevWarning = new DisplayItem("<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>") { Name = "Development" };
-            DevMode = new BoolItem { Name = "Enable DEV MODE (Developers ONLY)", Value = false };
-            HardDriveCache = new BoolItem { Name = "Enable HARD DRIVE CACHE (Developers ONLY)", Value = false };
-            HardDriveCacheKeepTime = new StringItem { Name = "Keep Cached files for (ms)", Value = "300000" };
+            AuthKey = new HiddenStringConfigurationItem("AuthKey") { Value = "" };
+            TorrentPass = new HiddenStringConfigurationItem("TorrentPass") { Value = "" };
+            CredentialsWarning = new DisplayInfoConfigurationItem("Credentials", "<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>Username</b> is your account name on this tracker.</li><li><b>Password</b> is your password associated to your account name.</li></ul>");
+            Username = new StringConfigurationItem("Username") { Value = "" };
+            Password = new StringConfigurationItem("Password") { Value = "" };
+            PagesWarning = new DisplayInfoConfigurationItem("Preferences", "<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Max Pages to Process</b> let you specify how many page (max) Jackett can process when doing a search. Setting a value <b>higher than 4 is dangerous</b> for you account ! (<b>Result of too many requests to tracker...that <u>will be suspect</u></b>).</li></ul>");
+            Pages = new StringConfigurationItem("Max Pages to Process (Required)") { Value = "4" };
+            ReplaceMulti = new StringConfigurationItem("Replace MULTI") { Value = "MULTI.FRENCH" };
+            SecurityWarning = new DisplayInfoConfigurationItem("Security", "<b>Security Configuration</b> (<i>Read this area carefully !</i>),<br /><br /> <ul><li><b>Latency Simulation</b> will simulate human browsing with Jacket by pausing Jacket for an random time between each request, to fake a real content browsing.</li><li><b>Browser Simulation</b> will simulate a real human browser by injecting additionals headers when doing requests to tracker.</li></ul>");
+            Latency = new BoolConfigurationItem("Latency Simulation (Optional)") { Value = false };
+            Browser = new BoolConfigurationItem("Browser Simulation (Optional)") { Value = true };
+            LatencyWarning = new DisplayInfoConfigurationItem("Simulate Latency", "<b>Latency Configuration</b> (<i>Required if latency simulation enabled</i>),<br /><br/> <ul><li>By filling this range, <b>Jackett will make a random timed pause</b> <u>between requests</u> to tracker <u>to simulate a real browser</u>.</li><li>MilliSeconds <b>only</b></li></ul>");
+            LatencyStart = new StringConfigurationItem("Minimum Latency (ms)") { Value = "1589" };
+            LatencyEnd = new StringConfigurationItem("Maximum Latency (ms)") { Value = "3674" };
+            HeadersWarning = new DisplayInfoConfigurationItem("Injecting headers", "<b>Browser Headers Configuration</b> (<i>Required if browser simulation enabled</i>),<br /><br /> <ul><li>By filling these fields, <b>Jackett will inject headers</b> with your values <u>to simulate a real browser</u>.</li><li>You can get <b>your browser values</b> here: <a href='https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending' target='blank'>www.whatismybrowser.com</a></li></ul><br /><i><b>Note that</b> some headers are not necessary because they are injected automatically by this provider such as Accept_Encoding, Connection, Host or X-Requested-With</i>");
+            HeaderAccept = new StringConfigurationItem("Accept") { Value = "" };
+            HeaderAcceptLang = new StringConfigurationItem("Accept-Language") { Value = "" };
+            HeaderDNT = new BoolConfigurationItem("DNT") { Value = false };
+            HeaderUpgradeInsecure = new BoolConfigurationItem("Upgrade-Insecure-Requests") { Value = false };
+            HeaderUserAgent = new StringConfigurationItem("User-Agent") { Value = "" };
+            DevWarning = new DisplayInfoConfigurationItem("Development", "<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>");
+            DevMode = new BoolConfigurationItem("Enable DEV MODE (Developers ONLY)") { Value = false };
+            HardDriveCache = new BoolConfigurationItem("Enable HARD DRIVE CACHE (Developers ONLY)") { Value = false };
+            HardDriveCacheKeepTime = new StringConfigurationItem("Keep Cached files for (ms)") { Value = "300000" };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniDub.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniDub.cs
index 12c51ca3b..2e9b13f29 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniDub.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniDub.cs
@@ -5,13 +5,12 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataAniDub : ConfigurationDataBasicLogin
     {
-        public BoolItem StripRussianTitle { get; private set; }
+        public BoolConfigurationItem StripRussianTitle { get; private set; }
 
         public ConfigurationDataAniDub() : base()
         {
-            StripRussianTitle = new BoolItem
+            StripRussianTitle = new BoolConfigurationItem("Strip Russian Title")
             {
-                Name = "Strip Russian Title",
                 Value = true
             };
         }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniLibria.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniLibria.cs
index 93b1fd3c8..477eb1a71 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniLibria.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAniLibria.cs
@@ -5,19 +5,17 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataAniLibria : ConfigurationData
     {
-        public StringItem ApiLink { get; private set; }
-        public StringItem StaticLink { get; private set; }
+        public StringConfigurationItem ApiLink { get; private set; }
+        public StringConfigurationItem StaticLink { get; private set; }
 
         public ConfigurationDataAniLibria() : base()
         {
-            ApiLink = new StringItem
+            ApiLink = new StringConfigurationItem("API Url")
             {
-                Name = "API Url",
                 Value = "https://api.anilibria.tv/v2/"
             };
-            StaticLink = new StringItem
+            StaticLink = new StringConfigurationItem("Static Url")
             {
-                Name = "Static Url",
                 Value = "https://static.anilibria.tv/"
             };
         }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
index d7236eda2..0fcb80195 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs
@@ -5,25 +5,25 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataAnimeBytes : ConfigurationDataUserPasskey
     {
-        public BoolItem IncludeRaw { get; private set; }
+        public BoolConfigurationItem IncludeRaw { get; private set; }
         //public DisplayItem DateWarning { get; private set; }
-        public BoolItem PadEpisode { get; private set; }
-        public BoolItem AddJapaneseTitle { get; private set; }
-        public BoolItem AddRomajiTitle { get; private set; }
-        public BoolItem AddAlternativeTitles { get; private set; }
-        public BoolItem FilterSeasonEpisode { get; private set; }
+        public BoolConfigurationItem PadEpisode { get; private set; }
+        public BoolConfigurationItem AddJapaneseTitle { get; private set; }
+        public BoolConfigurationItem AddRomajiTitle { get; private set; }
+        public BoolConfigurationItem AddAlternativeTitles { get; private set; }
+        public BoolConfigurationItem FilterSeasonEpisode { get; private set; }
 
         public ConfigurationDataAnimeBytes(string instructionMessageOptional = null)
             : base()
         {
-            IncludeRaw = new BoolItem() { Name = "IncludeRaw", Value = false };
+            IncludeRaw = new BoolConfigurationItem("IncludeRaw") { Value = false };
             //DateWarning = new DisplayItem("This tracker does not supply upload dates so they are based off year of release.") { Name = "DateWarning" };
-            PadEpisode = new BoolItem() { Name = "Pad episode number for Sonarr compatability", Value = false };
-            AddJapaneseTitle = new BoolItem() { Name = "Add releases for Japanese Title", Value = false };
-            AddRomajiTitle = new BoolItem() { Name = "Add releases for Romaji Title", Value = false };
-            AddAlternativeTitles = new BoolItem() { Name = "Add releases for Alternative Title(s)", Value = false };
-            FilterSeasonEpisode = new BoolItem() { Name = "Filter results by season/episode", Value = false };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            PadEpisode = new BoolConfigurationItem("Pad episode number for Sonarr compatability") { Value = false };
+            AddJapaneseTitle = new BoolConfigurationItem("Add releases for Japanese Title") { Value = false };
+            AddRomajiTitle = new BoolConfigurationItem("Add releases for Romaji Title") { Value = false };
+            AddAlternativeTitles = new BoolConfigurationItem("Add releases for Alternative Title(s)") { Value = false };
+            FilterSeasonEpisode = new BoolConfigurationItem("Filter results by season/episode") { Value = false };
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataBakaBT.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataBakaBT.cs
index d7c98a267..8134dc522 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataBakaBT.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataBakaBT.cs
@@ -5,14 +5,14 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataBakaBT : ConfigurationDataBasicLogin
     {
-        public BoolItem AddRomajiTitle { get; private set; }
-        public BoolItem AppendSeason { get; private set; }
+        public BoolConfigurationItem AddRomajiTitle { get; private set; }
+        public BoolConfigurationItem AppendSeason { get; private set; }
 
         public ConfigurationDataBakaBT(string instructionMessageOptional = null)
             : base(instructionMessageOptional)
         {
-            AddRomajiTitle = new BoolItem() { Name = "Add releases for Romaji Title", Value = true };
-            AppendSeason = new BoolItem() { Name = "Append Season for Sonarr Compatibility", Value = false };
+            AddRomajiTitle = new BoolConfigurationItem("Add releases for Romaji Title") { Value = true };
+            AppendSeason = new BoolConfigurationItem("Append Season for Sonarr Compatibility") { Value = false };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
index ede16eb74..2ff5d16b8 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataEliteTracker.cs
@@ -5,19 +5,19 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataEliteTracker : ConfigurationDataBasicLogin
     {
-        public BoolItem TorrentHTTPSMode { get; }
+        public BoolConfigurationItem TorrentHTTPSMode { get; }
         // ReSharper disable once MemberCanBePrivate.Global
         // ReSharper disable once UnusedAutoPropertyAccessor.Global
-        public DisplayItem PagesWarning { get; }
-        public StringItem ReplaceMulti { get; }
-        public BoolItem Vostfr { get; }
+        public DisplayInfoConfigurationItem PagesWarning { get; }
+        public StringConfigurationItem ReplaceMulti { get; }
+        public BoolConfigurationItem Vostfr { get; }
 
         public ConfigurationDataEliteTracker()
         {
-            TorrentHTTPSMode = new BoolItem { Name = "Use HTTPS for tracker URL", Value = false };
-            PagesWarning = new DisplayItem("<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Replace VOSTFR with ENGLISH</b> lets you change the titles by replacing VOSTFR with ENGLISH.</li></ul>") { Name = "Preferences" };
-            ReplaceMulti = new StringItem { Name = "Replace MULTI", Value = "MULTI.FRENCH" };
-            Vostfr = new BoolItem { Name = "Replace VOSTFR with ENGLISH", Value = false };
+            TorrentHTTPSMode = new BoolConfigurationItem("Use HTTPS for tracker URL") { Value = false };
+            PagesWarning = new DisplayInfoConfigurationItem("Preferences", "<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Replace VOSTFR with ENGLISH</b> lets you change the titles by replacing VOSTFR with ENGLISH.</li></ul>");
+            ReplaceMulti = new StringConfigurationItem("Replace MULTI") { Value = "MULTI.FRENCH" };
+            Vostfr = new BoolConfigurationItem("Replace VOSTFR with ENGLISH") { Value = false };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
index 04a4f01f3..ead527458 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs
@@ -5,14 +5,14 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataFileList : ConfigurationDataUserPasskey
     {
-        public BoolItem IncludeRomanianReleases { get; private set; }
-        public DisplayItem CatWarning { get; private set; }
+        public BoolConfigurationItem IncludeRomanianReleases { get; private set; }
+        public DisplayInfoConfigurationItem CatWarning { get; private set; }
 
         public ConfigurationDataFileList()
             : base("Note this is <b>not</b> your <i>password</i>.<ul><li>Login to the FileList Website</li><li>Click on the <b>Profile</b> link</li><li>Scroll down to the <b>Reset Passkey</b> section</li><li>Copy the <b>passkey</b>.</li><li>Also be aware of not leaving a trailing blank at the end of the passkey after pasting it here.</li></ul>")
         {
-            IncludeRomanianReleases = new BoolItem {Name = "IncludeRomanianReleases", Value = false};
-            CatWarning = new DisplayItem("When mapping TV ensure you add category 5000 in addition to 5030, 5040.") {Name = "CatWarning"};
+            IncludeRomanianReleases = new BoolConfigurationItem("IncludeRomanianReleases") { Value = false};
+            CatWarning = new DisplayInfoConfigurationItem("CatWarning", "When mapping TV ensure you add category 5000 in addition to 5030, 5040.");
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataGazelleTracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataGazelleTracker.cs
index 4bb067965..73563ac2c 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataGazelleTracker.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataGazelleTracker.cs
@@ -5,28 +5,28 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataGazelleTracker : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public StringItem ApiKey { get; private set; }
-        public DisplayItem CookieHint { get; private set; }
-        public StringItem CookieItem { get; private set; }
-        public BoolItem UseTokenItem { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public PasswordConfigurationItem Password { get; private set; }
+        public StringConfigurationItem ApiKey { get; private set; }
+        public DisplayInfoConfigurationItem CookieHint { get; private set; }
+        public StringConfigurationItem CookieItem { get; private set; }
+        public BoolConfigurationItem UseTokenItem { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataGazelleTracker(bool has2Fa = false, bool supportsFreeleechToken = false,
                                                bool useApiKey = false, string instructionMessageOptional = null)
         {
             if (useApiKey)
-                ApiKey = new StringItem { Name = "APIKey" };
+                ApiKey = new StringConfigurationItem("APIKey");
             else
             {
-                Username = new StringItem { Name = "Username" };
-                Password = new StringItem { Name = "Password" };
+                Username = new StringConfigurationItem("Username");
+                Password = new PasswordConfigurationItem("Password");
             }
 
             if (has2Fa)
             {
-                CookieHint = new DisplayItem(
+                CookieHint = new DisplayInfoConfigurationItem("CookieHint",
                     @"Use the Cookie field only if 2FA is enabled for your account, let it empty otherwise.
 <ol><li>Login to this tracker with your browser
 <li>Open the <b>DevTools</b> panel by pressing <b>F12</b>
@@ -35,18 +35,14 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
 <li>Refresh the page by pressing <b>F5</b>
 <li>Select the <b>Headers</b> tab
 <li>Find 'cookie:' in the <b>Request Headers</b> section
-<li>Copy & paste the whole cookie string to here.</ol>")
-                {
-                    Name = "CookieHint"
-                };
-                CookieItem = new StringItem { Name = "Cookie", Value = "" };
+<li>Copy & paste the whole cookie string to here.</ol>");
+                CookieItem = new StringConfigurationItem("Cookie") { Value = "" };
             }
 
             if (supportsFreeleechToken)
-                UseTokenItem = new BoolItem { Name = "Use Freeleech Tokens when Available", Value = false };
+                UseTokenItem = new BoolConfigurationItem("Use Freeleech Tokens when Available") { Value = false };
 
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
-
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataHDBitsApi.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataHDBitsApi.cs
index f65c89a63..3b037c58c 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataHDBitsApi.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataHDBitsApi.cs
@@ -6,13 +6,13 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataHDBitsApi : ConfigurationDataUserPasskey
     {
-        public CheckboxItem Codecs { get; private set; }
-        public CheckboxItem Mediums { get; private set; }
-        public CheckboxItem Origins { get; private set; }
+        public MultiSelectConfigurationItem Codecs { get; private set; }
+        public MultiSelectConfigurationItem Mediums { get; private set; }
+        public MultiSelectConfigurationItem Origins { get; private set; }
 
         public ConfigurationDataHDBitsApi()
         {
-            Codecs = new CheckboxItem(new Dictionary<string, string>()
+            Codecs = new MultiSelectConfigurationItem("Codec", new Dictionary<string, string>()
                 {
                     {"0", "Undefined"},
                     {"1", "H.264"},
@@ -22,9 +22,9 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
                     {"6", "VP9"},
                     {"4", "XviD"}
                 })
-            { Name = "Codec", Values = new [] { "0", "1", "5", "2", "3", "6", "4" } };
+            { Values = new [] { "0", "1", "5", "2", "3", "6", "4" } };
 
-            Mediums = new CheckboxItem(new Dictionary<string, string>()
+            Mediums = new MultiSelectConfigurationItem("Medium", new Dictionary<string, string>()
                 {
                     {"0", "Undefined"},
                     {"1", "Blu-ray/HD DVD"},
@@ -33,14 +33,14 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
                     {"5", "Remux"},
                     {"6", "WEB-DL"}
                 })
-            { Name = "Medium", Values = new [] { "0", "1", "4", "3", "5", "6" } };
+            { Values = new [] { "0", "1", "4", "3", "5", "6" } };
 
-            Origins = new CheckboxItem(new Dictionary<string, string>()
+            Origins = new MultiSelectConfigurationItem("Origin", new Dictionary<string, string>()
                 {
                     {"0", "Undefined"},
                     {"1", "Internal"}
                 })
-            { Name = "Origin", Values = new [] { "0", "1" } };
+            { Values = new [] { "0", "1" } };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataMyAnonamouse.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataMyAnonamouse.cs
index 849016c10..e865d2b40 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataMyAnonamouse.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataMyAnonamouse.cs
@@ -5,21 +5,17 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataMyAnonamouse : ConfigurationData
     {
-        public StringItem MamId { get; private set; }
-        public DisplayItem MamIdHint { get; private set; }
-        public BoolItem ExcludeVip { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem MamId { get; private set; }
+        public DisplayInfoConfigurationItem MamIdHint { get; private set; }
+        public BoolConfigurationItem ExcludeVip { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataMyAnonamouse()
         {
-            MamId = new StringItem { Name = "mam_id" };
-            MamIdHint = new DisplayItem(
-            "Go to your <a href=\"https://www.myanonamouse.net/preferences/index.php?view=security\" target=\"_blank\">security preferences</a> and create a new session for the IP used by the Jackett server. Then paste the resulting mam_id value into the mam_id field here.")
-            {
-                Name = "mam_id instructions"
-            };
-            ExcludeVip = new BoolItem { Name = "Exclude VIP torrents" };
-            Instructions = new DisplayItem("For best results, change the 'Torrents per page' setting to 100 in your Profile => Torrent tab.") { Name = "" };
+            MamId = new StringConfigurationItem("mam_id");
+            MamIdHint = new DisplayInfoConfigurationItem("mam_id instructions", "Go to your <a href=\"https://www.myanonamouse.net/preferences/index.php?view=security\" target=\"_blank\">security preferences</a> and create a new session for the IP used by the Jackett server. Then paste the resulting mam_id value into the mam_id field here.");
+            ExcludeVip = new BoolConfigurationItem("Exclude VIP torrents");
+            Instructions = new DisplayInfoConfigurationItem("", "For best results, change the 'Torrents per page' setting to 100 in your Profile => Torrent tab.");
         }
     }
 
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
index ceef7e3be..25454badc 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs
@@ -7,19 +7,19 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataNCore : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public StringItem TwoFactor { get; private set; }
-        public BoolItem Hungarian { get; set; }
-        public BoolItem English { get; set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public StringConfigurationItem TwoFactor { get; private set; }
+        public BoolConfigurationItem Hungarian { get; set; }
+        public BoolConfigurationItem English { get; set; }
 
         public ConfigurationDataNCore()
         {
-            Username = new StringItem { Name = "Username", Value = "" };
-            Password = new StringItem { Name = "Password", Value = "" };
-            TwoFactor = new StringItem { Name = "Twofactor", Value = "" };
-            Hungarian = new BoolItem { Name = "Hungarian", Value = true };
-            English = new BoolItem { Name = "English", Value = true };
+            Username = new StringConfigurationItem("Username") { Value = "" };
+            Password = new StringConfigurationItem("Password") { Value = "" };
+            TwoFactor = new StringConfigurationItem("Twofactor") { Value = "" };
+            Hungarian = new BoolConfigurationItem("Hungarian") { Value = true };
+            English = new BoolConfigurationItem("English") { Value = true };
         }
 
         public ConfigurationDataNCore(JToken json)
@@ -33,19 +33,19 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
                 switch (propertyName)
                 {
                     case "Username":
-                        Username = new StringItem { Name = propertyName, Value = config.value };
+                        Username = new StringConfigurationItem(propertyName) { Value = config.value };
                         break;
                     case "Password":
-                        Password = new StringItem { Name = propertyName, Value = config.value };
+                        Password = new StringConfigurationItem(propertyName) { Value = config.value };
                         break;
                     case "Twofactor":
-                        TwoFactor = new StringItem { Name = propertyName, Value = config.value };
+                        TwoFactor = new StringConfigurationItem(propertyName) { Value = config.value };
                         break;
                     case "Hungarian":
-                        Hungarian = new BoolItem { Name = propertyName, Value = config.value };
+                        Hungarian = new BoolConfigurationItem(propertyName) { Value = config.value };
                         break;
                     case "English":
-                        English = new BoolItem { Name = propertyName, Value = config.value };
+                        English = new BoolConfigurationItem(propertyName) { Value = config.value };
                         break;
                     default:
                         break;
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs
index b135565a7..17dfe0467 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs
@@ -5,53 +5,53 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataNorbits : ConfigurationData
     {
-        public DisplayItem CredentialsWarning { get; private set; }
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public DisplayItem PagesWarning { get; private set; }
-        public StringItem Pages { get; private set; }
-        public BoolItem UseFullSearch { get; private set; }
-        public DisplayItem SecurityWarning { get; private set; }
-        public BoolItem Latency { get; private set; }
-        public BoolItem Browser { get; private set; }
-        public DisplayItem LatencyWarning { get; private set; }
-        public StringItem LatencyStart { get; private set; }
-        public StringItem LatencyEnd { get; private set; }
-        public DisplayItem HeadersWarning { get; private set; }
-        public StringItem HeaderAccept { get; private set; }
-        public StringItem HeaderAcceptLang { get; private set; }
-        public BoolItem HeaderDnt { get; private set; }
-        public BoolItem HeaderUpgradeInsecure { get; private set; }
-        public StringItem HeaderUserAgent { get; private set; }
-        public DisplayItem DevWarning { get; private set; }
-        public BoolItem DevMode { get; private set; }
-        public BoolItem HardDriveCache { get; private set; }
-        public StringItem HardDriveCacheKeepTime { get; private set; }
+        public DisplayInfoConfigurationItem CredentialsWarning { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public DisplayInfoConfigurationItem PagesWarning { get; private set; }
+        public StringConfigurationItem Pages { get; private set; }
+        public BoolConfigurationItem UseFullSearch { get; private set; }
+        public DisplayInfoConfigurationItem SecurityWarning { get; private set; }
+        public BoolConfigurationItem Latency { get; private set; }
+        public BoolConfigurationItem Browser { get; private set; }
+        public DisplayInfoConfigurationItem LatencyWarning { get; private set; }
+        public StringConfigurationItem LatencyStart { get; private set; }
+        public StringConfigurationItem LatencyEnd { get; private set; }
+        public DisplayInfoConfigurationItem HeadersWarning { get; private set; }
+        public StringConfigurationItem HeaderAccept { get; private set; }
+        public StringConfigurationItem HeaderAcceptLang { get; private set; }
+        public BoolConfigurationItem HeaderDnt { get; private set; }
+        public BoolConfigurationItem HeaderUpgradeInsecure { get; private set; }
+        public StringConfigurationItem HeaderUserAgent { get; private set; }
+        public DisplayInfoConfigurationItem DevWarning { get; private set; }
+        public BoolConfigurationItem DevMode { get; private set; }
+        public BoolConfigurationItem HardDriveCache { get; private set; }
+        public StringConfigurationItem HardDriveCacheKeepTime { get; private set; }
 
         public ConfigurationDataNorbits()
         {
-            CredentialsWarning = new DisplayItem("<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>Username</b> is your account name on this tracker.</li><li><b>Password</b> is your password associated to your account name.</li></ul>") { Name = "Credentials" };
-            Username = new StringItem { Name = "Username", Value = "" };
-            Password = new StringItem { Name = "Password", Value = "" };
-            PagesWarning = new DisplayItem("<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Max Pages to Process</b> let you specify how many page (max) Jackett can process when doing a search. Setting a value <b>higher than 4 is dangerous</b> for you account ! (<b>Result of too many requests to tracker...that <u>will be suspect</u></b>).</li></ul>") { Name = "Preferences" };
-            Pages = new StringItem { Name = "Max Pages to Process (Required)", Value = "4" };
-            UseFullSearch = new BoolItem { Name = "Enable search in description.", Value = false };
-            SecurityWarning = new DisplayItem("<b>Security Configuration</b> (<i>Read this area carefully !</i>),<br /><br /> <ul><li><b>Latency Simulation</b> will simulate human browsing with Jacket by pausing Jacket for an random time between each request, to fake a real content browsing.</li><li><b>Browser Simulation</b> will simulate a real human browser by injecting additionals headers when doing requests to tracker.<b>You must enable it to use this provider!</b></li></ul>") { Name = "Security" };
-            Latency = new BoolItem() { Name = "Latency Simulation (Optional)", Value = false };
-            Browser = new BoolItem() { Name = "Browser Simulation (Forced)", Value = true };
-            LatencyWarning = new DisplayItem("<b>Latency Configuration</b> (<i>Required if latency simulation enabled</i>),<br /><br/> <ul><li>By filling this range, <b>Jackett will make a random timed pause</b> <u>between requests</u> to tracker <u>to simulate a real browser</u>.</li><li>MilliSeconds <b>only</b></li></ul>") { Name = "Simulate Latency" };
-            LatencyStart = new StringItem { Name = "Minimum Latency (ms)", Value = "1589" };
-            LatencyEnd = new StringItem { Name = "Maximum Latency (ms)", Value = "3674" };
-            HeadersWarning = new DisplayItem("<b>Browser Headers Configuration</b> (<i>Required if browser simulation enabled</i>),<br /><br /> <ul><li>By filling these fields, <b>Jackett will inject headers</b> with your values <u>to simulate a real browser</u>.</li><li>You can get <b>your browser values</b> here: <a href='https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending' target='blank'>www.whatismybrowser.com</a></li></ul><br /><i><b>Note that</b> some headers are not necessary because they are injected automatically by this provider such as Accept_Encoding, Connection, Host or X-Requested-With</i>") { Name = "Injecting headers" };
-            HeaderAccept = new StringItem { Name = "Accept", Value = "" };
-            HeaderAcceptLang = new StringItem { Name = "Accept-Language", Value = "" };
-            HeaderDnt = new BoolItem { Name = "DNT", Value = false };
-            HeaderUpgradeInsecure = new BoolItem { Name = "Upgrade-Insecure-Requests", Value = false };
-            HeaderUserAgent = new StringItem { Name = "User-Agent", Value = "" };
-            DevWarning = new DisplayItem("<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>") { Name = "Development" };
-            DevMode = new BoolItem { Name = "Enable DEV MODE (Developers ONLY)", Value = false };
-            HardDriveCache = new BoolItem { Name = "Enable HARD DRIVE CACHE (Developers ONLY)", Value = false };
-            HardDriveCacheKeepTime = new StringItem { Name = "Keep Cached files for (ms)", Value = "300000" };
+            CredentialsWarning = new DisplayInfoConfigurationItem("Credentials", "<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>Username</b> is your account name on this tracker.</li><li><b>Password</b> is your password associated to your account name.</li></ul>");
+            Username = new StringConfigurationItem("Username") { Value = "" };
+            Password = new StringConfigurationItem("Password") { Value = "" };
+            PagesWarning = new DisplayInfoConfigurationItem("Preferences", "<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Max Pages to Process</b> let you specify how many page (max) Jackett can process when doing a search. Setting a value <b>higher than 4 is dangerous</b> for you account ! (<b>Result of too many requests to tracker...that <u>will be suspect</u></b>).</li></ul>");
+            Pages = new StringConfigurationItem("Max Pages to Process (Required)") { Value = "4" };
+            UseFullSearch = new BoolConfigurationItem("Enable search in description.") { Value = false };
+            SecurityWarning = new DisplayInfoConfigurationItem("Security", "<b>Security Configuration</b> (<i>Read this area carefully !</i>),<br /><br /> <ul><li><b>Latency Simulation</b> will simulate human browsing with Jacket by pausing Jacket for an random time between each request, to fake a real content browsing.</li><li><b>Browser Simulation</b> will simulate a real human browser by injecting additionals headers when doing requests to tracker.<b>You must enable it to use this provider!</b></li></ul>");
+            Latency = new BoolConfigurationItem("Latency Simulation (Optional)") { Value = false };
+            Browser = new BoolConfigurationItem("Browser Simulation (Forced)") { Value = true };
+            LatencyWarning = new DisplayInfoConfigurationItem("Simulate Latency", "<b>Latency Configuration</b> (<i>Required if latency simulation enabled</i>),<br /><br/> <ul><li>By filling this range, <b>Jackett will make a random timed pause</b> <u>between requests</u> to tracker <u>to simulate a real browser</u>.</li><li>MilliSeconds <b>only</b></li></ul>");
+            LatencyStart = new StringConfigurationItem("Minimum Latency (ms)") { Value = "1589" };
+            LatencyEnd = new StringConfigurationItem("Maximum Latency (ms)") { Value = "3674" };
+            HeadersWarning = new DisplayInfoConfigurationItem("Injecting headers", "<b>Browser Headers Configuration</b> (<i>Required if browser simulation enabled</i>),<br /><br /> <ul><li>By filling these fields, <b>Jackett will inject headers</b> with your values <u>to simulate a real browser</u>.</li><li>You can get <b>your browser values</b> here: <a href='https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending' target='blank'>www.whatismybrowser.com</a></li></ul><br /><i><b>Note that</b> some headers are not necessary because they are injected automatically by this provider such as Accept_Encoding, Connection, Host or X-Requested-With</i>");
+            HeaderAccept = new StringConfigurationItem("Accept") { Value = "" };
+            HeaderAcceptLang = new StringConfigurationItem("Accept-Language") { Value = "" };
+            HeaderDnt = new BoolConfigurationItem("DNT") { Value = false };
+            HeaderUpgradeInsecure = new BoolConfigurationItem("Upgrade-Insecure-Requests") { Value = false };
+            HeaderUserAgent = new StringConfigurationItem("User-Agent") { Value = "" };
+            DevWarning = new DisplayInfoConfigurationItem("Development", "<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>");
+            DevMode = new BoolConfigurationItem("Enable DEV MODE (Developers ONLY)") { Value = false };
+            HardDriveCache = new BoolConfigurationItem("Enable HARD DRIVE CACHE (Developers ONLY)") { Value = false };
+            HardDriveCacheKeepTime = new StringConfigurationItem("Keep Cached files for (ms)") { Value = "300000" };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
index b939149e7..fe2a29c9b 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataPornolab.cs
@@ -5,9 +5,9 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataPornolab : ConfigurationDataCaptchaLogin
     {
-        public BoolItem StripRussianLetters { get; private set; }
+        public BoolConfigurationItem StripRussianLetters { get; private set; }
 
         public ConfigurationDataPornolab()
-            => StripRussianLetters = new BoolItem() { Name = "Strip Russian Letters", Value = false };
+            => StripRussianLetters = new BoolConfigurationItem("Strip Russian Letters") { Value = false };
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
index 2f0eec418..39615fd1b 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs
@@ -5,25 +5,24 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataRutracker : ConfigurationDataCaptchaLogin
     {
-        public BoolItem StripRussianLetters { get; private set; }
-        public DisplayItem MoveTagsInfo { get; private set; }
-        public BoolItem MoveFirstTagsToEndOfReleaseTitle { get; private set; }
-        public BoolItem MoveAllTagsToEndOfReleaseTitle { get; private set; }
-        public DisplayItem CaptchaWarning { get; private set; }
+        public BoolConfigurationItem StripRussianLetters { get; private set; }
+        public DisplayInfoConfigurationItem MoveTagsInfo { get; private set; }
+        public BoolConfigurationItem MoveFirstTagsToEndOfReleaseTitle { get; private set; }
+        public BoolConfigurationItem MoveAllTagsToEndOfReleaseTitle { get; private set; }
+        public DisplayInfoConfigurationItem CaptchaWarning { get; private set; }
 
         public ConfigurationDataRutracker()
             : base()
         {
-            StripRussianLetters = new BoolItem() { Name = "Strip Russian Letters", Value = true };
-            MoveTagsInfo = new DisplayItem("<b>About moving tags:</b> "+
+            StripRussianLetters = new BoolConfigurationItem("Strip Russian Letters") { Value = true };
+            MoveTagsInfo = new DisplayInfoConfigurationItem("Move Tags Info", "<b>About moving tags:</b> "+
                                             "We define a tag as a part of the release title between round or square brackets. "+
                                             "If the release title contains tags then these options will move those tags and their brackets to the end of the release title. "+
                                             "Moving only the first tags will try to detect where the actual title of the release begins, and move only the tags that are found before that point. "+
-                                            "Enabling both options will enable moving of all tags.")
-                                            { Name = "Move Tags Info" };
-            MoveFirstTagsToEndOfReleaseTitle = new BoolItem() { Name = "Move first tags to end of release title", Value = false };
-            MoveAllTagsToEndOfReleaseTitle = new BoolItem() { Name = "Move all tags to end of release title", Value = false };
-            CaptchaWarning = new DisplayItem("<b>About Captcha:</b> If the Captcha Image is missing then leave the Captcha Text empty.") { Name = "Captcha Info" };
+                                            "Enabling both options will enable moving of all tags.");
+            MoveFirstTagsToEndOfReleaseTitle = new BoolConfigurationItem("Move first tags to end of release title") { Value = false };
+            MoveAllTagsToEndOfReleaseTitle = new BoolConfigurationItem("Move all tags to end of release title") { Value = false };
+            CaptchaWarning = new DisplayInfoConfigurationItem("Captcha Info", "<b>About Captcha:</b> If the Captcha Image is missing then leave the Captcha Text empty.");
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneTime.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneTime.cs
index 83d246446..7cec2a4eb 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneTime.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneTime.cs
@@ -5,12 +5,12 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataSceneTime : ConfigurationDataCookie
     {
-        public BoolItem Freeleech { get; private set; }
+        public BoolConfigurationItem Freeleech { get; private set; }
 
         public ConfigurationDataSceneTime()
             : base("For best results, change the 'Torrents per page' setting to the maximum in your profile on the SceneTime webpage.")
         {
-            Freeleech = new BoolItem() { Name = "Freeleech Only (Optional)", Value = false };
+            Freeleech = new BoolConfigurationItem("Freeleech Only (Optional)") { Value = false };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
index a3a4c0f72..042785a95 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataTVstore.cs
@@ -7,13 +7,13 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataTVstore : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
 
         public ConfigurationDataTVstore()
         {
-            Username = new StringItem { Name = "Username", Value = "" };
-            Password = new StringItem { Name = "Password", Value = "" };
+            Username = new StringConfigurationItem("Username") { Value = "" };
+            Password = new StringConfigurationItem("Password") { Value = "" };
         }
 
         public ConfigurationDataTVstore(JToken json)
@@ -27,10 +27,10 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
                 switch (propertyName)
                 {
                     case "Username":
-                        Username = new StringItem { Name = propertyName, Value = config.value };
+                        Username = new StringConfigurationItem(propertyName) { Value = config.value };
                         break;
                     case "Password":
-                        Password = new StringItem { Name = propertyName, Value = config.value };
+                        Password = new StringConfigurationItem(propertyName) { Value = config.value };
                         break;
                     default:
                         break;
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
index 9ef961f24..66c0f1bea 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataToloka.cs
@@ -5,9 +5,9 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataToloka : ConfigurationDataBasicLogin
     {
-        public BoolItem StripCyrillicLetters { get; private set; }
+        public BoolConfigurationItem StripCyrillicLetters { get; private set; }
 
         public ConfigurationDataToloka()
-            => StripCyrillicLetters = new BoolItem() { Name = "Strip Cyrillic Letters", Value = true };
+            => StripCyrillicLetters = new BoolConfigurationItem("Strip Cyrillic Letters") { Value = true };
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
index e3d0e2d74..546277e69 100644
--- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs
@@ -5,36 +5,35 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataXthor : ConfigurationData
     {
-        public DisplayItem CredentialsWarning { get; private set; }
-        public StringItem PassKey { get; set; }
-        public DisplayItem PagesWarning { get; private set; }
-        public StringItem Accent { get; set; }
-        public BoolItem Freeleech { get; private set; }
-        public StringItem ReplaceMulti { get; private set; }
-        public BoolItem EnhancedAnime { get; private set; }
-        public DisplayItem DevWarning { get; private set; }
-        public BoolItem DevMode { get; private set; }
-        public BoolItem HardDriveCache { get; private set; }
-        public StringItem HardDriveCacheKeepTime { get; private set; }
+        public DisplayInfoConfigurationItem CredentialsWarning { get; private set; }
+        public StringConfigurationItem PassKey { get; set; }
+        public DisplayInfoConfigurationItem PagesWarning { get; private set; }
+        public StringConfigurationItem Accent { get; set; }
+        public BoolConfigurationItem Freeleech { get; private set; }
+        public StringConfigurationItem ReplaceMulti { get; private set; }
+        public BoolConfigurationItem EnhancedAnime { get; private set; }
+        public DisplayInfoConfigurationItem DevWarning { get; private set; }
+        public BoolConfigurationItem DevMode { get; private set; }
+        public BoolConfigurationItem HardDriveCache { get; private set; }
+        public StringConfigurationItem HardDriveCacheKeepTime { get; private set; }
 
-        public BoolItem Vostfr { get; private set; }
+        public BoolConfigurationItem Vostfr { get; private set; }
 
         public ConfigurationDataXthor()
             : base()
         {
-            CredentialsWarning = new DisplayItem("<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>PassKey</b> is your private key on your account</li></ul>") { Name = "Credentials" };
-            PassKey = new StringItem { Name = "PassKey", Value = "" };
-            Accent = new StringItem { Name = "Accent", Value = "" };
-            PagesWarning = new DisplayItem("<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Freeleech Only</b> let you search <u>only</u> for torrents which are marked Freeleech.</li><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Enhanced anime search</b>, Enhance sonarr compatibility with Xthor. Only effective on requests with the <u>TVAnime Torznab category</u>.</li><li><b>Accent</b> is the french accent you want. 1 for VFF (Truefrench) 2 for VFQ (FRENCH, canada). When one is selected, the other will not be searched.</li></ul>") { Name = "Preferences" };
-            Freeleech = new BoolItem() { Name = "Freeleech Only (Optional)", Value = false };
-            ReplaceMulti = new StringItem() { Name = "Replace MULTI", Value = "MULTI.FRENCH" };
-            EnhancedAnime = new BoolItem() { Name = "Enhanced anime search", Value = false };
-            DevWarning = new DisplayItem("<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>") { Name = "Development" };
-            DevMode = new BoolItem { Name = "Enable DEV MODE (Developers ONLY)", Value = false };
-            HardDriveCache = new BoolItem { Name = "Enable HARD DRIVE CACHE (Developers ONLY)", Value = false };
-            HardDriveCacheKeepTime = new StringItem { Name = "Keep Cached files for (ms)", Value = "300000" };
-            Vostfr = new BoolItem() { Name = "Replace VOSTFR or SUBFRENCH with ENGLISH", Value = false };
-
+            CredentialsWarning = new DisplayInfoConfigurationItem("Credentials", "<b>Credentials Configuration</b> (<i>Private Tracker</i>),<br /><br /> <ul><li><b>PassKey</b> is your private key on your account</li></ul>");
+            PassKey = new StringConfigurationItem("PassKey") { Value = "" };
+            Accent = new StringConfigurationItem("Accent") { Value = "" };
+            PagesWarning = new DisplayInfoConfigurationItem("Preferences", "<b>Preferences Configuration</b> (<i>Tweak your search settings</i>),<br /><br /> <ul><li><b>Freeleech Only</b> let you search <u>only</u> for torrents which are marked Freeleech.</li><li><b>Replace MULTI</b>, replace multi keyword in the resultset (leave empty  to deactivate)</li><li><b>Enhanced anime search</b>, Enhance sonarr compatibility with Xthor. Only effective on requests with the <u>TVAnime Torznab category</u>.</li><li><b>Accent</b> is the french accent you want. 1 for VFF (Truefrench) 2 for VFQ (FRENCH, canada). When one is selected, the other will not be searched.</li></ul>");
+            Freeleech = new BoolConfigurationItem("Freeleech Only (Optional)") { Value = false };
+            ReplaceMulti = new StringConfigurationItem("Replace MULTI") { Value = "MULTI.FRENCH" };
+            EnhancedAnime = new BoolConfigurationItem("Enhanced anime search") { Value = false };
+            DevWarning = new DisplayInfoConfigurationItem("Development", "<b>Development Facility</b> (<i>For Developers ONLY</i>),<br /><br /> <ul><li>By enabling development mode, <b>Jackett will bypass his cache</b> and will <u>output debug messages to console</u> instead of his log file.</li><li>By enabling Hard Drive Cache, <b>This provider</b> will <u>save each query answers from tracker</u> in temp directory, in fact this reduce drastically HTTP requests when building a provider at parsing step for example. So, <b> Jackett will search for a cached query answer on hard drive before executing query on tracker side !</b> <i>DEV MODE must be enabled to use it !</li></ul>");
+            DevMode = new BoolConfigurationItem("Enable DEV MODE (Developers ONLY)") { Value = false };
+            HardDriveCache = new BoolConfigurationItem("Enable HARD DRIVE CACHE (Developers ONLY)") { Value = false };
+            HardDriveCacheKeepTime = new StringConfigurationItem("Keep Cached files for (ms)") { Value = "300000" };
+            Vostfr = new BoolConfigurationItem("Replace VOSTFR or SUBFRENCH with ENGLISH") { Value = false };
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
index 644fdadea..afc539140 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs
@@ -10,154 +10,154 @@ namespace Jackett.Common.Models.IndexerConfig
     public class ConfigurationData
     {
         private const string PASSWORD_REPLACEMENT = "|||%%PREVJACKPASSWD%%|||";
-        protected Dictionary<string, Item> dynamics = new Dictionary<string, Item>(); // list for dynamic items
+        protected Dictionary<string, ConfigurationItem> dynamics = new Dictionary<string, ConfigurationItem>(); // list for dynamic items
 
-        public enum ItemType
-        {
-            InputString,
-            InputBool,
-            InputCheckbox,
-            InputSelect,
-            DisplayImage,
-            DisplayInfo,
-            HiddenData
-        }
-
-        public HiddenItem CookieHeader { get; private set; } = new HiddenItem { Name = "CookieHeader" };
-        public HiddenItem LastError { get; private set; } = new HiddenItem { Name = "LastError" };
-        public StringItem SiteLink { get; private set; } = new StringItem { Name = "Site Link" };
+        public HiddenStringConfigurationItem CookieHeader { get; private set; } = new HiddenStringConfigurationItem(name:"CookieHeader");
+        public HiddenStringConfigurationItem LastError { get; private set; } = new HiddenStringConfigurationItem(name:"LastError");
+        public StringConfigurationItem SiteLink { get; private set; } = new StringConfigurationItem(name:"Site Link");
 
         public ConfigurationData()
         {
 
         }
 
+        /// <summary>
+        /// Loads all JSON values into the matching properties.
+        /// </summary>
         public void LoadConfigDataValuesFromJson(JToken json, IProtectionService ps = null)
         {
             if (json == null)
                 return;
 
-            var arr = (JArray)json;
+            var jsonArray = (JArray)json;
 
-            // transistion from alternatelink to sitelink
-            var alternatelinkItem = arr.FirstOrDefault(f => f.Value<string>("id") == "alternatelink");
-            if (alternatelinkItem != null && !string.IsNullOrEmpty(alternatelinkItem.Value<string>("value")))
+            foreach (var item in GetAllConfigurationItems().Where(x => x.CanBeSavedToFile))
             {
-                //SiteLink.Value = alternatelinkItem.Value<string>("value");
-            }
-
-            foreach (var item in GetItems(forDisplay: false))
-            {
-                var arrItem = arr.FirstOrDefault(f => f.Value<string>("id") == item.ID);
-                if (arrItem == null)
+                var jsonToken = jsonArray.FirstOrDefault(f => f.Value<string>("id") == item.ID);
+                if (jsonToken == null)
                     continue;
 
-                switch (item.ItemType)
+                switch (item)
                 {
-                    case ItemType.InputString:
-                        var sItem = (StringItem)item;
-                        var newValue = arrItem.Value<string>("value");
-
-                        if (string.Equals(item.Name, "password", StringComparison.InvariantCultureIgnoreCase))
+                    case StringConfigurationItem stringItem:
+                    {
+                        if (HasPasswordValue(item))
                         {
-                            if (newValue != PASSWORD_REPLACEMENT)
+                            var pw = ReadValueAs<string>(jsonToken);
+                            if (pw != PASSWORD_REPLACEMENT)
                             {
-                                sItem.Value = newValue;
-                                if (ps != null)
-                                    sItem.Value = ps.UnProtect(newValue);
+                                stringItem.Value = ps != null ? ps.UnProtect(pw) : pw;
                             }
                         }
                         else
                         {
-                            sItem.Value = newValue;
+                            stringItem.Value = ReadValueAs<string>(jsonToken);
                         }
                         break;
-                    case ItemType.HiddenData:
-                        ((HiddenItem)item).Value = arrItem.Value<string>("value");
+                    }
+                    case HiddenStringConfigurationItem hiddenStringItem:
+                    {
+                        hiddenStringItem.Value = ReadValueAs<string>(jsonToken);
                         break;
-                    case ItemType.InputBool:
-                        ((BoolItem)item).Value = arrItem.Value<bool>("value");
+                    }
+                    case BoolConfigurationItem boolItem:
+                    {
+                        boolItem.Value = ReadValueAs<bool>(jsonToken);
                         break;
-                    case ItemType.InputCheckbox:
-                        var values = arrItem.Value<JArray>("values");
+                    }
+                    case SingleSelectConfigurationItem singleSelectItem:
+                    {
+                        singleSelectItem.Value = ReadValueAs<string>(jsonToken);
+                        break;
+                    }
+                    case MultiSelectConfigurationItem multiSelectItem:
+                    {
+                        var values = jsonToken.Value<JArray>("values");
                         if (values != null)
-                            ((CheckboxItem)item).Values = values.Values<string>().ToArray();
+                        {
+                            multiSelectItem.Values = values.Values<string>().ToArray();
+                        }
                         break;
-                    case ItemType.InputSelect:
-                        ((SelectItem)item).Value = arrItem.Value<string>("value");
+                    }
+                    case PasswordConfigurationItem passwordItem:
+                    {
+                        var pw = ReadValueAs<string>(jsonToken);
+                        if (pw != PASSWORD_REPLACEMENT)
+                        {
+                            passwordItem.Value = ps != null ? ps.UnProtect(pw) : pw;
+                        }
                         break;
+                    }
                 }
             }
         }
 
+        private T ReadValueAs<T>(JToken jToken) => jToken.Value<T>("value");
+
+        private bool HasPasswordValue(ConfigurationItem item)
+            => string.Equals(item.Name, "password", StringComparison.InvariantCultureIgnoreCase);
+
         public JToken ToJson(IProtectionService ps, bool forDisplay = true)
         {
-            var items = GetItems(forDisplay);
             var jArray = new JArray();
-            foreach (var item in items)
+
+            var configurationItems = GetConfigurationItems(forDisplay);
+            foreach (var configurationItem in configurationItems)
             {
-                var jObject = new JObject
-                {
-                    ["id"] = item.ID,
-                    ["type"] = item.ItemType.ToString().ToLower(),
-                    ["name"] = item.Name
-                };
-                switch (item.ItemType)
-                {
-                    case ItemType.InputString:
-                    case ItemType.HiddenData:
-                    case ItemType.DisplayInfo:
-                        var value = ((StringItem)item).Value;
-                        if (string.Equals(item.Name, "password", StringComparison.InvariantCultureIgnoreCase)) // if we chagne this logic we've to change the MigratedFromDPAPI() logic too, #2114 is realted
-                        {
-                            if (string.IsNullOrEmpty(value))
-                                value = string.Empty;
-                            else if (forDisplay)
-                                value = PASSWORD_REPLACEMENT;
-                            else if (ps != null)
-                                value = ps.Protect(value);
-                        }
-                        jObject["value"] = value;
-                        break;
-                    case ItemType.InputBool:
-                        jObject["value"] = ((BoolItem)item).Value;
-                        break;
-                    case ItemType.InputCheckbox:
-                        jObject["values"] = new JArray(((CheckboxItem)item).Values);
-                        jObject["options"] = new JObject();
+                JObject jObject = null;
 
-                        foreach (var option in ((CheckboxItem)item).Options)
-                        {
-                            jObject["options"][option.Key] = option.Value;
-                        }
+                switch (configurationItem)
+                {
+                    case ConfigurationItemMaybePassword maybePassword:
+                    {
+                        // Remove this code and give each derived ConfigurationItem class its own ToJson method
+                        // as soon as everyone is using PasswordConfigurationItem for passwords.
+                        jObject = maybePassword.ToJson(ps);
                         break;
-                    case ItemType.InputSelect:
-                        jObject["value"] = ((SelectItem)item).Value;
-                        jObject["options"] = new JObject();
-
-                        foreach (var option in ((SelectItem)item).Options)
-                        {
-                            jObject["options"][option.Key] = option.Value;
-                        }
+                    }
+                    case BoolConfigurationItem boolItem:
+                    {
+                        jObject = boolItem.ToJson();
                         break;
-                    case ItemType.DisplayImage:
-                        var dataUri = DataUrlUtils.BytesToDataUrl(((ImageItem)item).Value, "image/jpeg");
-                        jObject["value"] = dataUri;
+                    }
+                    case SingleSelectConfigurationItem singleSelectItem:
+                    {
+                        jObject = singleSelectItem.ToJson();
                         break;
+                    }
+                    case MultiSelectConfigurationItem multiSelectItem:
+                    {
+                        jObject = multiSelectItem.ToJson();
+                        break;
+                    }
+                    case DisplayImageConfigurationItem imageItem:
+                    {
+                        jObject = imageItem.ToJson();
+                        break;
+                    }
+                    case PasswordConfigurationItem passwordItem:
+                    {
+                        jObject = passwordItem.ToJson(forDisplay, ps);
+                        break;
+                    }
+                }
+
+                if (jObject != null)
+                {
+                    jArray.Add(jObject);
                 }
-                jArray.Add(jObject);
             }
             return jArray;
         }
 
-        private Item[] GetItems(bool forDisplay)
+        private IEnumerable<ConfigurationItem> GetAllConfigurationItems()
         {
             var properties = GetType()
                 .GetProperties()
                 .Where(p => p.CanRead)
-                .Where(p => p.PropertyType.IsSubclassOf(typeof(Item)))
+                .Where(p => p.PropertyType.IsSubclassOf(typeof(ConfigurationItem)))
                 .Where(p => p.GetValue(this) != null)
-                .Select(p => (Item)p.GetValue(this)).ToList();
+                .Select(p => (ConfigurationItem)p.GetValue(this)).ToList();
 
             // remove/insert Site Link manualy to make sure it shows up first
             properties.Remove(SiteLink);
@@ -165,105 +165,214 @@ namespace Jackett.Common.Models.IndexerConfig
 
             properties.AddRange(dynamics.Values);
 
-            if (!forDisplay)
-            {
-                properties = properties
-                    .Where(p => p.ItemType == ItemType.HiddenData || p.ItemType == ItemType.InputBool || p.ItemType == ItemType.InputString || p.ItemType == ItemType.InputCheckbox || p.ItemType == ItemType.InputSelect || p.ItemType == ItemType.DisplayInfo)
-                    .ToList();
-            }
-
-            return properties.ToArray();
+            return properties;
         }
 
-        public void AddDynamic(string ID, Item item) => dynamics[ID] = item;
+        private ConfigurationItem[] GetConfigurationItems(bool forDisplay)
+            => GetAllConfigurationItems().Where(p => forDisplay ? p.CanBeShownToUser : p.CanBeSavedToFile).ToArray();
 
-        // TODO Convert to TryGetValue to avoid throwing exception
-        public Item GetDynamic(string ID)
-        {
-            try
-            {
-                return dynamics[ID];
-            }
-            catch (KeyNotFoundException)
-            {
-                return null;
-            }
-        }
+        public void AddDynamic(string ID, ConfigurationItem item) => dynamics[ID] = item;
 
-        public Item GetDynamicByName(string Name)
+        public ConfigurationItem GetDynamic(string ID) => dynamics.TryGetValue(ID, out var value) ? value : null;
+
+        public ConfigurationItem GetDynamicByName(string Name)
             => dynamics.Values.FirstOrDefault(i => string.Equals(i.Name, Name, StringComparison.InvariantCultureIgnoreCase));
 
-        public class Item
+        public abstract class ConfigurationItem
         {
-            public ItemType ItemType { get; set; }
-            public string Name { get; set; }
             public string ID => Name.Replace(" ", "").ToLower();
-        }
+            public string Name { get; }
+            public string ItemType { get; }
 
-        public class HiddenItem : StringItem
-        {
-            public HiddenItem(string value = "")
+            public bool CanBeShownToUser { get; } = true;
+            public bool CanBeSavedToFile { get; } = true;
+
+            protected ConfigurationItem(string name, string itemType, bool canBeShownToUser = true, bool canBeSavedToFile = true)
             {
-                Value = value;
-                ItemType = ItemType.HiddenData;
+                Name = name; // TODO Error when name is null/empty/not unique/...
+                ItemType = itemType;
+                CanBeShownToUser = canBeShownToUser;
+                CanBeSavedToFile = canBeSavedToFile;
+            }
+
+            protected JObject CreateJObject()
+            {
+                return new JObject
+                {
+                    ["id"] = ID,
+                    ["type"] = ItemType.ToLower(),
+                    ["name"] = Name
+                };
             }
         }
 
-        public class DisplayItem : StringItem
+        /// <summary>
+        /// Remove this class when all passwords are configured to use the correct class: PasswordConfigurationItem.
+        /// </summary>
+        public abstract class ConfigurationItemMaybePassword : ConfigurationItem
         {
-            public DisplayItem(string value)
-            {
-                Value = value;
-                ItemType = ItemType.DisplayInfo;
-            }
-        }
-
-        public class StringItem : Item
-        {
-            public string SiteKey { get; set; }
             public string Value { get; set; }
-            public string Cookie { get; set; }
-            public StringItem() => ItemType = ItemType.InputString;
+
+            protected ConfigurationItemMaybePassword(string name, string itemType, bool canBeShownToUser = true, bool canBeSavedToFile = true)
+                : base(name, itemType, canBeShownToUser, canBeSavedToFile)
+            {
+            }
+
+            public JObject ToJson(IProtectionService protectionService = null)
+            {
+                var jObject = CreateJObject();
+
+                if (string.Equals(Name, "password", StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var password = Value;
+                    if (string.IsNullOrEmpty(password))
+                        password = string.Empty;
+                    else if (protectionService != null)
+                        password = protectionService.Protect(password);
+                    jObject["value"] = password;
+                }
+                else
+                {
+                    jObject["value"] = Value;
+                }
+                return jObject;
+            }
         }
 
-        public class BoolItem : Item
+        public class StringConfigurationItem : ConfigurationItemMaybePassword
+        {
+            public StringConfigurationItem(string name)
+                : base(name, itemType: "inputstring")
+            {
+            }
+        }
+
+        public class HiddenStringConfigurationItem : ConfigurationItemMaybePassword
+        {
+            public HiddenStringConfigurationItem(string name)
+                : base(name, itemType: "hiddendata", canBeShownToUser: false)
+            {
+            }
+        }
+
+        public class DisplayInfoConfigurationItem : ConfigurationItemMaybePassword
+        {
+            public DisplayInfoConfigurationItem(string name, string value)
+                : base(name, itemType: "displayinfo", canBeSavedToFile: false)
+            {
+                Value = value;
+            }
+        }
+
+        public class BoolConfigurationItem : ConfigurationItem
         {
             public bool Value { get; set; }
-            public BoolItem() => ItemType = ItemType.InputBool;
+
+            public BoolConfigurationItem(string name)
+                : base(name, itemType: "inputbool")
+            {
+            }
+
+            public JObject ToJson()
+            {
+                var jObject = CreateJObject();
+                jObject["value"] = Value;
+                return jObject;
+            }
         }
 
-        public class ImageItem : Item
+        public class DisplayImageConfigurationItem : ConfigurationItem
         {
             public byte[] Value { get; set; }
-            public ImageItem() => ItemType = ItemType.DisplayImage;
+
+            public DisplayImageConfigurationItem(string name)
+                : base(name, itemType: "displayimage", canBeSavedToFile: false)
+            {
+            }
+
+            public JObject ToJson()
+            {
+                var jObject = CreateJObject();
+
+                var dataUri = DataUrlUtils.BytesToDataUrl(Value, "image/jpeg");
+                jObject["value"] = dataUri;
+
+                return jObject;
+            }
         }
 
-        public class CheckboxItem : Item
+        public class SingleSelectConfigurationItem : ConfigurationItem
+        {
+            public string Value { get; set; }
+
+            public Dictionary<string, string> Options { get; }
+
+            public SingleSelectConfigurationItem(string name, Dictionary<string, string> options)
+                : base(name, itemType: "inputselect") => Options = options;
+
+            public JObject ToJson()
+            {
+                var jObject = CreateJObject();
+
+                jObject["value"] = Value;
+                jObject["options"] = new JObject();
+                foreach (var option in Options)
+                {
+                    jObject["options"][option.Key] = option.Value;
+                }
+
+                return jObject;
+            }
+        }
+
+        public class MultiSelectConfigurationItem : ConfigurationItem
         {
             public string[] Values { get; set; }
 
             public Dictionary<string, string> Options { get; }
 
-            public CheckboxItem(Dictionary<string, string> options)
+            public MultiSelectConfigurationItem(string name, Dictionary<string, string> options)
+                : base(name, itemType: "inputcheckbox") => Options = options;
+
+            public JObject ToJson()
             {
-                ItemType = ItemType.InputCheckbox;
-                Options = options;
+                var jObject = CreateJObject();
+
+                jObject["values"] = new JArray(Values);
+                jObject["options"] = new JObject();
+                foreach (var option in Options)
+                {
+                    jObject["options"][option.Key] = option.Value;
+                }
+
+                return jObject;
             }
         }
 
-        public class SelectItem : Item
+        public class PasswordConfigurationItem : ConfigurationItem
         {
             public string Value { get; set; }
 
-            public Dictionary<string, string> Options { get; }
-
-            public SelectItem(Dictionary<string, string> options)
+            public PasswordConfigurationItem(string name)
+                : base(name, itemType: "password")
             {
-                ItemType = ItemType.InputSelect;
-                Options = options;
+            }
+
+            public JObject ToJson(bool forDisplay, IProtectionService protectionService = null)
+            {
+                var jObject = CreateJObject();
+
+                var password = Value;
+                if (string.IsNullOrEmpty(password))
+                    password = string.Empty;
+                else if (forDisplay)
+                    password = PASSWORD_REPLACEMENT;
+                else if (protectionService != null)
+                    password = protectionService.Protect(password);
+                jObject["value"] = password;
+
+                return jObject;
             }
         }
-
-        //public abstract Item[] GetItems();
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs
index b5a5452dd..c9cb3634c 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs
@@ -2,8 +2,8 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataAPIKey : ConfigurationData
     {
-        public StringItem Key { get; private set; }
+        public StringConfigurationItem Key { get; private set; }
 
-        public ConfigurationDataAPIKey() => Key = new StringItem { Name = "APIKey", Value = string.Empty };
+        public ConfigurationDataAPIKey() => Key = new StringConfigurationItem("APIKey") { Value = string.Empty };
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPILoginWithUserAndPasskeyAndFilter.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPILoginWithUserAndPasskeyAndFilter.cs
index 2a79cb455..c9d314689 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPILoginWithUserAndPasskeyAndFilter.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPILoginWithUserAndPasskeyAndFilter.cs
@@ -2,26 +2,20 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataAPILoginWithUserAndPasskeyAndFilter : ConfigurationData
     {
-        public DisplayItem KeyHint { get; private set; }
-        public StringItem User { get; private set; }
-        public StringItem Key { get; private set; }
-        public DisplayItem FilterExample { get; private set; }
-        public StringItem FilterString { get; private set; }
+        public DisplayInfoConfigurationItem KeyHint { get; private set; }
+        public StringConfigurationItem User { get; private set; }
+        public StringConfigurationItem Key { get; private set; }
+        public DisplayInfoConfigurationItem FilterExample { get; private set; }
+        public StringConfigurationItem FilterString { get; private set; }
 
         public ConfigurationDataAPILoginWithUserAndPasskeyAndFilter(string FilterInstructions)
         {
-            KeyHint = new DisplayItem("<ul><li>Visit the security tab on your user settings page to access your ApiUser and ApiKey <li>If you haven't yet generated a key, you may have to first generate one using the checkbox below your keys</ul>")
-            {
-                Name = "API Authentication"
-            };
-            User = new StringItem { Name = "ApiUser", Value = string.Empty };
-            Key = new StringItem { Name = "ApiKey", Value = string.Empty };
+            KeyHint = new DisplayInfoConfigurationItem("API Authentication", "<ul><li>Visit the security tab on your user settings page to access your ApiUser and ApiKey <li>If you haven't yet generated a key, you may have to first generate one using the checkbox below your keys</ul>");
+            User = new StringConfigurationItem("ApiUser") { Value = string.Empty };
+            Key = new StringConfigurationItem("ApiKey") { Value = string.Empty };
 
-            FilterExample = new DisplayItem(FilterInstructions)
-            {
-                Name = ""
-            };
-            FilterString = new StringItem { Name = "Filters (optional)" };
+            FilterExample = new DisplayInfoConfigurationItem("", FilterInstructions);
+            FilterString = new StringConfigurationItem("Filters (optional)");
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs
index 41d44c2f4..eb9d9fb34 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs
@@ -2,17 +2,15 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLogin : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataBasicLogin(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
-
-
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWith2FA.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWith2FA.cs
index debcf9913..b91ea3e2a 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWith2FA.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWith2FA.cs
@@ -2,17 +2,17 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWith2FA : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public StringItem TwoFactorAuth { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public StringConfigurationItem TwoFactorAuth { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataBasicLoginWith2FA(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            TwoFactorAuth = new StringItem { Name = "Two-Factor Auth" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            TwoFactorAuth = new StringConfigurationItem("Two-Factor Auth");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs
index 10de1bac4..3c48dcfaa 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithEmail.cs
@@ -2,17 +2,15 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWithEmail : ConfigurationData
     {
-        public StringItem Email { get; private set; }
-        public StringItem Password { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Email { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataBasicLoginWithEmail(string instructionMessageOptional = null)
         {
-            Email = new StringItem { Name = "Email" };
-            Password = new StringItem { Name = "Password" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Email = new StringConfigurationItem("Email");
+            Password = new StringConfigurationItem("Password");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
-
-
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs
index fb72da57f..2fe6eb576 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs
@@ -2,24 +2,19 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWithFilter : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public HiddenItem LastLoggedInCheck { get; private set; }
-        public DisplayItem FilterExample { get; private set; }
-        public StringItem FilterString { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public HiddenStringConfigurationItem LastLoggedInCheck { get; private set; }
+        public DisplayInfoConfigurationItem FilterExample { get; private set; }
+        public StringConfigurationItem FilterString { get; private set; }
 
         public ConfigurationDataBasicLoginWithFilter(string FilterInstructions)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            LastLoggedInCheck = new HiddenItem { Name = "LastLoggedInCheck" };
-            FilterExample = new DisplayItem(FilterInstructions)
-            {
-                Name = ""
-            };
-            FilterString = new StringItem { Name = "Filters (optional)" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            LastLoggedInCheck = new HiddenStringConfigurationItem("LastLoggedInCheck");
+            FilterExample = new DisplayInfoConfigurationItem("", FilterInstructions);
+            FilterString = new StringConfigurationItem("Filters (optional)");
         }
-
-
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithPID.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithPID.cs
index e5c878a0a..d605990b9 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithPID.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithPID.cs
@@ -2,17 +2,17 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWithPID : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public StringItem Pid { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public StringConfigurationItem Pid { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataBasicLoginWithPID(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            Pid = new StringItem { Name = "Pid" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            Pid = new StringConfigurationItem("Pid");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs
index 681998dc0..90450f71f 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs
@@ -2,15 +2,15 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWithRSS : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public HiddenItem RSSKey { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public HiddenStringConfigurationItem RSSKey { get; private set; }
 
         public ConfigurationDataBasicLoginWithRSS()
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            RSSKey = new HiddenItem { Name = "RSSKey" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            RSSKey = new HiddenStringConfigurationItem("RSSKey");
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs
index d80eed06b..5cb0e5bb4 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs
@@ -2,17 +2,17 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataBasicLoginWithRSSAndDisplay : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Password { get; private set; }
-        public HiddenItem RSSKey { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
+        public HiddenStringConfigurationItem RSSKey { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataBasicLoginWithRSSAndDisplay(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            RSSKey = new HiddenItem { Name = "RSSKey" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            RSSKey = new HiddenStringConfigurationItem("RSSKey");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
index 1f71840f5..e0384e91e 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs
@@ -2,27 +2,27 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     internal class ConfigurationDataCaptchaLogin : ConfigurationData
     {
-        public StringItem Username { get; private set; }
+        public StringConfigurationItem Username { get; private set; }
 
-        public StringItem Password { get; private set; }
+        public StringConfigurationItem Password { get; private set; }
 
-        public ImageItem CaptchaImage { get; private set; }
+        public DisplayImageConfigurationItem CaptchaImage { get; private set; }
 
-        public StringItem CaptchaText { get; private set; }
+        public StringConfigurationItem CaptchaText { get; private set; }
 
-        public HiddenItem CaptchaCookie { get; private set; }
+        public HiddenStringConfigurationItem CaptchaCookie { get; private set; }
 
-        public DisplayItem Instructions { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         /// <param name="instructionMessageOptional">Enter any instructions the user will need to setup the tracker</param>
         public ConfigurationDataCaptchaLogin(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Password = new StringItem { Name = "Password" };
-            CaptchaImage = new ImageItem { Name = "Captcha Image" };
-            CaptchaText = new StringItem { Name = "Captcha Text" };
-            CaptchaCookie = new HiddenItem("") { Name = "Captcha Cookie" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Password = new StringConfigurationItem("Password");
+            CaptchaImage = new DisplayImageConfigurationItem("Captcha Image");
+            CaptchaText = new StringConfigurationItem("Captcha Text");
+            CaptchaCookie = new HiddenStringConfigurationItem("Captcha Cookie");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs
index f974a808e..c28a4341d 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs
@@ -1,23 +1,18 @@
 namespace Jackett.Common.Models.IndexerConfig
 {
-
     public class ConfigurationDataCookie : ConfigurationData
     {
-        public StringItem Cookie { get; private set; }
-        public DisplayItem CookieInstructions { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Cookie { get; private set; }
+        public DisplayInfoConfigurationItem CookieInstructions { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataCookie(string instructionMessageOptional = null)
         {
-            Cookie = new StringItem { Name = "Cookie" };
-            CookieInstructions = new DisplayItem(
+            Cookie = new StringConfigurationItem("Cookie");
+            CookieInstructions = new DisplayInfoConfigurationItem("Cookie Instructions", 
             "Please enter the cookie for the site manually. <a href=\"https://github.com/Jackett/Jackett/wiki/Finding-cookies\" target=\"_blank\">See here</a> on how get the cookies." +
-            "<br>Example cookie header (usually longer than this):<br><code>PHPSESSID=8rk27odm; ipsconnect_63ad9c=1; more_stuff=etc;</code>")
-            {
-                Name = "Cookie Instructions"
-            };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            "<br>Example cookie header (usually longer than this):<br><code>PHPSESSID=8rk27odm; ipsconnect_63ad9c=1; more_stuff=etc;</code>");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
-
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPasskey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPasskey.cs
index f76b1ca78..a3e63de05 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPasskey.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPasskey.cs
@@ -2,13 +2,13 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataPasskey : ConfigurationData
     {
-        public StringItem Passkey { get; private set; }
-        public DisplayItem Instructions { get; private set; }
+        public StringConfigurationItem Passkey { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; private set; }
 
         public ConfigurationDataPasskey(string instructionMessageOptional = null)
         {
-            Passkey = new StringItem { Name = "Passkey" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Passkey = new StringConfigurationItem("Passkey");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
index 693c8c159..10b6a735d 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs
@@ -2,10 +2,10 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     internal class ConfigurationDataPinNumber : ConfigurationDataBasicLogin
     {
-        public StringItem Pin { get; private set; }
+        public StringConfigurationItem Pin { get; private set; }
 
         public ConfigurationDataPinNumber(string instructionMessageOptional = null)
             : base(instructionMessageOptional)
-            => Pin = new StringItem { Name = "Login Pin Number" };
+            => Pin = new StringConfigurationItem("Login Pin Number");
     }
 }
diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs
index 43763b0d7..863483652 100644
--- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs
+++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs
@@ -2,15 +2,15 @@ namespace Jackett.Common.Models.IndexerConfig
 {
     public class ConfigurationDataUserPasskey : ConfigurationData
     {
-        public StringItem Username { get; private set; }
-        public StringItem Passkey { get; private set; }
-        public DisplayItem Instructions { get; protected set; }
+        public StringConfigurationItem Username { get; private set; }
+        public StringConfigurationItem Passkey { get; private set; }
+        public DisplayInfoConfigurationItem Instructions { get; protected set; }
 
         public ConfigurationDataUserPasskey(string instructionMessageOptional = null)
         {
-            Username = new StringItem { Name = "Username" };
-            Passkey = new StringItem { Name = "Passkey" };
-            Instructions = new DisplayItem(instructionMessageOptional) { Name = "" };
+            Username = new StringConfigurationItem("Username");
+            Passkey = new StringConfigurationItem("Passkey");
+            Instructions = new DisplayInfoConfigurationItem("", instructionMessageOptional);
         }
     }
 }