diff --git a/daemon/extension/Extension.cpp b/daemon/extension/Extension.cpp
index e6ab2bbda..a70982e9c 100644
--- a/daemon/extension/Extension.cpp
+++ b/daemon/extension/Extension.cpp
@@ -256,6 +256,9 @@ namespace Extension
 
 			optionJson["Name"] = option.name;
 			optionJson["DisplayName"] = option.displayName;
+			optionJson["Section"] = option.section.name;
+			optionJson["Multi"] = option.section.multi;
+			optionJson["Prefix"] = option.section.prefix;
 
 			if (const std::string* val = boost::variant2::get_if<std::string>(&option.value))
 			{
@@ -296,7 +299,9 @@ namespace Extension
 			commandJson["Name"] = command.name;
 			commandJson["DisplayName"] = command.displayName;
 			commandJson["Action"] = command.action;
-
+			commandJson["Section"] = command.section.name;
+			commandJson["Multi"] = command.section.multi;
+			commandJson["Prefix"] = command.section.prefix;
 
 			for (const auto& line : command.description)
 			{
@@ -358,6 +363,9 @@ namespace Extension
 			AddNewNode(commandsNode, "Name", "string", command.name.c_str());
 			AddNewNode(commandsNode, "DisplayName", "string", command.displayName.c_str());
 			AddNewNode(commandsNode, "Action", "string", command.action.c_str());
+			AddNewNode(commandsNode, "Multi", "boolean", BoolToStr(command.section.multi));
+			AddNewNode(commandsNode, "Section", "string", command.section.name.c_str());
+			AddNewNode(commandsNode, "Prefix", "string", command.section.prefix.c_str());
 
 			xmlNodePtr descriptionNode = xmlNewNode(NULL, BAD_CAST "Description");
 			for (const std::string& line : command.description)
@@ -372,6 +380,9 @@ namespace Extension
 		{
 			AddNewNode(optionsNode, "Name", "string", option.name.c_str());
 			AddNewNode(optionsNode, "DisplayName", "string", option.displayName.c_str());
+			AddNewNode(optionsNode, "Multi", "boolean", BoolToStr(option.section.multi));
+			AddNewNode(optionsNode, "Section", "string", option.section.name.c_str());
+			AddNewNode(optionsNode, "Prefix", "string", option.section.prefix.c_str());
 
 			if (const std::string* val = boost::variant2::get_if<std::string>(&option.value))
 			{
diff --git a/daemon/extension/Extension.h b/daemon/extension/Extension.h
index dd4f04078..195579661 100644
--- a/daemon/extension/Extension.h
+++ b/daemon/extension/Extension.h
@@ -107,8 +107,8 @@ namespace Extension
 	std::string ToJsonStr(const Script& script);
 	std::string ToXmlStr(const Script& script);
 
-	static void AddNewNode(xmlNodePtr rootNode, const char* name, const char* type, const char* value);
-	static const char* BoolToStr(bool value);
+	void AddNewNode(xmlNodePtr rootNode, const char* name, const char* type, const char* value);
+	const char* BoolToStr(bool value);
 }
 
 #endif
diff --git a/daemon/extension/ExtensionLoader.cpp b/daemon/extension/ExtensionLoader.cpp
index 5ade183f8..94b40a386 100644
--- a/daemon/extension/ExtensionLoader.cpp
+++ b/daemon/extension/ExtensionLoader.cpp
@@ -27,6 +27,7 @@
 
 namespace ExtensionLoader
 {
+	const char* DEFAULT_SECTION_NAME = "options";
 	const char* BEGIN_SCRIPT_SIGNATURE = "### NZBGET ";
 	const char* BEGIN_SCRIPT_COMMANDS_AND_OTPIONS = "### OPTIONS";
 	const char* POST_SCRIPT_SIGNATURE = "POST-PROCESSING";
@@ -83,10 +84,12 @@ namespace ExtensionLoader
 				{
 					continue;
 				}
+
 				if (!inBeforeConfig && !strncmp(line.c_str(), DEFINITION_SIGNATURE, DEFINITION_SIGNATURE_LEN))
 				{
 					inBeforeConfig = true;
 				}
+
 				if (!inBeforeConfig && !inConfig)
 				{
 					continue;
@@ -149,6 +152,7 @@ namespace ExtensionLoader
 					continue;
 				}
 
+				// if "OPTIONS" and other sections, e.g.: ### OPTIONS or ### CATEGORIES
 				if (!strncmp(line.c_str(), BEGIN_SCRIPT_COMMANDS_AND_OTPIONS, BEGIN_SCRIPT_COMMANDS_AND_OTPIONS_LEN))
 				{
 					ParseOptionsAndCommands(file, options, commands);
@@ -209,6 +213,7 @@ namespace ExtensionLoader
 		{
 			std::vector<ManifestFile::SelectOption> selectOpts;
 			std::vector<std::string> description;
+			std::string currSectionName = DEFAULT_SECTION_NAME;
 
 			std::string line;
 			while (std::getline(file, line))
@@ -223,6 +228,13 @@ namespace ExtensionLoader
 					continue;
 				}
 
+				if (!strncmp(line.c_str(), DEFINITION_SIGNATURE, DEFINITION_SIGNATURE_LEN))
+				{
+					currSectionName = line.substr(DEFINITION_SIGNATURE_LEN + 1);
+					RemoveTailAndTrim(currSectionName, "###");
+					continue;
+				}
+
 				size_t selectStartIdx = line.rfind("(");
 				size_t selectEndIdx = line.rfind(")");
 				bool hasSelectOptions = description.empty()
@@ -274,15 +286,11 @@ namespace ExtensionLoader
 
 					if (atPos != std::string::npos && eqPos == std::string::npos)
 					{
-						ManifestFile::Command command;
-						std::string name = line.substr(1, atPos - 1);
-						std::string action = line.substr(atPos + 1);
-						Util::Trim(action);
-						Util::Trim(name);
-						command.action = std::move(action);
-						command.name = std::move(name);
+						ManifestFile::Command command{};
+						command.action = line.substr(atPos + 1);
+						Util::Trim(command.action);
+						ParseSectionAndSet<ManifestFile::Command>(command, currSectionName, line, atPos);
 						command.description = std::move(description);
-						command.displayName = command.name;
 						commands.push_back(std::move(command));
 						description.clear();
 						selectOpts.clear();
@@ -291,17 +299,14 @@ namespace ExtensionLoader
 
 					if (eqPos != std::string::npos)
 					{
-						ManifestFile::Option option;
-						std::string name = line.substr(1, eqPos - 1);
+						ManifestFile::Option option{};
+						ParseSectionAndSet<ManifestFile::Option>(option, currSectionName, line, eqPos);
+						bool canBeNum = !selectOpts.empty() && boost::variant2::get_if<double>(&selectOpts[0]);
 						std::string value = line.substr(eqPos + 1);
 						Util::Trim(value);
-						Util::Trim(name);
-						bool canBeNum = !selectOpts.empty() && boost::variant2::get_if<double>(&selectOpts[0]);
-						option.value = std::move(GetSelectOpt(value, canBeNum));
-						option.name = std::move(name);
+						option.value = GetSelectOpt(value, canBeNum);
 						option.description = std::move(description);
 						option.select = std::move(selectOpts);
-						option.displayName = option.name;
 						options.push_back(std::move(option));
 						description.clear();
 						selectOpts.clear();
@@ -421,7 +426,7 @@ namespace ExtensionLoader
 
 	bool V2::Load(Extension::Script& script, const char* location, const char* rootDir)
 	{
-		ManifestFile::Manifest manifest;
+		ManifestFile::Manifest manifest{};
 		if (!ManifestFile::Load(manifest, location))
 			return false;
 
diff --git a/daemon/extension/ExtensionLoader.h b/daemon/extension/ExtensionLoader.h
index 916e8c626..07c5612d7 100644
--- a/daemon/extension/ExtensionLoader.h
+++ b/daemon/extension/ExtensionLoader.h
@@ -26,6 +26,7 @@
 
 namespace ExtensionLoader
 {
+	extern const char* DEFAULT_SECTION_NAME;
 	extern const char* BEGIN_SCRIPT_SIGNATURE;
 	extern const char* BEGIN_SCRIPT_COMMANDS_AND_OTPIONS;
 	extern const char* POST_SCRIPT_SIGNATURE;
@@ -48,18 +49,39 @@ namespace ExtensionLoader
 	{
 		bool Load(Extension::Script& script, const char* location, const char* rootDir);
 
-		static void ParseOptionsAndCommands(
+		void ParseOptionsAndCommands(
 			std::ifstream& file,
 			std::vector<ManifestFile::Option>& options,
 			std::vector<ManifestFile::Command>& commands
 		);
-		static std::vector<ManifestFile::SelectOption>
+		std::vector<ManifestFile::SelectOption>
 		GetSelectOptions(const std::vector<std::string>& opts, bool isDashDelim);
-		static ManifestFile::SelectOption GetSelectOpt(const std::string& val, bool canBeNum);
-		static void RemoveTailAndTrim(std::string& str, const char* tail);
-		static void BuildDisplayName(Extension::Script& script);
-		static std::pair<std::vector<std::string>, std::string>
+		ManifestFile::SelectOption GetSelectOpt(const std::string& val, bool canBeNum);
+		void RemoveTailAndTrim(std::string& str, const char* tail);
+		void BuildDisplayName(Extension::Script& script);
+		std::pair<std::vector<std::string>, std::string>
 		ExtractElements(const std::string& str);
+		template <typename T>
+		void ParseSectionAndSet(T& opt, std::string sectionName, const std::string& line, size_t sepPos)
+		{
+			opt.name = line.substr(1, sepPos - 1);
+			Util::Trim(opt.name);
+
+			ManifestFile::Section section{};
+			section.name = std::move(sectionName);
+
+			size_t digitPos = opt.name.find("1.");
+			if (digitPos != std::string::npos)
+			{
+				section.prefix = opt.name.substr(0, digitPos);
+				section.multi = true;
+				opt.name = opt.name.substr(digitPos + 2);
+				
+			}
+			
+			opt.section = std::move(section);
+			opt.displayName = opt.name;
+		}
 	}
 
 	namespace V2
@@ -67,7 +89,7 @@ namespace ExtensionLoader
 		bool Load(Extension::Script& script, const char* location, const char* rootDir);
 	}
 
-	static Extension::Kind GetScriptKind(const std::string& line);
+	Extension::Kind GetScriptKind(const std::string& line);
 }
 
 #endif
diff --git a/daemon/extension/ManifestFile.cpp b/daemon/extension/ManifestFile.cpp
index d96836c12..bac0c1266 100644
--- a/daemon/extension/ManifestFile.cpp
+++ b/daemon/extension/ManifestFile.cpp
@@ -27,6 +27,7 @@
 namespace ManifestFile
 {
 	const char* MANIFEST_FILE = "manifest.json";
+	const char* DEFAULT_SECTION_NAME = "options";
 
 	bool Load(Manifest& manifest, const char* directory)
 	{
@@ -89,6 +90,8 @@ namespace ManifestFile
 		if (!ValidateCommandsAndSet(json, manifest.commands))
 			return false;
 
+		ValidateSectionsAndSet(json, manifest.options, manifest.commands);
+
 		if (!ValidateTxtAndSet(json, manifest.description, "description"))
 			return false;
 
@@ -107,7 +110,9 @@ namespace ManifestFile
 		for (auto& value : rawCommands->as_array())
 		{
 			Json::JsonObject cmdJson = value.as_object();
-			Command command;
+			Command command{};
+
+			CheckKeyAndSet(cmdJson, "section", command.section.name, DEFAULT_SECTION_NAME);
 
 			if (!CheckKeyAndSet(cmdJson, "name", command.name))
 				continue;
@@ -142,7 +147,10 @@ namespace ManifestFile
 			if (!selectJson || !selectJson->is_array())
 				continue;
 
-			Option option;
+			Option option{};
+
+			CheckKeyAndSet(optionJson, "section", option.section.name, DEFAULT_SECTION_NAME);
+
 			if (!CheckKeyAndSet(optionJson, "name", option.name))
 				continue;
 
@@ -206,6 +214,19 @@ namespace ManifestFile
 		return true;
 	}
 
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, std::string& property, std::string defValue)
+	{
+		const auto& rawProperty = json.if_contains(key);
+		if (!rawProperty || !rawProperty->is_string())
+		{
+			property = std::move(defValue);
+			return false;
+		}
+
+		property = rawProperty->get_string().c_str();
+		return true;
+	}
+
 	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, SelectOption& property)
 	{
 		const auto& rawProperty = json.if_contains(key);
@@ -226,4 +247,60 @@ namespace ManifestFile
 
 		return false;
 	}
+
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, bool& property)
+	{
+		const auto& rawProperty = json.if_contains(key);
+		if (rawProperty && rawProperty->is_bool())
+		{
+			property = rawProperty->as_bool();
+			return true;
+		}
+
+		return false;
+	}
+
+	bool ValidateSectionsAndSet(const Json::JsonObject& json, std::vector<Option>& options, std::vector<Command>& commands)
+	{
+		auto rawSections = json.if_contains("sections");
+		if (!rawSections || !rawSections->is_array())
+			return false;
+
+		for (auto& sectionVal : rawSections->as_array())
+		{
+			Json::JsonObject sectionJson = sectionVal.as_object();
+
+			Section section;
+
+			if (!CheckKeyAndSet(sectionJson, "name", section.name))
+				continue;
+
+			if (Util::StrCaseCmp(section.name, DEFAULT_SECTION_NAME))
+				continue;
+
+			if (!CheckKeyAndSet(sectionJson, "prefix", section.prefix))
+				continue;
+
+			if (!CheckKeyAndSet(sectionJson, "multi", section.multi))
+				continue;
+
+			for (auto& option : options)
+			{
+				if (option.section.name == section.name)
+				{
+					option.section = section;
+				}
+			}
+
+			for (auto& command : commands)
+			{
+				if (command.section.name == section.name)
+				{
+					command.section = section;
+				}
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/daemon/extension/ManifestFile.h b/daemon/extension/ManifestFile.h
index 494e784e6..46cba0c8c 100644
--- a/daemon/extension/ManifestFile.h
+++ b/daemon/extension/ManifestFile.h
@@ -24,15 +24,25 @@
 #include <vector>
 #include <boost/variant2.hpp>
 #include "Json.h"
+#include "Util.h"
 
 namespace ManifestFile
 {
 	using SelectOption = boost::variant2::variant<double, std::string>;
 
 	extern const char* MANIFEST_FILE;
+	extern const char* DEFAULT_SECTION_NAME;
+
+	struct Section
+	{
+		bool multi;
+		std::string name;
+		std::string prefix;
+	};
 
 	struct Option
 	{
+		Section section;
 		std::string name;
 		std::string displayName;
 		std::vector<std::string> description;
@@ -42,6 +52,7 @@ namespace ManifestFile
 
 	struct Command
 	{
+		Section section;
 		std::string name;
 		std::string displayName;
 		std::string action;
@@ -69,12 +80,15 @@ namespace ManifestFile
 
 	bool Load(Manifest& manifest, const char* directory);
 
-	static bool ValidateAndSet(const Json::JsonObject& json, Manifest& manifest);
-	static bool ValidateCommandsAndSet(const Json::JsonObject& json, std::vector<Command>& commands);
-	static bool ValidateOptionsAndSet(const Json::JsonObject& json, std::vector<Option>& options);
-	static bool ValidateTxtAndSet(const Json::JsonObject& json, std::vector<std::string>& property, const char* propName);
-	static bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, std::string& property);
-	static bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, SelectOption& property);
+	bool ValidateAndSet(const Json::JsonObject& json, Manifest& manifest);
+	bool ValidateCommandsAndSet(const Json::JsonObject& json, std::vector<Command>& commands);
+	bool ValidateOptionsAndSet(const Json::JsonObject& json, std::vector<Option>& options);
+	bool ValidateSectionsAndSet(const Json::JsonObject& json, std::vector<Option>& options, std::vector<Command>& commands);
+	bool ValidateTxtAndSet(const Json::JsonObject& json, std::vector<std::string>& property, const char* propName);
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, std::string& property);
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, std::string& property, std::string defValue);
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, SelectOption& property);
+	bool CheckKeyAndSet(const Json::JsonObject& json, const char* key, bool& property);
 };
 
 #endif
diff --git a/daemon/util/Util.cpp b/daemon/util/Util.cpp
index 47b857378..6833cd62a 100644
--- a/daemon/util/Util.cpp
+++ b/daemon/util/Util.cpp
@@ -774,6 +774,16 @@ time_t Util::Timegm(tm const *t)
 	return internal_timegm(t);
 }
 
+bool Util::StrCaseCmp(const std::string& a, const std::string& b)
+{
+	auto comparator = [](unsigned char a, unsigned char b)
+	{
+		return std::tolower(a) == std::tolower(b);
+	};
+
+    return std::equal(a.begin(), a.end(), b.begin(), b.end(), comparator);
+}
+
 // prevent PC from going to sleep
 void Util::SetStandByMode(bool standBy)
 {
diff --git a/daemon/util/Util.h b/daemon/util/Util.h
index 1448d6b6e..84af0ff1c 100644
--- a/daemon/util/Util.h
+++ b/daemon/util/Util.h
@@ -77,6 +77,8 @@ class Util
 	/* cross platform version of GNU timegm, which is similar to mktime but takes an UTC time as parameter */
 	static time_t Timegm(tm const *t);
 
+	static bool StrCaseCmp(const std::string& a, const std::string& b);
+
 	static void FormatTime(time_t timeSec, char* buffer, int bufsize);
 	static CString FormatTime(time_t timeSec);
 
diff --git a/docs/extensions/EXTENSIONS.md b/docs/extensions/EXTENSIONS.md
index e9af67920..9b65fe147 100644
--- a/docs/extensions/EXTENSIONS.md
+++ b/docs/extensions/EXTENSIONS.md
@@ -45,6 +45,7 @@ and the `executable` file, like `main.py`.
   "license": "GNU",
   "about": "Sends E-Mail notification.",
   "queueEvents": "",
+  "taskTime": "",
   "requirements": [
     "This script requires Python3.8 to be installed on your system."
   ],
@@ -65,6 +66,7 @@ and the `executable` file, like `main.py`.
       "select": [1, 65535]
     },
     {
+      "section": "Categories",
       "name": "SendMail",
       "displayName": "SendMail",
       "value": "Always",
@@ -78,11 +80,30 @@ and the `executable` file, like `main.py`.
       "action": "Send Test E-Mail",
       "displayName": "ConnectionTest",
       "description": ["To check connection parameters click the button."]
+    },
+    {
+      "section": "Feeds",
+      "name": "ConnectionTest",
+      "action": "Send Test E-Mail",
+      "displayName": "ConnectionTest",
+      "description": ["To check connection parameters click the button."]
     }
   ],
-  "taskTime": ""
+  "sections": [
+   {
+      "name": "Categories",
+      "prefix": "Category",
+      "multi": true
+    },
+    {
+      "name": "Feeds",
+      "prefix": "Feed",
+      "multi": false
+    }
+  ]
 }
 ```
+>`"sections"` property is optional.
 
 ### `"main"`
 
@@ -185,6 +206,7 @@ In the provided `manifest.json` example we defined three options:
     "select": []
   },
   {
+    "section": "Categories",
     "name": "Port",
     "displayName": "Port",
     "value": 25,
@@ -197,9 +219,10 @@ In the provided `manifest.json` example we defined three options:
     "value": "Always",
     "description": ["When to send the message."],
     "select": ["Always", "OnFailure"]
-  },
+  }
 ],
 ```
+>`"section"` property is optional. Default value is `"options"`.
 
 When the user saves settings in web-interface the extension configuration 
 options are saved to NZBGet configuration file using the extension name as prefix. For example:
@@ -243,6 +266,7 @@ part of extension configuration, almost similar to extension configuration optio
 ```json
 "commands": [
   {
+    "section": "Categories",
     "name": "ConnectionTest",
     "action": "Send Test E-Mail",
     "displayName": "ConnectionTest",
@@ -250,6 +274,7 @@ part of extension configuration, almost similar to extension configuration optio
   }
 ],
 ```
+>`"section"` property is optional. Default value is `"options"`.
 
 This example creates a button with text "Send Test E-Mail" and description 
 "To check connection parameters click the button.".
@@ -283,6 +308,38 @@ The extension must exit with one of predefined exit codes indicating success
 User may close the progress dialog but the extension continues running in the background. 
 All messages printed by the extension are saved to NZBGet log and are seen in web-interface on Messages tab.
 
+### `"sections" (optional)`
+
+`Sections` are used to logically organize options and commands in `web-interface`.
+>`Sections` with the reserved name `"options"` will be ignored.
+
+```json
+"sections": [
+	{
+		"name": "Categories",
+		"prefix": "Category",
+		"multi": true
+	},
+	{
+		"name": "Feeds",
+		"prefix": "Feed",
+		"multi": false
+	}
+]
+
+```
+
+`"multi"` means that `options` or `commands` can be added dynamically in `web-intefrace.`
+
+`"prefix"` is relevant for `multi` sections to avoid name conflicts of `options` saved in `nzbget.conf`.
+
+Example of a `Name` option saved in `nzbget.conf` that refers to the `"Categories"` section with the prefix `"Category"`:
+
+```conf
+SpeedControl:Category1.Name=
+SpeedControl:Category2.Name=
+```
+
 ### `"taskTime"`
 
 For [SCHEDULER](SCHEDULER.md) extensions.
diff --git a/tests/extension/ExtensionLoaderTest.cpp b/tests/extension/ExtensionLoaderTest.cpp
index a495e5d6b..53003b2b2 100644
--- a/tests/extension/ExtensionLoaderTest.cpp
+++ b/tests/extension/ExtensionLoaderTest.cpp
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(ExtensionV1LoaderTest)
 	extension.SetEntry(entry);
 	extension.SetName(name);
 
-	BOOST_CHECK(ExtensionLoader::V1::Load(extension, location.c_str(), rootDir.c_str()) == true);
+	BOOST_REQUIRE(ExtensionLoader::V1::Load(extension, location.c_str(), rootDir.c_str()) == true);
 
 	BOOST_CHECK(extension.GetEntry() == entry);
 	BOOST_CHECK(extension.GetLocation() == location);
@@ -65,21 +65,36 @@ BOOST_AUTO_TEST_CASE(ExtensionV1LoaderTest)
 	BOOST_CHECK(extension.GetRequirements().size() == 1);
 	BOOST_CHECK(extension.GetRequirements() == std::vector<std::string>({ "This script requires Python to be installed on your system." }));
 
-	BOOST_CHECK(extension.GetCommands().size() == 2);
+	BOOST_REQUIRE(extension.GetCommands().size() == 3);
 
 	auto command = extension.GetCommands()[0];
 	BOOST_CHECK(command.name == "ConnectionTest");
+	BOOST_CHECK(command.section.multi == false);
+	BOOST_CHECK(command.section.name == "options");
+	BOOST_CHECK(command.section.prefix == "");
 	BOOST_CHECK(command.displayName == "ConnectionTest");
 	BOOST_CHECK(command.action == "Send Test E-Mail");
 	BOOST_CHECK(command.description == std::vector<std::string>({ "To check connection parameters click the button." }));
 
 	auto command2 = extension.GetCommands()[1];
 	BOOST_CHECK(command2.name == "Test");
+	BOOST_CHECK(command2.section.multi == false);
+	BOOST_CHECK(command2.section.name == "options");
+	BOOST_CHECK(command2.section.prefix == "");
 	BOOST_CHECK(command2.displayName == "Test");
 	BOOST_CHECK(command2.action == "Send Test");
 	BOOST_CHECK(command2.description == std::vector<std::string>({ "Test (0 1).", "description." }));
 
-	BOOST_CHECK(extension.GetOptions().size() == 16);
+	auto command3 = extension.GetCommands()[2];
+	BOOST_CHECK(command3.name == "TestFeed");
+	BOOST_CHECK(command3.section.prefix == "Feed");
+	BOOST_CHECK(command3.section.multi == true);
+	BOOST_CHECK(command3.section.name == "FEEDS");
+	BOOST_CHECK(command3.displayName == "TestFeed");
+	BOOST_CHECK(command3.action == "Test Test");
+	BOOST_CHECK(command3.description == std::vector<std::string>({ "Feed Test." }));
+
+	BOOST_REQUIRE(extension.GetOptions().size() == 19);
 
 	auto option = extension.GetOptions()[0];
 
@@ -242,4 +257,34 @@ BOOST_AUTO_TEST_CASE(ExtensionV1LoaderTest)
 		}));
 	BOOST_CHECK(boost::variant2::get<std::string>(option16.value) == "");
 	BOOST_CHECK(option16.select.empty());
+
+	auto option17 = extension.GetOptions()[16];
+	BOOST_CHECK(option17.section.name == "CATEGORIES");
+	BOOST_CHECK(option17.section.multi == true);
+	BOOST_CHECK(option17.section.prefix == "Category");
+	BOOST_CHECK(option17.name == "Name");
+	BOOST_CHECK(option17.displayName == "Name");
+	BOOST_CHECK(option17.description == std::vector<std::string>({ "Name of the category to monitor." }));
+	BOOST_CHECK(boost::variant2::get<std::string>(option17.value) == "");
+	BOOST_CHECK(option17.select.empty());
+
+	auto option18 = extension.GetOptions()[17];
+	BOOST_CHECK(option18.section.name == "CATEGORIES");
+	BOOST_CHECK(option18.section.multi == true);
+	BOOST_CHECK(option18.section.prefix == "Category");
+	BOOST_CHECK(option18.name == "DownloadRate");
+	BOOST_CHECK(option18.displayName == "DownloadRate");
+	BOOST_CHECK(option18.description == std::vector<std::string>({ "Speed limit for that category (KB)." }));
+	BOOST_CHECK(boost::variant2::get<std::string>(option18.value) == "0");
+	BOOST_CHECK(option18.select.empty());
+
+	auto option19 = extension.GetOptions()[18];
+	BOOST_CHECK(option19.section.name == "FEEDS");
+	BOOST_CHECK(option19.section.multi == true);
+	BOOST_CHECK(option19.section.prefix == "Feed");
+	BOOST_CHECK(option19.name == "Name");
+	BOOST_CHECK(option19.displayName == "Name");
+	BOOST_CHECK(option19.description == std::vector<std::string>({ "Feed." }));
+	BOOST_CHECK(boost::variant2::get<std::string>(option19.value) == "");
+	BOOST_CHECK(option19.select.empty());
 }
diff --git a/tests/extension/ExtensionManagerTest.cpp b/tests/extension/ExtensionManagerTest.cpp
index 02b4b3641..570704d53 100644
--- a/tests/extension/ExtensionManagerTest.cpp
+++ b/tests/extension/ExtensionManagerTest.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(LoadExtesionsTest)
 	ExtensionManager::Manager manager;
 
 	BOOST_REQUIRE(manager.LoadExtensions() == boost::none);
-	BOOST_CHECK(manager.GetExtensions().size() == 4);
+	BOOST_REQUIRE(manager.GetExtensions().size() == 4);
 
 	for (size_t i = 0; i < manager.GetExtensions().size(); ++i)
 	{
diff --git a/tests/extension/ExtensionTest.cpp b/tests/extension/ExtensionTest.cpp
index 7e55f735e..0b83c0cf9 100644
--- a/tests/extension/ExtensionTest.cpp
+++ b/tests/extension/ExtensionTest.cpp
@@ -51,9 +51,15 @@ Extension::Script GetExtension()
 	option.name = "name";
 	option.value = 5.;
 	option.select = { 0., 10. };
+	option.section.multi = true;
+	option.section.prefix = "Prefix";
+	option.section.name = "Section";
 
 	command.action = "action";
 	command.name = "name";
+	command.section.multi = true;
+	command.section.prefix = "Prefix";
+	command.section.name = "Section";
 	command.displayName = "displayName";
 	command.description = { "description" };
 
@@ -89,8 +95,10 @@ BOOST_AUTO_TEST_CASE(ToJsonStrTest)
 \"TaskTime\":\"TaskTime\",\
 \"Description\":[\"Description\"],\
 \"Requirements\":[\"Requirements\"],\
-\"Options\":[{\"Name\":\"name\",\"DisplayName\":\"displayName\",\"Value\":5E0,\"Description\":[\"description\"],\"Select\":[0E0,1E1]}],\
-\"Commands\":[{\"Name\":\"name\",\"DisplayName\":\"displayName\",\"Action\":\"action\",\"Description\":[\"description\"]}]}";
+\"Options\":[{\"Name\":\"name\",\"DisplayName\":\"displayName\",\"Section\":\"Section\",\
+\"Multi\":true,\"Prefix\":\"Prefix\",\"Value\":5E0,\"Description\":[\"description\"],\"Select\":[0E0,1E1]}],\
+\"Commands\":[{\"Name\":\"name\",\"DisplayName\":\"displayName\",\"Action\":\"action\",\"Section\":\"Section\",\
+\"Multi\":true,\"Prefix\":\"Prefix\",\"Description\":[\"description\"]}]}";
 
 	BOOST_CHECK(result == expected);
 }
@@ -127,6 +135,9 @@ BOOST_AUTO_TEST_CASE(ToXmlStrTest)
 <member><name>Name</name><value><string>name</string></value></member>\
 <member><name>DisplayName</name><value><string>displayName</string></value></member>\
 <member><name>Action</name><value><string>action</string></value></member>\
+<member><name>Multi</name><value><boolean>true</boolean></value></member>\
+<member><name>Section</name><value><string>Section</string></value></member>\
+<member><name>Prefix</name><value><string>Prefix</string></value></member>\
 <Description>\
 <member><name>Value</name><value><string>description</string></value></member>\
 </Description>\
@@ -134,6 +145,9 @@ BOOST_AUTO_TEST_CASE(ToXmlStrTest)
 <Options>\
 <member><name>Name</name><value><string>name</string></value></member>\
 <member><name>DisplayName</name><value><string>displayName</string></value></member>\
+<member><name>Multi</name><value><boolean>true</boolean></value></member>\
+<member><name>Section</name><value><string>Section</string></value></member>\
+<member><name>Prefix</name><value><string>Prefix</string></value></member>\
 <member><name>Value</name><value><number>5.000000</number></value></member>\
 <Description>\
 <member><name>Value</name><value><string>description</string></value></member>\
diff --git a/tests/extension/ManifestFileTest.cpp b/tests/extension/ManifestFileTest.cpp
index 8c7b8d839..9a4a96bb3 100644
--- a/tests/extension/ManifestFileTest.cpp
+++ b/tests/extension/ManifestFileTest.cpp
@@ -36,11 +36,11 @@ BOOST_AUTO_TEST_CASE(ManifestFileTest)
 	std::string dir = FileSystem::GetCurrentDirectory().Str() + std::string("/manifest");
 	std::string invalidFilePath = dir + "/invalid";
 
-	BOOST_CHECK(ManifestFile::Load(manifestFile, invalidFilePath.c_str()) == false);
+	BOOST_REQUIRE(ManifestFile::Load(manifestFile, invalidFilePath.c_str()) == false);
 	BOOST_CHECK(manifestFile.main.empty());
 
 	std::string validFilePath = dir + "/valid";
-	BOOST_CHECK(ManifestFile::Load(manifestFile, validFilePath.c_str()) == true);
+	BOOST_REQUIRE(ManifestFile::Load(manifestFile, validFilePath.c_str()) == true);
 
 	BOOST_CHECK(manifestFile.main == "email.py");
 	BOOST_CHECK(manifestFile.name == "email");
@@ -58,9 +58,12 @@ BOOST_AUTO_TEST_CASE(ManifestFileTest)
 	BOOST_CHECK(manifestFile.requirements.size() == 1);
 	BOOST_CHECK(manifestFile.requirements == std::vector<std::string>({ "This script requires Python to be installed on your system." }));
 
-	BOOST_CHECK(manifestFile.options.size() == 2);
+	BOOST_REQUIRE(manifestFile.options.size() == 3);
 
 	auto& option = manifestFile.options[0];
+	BOOST_CHECK(option.section.multi == false);
+	BOOST_CHECK(option.section.prefix == "");
+	BOOST_CHECK(option.section.name == "options");
 	BOOST_CHECK(option.name == "sendMail");
 	BOOST_CHECK(option.displayName == "SendMail");
 	BOOST_CHECK(option.description == std::vector<std::string>({ "When to send the message." }));
@@ -69,6 +72,9 @@ BOOST_AUTO_TEST_CASE(ManifestFileTest)
 	BOOST_CHECK(boost::variant2::get<std::string>(option.select[1]) == "OnFailure");
 
 	auto& option2 = manifestFile.options[1];
+	BOOST_CHECK(option2.section.multi == false);
+	BOOST_CHECK(option2.section.prefix == "");
+	BOOST_CHECK(option2.section.name == "options");
 	BOOST_CHECK(option2.name == "port");
 	BOOST_CHECK(option2.displayName == "Port");
 	BOOST_CHECK(option2.description == std::vector<std::string>({ "SMTP server port (1-65535)" }));
@@ -76,9 +82,32 @@ BOOST_AUTO_TEST_CASE(ManifestFileTest)
 	BOOST_CHECK(boost::variant2::get<double>(option2.select[0]) == 1.);
 	BOOST_CHECK(boost::variant2::get<double>(option2.select[1]) == 65535.);
 
+	auto& option3 = manifestFile.options[2];
+	BOOST_CHECK(option3.section.multi == true);
+	BOOST_CHECK(option3.section.prefix == "Category");
+	BOOST_CHECK(option3.section.name == "Categories");
+	BOOST_CHECK(option3.name == "Category");
+	BOOST_CHECK(option3.displayName == "Category");
+	BOOST_CHECK(option3.description == std::vector<std::string>({ "Categories section" }));
+	BOOST_CHECK(boost::variant2::get<double>(option2.value) == 25.);
+
+	BOOST_REQUIRE(manifestFile.commands.size() == 2);
+
 	auto& command = manifestFile.commands[0];
+	BOOST_CHECK(command.section.multi == false);
+	BOOST_CHECK(command.section.prefix == "");
+	BOOST_CHECK(command.section.name == "options");
 	BOOST_CHECK(command.name == "connectionTest");
 	BOOST_CHECK(command.action == "Send");
 	BOOST_CHECK(command.displayName == "ConnectionTest");
-	BOOST_CHECK(command.description == std::vector<std::string>({"To check connection parameters click the button."}));
+	BOOST_CHECK(command.description == std::vector<std::string>({ "To check connection parameters click the button." }));
+
+	auto& command2 = manifestFile.commands[1];
+	BOOST_CHECK(command2.section.multi == false);
+	BOOST_CHECK(command2.section.prefix == "Feed");
+	BOOST_CHECK(command2.section.name == "Feeds");
+	BOOST_CHECK(command2.name == "connectionTestTask");
+	BOOST_CHECK(command2.action == "SendToTask");
+	BOOST_CHECK(command2.displayName == "ConnectionTestTask");
+	BOOST_CHECK(command2.description == std::vector<std::string>({ "Feeds command" }));
 }
diff --git a/tests/testdata/extension/V1/Extension.py b/tests/testdata/extension/V1/Extension.py
index ca84e6591..4b3166dc7 100644
--- a/tests/testdata/extension/V1/Extension.py
+++ b/tests/testdata/extension/V1/Extension.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+#
+# Test extension script for NZBGet.
+#
+
 ### TASK TIME: *;*:00;*:30                           					   ###
 ##############################################################################
 ### NZBGET QUEUE/POST-PROCESSING SCRIPT                                    ###
@@ -98,5 +103,26 @@
 # description.
 #test2=
 
+##############################################################################
+### CATEGORIES                                                             ###
+
+# Name of the category to monitor.
+#Category1.Name=
+
+# Speed limit for that category (KB).
+#Category1.DownloadRate=0
+
+##############################################################################
+### FEEDS                                                                  ###
+
+# Feed.
+#Feed1.Name=
+
+# Feed Test.
+#Feed1.TestFeed@Test Test 
+
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
 ##############################################################################
+
+
+print("TEST")
diff --git a/tests/testdata/extension/manifest/valid/manifest.json b/tests/testdata/extension/manifest/valid/manifest.json
index d7732ecea..7f14b2e59 100644
--- a/tests/testdata/extension/manifest/valid/manifest.json
+++ b/tests/testdata/extension/manifest/valid/manifest.json
@@ -1,39 +1,71 @@
 {
-    "main": "email.py",
-    "name": "email",
-    "kind": "POST-PROCESSING",
-    "displayName": "Email",
-    "version": "1.0.0",
-    "author": "Author's name",
-    "homepage": "https://github",
-    "license": "GNU",
-    "about": "About",
-    "description": ["Description"],
-    "requirements": ["This script requires Python to be installed on your system."],
-    "options": [
-        {
-            "name": "sendMail",
-            "displayName": "SendMail",
-            "value": "Always",
-            "description": ["When to send the message."],
-            "select": ["Always", "OnFailure"]
-        },
-        {
-            "name": "port",
-            "displayName": "Port",
-            "value": 25,
-            "description": ["SMTP server port (1-65535)"],
-            "select": [1, 65535]
-        }
-    ],
-    "commands": [
-        {
-            "name": "connectionTest",
-            "action": "Send",
-            "displayName": "ConnectionTest",
-            "description": ["To check connection parameters click the button."]
-        }
-    ],
-    "queueEvents": "NZB_ADDED, NZB_DOWNLOADED, FILE_DOWNLOADED",
-    "taskTime": "1:00:00"
+	"main": "email.py",
+	"name": "email",
+	"kind": "POST-PROCESSING",
+	"displayName": "Email",
+	"version": "1.0.0",
+	"author": "Author's name",
+	"homepage": "https://github",
+	"license": "GNU",
+	"about": "About",
+	"description": ["Description"],
+	"requirements": ["This script requires Python to be installed on your system."],
+	"options": [
+		{
+			"name": "sendMail",
+			"displayName": "SendMail",
+			"value": "Always",
+			"description": ["When to send the message."],
+			"select": ["Always", "OnFailure"]
+		},
+		{
+			"name": "port",
+			"displayName": "Port",
+			"value": 25,
+			"description": ["SMTP server port (1-65535)"],
+			"select": [1, 65535]
+		},
+		{
+			"section": "Categories",
+			"name": "Category",
+			"displayName": "Category",
+			"value": 25,
+			"description": ["Categories section"],
+			"select": []
+		}
+	],
+	"commands": [
+		{
+			"name": "connectionTest",
+			"action": "Send",
+			"displayName": "ConnectionTest",
+			"description": ["To check connection parameters click the button."]
+		},
+		{
+			"section": "Feeds",
+			"name": "connectionTestTask",
+			"action": "SendToTask",
+			"displayName": "ConnectionTestTask",
+			"description": ["Feeds command"]
+		}
+	],
+	"sections": [
+		{
+			"name": "Categories",
+			"prefix": "Category",
+			"multi": true
+		},
+		{
+			"name": "Feeds",
+			"prefix": "Feed",
+			"multi": false
+		},
+		{
+			"name": "options",
+			"prefix": "option",
+			"multi": true
+		}
+	],
+	"queueEvents": "NZB_ADDED, NZB_DOWNLOADED, FILE_DOWNLOADED",
+	"taskTime": "1:00:00"
 }
diff --git a/tests/util/UtilTest.cpp b/tests/util/UtilTest.cpp
index 4224eab2f..69080fed1 100644
--- a/tests/util/UtilTest.cpp
+++ b/tests/util/UtilTest.cpp
@@ -127,3 +127,12 @@ BOOST_AUTO_TEST_CASE(StrToNumTest)
 	BOOST_CHECK(Util::StrToNum("3 not a number").has_value() == false);
 	BOOST_CHECK(Util::StrToNum("not a number").has_value() == false);
 }
+
+BOOST_AUTO_TEST_CASE(StrCaseCmpTest)
+{
+	BOOST_CHECK(Util::StrCaseCmp("OPTIONS", "options"));
+	BOOST_CHECK(Util::StrCaseCmp("OPTIONS", "opt1ons") == false);
+	BOOST_CHECK(Util::StrCaseCmp("0PTIONS", "0ptions"));
+	BOOST_CHECK(Util::StrCaseCmp("", ""));
+	BOOST_CHECK(Util::StrCaseCmp("3.14", "3.12") == false);
+}
diff --git a/webui/config.js b/webui/config.js
index 9eace742f..dec6e71d9 100644
--- a/webui/config.js
+++ b/webui/config.js
@@ -103,6 +103,80 @@ var Options = (new function($)
 		}
 	}
 
+	function getOptionName(extConf, rawOption)
+	{
+		var name = extConf.Name + ':';
+
+		if (rawOption.Prefix)
+		{
+			name += rawOption.Prefix;
+		}
+
+		if (rawOption.Multi)
+		{
+			name += '1.'
+		}
+		name += rawOption.Name;
+
+		return name;
+	}
+
+	function makeOption(extConf, rawOption)
+	{
+		var [type, select] = GetTypeAndSelect(rawOption);
+		return {
+			caption: rawOption.DisplayName,
+			name: getOptionName(extConf, rawOption),
+			value: String(rawOption.Value),
+			defvalue: String(rawOption.Value),
+			sectionId: extConf.Name + '_' + rawOption.Section,
+			select,
+			description: arrToStr(rawOption.Description),
+			nocontent: false,
+			formId: extConf.Name + '_' + rawOption.Name,
+			multiid: 1,
+			multi: rawOption.Multi,
+			prefix: rawOption.Prefix,
+			template: rawOption.Multi,
+			section: rawOption.Section,
+			type,
+		};
+	}
+
+	function makeCommandOption(extConf, rawCommand)
+	{
+		return {
+			caption: rawCommand.DisplayName,
+			name: getOptionName(extConf, rawCommand),
+			value: null,
+			defvalue: rawCommand.Action,
+			sectionId: extConf.Name + '_' + rawCommand.Section,
+			select: [],
+			description: arrToStr(rawCommand.Description),
+			nocontent: false,
+			formId: extConf.Name + '_' + rawCommand.Name,
+			commandopts: 'settings',
+			multiid: 1,
+			template: rawCommand.Multi,
+			prefix: rawCommand.Prefix,
+			section: rawCommand.Section,
+			multi: rawCommand.Multi,
+			type: 'command',
+		};
+	}
+
+	function makeSection(extConf, option)
+	{
+		return {
+			name: option.section,
+			id: extConf.Name + '_' + option.section,
+			options: [option],
+			multi: option.multi,
+			hidden: false,
+			postparam: false,
+		};
+	}
+
 	/*** LOADING CONFIG ********************************************************************/
 
 	this.loadConfig = function(callbacks)
@@ -137,15 +211,9 @@ var Options = (new function($)
 		// read scripts configs
 		for (var i = 1; i < this.serverTemplateData.length; i++) 
 		{
-			var section = {
-				name: this.serverTemplateData[i].Name,
-				id: this.serverTemplateData[i].Name + '_' + 'OPTIONS',
-				options: [],
-				hidden: false,
-				postparam: false,
-			};
+			var sections = {};
 			var scriptConfig = {
-				sections: [section],
+				sections: [],
 				nameprefix: this.serverTemplateData[i].Name,
 			};
 			var requirements = this.serverTemplateData[i].Requirements;
@@ -173,41 +241,33 @@ var Options = (new function($)
 			scriptConfig['license'] = this.serverTemplateData[i].License;
 			scriptConfig['version'] = this.serverTemplateData[i].Version;
 
-			for (var j = 0; j < this.serverTemplateData[i].Commands.length; j++) 
+			for (var j = 0; j < this.serverTemplateData[i].Options.length; j++) 
 			{
-				var command = this.serverTemplateData[i].Commands[j];
-				section.options.push({
-					caption: command.DisplayName,
-					name: this.serverTemplateData[i].Name + ':' + command.Name,
-					value: null,
-					defvalue: command.Action,
-					sectionId: this.serverTemplateData[i].Name + '_' + 'OPTIONS',
-					select: [],
-					description: arrToStr(command.Description),
-					nocontent: false,
-					formId: this.serverTemplateData[i].Name + '_' + command.Name,
-					commandopts: 'settings',
-					type: 'command'
-				});
+				var option = makeOption(this.serverTemplateData[i], this.serverTemplateData[i].Options[j]);
+				if (sections[option.section])
+				{
+					sections[option.section].options.push(option);
+				}
+				else
+				{
+					sections[option.section] = makeSection(this.serverTemplateData[i], option);
+				}
 			}
-			for (var j = 0; j < this.serverTemplateData[i].Options.length; j++) 
+
+			for (var j = 0; j < this.serverTemplateData[i].Commands.length; j++) 
 			{
-				var option = this.serverTemplateData[i].Options[j];
-				var [type, select] = GetTypeAndSelect(option);
-				section.options.push({
-					caption: option.DisplayName,
-					name: this.serverTemplateData[i].Name + ':' + option.Name,
-					value: String(option.Value),
-					defvalue: String(option.Value),
-					sectionId: this.serverTemplateData[i].Name + '_' + 'OPTIONS',
-					select,
-					description: arrToStr(option.Description),
-					nocontent: false,
-					formId: this.serverTemplateData[i].Name + '_' + option.Name,
-					type
-				});
+				var command = makeCommandOption(this.serverTemplateData[i], this.serverTemplateData[i].Commands[j]);
+				if (sections[command.section])
+				{
+					sections[command.section].options.push(command);
+				}
+				else
+				{
+					sections[command.section] = makeSection(this.serverTemplateData[i], command);
+				}
 			}
-			
+
+			scriptConfig.sections = Object.values(sections);
 			mergeValues(scriptConfig.sections, serverValues);
 			config.push(scriptConfig);
 		}
@@ -996,15 +1056,16 @@ var Config = (new function($)
 	function buildMultiRowStart(section, multiid, option)
 	{
 		var name = option.caption;
-		var setname = name.substr(0, name.indexOf('.'));
+		var setname = name.substr(0, name.indexOf('.')) || option.prefix + option.multiid;
 		var html = '<div class="config-settitle ' + section.id + ' multiid' + multiid + ' multiset">' + setname + '</div>';
 		return html;
 	}
 
 	function buildMultiRowEnd(section, multiid, hasmore, hasoptions)
 	{
-		var name = section.options[0].caption;
-		var setname = name.substr(0, name.indexOf('1'));
+		var option = section.options[0];
+		var name = option.caption;
+		var setname = name.substr(0, name.indexOf('1')) || option['prefix'] || '';
 		var html = '';
 
 		if (hasoptions)
@@ -1167,7 +1228,6 @@ var Config = (new function($)
 			option.about = conf.about;
 			option.nocontent = true;
 			option.description = conf.description;
-			option.about = conf.about;
 			firstVisibleSection.options.unshift(option);
 		}