diff --git a/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/common/src/main/java/stirling/software/common/configuration/AppConfig.java
index 86b9e1230..1acebeaf4 100644
--- a/common/src/main/java/stirling/software/common/configuration/AppConfig.java
+++ b/common/src/main/java/stirling/software/common/configuration/AppConfig.java
@@ -273,6 +273,12 @@ public class AppConfig {
         return false;
     }
     
+    @Bean(name = "license")
+    public String licenseType() {
+        return "NORMAL";
+    }
+    
+    
     @Bean(name = "disablePixel")
     public boolean disablePixel() {
     	return Boolean.parseBoolean(env.getProperty("DISABLE_PIXEL", "false"));
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
index f92160c8d..e6afa6e40 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
@@ -26,7 +26,7 @@ import stirling.software.common.model.exception.UnsupportedProviderException;
         basePackages = {
             "stirling.software.proprietary.security.database.repository",
             "stirling.software.proprietary.security.repository"
-        })   
+        })
 @EntityScan({"stirling.software.proprietary.security.model", "stirling.software.proprietary.model"})
 public class DatabaseConfig {
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
index 28904ed15..85a6cc310 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
@@ -2,7 +2,6 @@ package stirling.software.proprietary.security.configuration.ee;
 
 import static stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -36,6 +35,7 @@ public class EEAppConfig {
     }
 
     @Bean(name = "license")
+    @Primary
     public String licenseType() {
         return licenseKeyChecker.getPremiumLicenseEnabledResult().name();
     }
diff --git a/stirling-pdf/src/main/resources/messages_en_GB.properties b/stirling-pdf/src/main/resources/messages_en_GB.properties
index 773748240..8add1b6bd 100644
--- a/stirling-pdf/src/main/resources/messages_en_GB.properties
+++ b/stirling-pdf/src/main/resources/messages_en_GB.properties
@@ -130,6 +130,65 @@ enterpriseEdition.ssoAdvert=Looking for more user management features? Check out
 enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro licence or higher
 
 
+#################
+#  Analytics    #
+#################
+analytics.title=Do you want make Stirling PDF better?
+analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
+analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
+analytics.enable=Enable analytics
+analytics.disable=Disable analytics
+analytics.settings=You can change the settings for analytics in the config/settings.yml file
+
+
+#############
+#  NAVBAR   #
+#############
+navbar.favorite=Favorites
+navbar.recent=New and recently updated
+navbar.darkmode=Dark Mode
+navbar.language=Languages
+navbar.settings=Settings
+navbar.allTools=Tools
+navbar.multiTool=Multi Tool
+navbar.search=Search
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
+navbar.sections.popular=Popular
+
+#############
+#  SETTINGS #
+#############
+settings.title=Settings
+settings.update=Update available
+settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
+settings.appVersion=App Version:
+settings.downloadOption.title=Choose download option (For single file non zip downloads):
+settings.downloadOption.1=Open in same window
+settings.downloadOption.2=Open in new window
+settings.downloadOption.3=Download file
+settings.zipThreshold=Zip files when the number of downloaded files exceeds
+settings.signOut=Sign Out
+settings.accountSettings=Account Settings
+settings.bored.help=Enables easter egg game
+settings.cacheInputs.name=Save form inputs
+settings.cacheInputs.help=Enable to store previously used inputs for future runs
+
+changeCreds.title=Change Credentials
+changeCreds.header=Update Your Account Details
+changeCreds.changePassword=You are using default login credentials. Please enter a new password
+changeCreds.newUsername=New Username
+changeCreds.oldPassword=Current Password
+changeCreds.newPassword=New Password
+changeCreds.confirmNewPassword=Confirm New Password
+changeCreds.submit=Submit Changes
+
+
+
 account.title=Account Settings
 account.accountSettings=Account Settings
 account.adminSettings=Admin Settings - View and Add Users
diff --git a/stirling-pdf/src/main/resources/templates/convert/pdf-to-text.html b/stirling-pdf/src/main/resources/templates/convert/pdf-to-text.html
index d531ce497..c4b737914 100644
--- a/stirling-pdf/src/main/resources/templates/convert/pdf-to-text.html
+++ b/stirling-pdf/src/main/resources/templates/convert/pdf-to-text.html
@@ -22,13 +22,13 @@
                 <div class="mb-3">
                   <label th:text="#{PDFToText.selectText.1}"></label>
                   <select class="form-control" name="outputFormat">
-                    <option th:if="${@endpointConfigurationService.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
+                    <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
                     <option value="txt">TXT</option>
                   </select>
                 </div>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToText.submit}"></button>
               </form>
-              <p th:if="${@endpointConfigurationService.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
+              <p th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
                     <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
                     <option value="txt">TXT</option>
                   </select>
diff --git a/stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html b/stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html
index e9700e304..42f696bfb 100644
--- a/stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html
+++ b/stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html
@@ -1,5 +1,5 @@
 <th:block th:fragment="navbarEntry(endpoint, toolIcon, titleKey, descKey, tagKey, toolGroup)"
-th:if="${@endpointConfigurationService.isEndpointEnabled(endpoint)}">
+th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
   <a th:id="@{${endpoint}}" class="dropdown-item" style="position:relative" th:href="@{${endpoint}}"
     th:data-bs-link="@{${endpoint}}"
     th:classappend="${endpoint.equals(currentPage)} ?  ${toolGroup} + ' active' : '' + ${toolGroup}"