diff --git a/README.md b/README.md
index db9576f..d589b99 100644
--- a/README.md
+++ b/README.md
@@ -181,10 +181,10 @@ ch.sbb.polarion.extension.pdf-exporter.internalizeExternalCss=true
 ## Extension Configuration
 
 1. On the top of the project's navigation pane click ⚙ (Actions) ➙ 🔧 Administration. Project's administration page will be opened.
-2. On the administration's navigation pane select `PDF Export`. There are 5 sub-menus with different configuration options for PDF Exporter.
-3. For 5 of these options (Cover page, Header and Footer, Localization, Webhooks and Filename template) `Quick Help` section available with option short description. For the rest 2
+2. On the administration's navigation pane select `PDF Export`. There are expandable sub-menus with different configuration options for PDF Exporter.
+3. For some of these options (Cover page, Header and Footer, Localization, Webhooks and Filename template) `Quick Help` section available with option short description. For the rest
    (Style package, Stylesheets) there's no `Quick Help` section as their content is self-evident.
-4. To change configuration of PDF exporter extension just edit corresponding section and press `Save` button.
+4. To change configuration of PDF Exporter extension just edit corresponding section and press `Save` button.
 
 ## Usage
 
diff --git a/docs/openapi.json b/docs/openapi.json
index 630cc49..03f9a06 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -815,6 +815,53 @@
         ]
       }
     },
+    "/api/settings/style-package/suitable-names": {
+      "get": {
+        "operationId": "getSuitableStylePackageNames",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "projectId",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "spaceId",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "documentName",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "default": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": {
+                    "$ref": "#/components/schemas/SettingName"
+                  },
+                  "type": "array"
+                }
+              }
+            },
+            "description": "default response"
+          }
+        },
+        "summary": "Get list of style packages suitable for a document",
+        "tags": [
+          "Settings"
+        ]
+      }
+    },
     "/api/settings/{feature}/default-content": {
       "get": {
         "operationId": "getDefaultValues_1",
@@ -1165,7 +1212,7 @@
             "description": "default response"
           }
         },
-        "summary": "Returns boolean value telling if webhooks are enabled or not",
+        "summary": "Gets webhooks status - if they are enabled or not",
         "tags": [
           "Utility resources"
         ]
diff --git a/pom.xml b/pom.xml
index 4473e63..f0828c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.sbb.polarion.extensions</groupId>
         <artifactId>ch.sbb.polarion.extension.generic</artifactId>
-        <version>6.7.0</version>
+        <version>7.0.0</version>
     </parent>
 
     <artifactId>ch.sbb.polarion.extension.pdf-exporter</artifactId>
@@ -59,6 +59,7 @@
 
         <maven-jar-plugin.Extension-Context>pdf-exporter</maven-jar-plugin.Extension-Context>
         <maven-jar-plugin.Automatic-Module-Name>ch.sbb.polarion.extension.pdf_exporter</maven-jar-plugin.Automatic-Module-Name>
+        <maven-jar-plugin.Discover-Base-Package>ch.sbb.polarion.extension.pdf.exporter</maven-jar-plugin.Discover-Base-Package>
         <web.app.name>${maven-jar-plugin.Extension-Context}</web.app.name>
 
         <!--suppress UnresolvedMavenProperty -->
@@ -109,11 +110,6 @@
             <artifactId>byte-buddy</artifactId>
             <version>${byte-buddy.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.re2j</groupId>
-            <artifactId>re2j</artifactId>
-            <version>${re2j.version}</version>
-        </dependency>
 
         <!--  Test dependencies  -->
         <dependency>
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
index 3c23f02..28f2ee8 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
@@ -1,8 +1,6 @@
 package ch.sbb.polarion.extension.pdf.exporter;
 
 import ch.sbb.polarion.extension.generic.GenericUiServlet;
-import ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration;
-import ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration;
 
 import java.io.Serial;
 
@@ -13,6 +11,5 @@ public class PdfExporterAdminUiServlet extends GenericUiServlet {
 
     public PdfExporterAdminUiServlet() {
         super("pdf-exporter-admin");
-        CurrentExtensionConfiguration.getInstance().setExtensionConfiguration(PdfExporterExtensionConfiguration.getInstance());
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
index 71d61be..0fe14d3 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
@@ -49,6 +49,8 @@ public class PdfExporterFormExtension implements IFormExtension {
     private static final String OPTION_SELECTED = "<option value='%s' selected";
     private static final String SELECTED = "selected";
 
+    private final PdfExporterPolarionService polarionService = new PdfExporterPolarionService();
+
     @Override
     @Nullable
     public String render(@NotNull IFormExtensionContext context) {
@@ -66,7 +68,7 @@ public String renderForm(@NotNull SharedContext context, @NotNull IPObject objec
             String scope = ScopeUtils.getScopeFromProject(module.getProject().getId());
             form = form.replace("{SCOPE_VALUE}", scope);
 
-            Collection<SettingName> stylePackageNames = getSettingNames(StylePackageSettings.FEATURE_NAME, scope);
+            Collection<SettingName> stylePackageNames = getSuitableStylePackages(module);
             SettingName stylePackageNameToSelect = getStylePackageNameToSelect(stylePackageNames); // Either default (if exists) or first from list
 
             form = form.replace("{STYLE_PACKAGE_OPTIONS}", generateSelectOptions(stylePackageNames, stylePackageNameToSelect != null ? stylePackageNameToSelect.getName() : null));
@@ -109,7 +111,7 @@ public String renderForm(@NotNull SharedContext context, @NotNull IPObject objec
 
     private SettingName getStylePackageNameToSelect(Collection<SettingName> stylePackageNames) {
         return stylePackageNames.stream()
-                .filter(stylePackageName -> NamedSettings.DEFAULT_NAME.equals(stylePackageName.getName()))
+                .filter(stylePackageName -> !NamedSettings.DEFAULT_NAME.equals(stylePackageName.getName()))
                 .findFirst()
                 .orElse(stylePackageNames.stream()
                         .findFirst()
@@ -155,12 +157,25 @@ private String adjustWebhooks(String scope, String form, StylePackageModel style
         Collection<SettingName> webhooksNames = getSettingNames(WebhooksSettings.FEATURE_NAME, scope);
         boolean noHooks = StringUtils.isEmpty(stylePackage.getWebhooks());
         String webhooksOptions = generateSelectOptions(webhooksNames, noHooks ? NamedSettings.DEFAULT_NAME : stylePackage.getWebhooks());
-        form = form.replace("{WEBHOOKS_DISPLAY}", PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() ? "" : "hidden");
+        form = form.replace("{WEBHOOKS_DISPLAY}", PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() ? "" : "hidden");
         form = form.replace("{WEBHOOKS_OPTIONS}", webhooksOptions);
         form = form.replace("{WEBHOOKS_SELECTOR_DISPLAY}", noHooks ? "none" : "inline-block");
         return form.replace("{WEBHOOKS_SELECTED}", noHooks ? "" : "checked");
     }
 
+    private Collection<SettingName> getSuitableStylePackages(@NotNull IModule module) {
+        String locationPath = module.getModuleLocation().getLocationPath();
+        String spaceId = "";
+        final String documentName;
+        if (locationPath.contains("/")) {
+            spaceId = locationPath.substring(0, locationPath.lastIndexOf('/'));
+            documentName = locationPath.substring(locationPath.lastIndexOf('/') + 1);
+        } else {
+            documentName = locationPath;
+        }
+        return polarionService.getSuitableStylePackages(module.getProject().getId(), spaceId, documentName);
+    }
+
     private Collection<SettingName> getSettingNames(@NotNull String featureName, @NotNull String scope) {
         try {
             return NamedSettingsRegistry.INSTANCE.getByFeatureName(featureName).readNames(scope);
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
index ee4d11d..8ada440 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
@@ -9,7 +9,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.util.PdfExporterFileResourceProvider;
 import ch.sbb.polarion.extension.pdf.exporter.util.PdfTemplateProcessor;
 import ch.sbb.polarion.extension.pdf.exporter.util.html.HtmlLinksHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.WeasyPrintOptions;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
 import lombok.Getter;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
index 5879627..2eed861 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
@@ -9,12 +9,14 @@
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.DocumentType;
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.ExportParams;
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.headerfooter.HeaderFooterModel;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.hooks.WebhooksModel;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks.AuthType;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks.WebhookConfig;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks.WebhooksModel;
 import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.settings.CssSettings;
 import ch.sbb.polarion.extension.pdf.exporter.settings.HeaderFooterSettings;
-import ch.sbb.polarion.extension.pdf.exporter.settings.WebhooksSettings;
 import ch.sbb.polarion.extension.pdf.exporter.settings.LocalizationSettings;
+import ch.sbb.polarion.extension.pdf.exporter.settings.WebhooksSettings;
 import ch.sbb.polarion.extension.pdf.exporter.util.EnumValuesProvider;
 import ch.sbb.polarion.extension.pdf.exporter.util.HtmlLogger;
 import ch.sbb.polarion.extension.pdf.exporter.util.HtmlProcessor;
@@ -27,11 +29,12 @@
 import ch.sbb.polarion.extension.pdf.exporter.util.placeholder.PlaceholderProcessor;
 import ch.sbb.polarion.extension.pdf.exporter.util.velocity.VelocityEvaluator;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.WeasyPrintOptions;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.polarion.alm.tracker.model.ITrackerProject;
 import com.polarion.core.util.StringUtils;
 import com.polarion.core.util.logging.Logger;
+import com.polarion.platform.internal.security.UserAccountVault;
 import lombok.AllArgsConstructor;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
@@ -43,12 +46,15 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -148,39 +154,43 @@ public byte[] convertToPdf(@NotNull ExportParams exportParams, @Nullable ExportM
 
     private @NotNull String applyWebhooks(@NotNull ExportParams exportParams, @NotNull String htmlContent) {
         // Skip webhooks processing among other if this functionality is not enabled by system administrator
-        if (!PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() || exportParams.getWebhooks() == null) {
+        if (!PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() || exportParams.getWebhooks() == null) {
             return htmlContent;
         }
 
         WebhooksModel webhooksModel = new WebhooksSettings().load(exportParams.getProjectId(), SettingId.fromName(exportParams.getWebhooks()));
         String result = htmlContent;
-        for (String webhook : webhooksModel.getWebhooks()) {
-            result = applyWebhook(webhook, exportParams, result);
+        for (WebhookConfig webhookConfig : webhooksModel.getWebhookConfigs()) {
+            result = applyWebhook(webhookConfig, exportParams, result);
         }
         return result;
     }
 
-    private @NotNull String applyWebhook(@NotNull String webhook, @NotNull ExportParams exportParams, @NotNull String htmlContent) {
+    private @NotNull String applyWebhook(@NotNull WebhookConfig webhookConfig, @NotNull ExportParams exportParams, @NotNull String htmlContent) {
         Client client = null;
         try {
             client = ClientBuilder.newClient();
-            WebTarget webTarget = client.target(webhook).register(MultiPartFeature.class);
+            WebTarget webTarget = client.target(webhookConfig.getUrl()).register(MultiPartFeature.class);
 
             FormDataMultiPart multipart = new FormDataMultiPart();
             multipart.bodyPart(new FormDataBodyPart("exportParams", new ObjectMapper().writeValueAsString(exportParams), MediaType.APPLICATION_JSON_TYPE));
             multipart.bodyPart(new FormDataBodyPart("html", htmlContent.getBytes(StandardCharsets.UTF_8), MediaType.APPLICATION_OCTET_STREAM_TYPE));
 
-            try (Response response = webTarget.request(MediaType.TEXT_PLAIN).post(Entity.entity(multipart, multipart.getMediaType()))) {
+            Invocation.Builder requestBuilder = webTarget.request(MediaType.TEXT_PLAIN);
+
+            addAuthHeader(webhookConfig, requestBuilder);
+
+            try (Response response = requestBuilder.post(Entity.entity(multipart, multipart.getMediaType()))) {
                 if (response.getStatus() == Response.Status.OK.getStatusCode()) {
                     try (InputStream inputStream = response.readEntity(InputStream.class)) {
                         return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
                     }
                 } else {
-                    logger.error(String.format("Could not get proper response from webhook [%s]: response status %s", webhook, response.getStatus()));
+                    logger.error(String.format("Could not get proper response from webhook [%s]: response status %s", webhookConfig.getUrl(), response.getStatus()));
                 }
             }
         } catch (Exception e) {
-            logger.error(String.format("Could not get response from webhook [%s]", webhook), e);
+            logger.error(String.format("Could not get response from webhook [%s]", webhookConfig.getUrl()), e);
         } finally {
             if (client != null) {
                 client.close();
@@ -191,6 +201,31 @@ public byte[] convertToPdf(@NotNull ExportParams exportParams, @Nullable ExportM
         return htmlContent;
     }
 
+    private static void addAuthHeader(@NotNull WebhookConfig webhookConfig, @NotNull Invocation.Builder requestBuilder) {
+        if (webhookConfig.getAuthType() == null || webhookConfig.getAuthTokenName() == null) {
+            return;
+        }
+
+        String authInfoFromUserAccountVault = getAuthInfoFromUserAccountVault(webhookConfig.getAuthType(), webhookConfig.getAuthTokenName());
+        if (authInfoFromUserAccountVault == null) {
+            return;
+        }
+
+        requestBuilder.header(HttpHeaders.AUTHORIZATION, webhookConfig.getAuthType().getAuthHeaderPrefix() + " " + authInfoFromUserAccountVault);
+    }
+
+    private static @Nullable String getAuthInfoFromUserAccountVault(@NotNull AuthType authType, @NotNull String authTokenName) {
+        @NotNull UserAccountVault.Credentials credentials = UserAccountVault.getInstance().getCredentialsForKey(authTokenName);
+
+        return switch (authType) {
+            case BASIC_AUTH -> {
+                String authInfo = credentials.getUser() + ":" + credentials.getPassword();
+                yield Base64.getEncoder().encodeToString(authInfo.getBytes());
+            }
+            case BEARER_TOKEN -> credentials.getPassword();
+        };
+    }
+
     @VisibleForTesting
     byte[] generatePdf(
             LiveDocHelper.DocumentData documentData,
@@ -219,8 +254,8 @@ String postProcessDocumentContent(@NotNull ExportParams exportParams, @Nullable
     @NotNull
     @VisibleForTesting
     String composeHtml(@NotNull String documentName,
-                               @NotNull HtmlData htmlData,
-                               @NotNull ExportParams exportParams) {
+                       @NotNull HtmlData htmlData,
+                       @NotNull ExportParams exportParams) {
         String content = htmlData.headerFooterContent
                 + "<div class='content'>" + htmlData.documentContent + "</div>";
         return pdfTemplateProcessor.processUsing(exportParams, documentName, htmlData.cssContent, content);
@@ -236,9 +271,9 @@ String getCssContent(
         String listStyles = new PdfExporterListStyleProvider(exportParams.getNumberedListStyles()).getStyle();
         String css = pdfStyles
                 + (exportParams.getHeadersColor() != null ?
-                  "      h1, h2, h3, h4, h5, h6, .content .title {"
-                + "        color: " + exportParams.getHeadersColor() + ";"
-                + "      }"
+                "      h1, h2, h3, h4, h5, h6, .content .title {" +
+                "        color: " + exportParams.getHeadersColor() + ";" +
+                "      }"
                 : "")
                 + listStyles;
 
@@ -279,5 +314,6 @@ private String appendWikiCss(String css) {
         return css + System.lineSeparator() + ScopeUtils.getFileContent("default/wiki.css");
     }
 
-    record HtmlData(String cssContent, String documentContent, String headerFooterContent) {}
+    record HtmlData(String cssContent, String documentContent, String headerFooterContent) {
+    }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
index 6efd98a..e0c3df8 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
@@ -1,12 +1,15 @@
 package ch.sbb.polarion.extension.pdf.exporter.properties;
 
+import ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration;
 import ch.sbb.polarion.extension.generic.properties.ExtensionConfiguration;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
 import com.polarion.core.config.impl.SystemValueReader;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Discoverable
 public class PdfExporterExtensionConfiguration extends ExtensionConfiguration {
 
     public static final String WEASYPRINT_SERVICE = "weasyprint.service";
@@ -28,7 +31,7 @@ public Boolean getInternalizeExternalCss() {
     }
 
     @NotNull
-    public Boolean areWebhooksEnabled() {
+    public Boolean getWebhooksEnabled() {
         return SystemValueReader.getInstance().readBoolean(getPropertyPrefix() + WEBHOOKS_ENABLED, false);
     }
 
@@ -42,16 +45,7 @@ public Boolean areWebhooksEnabled() {
         return supportedProperties;
     }
 
-    public PdfExporterExtensionConfiguration() {
-        super();
-    }
-
     public static PdfExporterExtensionConfiguration getInstance() {
-        return PdfExporterExtensionConfigurationHolder.INSTANCE;
+        return (PdfExporterExtensionConfiguration) CurrentExtensionConfiguration.getInstance().getExtensionConfiguration();
     }
-
-    private static class PdfExporterExtensionConfigurationHolder {
-        private static final PdfExporterExtensionConfiguration INSTANCE = new PdfExporterExtensionConfiguration();
-    }
-
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
index 90b7478..5bc5078 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
@@ -1,8 +1,8 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.controller;
 
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
 import ch.sbb.polarion.extension.generic.rest.filter.Secured;
 import ch.sbb.polarion.extension.generic.service.PolarionService;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
 import org.jetbrains.annotations.NotNull;
 
 import javax.ws.rs.Path;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
index a3d8855..14d7d30 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
@@ -1,7 +1,13 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.controller;
 
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
-import ch.sbb.polarion.extension.pdf.exporter.util.configuration.ConfigurationStatusUtils;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.CORSStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DefaultSettingsStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DleToolbarStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DocumentPropertiesPaneStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.LiveReportMainHeadStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.WeasyPrintStatusProvider;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +29,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/default-settings")
     @Operation(summary = "Checks default settings configuration")
     public @NotNull ConfigurationStatus checkDefaultSettings(@QueryParam("scope") @DefaultValue("") String scope) {
-        return ConfigurationStatusUtils.getSettingsStatus(scope);
+        return new DefaultSettingsStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().scope(scope).build());
     }
 
     @GET
@@ -31,7 +37,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/document-properties-pane-config")
     @Operation(summary = "Checks document properties pane configuration")
     public @NotNull ConfigurationStatus checkDocumentPropertiesPaneConfig(@QueryParam("scope") @DefaultValue("") String scope) {
-        return ConfigurationStatusUtils.getDocumentPropertiesPaneStatus(scope);
+        return new DocumentPropertiesPaneStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().scope(scope).build());
     }
 
     @GET
@@ -39,7 +45,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/dle-toolbar-config")
     @Operation(summary = "Checks DLE Toolbar configuration")
     public @NotNull ConfigurationStatus checkDleToolbarConfig() {
-        return ConfigurationStatusUtils.getDleToolbarStatus();
+        return new DleToolbarStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -47,7 +53,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/live-report-config")
     @Operation(summary = "Checks Live Report configuration")
     public @NotNull ConfigurationStatus checkLiveReportConfig() {
-        return ConfigurationStatusUtils.getLiveReportMainHeadStatus();
+        return new LiveReportMainHeadStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -55,7 +61,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/cors-config")
     @Operation(summary = "Checks CORS configuration")
     public @NotNull ConfigurationStatus checkCORSConfig() {
-        return ConfigurationStatusUtils.getCORSStatus();
+        return new CORSStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -63,6 +69,6 @@ public class ConfigurationInternalController {
     @Path("/configuration/weasyprint")
     @Operation(summary = "Checks WeasyPrint configuration")
     public @NotNull List<ConfigurationStatus> checkWeasyPrint() {
-        return ConfigurationStatusUtils.getWeasyPrintStatus();
+        return new WeasyPrintStatusProvider().getStatuses(ConfigurationStatusProvider.Context.builder().build());
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsApiController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsApiController.java
index eb21813..2c0e8da 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsApiController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsApiController.java
@@ -2,6 +2,7 @@
 
 import ch.sbb.polarion.extension.generic.rest.filter.Secured;
 import ch.sbb.polarion.extension.generic.service.PolarionService;
+import ch.sbb.polarion.extension.generic.settings.SettingName;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 
 import javax.ws.rs.Path;
@@ -39,4 +40,9 @@ public void persistCoverPageTemplate(String template, String scope) {
     public void deleteImages(String coverPageName, String scope) {
         polarionService.callPrivileged(() -> super.deleteImages(coverPageName, scope));
     }
+
+    @Override
+    public Collection<SettingName> getSuitableStylePackageNames(String projectId, String spaceId, String documentName) {
+        return polarionService.callPrivileged(() -> super.getSuitableStylePackageNames(projectId, spaceId, documentName));
+    }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsInternalController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsInternalController.java
index 8e62960..b6f683c 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsInternalController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/SettingsInternalController.java
@@ -4,6 +4,7 @@
 import ch.sbb.polarion.extension.generic.settings.SettingName;
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.coverpage.CoverPageModel;
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.localization.LocalizationModel;
+import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.settings.CoverPageSettings;
 import ch.sbb.polarion.extension.pdf.exporter.settings.LocalizationSettings;
 import ch.sbb.polarion.extension.pdf.exporter.util.LocalizationHelper;
@@ -14,6 +15,7 @@
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
+import javax.ws.rs.BadRequestException;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -38,6 +40,7 @@
 public class SettingsInternalController {
 
     private Set<String> predefinedCoverPageTemplates;
+    private final PdfExporterPolarionService pdfExporterPolarionService = new PdfExporterPolarionService();
 
     @GET
     @Path("/settings/localization/names/{name}/download")
@@ -116,4 +119,17 @@ public void persistCoverPageTemplate(@PathParam("template") String template, @Qu
     public void deleteImages(@PathParam("name") String coverPageName, @QueryParam("scope") @DefaultValue("") String scope) {
         new CoverPageSettings().deleteCoverPageImages(coverPageName, scope);
     }
+
+    @GET
+    @Path("/settings/style-package/suitable-names")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Tag(name = "Settings")
+    @Operation(summary = "Get list of style packages suitable for a document")
+    public Collection<SettingName> getSuitableStylePackageNames(@QueryParam("projectId") String projectId, @QueryParam("spaceId") String spaceId, @QueryParam("documentName") String documentName) {
+        if (projectId == null || spaceId == null || documentName == null) {
+            throw new BadRequestException("Parameters 'projectId', 'spaceId', 'documentName' are required'");
+        }
+        return pdfExporterPolarionService.getSuitableStylePackages(projectId, spaceId, documentName);
+    }
+
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
index 2d040d3..6bd622b 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
@@ -90,6 +90,6 @@ public String getFileName(@QueryParam("locationPath") String locationPath, @Quer
     @Tag(name = "Utility resources")
     @Operation(summary = "Gets webhooks status - if they are enabled or not")
     public WebhooksStatus getWebhooksStatus() {
-        return WebhooksStatus.builder().enabled(PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled()).build();
+        return WebhooksStatus.builder().enabled(PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled()).build();
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
index 63bc247..ed869a6 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
@@ -1,6 +1,6 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.model;
 
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java
deleted file mode 100644
index 2477099..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ConfigurationStatus {
-    private @NotNull String name;
-    private @NotNull Status status;
-    private @NotNull String details;
-
-    public ConfigurationStatus(@NotNull String name, @NotNull Status status) {
-        this(name, status, "");
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java
deleted file mode 100644
index b34d10d..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration;
-
-public enum Status {
-    OK,
-    WARNING,
-    ERROR;
-
-    public String toHtml() {
-        String color = switch (this) {
-            case OK -> "green";
-            case WARNING -> "gray";
-            case ERROR -> "red";
-        };
-        return String.format("<span style='color: %s;'>%s</span>", color, this.name());
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/stylepackage/StylePackageModel.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/stylepackage/StylePackageModel.java
index 2407f0d..8b24dcb 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/stylepackage/StylePackageModel.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/stylepackage/StylePackageModel.java
@@ -23,6 +23,7 @@
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class StylePackageModel extends SettingsModel {
+    private static final String MATCHING_QUERY_ENTRY_NAME = "MATCHING QUERY";
     private static final String EXPOSE_SETTINGS_ENTRY_NAME = "EXPOSE SETTINGS";
     private static final String COVER_PAGE_ENTRY_NAME = "COVER PAGE";
     private static final String HEADER_FOOTER_ENTRY_NAME = "HEADER FOOTER";
@@ -46,6 +47,7 @@ public class StylePackageModel extends SettingsModel {
     private static final String LINKED_WORKITEM_ROLES_ENTRY_NAME = "LINKED WORKITEM ROLES";
     private static final String EXPOSE_PAGE_WIDTH_VALIDATION_ENTRY_NAME = "EXPOSE PAGE WIDTH VALIDATION";
 
+    private String matchingQuery;
     private boolean exposeSettings;
     private String coverPage;
     private String headerFooter;
@@ -71,7 +73,8 @@ public class StylePackageModel extends SettingsModel {
 
     @Override
     protected String serializeModelData() {
-        return serializeEntry(EXPOSE_SETTINGS_ENTRY_NAME, exposeSettings) +
+        return serializeEntry(MATCHING_QUERY_ENTRY_NAME, matchingQuery) +
+                serializeEntry(EXPOSE_SETTINGS_ENTRY_NAME, exposeSettings) +
                 serializeEntry(COVER_PAGE_ENTRY_NAME, coverPage) +
                 serializeEntry(HEADER_FOOTER_ENTRY_NAME, headerFooter) +
                 serializeEntry(CSS_ENTRY_NAME, css) +
@@ -97,6 +100,7 @@ protected String serializeModelData() {
 
     @Override
     protected void deserializeModelData(String serializedString) {
+        matchingQuery = deserializeEntry(MATCHING_QUERY_ENTRY_NAME, serializedString);
         exposeSettings = Boolean.parseBoolean(deserializeEntry(EXPOSE_SETTINGS_ENTRY_NAME, serializedString));
         coverPage = deserializeEntry(COVER_PAGE_ENTRY_NAME, serializedString);
         headerFooter = deserializeEntry(HEADER_FOOTER_ENTRY_NAME, serializedString);
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/AuthType.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/AuthType.java
new file mode 100644
index 0000000..1af7c7e
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/AuthType.java
@@ -0,0 +1,26 @@
+package ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import lombok.Getter;
+
+@Getter
+public enum AuthType {
+    BEARER_TOKEN("Bearer"),
+    BASIC_AUTH("Basic");
+
+    private final String authHeaderPrefix;
+
+    AuthType(String authHeaderPrefix) {
+        this.authHeaderPrefix = authHeaderPrefix;
+    }
+
+    @JsonCreator
+    public static AuthType forName(String name) {
+        for (AuthType authType : values()) {
+            if (authType.name().equalsIgnoreCase(name)) {
+                return authType;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhookConfig.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhookConfig.java
new file mode 100644
index 0000000..da2a9ba
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhookConfig.java
@@ -0,0 +1,14 @@
+package ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebhookConfig {
+    private String url;
+    private AuthType authType;
+    private String authTokenName;
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/hooks/WebhooksModel.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhooksModel.java
similarity index 65%
rename from src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/hooks/WebhooksModel.java
rename to src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhooksModel.java
index 34a4717..9fef281 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/hooks/WebhooksModel.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/settings/webhooks/WebhooksModel.java
@@ -1,4 +1,4 @@
-package ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.hooks;
+package ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks;
 
 import ch.sbb.polarion.extension.generic.settings.SettingsModel;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -25,22 +25,22 @@
 public class WebhooksModel extends SettingsModel {
     public static final String WEBHOOKS_ENTRY_NAME = "WEBHOOKS";
 
-    private List<String> webhooks = new ArrayList<>();
+    private List<WebhookConfig> webhookConfigs = new ArrayList<>();
 
     @Override
     protected String serializeModelData() {
-        return serializeEntry(WEBHOOKS_ENTRY_NAME, webhooks);
+        return serializeEntry(WEBHOOKS_ENTRY_NAME, webhookConfigs);
     }
 
     @Override
     protected void deserializeModelData(String serializedString) {
-        String webhooksString = deserializeEntry(WEBHOOKS_ENTRY_NAME, serializedString);
-        if (webhooksString != null) {
+        String content = deserializeEntry(WEBHOOKS_ENTRY_NAME, serializedString);
+        if (content != null) {
             try {
-                String[] webhooksArray = new ObjectMapper().readValue(webhooksString, String[].class);
-                webhooks = new ArrayList<>(Arrays.asList(webhooksArray));
+                WebhookConfig[] configs = new ObjectMapper().readValue(content, WebhookConfig[].class);
+                this.webhookConfigs = new ArrayList<>(Arrays.asList(configs));
             } catch (JsonProcessingException e) {
-                throw new IllegalArgumentException("Webhooks value couldn't be parsed", e);
+                throw new IllegalArgumentException(WEBHOOKS_ENTRY_NAME + " value couldn't be parsed", e);
             }
         }
     }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/service/PdfExporterPolarionService.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/service/PdfExporterPolarionService.java
index 8a4ba1c..a3e23d8 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/service/PdfExporterPolarionService.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/service/PdfExporterPolarionService.java
@@ -1,16 +1,26 @@
 package ch.sbb.polarion.extension.pdf.exporter.service;
 
 import ch.sbb.polarion.extension.generic.service.PolarionService;
+import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry;
+import ch.sbb.polarion.extension.generic.settings.SettingId;
+import ch.sbb.polarion.extension.generic.settings.SettingName;
 import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.stylepackage.StylePackageModel;
+import ch.sbb.polarion.extension.pdf.exporter.settings.StylePackageSettings;
 import com.polarion.alm.projects.IProjectService;
 import com.polarion.alm.tracker.ITrackerService;
+import com.polarion.alm.tracker.model.IModule;
 import com.polarion.alm.tracker.model.ITrackerProject;
 import com.polarion.core.util.StringUtils;
 import com.polarion.platform.IPlatformService;
+import com.polarion.platform.persistence.IDataService;
+import com.polarion.platform.persistence.model.IPObjectList;
 import com.polarion.platform.security.ISecurityService;
 import com.polarion.platform.service.repository.IRepositoryService;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
+
 public class PdfExporterPolarionService extends PolarionService {
 
     public PdfExporterPolarionService() {
@@ -35,4 +45,34 @@ public ITrackerProject getProjectFromScope(String scope) {
         }
         return project;
     }
+
+    public Collection<SettingName> getSuitableStylePackages(@NotNull String projectId, @NotNull String spaceId, @NotNull String documentName) {
+        StylePackageSettings stylePackageSettings = (StylePackageSettings) NamedSettingsRegistry.INSTANCE.getByFeatureName(StylePackageSettings.FEATURE_NAME);
+        Collection<SettingName> stylePackageNames = stylePackageSettings.readNames(ScopeUtils.getScopeFromProject(projectId));
+        return stylePackageNames.stream().filter(stylePackageName -> isStylePackageSuitable(projectId, spaceId, documentName, stylePackageSettings, stylePackageName)).toList();
+    }
+
+    @SuppressWarnings("unchecked")
+    private boolean isStylePackageSuitable(@NotNull String projectId, @NotNull String spaceId, @NotNull String documentName,
+                                           @NotNull StylePackageSettings stylePackageSettings, @NotNull SettingName stylePackageName) {
+        StylePackageModel model = stylePackageSettings.read(ScopeUtils.getScopeFromProject(projectId), SettingId.fromName(stylePackageName.getName()), null);
+
+        if (StringUtils.isEmpty(model.getMatchingQuery())) {
+            return true;
+        } else {
+            IDataService dataService = getTrackerService().getDataService();
+            IPObjectList<IModule> suitableDocuments =  dataService.searchInstances(dataService.getPrototype("Module"), model.getMatchingQuery(), "name");
+            for (IModule suitableDocument : suitableDocuments) {
+                if (sameDocument(projectId, spaceId, documentName, suitableDocument)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private boolean sameDocument(@NotNull String projectId, @NotNull String spaceId, @NotNull String documentName, @NotNull IModule document) {
+        return projectId.equals(document.getProjectId()) && String.format("%s/%s", spaceId, documentName).equals(document.getModuleLocation().getLocationPath());
+    }
+
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
index 19b7415..5fb77d2 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
@@ -7,7 +7,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.coverpage.CoverPageModel;
 import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.util.MediaUtils;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.core.util.logging.Logger;
 import com.polarion.platform.service.repository.IRepositoryReadOnlyConnection;
 import com.polarion.subterra.base.location.ILocation;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/WebhooksSettings.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/WebhooksSettings.java
index 2f581ec..9ba546a 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/WebhooksSettings.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/WebhooksSettings.java
@@ -2,7 +2,7 @@
 
 import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
 import ch.sbb.polarion.extension.generic.settings.SettingsService;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.hooks.WebhooksModel;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.webhooks.WebhooksModel;
 import org.jetbrains.annotations.NotNull;
 
 public class WebhooksSettings extends GenericNamedSettings<WebhooksModel> {
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
index 5260783..04e8c02 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
@@ -10,8 +10,8 @@
 import ch.sbb.polarion.extension.pdf.exporter.settings.LocalizationSettings;
 import ch.sbb.polarion.extension.pdf.exporter.util.exporter.CustomPageBreakPart;
 import ch.sbb.polarion.extension.pdf.exporter.util.html.HtmlLinksHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.IRegexEngine;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.IRegexEngine;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.alm.shared.util.StringUtils;
 import com.polarion.core.util.xml.CSSStyle;
 import lombok.SneakyThrows;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
index df2c76a..d9229bf 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
@@ -1,7 +1,7 @@
 package ch.sbb.polarion.extension.pdf.exporter.util;
 
 import ch.sbb.polarion.extension.pdf.exporter.model.LiveDocComment;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.alm.server.api.model.document.ProxyDocument;
 import com.polarion.alm.shared.api.model.comment.CommentBase;
 import com.polarion.alm.shared.api.model.comment.CommentBaseFields;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java
new file mode 100644
index 0000000..f2dc328
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java
@@ -0,0 +1,31 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import com.polarion.core.config.Configuration;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+@Discoverable
+public class CORSStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String CORS = "CORS (Cross-Origin Resource Sharing)";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        boolean restEnabled = Configuration.getInstance().rest().enabled();
+        if (restEnabled) {
+            Set<String> corsAllowedOrigins = Configuration.getInstance().rest().corsAllowedOrigins();
+            if (corsAllowedOrigins.isEmpty()) {
+                return new ConfigurationStatus(CORS, Status.WARNING, "CORS allowed origins are not configured");
+            } else {
+                return new ConfigurationStatus(CORS, Status.OK, "CORS allowed origins: %s".formatted(corsAllowedOrigins.stream().toList()));
+            }
+        } else {
+            return new ConfigurationStatus(CORS, Status.WARNING, "Polarion REST API is not enabled, so CORS is not enabled");
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java
deleted file mode 100644
index 831dffd..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
-
-import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
-import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry;
-import ch.sbb.polarion.extension.generic.settings.SettingsService;
-import ch.sbb.polarion.extension.generic.util.ScopeUtils;
-import ch.sbb.polarion.extension.pdf.exporter.converter.HtmlToPdfConverter;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.Status;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.Orientation;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.PaperSize;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
-import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
-import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.model.WeasyPrintInfo;
-import com.polarion.core.config.Configuration;
-import com.polarion.subterra.base.location.ILocation;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Set;
-
-@UtilityClass
-public class ConfigurationStatusUtils {
-    public static final String DEFAULT_SETTINGS = "Default Settings";
-    public static final String DOCUMENT_PROPERTIES_PANE = "Document Properties Pane";
-    public static final String DLE_TOOLBAR = "DLE Toolbar";
-    public static final String LIVE_REPORT_BUTTON = "LiveReport Button";
-    public static final String CORS = "CORS (Cross-Origin Resource Sharing)";
-    public static final List<String> WEASY_PRINT = List.of("WeasyPrint Python", "WeasyPrint", "WeasyPrint Service");
-
-    @SuppressWarnings("java:S1166") //need by design
-    public static @NotNull ConfigurationStatus getSettingsStatus(@NotNull String scope) {
-        ConfigurationStatus configurationStatus = new ConfigurationStatus(DEFAULT_SETTINGS, Status.OK, "");
-
-        NamedSettingsRegistry.INSTANCE.getAll().stream()
-                .map(GenericNamedSettings::getFeatureName)
-                .forEach(featureName -> {
-                    try {
-                        NamedSettingsRegistry.INSTANCE.getByFeatureName(featureName).readNames(scope);
-                    } catch (Exception e) {
-                        configurationStatus.setStatus(Status.ERROR);
-                        configurationStatus.setDetails(e.getMessage());
-                    }
-                });
-
-        return configurationStatus;
-    }
-
-    public static @NotNull ConfigurationStatus getDocumentPropertiesPaneStatus(@NotNull String scope) {
-        ILocation location = ScopeUtils.getContextLocation(scope).append(".polarion/documents/sidebar/document.xml");
-        String content = new SettingsService().read(location, null);
-
-        if (content == null) {
-            location = ScopeUtils.getDefaultLocation().append(".polarion/documents/sidebar/document.xml");
-            content = new SettingsService().read(location, null);
-            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured neither for global scope nor for current project"));
-        } else {
-            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured for current project"));
-        }
-    }
-
-
-    public static @NotNull ConfigurationStatus getDleToolbarStatus() {
-        final ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
-        final String content = new SettingsService().read(location, null);
-
-        return getConfigurationStatus(DLE_TOOLBAR, content, "scriptInjection.dleEditorHead=<script src=\"/polarion/pdf-exporter/js/starter.js\"></script>.*<script>PdfExporterStarter.injectToolbar();</script>");
-    }
-
-    public static @NotNull ConfigurationStatus getLiveReportMainHeadStatus() {
-        final ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
-        final String content = new SettingsService().read(location, null);
-
-        return getConfigurationStatus(LIVE_REPORT_BUTTON, content, "scriptInjection.mainHead=<script src=\"/polarion/pdf-exporter/js/starter.js\">");
-    }
-
-    @SuppressWarnings("java:S1166") //need by design
-    public static @NotNull List<ConfigurationStatus> getWeasyPrintStatus() {
-        try {
-            HtmlToPdfConverter htmlToPdfConverter = new HtmlToPdfConverter();
-            WeasyPrintServiceConnector weasyPrintServiceConnector = new WeasyPrintServiceConnector();
-
-            WeasyPrintInfo weasyPrintInfo = weasyPrintServiceConnector.getWeasyPrintInfo();
-            htmlToPdfConverter.convert("<html><body>test html</body></html>", Orientation.PORTRAIT, PaperSize.A4);
-
-            return List.of(
-                    createWeasyPrintStatus(WEASY_PRINT.get(0), weasyPrintInfo.getPython()),
-                    createWeasyPrintStatus(WEASY_PRINT.get(1), weasyPrintInfo.getWeasyprint()),
-                    createWeasyPrintStatus(WEASY_PRINT.get(2), weasyPrintInfo.getWeasyprintService())
-            );
-        } catch (Exception e) {
-            return List.of(new ConfigurationStatus(WEASY_PRINT.get(1), Status.ERROR, e.getMessage()));
-        }
-    }
-
-    private static @NotNull ConfigurationStatus createWeasyPrintStatus(@NotNull String name, @Nullable String description) {
-        if (description == null) {
-            return new ConfigurationStatus(name, Status.WARNING, "Unknown");
-        } else {
-            return new ConfigurationStatus(name, Status.OK, description);
-        }
-    }
-
-    public static @NotNull ConfigurationStatus getCORSStatus() {
-        boolean restEnabled = Configuration.getInstance().rest().enabled();
-        if (restEnabled) {
-            Set<String> corsAllowedOrigins = Configuration.getInstance().rest().corsAllowedOrigins();
-            if (corsAllowedOrigins.isEmpty()) {
-                return new ConfigurationStatus(CORS, Status.WARNING, "CORS allowed origins are not configured");
-            } else {
-                return new ConfigurationStatus(CORS, Status.OK, "CORS allowed origins: %s".formatted(corsAllowedOrigins.stream().toList()));
-            }
-        } else {
-            return new ConfigurationStatus(CORS, Status.WARNING, "Polarion REST API is not enabled, so CORS is not enabled");
-        }
-    }
-
-    private static @NotNull ConfigurationStatus getConfigurationStatus(@NotNull String name, @Nullable String content, @NotNull String regex) {
-        return getConfigurationStatus(name, content, regex, new ConfigurationStatus(name, Status.WARNING, "Not configured"));
-    }
-
-    private static @NotNull ConfigurationStatus getConfigurationStatus(@NotNull String name, @Nullable String content, @NotNull String regex, @NotNull ConfigurationStatus notOkStatus) {
-        if (content != null && contains(content, regex)) {
-            return new ConfigurationStatus(name, Status.OK);
-        } else {
-            return notOkStatus;
-        }
-    }
-
-    private static boolean contains(@NotNull String input, @NotNull String regex) {
-        return RegexMatcher.get(regex).anyMatch(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java
new file mode 100644
index 0000000..2f7a95a
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java
@@ -0,0 +1,33 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
+import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DefaultSettingsStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DEFAULT_SETTINGS = "Default Settings";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ConfigurationStatus configurationStatus = new ConfigurationStatus(DEFAULT_SETTINGS, Status.OK, "");
+
+        NamedSettingsRegistry.INSTANCE.getAll().stream()
+                .map(GenericNamedSettings::getFeatureName)
+                .forEach(featureName -> {
+                    try {
+                        NamedSettingsRegistry.INSTANCE.getByFeatureName(featureName).readNames(context.getScope());
+                    } catch (Exception e) {
+                        configurationStatus.setStatus(Status.ERROR);
+                        configurationStatus.setDetails(e.getMessage());
+                    }
+                });
+
+        return configurationStatus;
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java
new file mode 100644
index 0000000..61f5d70
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java
@@ -0,0 +1,23 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DleToolbarStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DLE_TOOLBAR = "DLE Toolbar";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
+        String content = new SettingsService().read(location, null);
+
+        return getConfigurationStatus(DLE_TOOLBAR, content, "scriptInjection.dleEditorHead=<script src=\"/polarion/pdf-exporter/js/starter.js\"></script>.*<script>PdfExporterStarter.injectToolbar();</script>");
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java
new file mode 100644
index 0000000..e043269
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java
@@ -0,0 +1,30 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DocumentPropertiesPaneStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DOCUMENT_PROPERTIES_PANE = "Document Properties Pane";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getContextLocation(context.getScope()).append(".polarion/documents/sidebar/document.xml");
+        String content = new SettingsService().read(location, null);
+
+        if (content == null) {
+            location = ScopeUtils.getDefaultLocation().append(".polarion/documents/sidebar/document.xml");
+            content = new SettingsService().read(location, null);
+            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured neither for global scope nor for current project"));
+        } else {
+            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured for current project"));
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java
new file mode 100644
index 0000000..82978f5
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java
@@ -0,0 +1,23 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class LiveReportMainHeadStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String LIVE_REPORT_BUTTON = "LiveReport Button";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
+        String content = new SettingsService().read(location, null);
+
+        return getConfigurationStatus(LIVE_REPORT_BUTTON, content, "scriptInjection.mainHead=<script src=\"/polarion/pdf-exporter/js/starter.js\">");
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java
new file mode 100644
index 0000000..739b868
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java
@@ -0,0 +1,48 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.pdf.exporter.converter.HtmlToPdfConverter;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.Orientation;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.PaperSize;
+import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
+import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.model.WeasyPrintInfo;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+@Discoverable
+public class WeasyPrintStatusProvider extends ConfigurationStatusProvider {
+
+    public static final List<String> WEASY_PRINT = List.of("WeasyPrint Python", "WeasyPrint", "WeasyPrint Service");
+
+    private static @NotNull ConfigurationStatus createWeasyPrintStatus(@NotNull String name, @Nullable String description) {
+        if (description == null) {
+            return new ConfigurationStatus(name, Status.WARNING, "Unknown");
+        } else {
+            return new ConfigurationStatus(name, Status.OK, description);
+        }
+    }
+
+    @Override
+    public @NotNull List<ConfigurationStatus> getStatuses(@NotNull Context context) {
+        try {
+            HtmlToPdfConverter htmlToPdfConverter = new HtmlToPdfConverter();
+            WeasyPrintServiceConnector weasyPrintServiceConnector = new WeasyPrintServiceConnector();
+
+            WeasyPrintInfo weasyPrintInfo = weasyPrintServiceConnector.getWeasyPrintInfo();
+            htmlToPdfConverter.convert("<html><body>test html</body></html>", Orientation.PORTRAIT, PaperSize.A4);
+
+            return List.of(
+                    createWeasyPrintStatus(WEASY_PRINT.get(0), weasyPrintInfo.getPython()),
+                    createWeasyPrintStatus(WEASY_PRINT.get(1), weasyPrintInfo.getWeasyprint()),
+                    createWeasyPrintStatus(WEASY_PRINT.get(2), weasyPrintInfo.getWeasyprintService())
+            );
+        } catch (Exception e) {
+            return List.of(new ConfigurationStatus(WEASY_PRINT.get(1), Status.ERROR, e.getMessage()));
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
index 756aab0..d6dbd6d 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
@@ -2,7 +2,7 @@
 
 import ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration;
 import ch.sbb.polarion.extension.pdf.exporter.util.FileResourceProvider;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
index a55d3c1..bd2d713 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
@@ -4,7 +4,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.headerfooter.Placeholder;
 import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.util.LiveDocHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java
deleted file mode 100644
index 1dd125b..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import java.util.Map;
-
-public interface IRegexEngine {
-
-    Map<String, Class<? extends IRegexEngine>> IMPLEMENTATIONS = Map.of(
-            RegexEngineJavaUtilImpl.NAME, RegexEngineJavaUtilImpl.class,
-            RegexEngineRE2JImpl.NAME, RegexEngineRE2JImpl.class
-    );
-
-    boolean find();
-
-    String group();
-
-    String group(int group);
-
-    String group(String name);
-
-    void appendReplacement(StringBuilder sb, String replacement);
-
-    void appendTail(StringBuilder sb);
-
-    String quoteReplacement(String input);
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java
deleted file mode 100644
index 3337f1a..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * {@link IRegexEngine} implementation based on standard Java regex engine.
- */
-public class RegexEngineJavaUtilImpl implements IRegexEngine {
-
-    public static final String NAME = "java.util.regex";
-    private final Matcher matcher;
-
-    public RegexEngineJavaUtilImpl(String regex, int flags, String input) {
-        matcher = Pattern.compile(regex, flags).matcher(input);
-    }
-
-    @Override
-    public boolean find() {
-        return matcher.find();
-    }
-
-    @Override
-    public String group() {
-        return matcher.group();
-    }
-
-    @Override
-    public String group(int group) {
-        return matcher.group(group);
-    }
-
-    @Override
-    public String group(String name) {
-        return matcher.group(name);
-    }
-
-    @Override
-    public void appendReplacement(StringBuilder sb, String replacement) {
-        matcher.appendReplacement(sb, replacement);
-    }
-
-    @Override
-    public void appendTail(StringBuilder sb) {
-        matcher.appendTail(sb);
-    }
-
-    @Override
-    public String quoteReplacement(String input) {
-        return Matcher.quoteReplacement(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java
deleted file mode 100644
index b1b9342..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import com.google.re2j.Matcher;
-import com.google.re2j.Pattern;
-
-/**
- * {@link IRegexEngine} implementation based on RE2J.
- * RE2J is a regular expression engine that runs in time linear in the size of the input. RE2J is a port
- * of C++ library RE2 to pure Java.
- * Java's standard regular expression package, java.util.regex, and many other widely used regular expression
- * packages such as PCRE, Perl and Python use a backtracking implementation strategy: when a pattern presents two
- * alternatives such as a|b, the engine will try to match subpattern a first, and if that yields no match,
- * it will reset the input stream and try to match b instead.
- */
-public class RegexEngineRE2JImpl implements IRegexEngine {
-
-    public static final String NAME = "re2j";
-    private final Matcher matcher;
-
-    public RegexEngineRE2JImpl(String regex, int flags, String input) {
-
-        // RE2J uses slightly different syntax for named groups
-        regex = regex.replace("(?<", "(?P<");
-
-        matcher = Pattern.compile(regex, flags).matcher(input);
-    }
-
-    @Override
-    public boolean find() {
-        return matcher.find();
-    }
-
-    @Override
-    public String group() {
-        return matcher.group();
-    }
-
-    @Override
-    public String group(int group) {
-        return matcher.group(group);
-    }
-
-    @Override
-    public String group(String name) {
-        return matcher.group(name);
-    }
-
-    @Override
-    public void appendReplacement(StringBuilder sb, String replacement) {
-        matcher.appendReplacement(sb, replacement);
-    }
-
-    @Override
-    public void appendTail(StringBuilder sb) {
-        matcher.appendTail(sb);
-    }
-
-    @Override
-    public String quoteReplacement(String input) {
-        return Matcher.quoteReplacement(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java
deleted file mode 100644
index d47aea7..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import lombok.SneakyThrows;
-
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-/**
- * Provides simplified way for string replacements/operations using regex.
- * Also allows to easily switch underlined regex engine: by default it uses RE2J implementation which is a preferable way because
- * in theory it works faster and guarantees linear time execution, but user can switch implementation to the java.util.regex-based
- * in case if there is need to use some features which is unsupported by RE2J - e.g. <code>(?=</code>, <code>(?></code> etc.,
- * full list of (un)supported features may be found <a href="https://github.com/google/re2/wiki/Syntax">here</a>).
- */
-@SuppressWarnings("unused")
-public class RegexMatcher {
-
-    public static final int CASE_INSENSITIVE = 1;
-    public static final int DOTALL = 2;
-
-    private final String regex;
-    private final int flags;
-    private String impl = RegexEngineRE2JImpl.NAME;
-
-    private RegexMatcher(String regex, int flags) {
-        this.regex = regex;
-        this.flags = flags;
-    }
-
-    public static RegexMatcher get(String regex) {
-        return get(regex, 0);
-    }
-
-    public static RegexMatcher get(String regex, int flags) {
-        return new RegexMatcher(regex, flags);
-    }
-
-    public static String quote(String s) {
-        return Pattern.quote(s);
-    }
-
-    /**
-     * Forces to use java.util.regex-based engine.
-     * NOTE: this isn't a preferable way, please consider rewriting regex to not use
-     * unsupported syntax and switch back to RE2J implementation.
-     */
-    public RegexMatcher useJavaUtil() {
-        this.impl = RegexEngineJavaUtilImpl.NAME;
-        return this;
-    }
-
-    public String replace(String input, IReplacementCalculator replacementCalculator) {
-        return replace(input, true, replacementCalculator);
-    }
-
-    public String replace(String input, boolean quoteReplacement, IReplacementCalculator replacementCalculator) {
-        IRegexEngine regexEngine = createEngine(input);
-        StringBuilder resultBuilder = new StringBuilder();
-        while (regexEngine.find()) {
-            String replacement = replacementCalculator.calculateReplacement(regexEngine);
-            if (replacement != null) {
-                regexEngine.appendReplacement(resultBuilder, quoteReplacement ? regexEngine.quoteReplacement(replacement) : replacement);
-            }
-        }
-        regexEngine.appendTail(resultBuilder);
-        return resultBuilder.toString();
-    }
-
-    public String replaceAll(String input, String replacementString) {
-        return replace(input, regexEngine -> replacementString);
-    }
-
-    public void processEntry(String input, IEntryProcessor entryProcessor) {
-        IRegexEngine regexEngine = createEngine(input);
-        while (regexEngine.find()) {
-            entryProcessor.processEntry(regexEngine);
-        }
-    }
-
-    public Optional<String> findFirst(String input) {
-        return findFirst(input, IRegexEngine::group);
-    }
-
-    public Optional<String> findFirst(String input, Function<IRegexEngine, String> entryCalculator) {
-        IRegexEngine regexEngine = createEngine(input);
-        return regexEngine.find() ? Optional.of(entryCalculator.apply(regexEngine)) : Optional.empty();
-    }
-
-    public boolean anyMatch(String input) {
-        return createEngine(input).find();
-    }
-
-    public boolean noneMatch(String input) {
-        return !createEngine(input).find();
-    }
-
-    public String removeAll(String input) {
-        return replace(input, regexEngine -> "");
-    }
-
-    @SneakyThrows
-    public IRegexEngine createEngine(String input) {
-        return IRegexEngine.IMPLEMENTATIONS.get(impl)
-                .getDeclaredConstructor(String.class, int.class, String.class)
-                .newInstance(regex, flags, input);
-    }
-
-    public interface IReplacementCalculator {
-        String calculateReplacement(IRegexEngine regexEngine);
-    }
-
-    public interface IEntryProcessor {
-        void processEntry(IRegexEngine regexEngine);
-    }
-
-}
diff --git a/src/main/resources/webapp/pdf-exporter-admin/js/style-packages.js b/src/main/resources/webapp/pdf-exporter-admin/js/style-packages.js
index cf8f389..d4d8e10 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/js/style-packages.js
+++ b/src/main/resources/webapp/pdf-exporter-admin/js/style-packages.js
@@ -158,6 +158,7 @@ function saveStylePackage() {
         url: `/polarion/${SbbCommon.extension}/rest/internal/settings/${SbbCommon.setting}/names/${Configurations.getSelectedConfiguration()}/content?scope=${SbbCommon.scope}`,
         contentType: 'application/json',
         body: JSON.stringify({
+            'matchingQuery': SbbCommon.getValueById('matching-query'),
             'exposeSettings': SbbCommon.getCheckboxValueById('exposeSettings'),
             'coverPage': SbbCommon.getCheckboxValueById('cover-page-checkbox') ? ChildConfigurations.coverPageSelect.getSelectedValue() : null,
             'css': ChildConfigurations.cssSelect.getSelectedValue(),
@@ -210,6 +211,10 @@ function revertToDefault() {
 
 function setStylePackage(content) {
     const stylePackage = JSON.parse(content);
+
+    SbbCommon.setValueById('matching-query', stylePackage.matchingQuery || "");
+    document.getElementById('matching-query-container').style.display = DEFAULT_SETTING_NAME === Configurations.getSelectedConfiguration() ? "none" : "flex";
+
     SbbCommon.setCheckboxValueById('exposeSettings', stylePackage.exposeSettings);
     SbbCommon.setCheckboxValueById('cover-page-checkbox', !!stylePackage.coverPage);
     document.getElementById('cover-page-checkbox').dispatchEvent(new Event('change'));
diff --git a/src/main/resources/webapp/pdf-exporter-admin/js/webhooks.js b/src/main/resources/webapp/pdf-exporter-admin/js/webhooks.js
index b5537e7..60c1782 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/js/webhooks.js
+++ b/src/main/resources/webapp/pdf-exporter-admin/js/webhooks.js
@@ -1,14 +1,24 @@
-const WebHooks = {
+const Webhooks = {
 
-    saveHooks : function () {
+    saveWebhooks: function () {
         SbbCommon.hideActionAlerts();
 
+        const webhookRows = Array.from(document.querySelectorAll('#webhooks-table tr'));
+        const webhookConfigs = webhookRows
+            .map(row => {
+                return {
+                    url: row.querySelector('input[name="url"]')?.value,
+                    authType: row.querySelector('input[name="auth"]')?.checked ? row.querySelector('select[name="auth_type"]')?.value : null,
+                    authTokenName: row.querySelector('input[name="auth"]')?.checked ? row.querySelector('input[name="auth_token_name"]')?.value : null
+                };
+            });
+
         SbbCommon.callAsync({
             method: 'PUT',
             url: `/polarion/${SbbCommon.extension}/rest/internal/settings/${SbbCommon.setting}/names/${Configurations.getSelectedConfiguration()}/content?scope=${SbbCommon.scope}`,
             contentType: 'application/json',
             body: JSON.stringify({
-                'webhooks': Array.from(document.getElementsByClassName("webhook")).map(input => input.value).filter(value => value),
+                'webhookConfigs': webhookConfigs,
             }),
             onOk: () => {
                 SbbCommon.showSaveSuccessAlert();
@@ -19,36 +29,38 @@ const WebHooks = {
         });
     },
 
-    setHooks: function(text) {
+    setWebhooks: function (text) {
         document.getElementById('webhooks-table').innerHTML = ""; // Remove all records currently displayed first
         const webhooksModel = JSON.parse(text);
-        if (webhooksModel.webhooks) {
-            webhooksModel.webhooks.forEach(hook => {
-                WebHooks.addHook(hook);
+        if (webhooksModel.webhookConfigs) {
+            webhooksModel.webhookConfigs.forEach(webhookConfig => {
+                Webhooks.addWebhook(webhookConfig);
             });
         }
         if (webhooksModel.bundleTimestamp !== SbbCommon.getValueById('bundle-timestamp')) {
-            WebHooks.loadDefaultContent()
+            Webhooks.loadDefaultContent()
                 .then((responseText) => {
-                    const defaultHooksModel = JSON.parse(responseText);
-                    SbbCommon.setNewerVersionNotificationVisible(webhooksModel.webhooks && defaultHooksModel.webhooks
-                        && (webhooksModel.webhooks.length !== defaultHooksModel.webhooks.length
-                            || webhooksModel.webhooks.every(function(value, index) { return value === defaultHooksModel.hooks[index]})));
+                    const defaultWebhooksModel = JSON.parse(responseText);
+                    SbbCommon.setNewerVersionNotificationVisible(webhooksModel.webhooks && defaultWebhooksModel.webhooks
+                        && (webhooksModel.webhooks.length !== defaultWebhooksModel.webhooks.length
+                            || webhooksModel.webhooks.every(function (value, index) {
+                                return value === defaultWebhooksModel.hooks[index]
+                            })));
                 })
         }
     },
 
-    revertToDefault: function() {
-        if (confirm("Are you sure you want to return the default value?")) {
-            WebHooks.loadDefaultContent()
+    revertToDefault: function () {
+        if (confirm('Are you sure you want to return the default value?')) {
+            Webhooks.loadDefaultContent()
                 .then((responseText) => {
-                    WebHooks.setHooks(responseText);
+                    Webhooks.setWebhooks(responseText);
                     SbbCommon.showRevertedToDefaultAlert();
                 })
         }
     },
 
-    loadDefaultContent: function() {
+    loadDefaultContent: function () {
         return new Promise((resolve, reject) => {
             SbbCommon.setLoadingErrorNotificationVisible(false);
             SbbCommon.hideActionAlerts();
@@ -66,54 +78,138 @@ const WebHooks = {
         });
     },
 
-    addHook: function(value) {
-        const table = document.getElementById('webhooks-table');
-        const tableRow = document.createElement('tr');
-        tableRow.classList.add('webhook-row');
-
-        const buttonCell = document.createElement('td');
-        const removeButton = document.createElement('button');
-        removeButton.classList.add('toolbar-button', 'webhook-button');
-        removeButton.setAttribute('title', 'Delete this webhook');
-        const image = document.createElement('img');
-        image.setAttribute('src', '/polarion/ria/images/control/tableMinus.png');
-        removeButton.appendChild(image);
-        removeButton.addEventListener('click', function () {
-            tableRow.remove();
-        })
-        buttonCell.appendChild(removeButton);
-        tableRow.appendChild(buttonCell);
-
-        const labelCell = document.createElement('td');
-        const fieldLabel = document.createElement('label');
-        fieldLabel.innerHTML = 'Webhook URL: ';
-        labelCell.appendChild(fieldLabel);
-        tableRow.appendChild(labelCell);
-
-        const fieldCell = document.createElement('td');
-        const field = document.createElement('input');
-        field.classList.add('fs-14', 'webhook');
-        field.setAttribute("placeholder", "https://my.domain.com/my-webhook");
-        if (value) {
-            field.setAttribute("value", value);
+    addWebhook: function (webhookConfig) {
+        function createTableRow() {
+            const tableRow = document.createElement('tr');
+            tableRow.classList.add('webhook-row');
+            return tableRow;
+        }
+
+        function createControlButtonCell() {
+            const cell = document.createElement('td');
+            const removeButton = document.createElement('button');
+            removeButton.classList.add('toolbar-button', 'webhook-button');
+            removeButton.setAttribute('title', 'Delete this webhook');
+            const removeButtonImage = document.createElement('img');
+            removeButtonImage.setAttribute('src', '/polarion/ria/images/control/tableMinus.png');
+            removeButton.appendChild(removeButtonImage);
+            removeButton.addEventListener('click', function () {
+                tableRow.remove();
+            })
+            cell.appendChild(removeButton);
+            return cell;
+        }
+
+        function createUrlLabelCell() {
+            const cell = document.createElement('td');
+            const fieldLabel = document.createElement('label');
+            fieldLabel.innerHTML = 'URL: ';
+            cell.appendChild(fieldLabel);
+            return cell;
+        }
+
+        function createUrlInputCell() {
+            const cell = document.createElement('td');
+
+            const urlInput = document.createElement('input');
+            urlInput.classList.add('fs-14', 'webhook');
+            urlInput.setAttribute('name', 'url');
+            urlInput.setAttribute('placeholder', 'https://my.domain.com/my-webhook');
+            if (webhookConfig?.url) {
+                urlInput.setAttribute('value', webhookConfig.url);
+            }
+
+            const invalidUrlError = document.createElement('div');
+            invalidUrlError.innerHTML = 'WARNING: Entered value doesn\'t seem to be a valid URL';
+            invalidUrlError.classList.add('invalid-webhook', 'hidden');
+            urlInput.addEventListener("keyup", (event) => {
+                const urlPattern = /^(http(s)?:\/\/.)[-a-zA-Z0-9@:%._+~#=]{2,256}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/g;
+                if (!event.target.value || urlPattern.test(event.target.value)) {
+                    invalidUrlError.classList.add('hidden');
+                } else {
+                    invalidUrlError.classList.remove('hidden');
+                }
+            });
+
+            cell.appendChild(urlInput);
+            cell.appendChild(invalidUrlError);
+            return cell;
+        }
+
+        function createAuthCheckboxCell() {
+            const cell = document.createElement('td');
+
+            const authCheckbox = document.createElement('input');
+            authCheckbox.setAttribute('type', 'checkbox');
+            authCheckbox.setAttribute('name', 'auth');
+            if (webhookConfig?.authType) {
+                authCheckbox.setAttribute('checked', 'checked');
+            }
+
+            authCheckbox.addEventListener('change', (event) => {
+                const authTypeCombobox = event.target.parentElement.parentElement.querySelector('select[name="auth_type"]');
+                const authTokenNameField = event.target.parentElement.parentElement.querySelector('input[name="auth_token_name"]');
+                if (event.target.checked) {
+                    authTypeCombobox.style.display = 'block';
+                    authTokenNameField.style.display = 'block';
+                } else {
+                    authTypeCombobox.style.display = 'none';
+                    authTokenNameField.style.display = 'none';
+                }
+            });
+
+            const authLabel = document.createElement('label');
+            authLabel.setAttribute('for', 'auth');
+            authLabel.innerHTML = 'Auth';
+
+            cell.appendChild(authCheckbox);
+            cell.appendChild(authLabel);
+            return cell;
+        }
+
+        function createAuthTypeComboboxCell() {
+            const cell = document.createElement('td');
+
+            const authTypeCombobox = document.createElement('select');
+            authTypeCombobox.setAttribute('name', 'auth_type');
+            authTypeCombobox.innerHTML = '<option value="BEARER_TOKEN">Bearer Token</option><option value="BASIC_AUTH">Basic</option>';
+            if (webhookConfig?.authType) {
+                switch (webhookConfig.authType) {
+                    case 'BEARER_TOKEN': authTypeCombobox.selectedIndex = 0; break;
+                    case 'BASIC_AUTH': authTypeCombobox.selectedIndex = 1; break;
+                }
+            } else {
+                authTypeCombobox.style.display = 'none';
+            }
+
+            cell.appendChild(authTypeCombobox);
+            return cell;
         }
-        fieldCell.appendChild(field);
-
-        const invalidUrlError = document.createElement('div');
-        invalidUrlError.innerHTML = "WARNING: Entered value doesn't seem to be a valid URL";
-        invalidUrlError.classList.add('invalid-webhook', 'hidden');
-        field.addEventListener("keyup", (event) => {
-            const urlPattern = /^(http(s)?:\/\/.)[-a-zA-Z0-9@:%._+~#=]{2,256}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/g;
-            if (!event.target.value || urlPattern.test(event.target.value)) {
-                invalidUrlError.classList.add('hidden');
+
+        function createAuthTokenNameInput() {
+            const cell = document.createElement('td');
+
+            const authTokenNameField = document.createElement('input');
+            authTokenNameField.setAttribute('name', 'auth_token_name');
+            authTokenNameField.setAttribute('placeholder', 'Polarion Vault entry name');
+            if (webhookConfig?.authType) {
+                authTokenNameField.setAttribute('value', webhookConfig.authTokenName ? webhookConfig.authTokenName : '');
             } else {
-                invalidUrlError.classList.remove('hidden');
+                authTokenNameField.style.display = 'none';
             }
-        });
-        fieldCell.appendChild(invalidUrlError);
 
-        tableRow.appendChild(fieldCell);
+            cell.appendChild(authTokenNameField);
+            return cell;
+        }
 
+        const table = document.getElementById('webhooks-table');
+        const tableRow = createTableRow();
+        tableRow.appendChild(createControlButtonCell());
+        tableRow.appendChild(createUrlLabelCell());
+        tableRow.appendChild(createUrlInputCell());
+        tableRow.appendChild(createAuthCheckboxCell());
+        tableRow.appendChild(createAuthTypeComboboxCell());
+        tableRow.appendChild(createAuthTokenNameInput());
         table.appendChild(tableRow);
     },
 }
@@ -125,7 +221,7 @@ SbbCommon.init({
 });
 
 Configurations.init({
-    setConfigurationContentCallback: WebHooks.setHooks
+    setConfigurationContentCallback: Webhooks.setWebhooks
 });
 
 Configurations.loadConfigurationNames();
\ No newline at end of file
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
index ef71789..256a009 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
@@ -1,145 +1,2 @@
-<%@ page import="ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration" %>
-<%@ page import="ch.sbb.polarion.extension.generic.rest.model.Version" %>
-<%@ page import="ch.sbb.polarion.extension.generic.util.ExtensionInfo" %>
-<%@ page import="ch.sbb.polarion.extension.generic.util.VersionUtils" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.io.InputStream" %>
-<%@ page import="java.nio.charset.StandardCharsets" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Set" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="ch.sbb.polarion.extension.generic.rest.model.Context" %>
-<%@ page import="ch.sbb.polarion.extension.pdf.exporter.util.configuration.ConfigurationStatusUtils" %>
-<%@ page import="ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus" %>
-<%@ page import="java.util.Arrays" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<%!
-    private static final String ABOUT_TABLE_ROW = "<tr><td>%s</td><td>%s</td></tr>";
-    private static final String CONFIGURATION_PROPERTIES_TABLE_ROW = "<tr><td>%s</td><td>%s</td></tr>";
-    private static final String CHECK_CONFIGURATION_TABLE_ROW = "<tr><td>%s</td><td>%s</td><td>%s</td></tr>";
-
-    Context context = ExtensionInfo.getInstance().getContext();
-    Version version = ExtensionInfo.getInstance().getVersion();
-    Properties properties = CurrentExtensionConfiguration.getInstance().getExtensionConfiguration().getProperties();
-%>
-
-<head>
-    <title></title>
-    <link rel="stylesheet" href="../ui/generic/css/common.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-    <link rel="stylesheet" href="../ui/generic/css/about.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-    <link rel="stylesheet" href="../ui/generic/css/github-markdown-light.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-</head>
-
-<body>
-<div class="standard-admin-page about-page">
-    <h1>About</h1>
-
-    <div class="about-page-text">
-        <img class="app-icon" src="../ui/images/app-icon.svg?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>" alt="" onerror="this.style.display='none'"/>
-
-        <h3>Extension info</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Manifest entry</th>
-                <th>Value</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_NAME, version.getBundleName()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_VENDOR, version.getBundleVendor()));
-                if (version.getSupportEmail() != null) {
-                    String mailToLink = "<a target=\"_blank\" href=\"mailto:%s\">%s</a>".formatted(version.getSupportEmail(), version.getSupportEmail());
-                    out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.SUPPORT_EMAIL, mailToLink));
-                }
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.AUTOMATIC_MODULE_NAME, version.getAutomaticModuleName()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_VERSION, version.getBundleVersion()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_BUILD_TIMESTAMP, version.getBundleBuildTimestamp()));
-            %>
-            </tbody>
-        </table>
-
-        <h3>Extension configuration properties</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Configuration property</th>
-                <th>Value</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                Set<Object> keySet = properties.keySet();
-                List<String> propertyNames = new ArrayList<>();
-                for (Object key : keySet) {
-                    propertyNames.add((String) key);
-                }
-                Collections.sort(propertyNames);
-
-                for (String key : propertyNames) {
-                    String value = properties.getProperty(key);
-                    String row = CONFIGURATION_PROPERTIES_TABLE_ROW.formatted(key, value);
-                    out.println(row);
-                }
-            %>
-            </tbody>
-        </table>
-
-        <h3>Extension configuration status</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Configuration</th>
-                <th>Status</th>
-                <th>Info</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                String scope = request.getParameter("scope");
-
-                List<ConfigurationStatus> statusList = new ArrayList<>(Arrays.asList(
-                        ConfigurationStatusUtils.getSettingsStatus(scope),
-                        ConfigurationStatusUtils.getDocumentPropertiesPaneStatus(scope),
-                        ConfigurationStatusUtils.getDleToolbarStatus(),
-                        ConfigurationStatusUtils.getLiveReportMainHeadStatus(),
-                        ConfigurationStatusUtils.getCORSStatus()
-                ));
-
-                statusList.addAll(ConfigurationStatusUtils.getWeasyPrintStatus());
-
-                for (ConfigurationStatus configurationStatus : statusList) {
-                    String row = CHECK_CONFIGURATION_TABLE_ROW.formatted(configurationStatus.getName(), configurationStatus.getStatus().toHtml(), configurationStatus.getDetails());
-                    out.println(row);
-                }
-            %>
-            </tbody>
-        </table>
-
-        <input id="scope" type="hidden" value="<%= request.getParameter("scope")%>"/>
-
-        <article class="markdown-body">
-            <%
-                String extensionContext = context.getExtensionContext();
-                try (InputStream inputStream = ExtensionInfo.class.getResourceAsStream("/webapp/" + extensionContext + "-admin/html/about.html")) {
-                    if (inputStream != null) {
-                        String configurationHelp = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-                        out.println(configurationHelp);
-                    } else {
-                        out.println("No help has been generated during build. Please check <a href=\"" + version.getProjectURL() + "/README.md\" target=\"_blank\">the online documentation</a>.");
-                    }
-                }
-            %>
-        </article>
-    </div>
-</div>
-</body>
-</html>
+<jsp:include page="/common/jsp/about.jsp"/>
\ No newline at end of file
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
index 16bf253..02082a1 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <%! String bundleTimestamp = ch.sbb.polarion.extension.generic.util.VersionUtils.getVersion().getBundleBuildTimestampDigitsOnly(); %>
-<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled(); %>
+<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled(); %>
 
 <head>
     <title>PDF Exporter: Style Packages</title>
@@ -62,7 +62,7 @@
 
     <jsp:include page='/common/jsp/configurations.jsp' />
 
-    <div class="content-area" style="border-top: 1px solid #ccc; margin-top: 20px; padding-top: 15px;">
+    <div class="content-area">
         <div id="child-configs-load-error" class="style-package-error" style="display: none; margin-bottom: 15px">
             There was an error loading names of children configurations. Please, contact project/system administrator to solve the issue, a style package can't be configured without them.
         </div>
@@ -70,11 +70,24 @@
             There was an error loading link role names.
         </div>
 
-        <div class='checkbox input-group'>
-            <label for='exposeSettings'>
-                <input id='exposeSettings' type='checkbox'/>
-                Expose style package settings to be redefined on UI
-            </label>
+        <div class="flex-container" id="matching-query-container" style="border-top: 1px solid #ccc; margin-top: 20px; padding-top: 15px;">
+            <p>Here you can specify a query to select documents to which this style package will be relevant. For documents not matching this query the style package won't be visible.
+                If you want to make this style package be available to all documents, just leave this field empty.</p>
+            <div class='input-group'>
+                <label for='matching-query'>Matching query:</label>
+                <input id='matching-query' style="width: 725px;"/>
+            </div>
+        </div>
+
+        <div class="flex-container" style="border-top: 1px solid #ccc; margin-top: 20px; padding-top: 15px;">
+            <div class="flex-column">
+                <div class='checkbox input-group'>
+                    <label for='exposeSettings'>
+                        <input id='exposeSettings' type='checkbox'/>
+                        Expose style package settings to be redefined on UI
+                    </label>
+                </div>
+            </div>
         </div>
 
         <div class="flex-container">
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
index 6b1b58a..ebada73 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <%! String bundleTimestamp = ch.sbb.polarion.extension.generic.util.VersionUtils.getVersion().getBundleBuildTimestampDigitsOnly(); %>
-<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled(); %>
+<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled(); %>
 
 <head>
     <title>PDF Exporter: Webhooks</title>
@@ -13,6 +13,7 @@
         html {
             height: 100%;
         }
+
         body {
             height: 100%;
             padding-left: 10px;
@@ -21,30 +22,61 @@
             display: flex;
             flex-direction: column;
         }
+
         .standard-admin-page {
             flex: 1;
             display: flex;
             flex-direction: column;
         }
-        .webhook-row td:first-child {
-            width: 20px;
+
+        #webhooks-table {
+            width: 1100px;
+            table-layout: fixed;
+        }
+
+        .webhook-row td {
             vertical-align: top;
         }
+
+        .webhook-row td:first-child {
+            width: 30px;
+        }
+
         .webhook-row td:nth-child(2) {
-            width: 96px;
-            vertical-align: top;
             padding-top: 6px;
+            width: 30px;
         }
-        .webhook-row td input {
+
+        .webhook-row td:nth-child(3),
+        .webhook-row td:nth-child(3) input {
             width: 400px;
         }
+
+
+        .webhook-row td:nth-child(4) {
+            padding-top: 4px;
+            width: 55px;
+            min-width: 55px;
+        }
+
+        .webhook-row td:nth-child(5) {
+            width: 100px;
+        }
+
+        .webhook-row td:nth-child(6),
+        .webhook-row td:nth-child(6) input {
+            width: 400px;
+        }
+
         .webhook-button {
             padding: 5px;
             width: 29px;
         }
+
         .invalid-webhook {
             color: #ddab19;
         }
+
         .invalid-webhook.hidden {
             visibility: hidden;
         }
@@ -56,13 +88,13 @@
     <div class="standard-admin-page">
         <h1>PDF Exporter: Webhooks</h1>
 
-        <jsp:include page='/common/jsp/notifications.jsp' />
+        <jsp:include page='/common/jsp/notifications.jsp'/>
 
-        <jsp:include page='/common/jsp/configurations.jsp' />
+        <jsp:include page='/common/jsp/configurations.jsp'/>
 
-        <h2 class="align-left">List of webhooks <%= ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() %></h2>
+        <h2 class="align-left">List of webhooks <%= ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() %></h2>
         <table id="webhooks-table"><!-- Filled by JS --></table>
-        <button class="toolbar-button webhook-button" onclick="WebHooks.addHook()" title="Add a webhook" style="margin-top: 10px; margin-left: 3px;">
+        <button class="toolbar-button webhook-button" onclick="Webhooks.addWebhook()" title="Add a webhook" style="margin-top: 10px; margin-left: 3px;">
             <img src='/polarion/ria/images/control/tablePlus.png' alt="Plus">
         </button>
 
@@ -71,9 +103,9 @@
     </div>
 
     <jsp:include page='/common/jsp/buttons.jsp'>
-        <jsp:param name="saveFunction" value="WebHooks.saveHooks()"/>
+        <jsp:param name="saveFunction" value="Webhooks.saveWebhooks()"/>
         <jsp:param name="cancelFunction" value="SbbCommon.cancelEdit()"/>
-        <jsp:param name="defaultFunction" value="WebHooks.revertToDefault()"/>
+        <jsp:param name="defaultFunction" value="Webhooks.revertToDefault()"/>
     </jsp:include>
 
     <div class="standard-admin-page help">
@@ -87,6 +119,12 @@
                 A webhook is a REST endpoint accepting initial HTML as a string (POST request), making some modification to this HTML and returning resulting HTML as a string back in body of response.
                 A webhook endpoint can locate anywhere, either within Polarion itself or outside of it.
             </p>
+            <h3>Webhook configuration</h3>
+            <p>
+                Each webhook has an URL and optional auth info. The URL is the endpoint to invoke. The auth info is a authentication for this endpoint.
+                The auth info can be either a basic auth with username and password or a Bearer token. The auth info should be stored in Polarion Vault.
+                Here should be provided a name of the vault entry with auth info.
+            </p>
             <h3>Webhooks processing</h3>
             <p>
                 Webhooks to run they should be selected in appropriate style package, or during PDF exporting. They are invoked in an order they entered on this page.
diff --git a/src/main/resources/webapp/pdf-exporter/js/pdf-exporter.js b/src/main/resources/webapp/pdf-exporter/js/pdf-exporter.js
index 160ab22..c9b8872 100644
--- a/src/main/resources/webapp/pdf-exporter/js/pdf-exporter.js
+++ b/src/main/resources/webapp/pdf-exporter/js/pdf-exporter.js
@@ -135,14 +135,16 @@ const PdfExporter = {
             this.adjustWebhooksVisibility()
         ]).then(() => {
             return this.loadSettingNames({
-                setting: "style-package",
-                scope: this.exportContext.scope,
+                customUrl: `/polarion/pdf-exporter/rest/internal/settings/style-package/suitable-names?projectId=${this.exportContext.getProjectId()}`
+                    + `&spaceId=${this.exportContext.getSpaceId()}&documentName=${this.exportContext.getDocumentName()}`,
                 selectElement: document.getElementById("popup-style-package-select")
             }).then(() => {
-                let valueToPreselect = SbbCommon.getCookie(SELECTED_STYLE_PACKAGE_COOKIE);
                 const stylePackageSelect = document.getElementById("popup-style-package-select");
+                const valueToPreselect = SbbCommon.getCookie(SELECTED_STYLE_PACKAGE_COOKIE);
                 if (valueToPreselect && this.containsOption(stylePackageSelect, valueToPreselect)) {
                     stylePackageSelect.value = valueToPreselect;
+                } else if (stylePackageSelect.options.length > 1) {
+                    stylePackageSelect.value = stylePackageSelect.options[1].value;
                 }
 
                 this.onStylePackageChanged();
@@ -154,11 +156,11 @@ const PdfExporter = {
         });
     },
 
-    loadSettingNames: function ({setting, scope, selectElement}) {
+    loadSettingNames: function ({setting, scope, selectElement, customUrl}) {
         return new Promise((resolve, reject) => {
             this.callAsync({
                 method: "GET",
-                url: `/polarion/pdf-exporter/rest/internal/settings/${setting}/names?scope=${scope}`,
+                url: customUrl ? customUrl : `/polarion/pdf-exporter/rest/internal/settings/${setting}/names?scope=${scope}`,
                 responseType: "json",
             }).then(({response}) => {
                 selectElement.innerHTML = ""; // Clear previously loaded content
diff --git a/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java b/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java
deleted file mode 100644
index 992867a..0000000
--- a/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import com.google.re2j.PatternSyntaxException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@ExtendWith(MockitoExtension.class)
-public class RegexMatcherTest {
-
-    private static final String REGEX_TAG = "<(?<tagName>[a-z]+)>";
-
-    @Test
-    void flagsTest() {
-        String input = "Text with <SPAN>tag</SPAN> inside";
-        assertNull(RegexMatcher.get(REGEX_TAG).findFirst(input).orElse(null));
-        assertEquals("<SPAN>", RegexMatcher.get(REGEX_TAG, RegexMatcher.CASE_INSENSITIVE).findFirst(input).orElse(null));
-    }
-
-    @Test
-    void unsupportedRE2JSyntaxTest() {
-        RegexMatcher simpleBackreferenceMatcher = RegexMatcher.get("(')[a-zA-Z]+\\1");
-
-        // backreferences not supported in RE2J
-        PatternSyntaxException exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> simpleBackreferenceMatcher.findFirst("Text with 'quotedText' inside")).getCause();
-        assertEquals("error parsing regexp: invalid escape sequence: `\\1`", exception.getMessage());
-        // but standard java regex does support them
-        assertEquals("'quotedText'", simpleBackreferenceMatcher.useJavaUtil().findFirst("Text with 'quotedText' inside").orElse(null));
-
-        // same for positive lookaheads (?=
-        RegexMatcher positiveLookaheadMatcher = RegexMatcher.get("[a-z]+(?=\\d)");
-        exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> positiveLookaheadMatcher.replaceAll("a1 b2 c d4", "beep")).getCause();
-        assertEquals("error parsing regexp: invalid or unsupported Perl syntax: `(?=`", exception.getMessage());
-        assertEquals("beep1 beep2 c beep4", positiveLookaheadMatcher.useJavaUtil().replaceAll("a1 b2 c d4", "beep"));
-
-        // and atomic groups
-        RegexMatcher atomicGroupsMatcher = RegexMatcher.get("a(?>bc|b)c");
-        exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> atomicGroupsMatcher.anyMatch("abc")).getCause();
-        assertEquals("error parsing regexp: invalid or unsupported Perl syntax: `(?>`", exception.getMessage());
-        assertFalse(atomicGroupsMatcher.useJavaUtil().anyMatch("abc"));
-    }
-
-    @Test
-    void findFirstTest() {
-        RegexMatcher matcher = RegexMatcher.get(REGEX_TAG);
-        String twoEntriesInput = "Text with <i>two</i> <b>tag</b> inside";
-        assertEquals("<i>", matcher.findFirst(twoEntriesInput).orElse(null));
-        assertEquals("i", matcher.findFirst(twoEntriesInput,
-                regexEngine -> regexEngine.group("tagName")).orElse(null));
-        assertEquals(Optional.empty(), matcher.findFirst("Text without tags inside"));
-    }
-
-    @Test
-    void anyAndNoneMatchTest() {
-        RegexMatcher matcher = RegexMatcher.get(REGEX_TAG);
-        assertTrue(matcher.anyMatch("Text with <br> tags inside"));
-        assertFalse(matcher.anyMatch("Text without tags inside"));
-        assertFalse(matcher.noneMatch("Text with <br> tags inside"));
-        assertTrue(matcher.noneMatch("Text without tags inside"));
-    }
-
-    @Test
-    void removeAllTest() {
-        assertEquals("Text with tags inside </br>", RegexMatcher.get(REGEX_TAG).removeAll("Text with <some><random>tags inside </br>"));
-    }
-
-    @Test
-    void processEntryTest() {
-        List<String> tags = new ArrayList<>();
-        RegexMatcher.get(REGEX_TAG).processEntry("Text with <a><few><random> tags inside",
-                regexEngine -> tags.add(regexEngine.group("tagName")));
-        assertEquals("a", tags.get(0));
-        assertEquals("few", tags.get(1));
-        assertEquals("random", tags.get(2));
-    }
-
-    @Test
-    void replaceTest() {
-        assertEquals("Text with {two}{random} tags inside plus one more at the {end}", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <two><random> tags inside plus one more at the <end>",
-                        regexEngine -> "{%s}".formatted(regexEngine.group("tagName"))));
-
-        // by default quoteReplacement = true
-        assertEquals("Text with $100 tag inside", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <br> tag inside",
-                        regexEngine -> "$100"));
-
-        assertEquals("Text with br00 tag inside", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <br> tag inside", false,
-                        regexEngine -> "$100"));
-
-        assertEquals("Text with 4242 tags inside plus one more at the 42", RegexMatcher.get(REGEX_TAG)
-                .replaceAll("Text with <two><random> tags inside plus one more at the <end>", "42"));
-    }
-
-}