Update octojpack config for J5.

Moved the issue templates to the correct folder.
Fixes indentation and text
2024-03-05 12:26:51 +02:00 · 2024-03-05 12:04:36 +02:00 · 2024-03-05 10:02:18 +00:00 · 2024-03-05 10:02:18 +00:00 · 2024-03-05 10:02:18 +00:00 · 2024-03-05 10:02:18 +00:00
824 changed files with 40221 additions and 81926 deletions
--- a/.gitea/ISSUE_TEMPLATE/a-bug.yml
+++ b/.gitea/ISSUE_TEMPLATE/a-bug.yml
@ -0,0 +1,96 @@
+name: Bug Report
+about: Draft a report to aid in our Debugging efforts.
+title: "[BUG]: "
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We value your effort in reporting an bug! Your feedback is essential for us to address and fix the problem.                
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What Happened?
+      description: Please provide a detailed description of the issue and explain what outcome you anticipate.
+      placeholder: Describe the issue you experienced.
+      value: ""
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Environment Details                
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version were you using?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Where did this issue occur?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermon Categories(admin_views)
+        - Series List(admin_views)
+        - Series(admin_view)
+        - Statistics(admin_view)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preachers(site_views)
+        - Preacher(site_view)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: On which browsers did you encounter the issue?
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Microsoft Edge
+        - Safari
+        - Opera
+        - Brave
+        - Vivaldi
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: What operating system are you currently using?
+      multiple: true
+      options:
+        - Windows (Desktop)
+        - macOS (Desktop)
+        - Linux (Desktop)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/b-enhancement.yml
+++ b/.gitea/ISSUE_TEMPLATE/b-enhancement.yml
@ -0,0 +1,83 @@
+name: Enhancement Request
+about: Suggest an idea for Joomla-Sermon-Distributor
+title: "[ENHANCEMENT]: "
+labels:
+  - enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for suggesting an enhancement! Your input is crucial for our innovation and progress. To assist us better, please share detailed information about your idea.                
+  - type: textarea
+    id: enhancement-details
+    attributes:
+      label: Enhancement Details
+      description: Could you detail the enhancement you're suggesting? Explain the issue it addresses or the new feature it introduces.
+      placeholder: Please give an in-depth explanation of your proposed enhancement.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Context and Priority        
+  - type: dropdown
+    id: system
+    attributes:
+      label: On which Joomla version will this enhancement have an impact?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which part of the extension will be affected by this enhancement?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermons Categories(admin_views)
+        - Series List(admin_view)
+        - Series(admin_views)
+        - Statistics(admin_views)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preacher(site_view)
+        - Preachers(site_views)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: benefits
+    attributes:
+      label: Expected Benefits
+      description: What advantages can be anticipated from this enhancement? How does it contribute to the improvement of the system?
+      placeholder: Detail the advantages that this enhancement will provide.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Supply additional context or screenshots related to the enhancement request in this space.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/c-task.yml
+++ b/.gitea/ISSUE_TEMPLATE/c-task.yml
@ -0,0 +1,83 @@
+name: Task
+about: Create a task for project management
+title: "[TASK]: "
+labels:
+  - task
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for setting up the task! Tasks assist us in arranging and ranking our work. Kindly provide comprehensive details about the task for clarity and efficient tracking.               
+  - type: textarea
+    id: task-details
+    attributes:
+      label: Task Details
+      description: Please describe the task. What are the specific actions required?
+      placeholder: Provide a detailed description of the task.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Task Context and Priority
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version is this task related to?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which area of the extension does this task impact?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermon Categories(admin_views)
+        - Series List(admin_views)
+        - Series(admin_view)
+        - Statistics(admin_view)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preachers(site_views)
+        - Preacher(site_view)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: task-objective
+    attributes:
+      label: Task Objective
+      description: What's the aim or purpose of this task? How will it contribute to the project or system's success?
+      placeholder: Describe the goal and anticipated result of the task.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Please share any extra context, files, or screenshots that could aid in comprehending or carrying out the task.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/d-doc.yml
+++ b/.gitea/ISSUE_TEMPLATE/d-doc.yml
@ -0,0 +1,83 @@
+name: Documentation
+about: Propose improvements to the documentation or highlight any issues found within it.
+title: "[DOCUMENTATION]: "
+labels:
+  - documentation
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We appreciate your input on our documentation! Clear and comprehensive documentation plays a vital role in enabling users to effectively interact with our systems. To assist us in making improvements, kindly offer thorough details regarding your suggestion or the specific problem you've encountered.               
+  - type: textarea
+    id: documentation-details
+    attributes:
+      label: Documentation Details
+      description: Please explain the specific problem with the documentation or the improvements you recommend. Is it a missing topic, unclear instructions, outdated content, or something else?
+      placeholder: Detail the issue with the documentation or suggest improvements..
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Specific Context        
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version does this documentation relate to?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which area of the extension does this documentation concern?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermon Categories(admin_views)
+        - Series List(admin_views)
+        - Series(admin_view)
+        - Statistics(admin_view)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preachers(site_views)
+        - Preacher(site_view)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: expected-outcome
+    attributes:
+      label: Expected Outcome
+      description: What outcomes do you anticipate from this change in documentation? How will it benifit the users or enhance the project?
+      placeholder: Explain the expected result of this change in the documentation.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Share any extra details, files, or screenshots that could help in understanding or applying the documentation change.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/e-performance.yml
+++ b/.gitea/ISSUE_TEMPLATE/e-performance.yml
@ -0,0 +1,126 @@
+name: Performance Issue
+about: Recommend or propose performance improvements
+title: "[PERFORMANCE]: "
+labels:
+  - performance
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Appreciation for tackling performance challenges! Optimizing performance is vital for our system's efficiency and the user experience. Could you offer more comprehensive details to aid in identifying and resolving the suggested performance issue or improvement?                
+  - type: textarea
+    id: performance-details
+    attributes:
+      label: Performance Details
+      description: Please outline the performance problem or the enhancements you propose. Is it related to speed, resource usage, responsiveness, or something else?
+      placeholder: Offer an in-depth explanation of the performance challenge or improvement.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Affected Systems and Context        
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version is affected by this performance issue?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which part of the extension will be affected by this performance issue?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermons Categories(admin_views)
+        - Series List(admin_view)
+        - Series(admin_views)
+        - Statistics(admin_views)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preacher(site_view)
+        - Preachers(site_views)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Which browsers did you experience the performance problem on?
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Microsoft Edge
+        - Safari
+        - Opera
+        - Brave
+        - Vivaldi
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Which operating system are you using?
+      multiple: true
+      options:
+        - Windows (Desktop)
+        - macOS (Desktop)
+        - Linux (Desktop)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: replication-steps
+    attributes:
+      label: Steps to Replicate
+      description: If possible, share a step-by-step guide to replicate the performance problem.
+      placeholder: Explain how to replicate the problem.
+    validations:
+      required: false
+  - type: textarea
+    id: impact-assessment
+    attributes:
+      label: Impact Assessment
+      description: How does the performance problem impact the system or its users? How severe is its effect?
+      placeholder: Explain the impact of the performance problem.
+    validations:
+      required: true
+  - type: textarea
+    id: proposed-solutions
+    attributes:
+      label: Proposed Solutions or Ideas
+      description: If you have any suggestions or ideas for resolving the performance problem, please share them here.
+      placeholder: Share any potential solutions or improvement problem.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Provide any additional context, benchmarks, logs, or screenshots that might help in understanding or addressing the performance problem.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/f-refactor.yml
+++ b/.gitea/ISSUE_TEMPLATE/f-refactor.yml
@ -0,0 +1,86 @@
+name: Refactoring Task
+about: Recommend or identify the necessity for code refactoring.
+title: "[REFACTOR]: "
+labels:
+  - refactor
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We appreciate your commitment to enhancing the maintainability and quality of our codebase! Code refactoring plays a crucial role in ensuring our system remains efficient and easy to manage. To assist us effectively, please share comprehensive details about the refactoring task you are suggesting or identifying.                
+  - type: textarea
+    id: refactoring-details
+    attributes:
+      label: Refactoring Details
+      description: Outline the refactoring task, specifying which code segment requires attention and the reasons behind this need. What improvements are expected from this refactoring?
+      placeholder: Provide an in-depth explanation of the refactoring task?
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Affected Components and Context        
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version does this refactoring task relate to?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which area of the extension will be impacted by this refactoring?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermon Categories(admin_views)
+        - Series List(admin_views)
+        - Series(admin_view)
+        - Statistics(admin_view)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preachers(site_views)
+        - Preacher(site_view)
+        - Series(site_view)
+        - Series List(site_views)
+        - Back-end (Just Code)
+        - Front-end (Just GUI)
+        - All
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: expected-outcome
+    attributes:
+      label: Expected Outcome
+      description: What benefits do you anticipate from this refactoring? How will it enhance the codebase or overall system?
+      placeholder: Explain the expected results of this refactoring.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Share any further details or information, like code snippets, that could aid in comprehending or executing the refactoring task.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/g-security.yml
+++ b/.gitea/ISSUE_TEMPLATE/g-security.yml
@ -0,0 +1,48 @@
+name: Security Issue
+about: Identify a possible security risk.
+title: "[SECURITY]: "
+labels:
+  - security
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **⚠️ CRITICAL: Avoid sharing any sensitive or confidential details in this message.** Should you suspect a security flaw, please contact us directly at [joomla@vdm.io].               
+  - type: textarea
+    id: security-general-description
+    attributes:
+      label: General Description
+      description: Offer a broad overview of the security concern, ensuring not to disclose any sensitive information.
+      placeholder: Provide a general description of the security problem.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Affected Systems        
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version could potentially be affected?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - All
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: non-sensitive-details
+    attributes:
+      label: Non-Sensitive Details
+      description: If applicable, please offer further non-sensitive information or general observations regarding the security concern.
+      placeholder: Provide any relevant non-sensitive details or observations.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.gitea/ISSUE_TEMPLATE/h-test.yml
+++ b/.gitea/ISSUE_TEMPLATE/h-test.yml
@ -0,0 +1,84 @@
+name: Test Issue
+about: Recommend additional assessments or identify any problems with current tests.
+title: "[TEST]: "
+labels:
+  - test
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for your involvement in the testing phase of our initiative! Thorough testing is essential to uphold the integrity and dependability of our systems. Please provide detailed information to aid us in comprehending the testing activity or problem you're proposing or highlighting.
+                
+  - type: textarea
+    id: testing-details
+    attributes:
+      label: Testing Details
+      description: Could you specify the testing task or concern? Are you proposing a new test, pointing out a defect in current tests, or identifying untested areas?
+      placeholder: Please offer an detailed description of the testing task or issue.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Affected Components and Context        
+  - type: dropdown
+    id: system
+    attributes:
+      label: Which Joomla version is this testing issue related to?
+      multiple: true
+      options:
+        - Joomla 5
+        - Joomla 4
+        - Joomla 3
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which area of the extension does this testing task impact?
+      multiple: true
+      options:
+        - Dashboard(admin_view)
+        - Preachers(admin_views)
+        - Preacher(admin_view)
+        - Sermons(admin_views)
+        - Sermon(admin_view)
+        - Sermons Categories(admin_views)
+        - Series List(admin_view)
+        - Series(admin_views)
+        - Statistics(admin_views)
+        - External Sources(admin_views)
+        - External Source(admin_view)
+        - Manual Updater(admin_view)
+        - Local Listings(admin_views)
+        - Help Documents(admin_views)
+        - Categories(site_views)
+        - Category(site_view)
+        - Preacher(site_view)
+        - Preachers(site_views)
+        - Series(site_view)
+        - Series List(site_views)
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    id: expected-outcome
+    attributes:
+      label: Expected Outcome
+      description: What do you expect to achieve with this testing task? How will it improve the system or its reliability?
+      placeholder: Describe the expected outcome of this testing task.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Provide any additional context, testing scenarios, or information that might help in understanding or implementing the testing task.
+    validations:
+      required: false
+  - type: textarea
+    id: comments
+    attributes:
+      label: Additional Comments
+      description: Feel free to include any further comments or pertinent details that might assist us.
--- a/.octojpack
+++ b/.octojpack
@ -9,8 +9,8 @@
    "name": "PKG_SERMONDISTRIBUTOR",
    "code_name": "sermondistributor",
    "package_name": "pkg_sermondistributor",
-    "min_joomla_version": "3.8",
-    "max_joomla_version": "3.10",
+    "min_joomla_version": "4.3",
+    "max_joomla_version": "5.1",
    "copyright": "Copyright (C) 2015 Llewellyn van der Merwe. All rights reserved.",
    "copyright_year": "2015",
    "license": "GNU General Public License version 2; see LICENSE",
@ -20,11 +20,12 @@
    "author_url": "https://io.vdm.dev/",
    "description": "The Sermon Distributor.",
    "version_id": "com_sermondistributor",
-    "update_servers": "https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/sermondistributor_update_server.xml"
+    "update_servers": "https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/5.0/sermondistributor_update_server.xml"
  },
  "repository": {
    "owner": "christian",
-    "repo": "pkg-sermondistributor"
+    "repo": "pkg-sermondistributor",
+    "branch": "5.0"
  },
  "files": [
    {
@ -32,19 +33,19 @@
      "repo": "Joomla-Sermon-Distributor",
      "id": "com_sermondistributor",
      "type": "component",
-      "mode": "master"
+      "mode": "5.0"
    },
    {
-      "owner": "christian",
-      "repo": "mod_dailylight",
+      "owner": "getBible",
+      "repo": "daily-light-module",
      "id": "mod_dailylight",
      "type": "module",
      "client": "site",
      "mode": "master"
    },
    {
-      "owner": "christian",
-      "repo": "mod_dailyscripture",
+      "owner": "getBible",
+      "repo": "daily-scripture-module",
      "id": "mod_dailyscripture",
      "type": "module",
      "client": "site",
@ -66,4 +67,3 @@
    }
  ]
 }
-
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,11 @@
-# v2.1.1
+# v5.0.0-beta1

- Moved over to a Joomla Package
+- First release of [[[Component]]] towards Joomla 5
+
+# v3.0.3
+
+- Removed the not_required field from the sermon model. #36
+
+# v3.0.2
+
+- Add the HTML class to the site default layout.
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
-# Sermon Distributor (2.1.x)
+# Sermon Distributor (5.0.x)

 ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")

-Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.
+Distributor is a highly advanced sermon distributor that runs on the [Joomla 4.x & 5.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.

 The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip)

@ -24,38 +24,38 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 29th May, 2023
-+ *Version*: 2.1.x
+ *Last Build*: 2nd March, 2024
+ *Version*: 5.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

 ## Build Time :hourglass:

-**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**245 Hours** or **31 Eight Hour Days** (actual time the author saved -
 due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))

 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)

-+ *Line count*: **75271**
-+ *File count*: **486**
-+ *Folder count*: **105**
+ *Line count*: **87679**
+ *File count*: **575**
+ *Folder count*: **120**

-**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**161 Hours** or **20 Eight Hour Days** (the actual time the author spent)

 > (with the following break down:
-> **debugging @52hours** = codingtime / 4;
-> **planning @30hours** = codingtime / 7;
-> **mapping @21hours** = codingtime / 10;
-> **office @35hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @41hours** = codingtime / 6;)

-**348 Hours** or **44 Eight Hour Days**
+**406 Hours** or **51 Eight Hour Days**
 (a total of the realistic time frame for this project)

 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)

-Project duration: **8.8 weeks** or **1.8 months**
+Project duration: **10.2 weeks** or **2.1 months**

 > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
-> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
--- a/SermondistributorInstallerScript.php
+++ b/SermondistributorInstallerScript.php
--- a/admin/README.txt
+++ b/admin/README.txt
@ -1,8 +1,8 @@
-# Sermon Distributor (2.1.x)
+# Sermon Distributor (5.0.x)

 ![Sermon Distributor image](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/raw/branch/master/admin/assets/images/vdm-component.jpg "The Sermon Distributor")

-Distributor is a highly advanced sermon distributor that runs on the [Joomla 3.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.
+Distributor is a highly advanced sermon distributor that runs on the [Joomla 4.x & 5.x](http://www.joomla.org) framework. You can link a shared folder from Dropbox to the component and use Dropbox as your file host, not to mention the advanced auto builder that gives you the ability to simply load sermons to your website by only adding them to Dropbox.

 The best way to see all your options is to install this component on you Joomla website and test all features yourself. Here is a [direct download link](https://git.vdm.dev/christian/Joomla-Sermon-Distributor/archive/master.zip)

@ -24,38 +24,38 @@ The best way to see all your options is to install this component on you Joomla
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Sermon Distributor](https://www.vdm.io/)
 + *First Build*: 22nd October, 2015
-+ *Last Build*: 29th May, 2023
-+ *Version*: 2.1.x
+ *Last Build*: 2nd March, 2024
+ *Version*: 5.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

 ## Build Time :hourglass:

-**210 Hours** or **26 Eight Hour Days** (actual time the author saved -
+**245 Hours** or **31 Eight Hour Days** (actual time the author saved -
 due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))

 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)

-+ *Line count*: **75271**
-+ *File count*: **486**
-+ *Folder count*: **105**
+ *Line count*: **87679**
+ *File count*: **575**
+ *Folder count*: **120**

-**138 Hours** or **18 Eight Hour Days** (the actual time the author spent)
+**161 Hours** or **20 Eight Hour Days** (the actual time the author spent)

 > (with the following break down:
-> **debugging @52hours** = codingtime / 4;
-> **planning @30hours** = codingtime / 7;
-> **mapping @21hours** = codingtime / 10;
-> **office @35hours** = codingtime / 6;)
+> **debugging @61hours** = codingtime / 4;
+> **planning @35hours** = codingtime / 7;
+> **mapping @24hours** = codingtime / 10;
+> **office @41hours** = codingtime / 6;)

-**348 Hours** or **44 Eight Hour Days**
+**406 Hours** or **51 Eight Hour Days**
 (a total of the realistic time frame for this project)

 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)

-Project duration: **8.8 weeks** or **1.8 months**
+Project duration: **10.2 weeks** or **2.1 months**

 > This **component** was build with a Joomla [Automated Component Builder](https://www.joomlacomponentbuilder.com).
-> Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+> Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		admin.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		dashboard.css
@ -24,153 +24,153 @@
 /* CSS Document */

 .dashboard-container {
-    margin-left: 10px;
-    margin-top: 10px;
-    width: 100%;
+	margin-left: 10px;
+	margin-top: 10px;
+	width: 100%;
 }
 .dashboard-container [class*="span"] {
-    display: block;
-    float: none;
-    margin-left: 0;
-    width: auto;
+	display: block;
+	float: none;
+	margin-left: 0;
+	width: auto;
 }
 .dashboard-container:before, .dashboard-container:after {
-    content: "";
-    display: table;
+	content: "";
+	display: table;
 }
 .dashboard-container:after {
-    clear: both;
+	clear: both;
 }
 .dashboard-container [class*="span"] {
-    box-sizing: border-box;
-    display: block;
-    float: left;
-    min-height: 145px;
-    min-width: 96px;
-    width: 100%;
+	box-sizing: border-box;
+	display: block;
+	float: left;
+	min-height: 145px;
+	min-width: 96px;
+	width: 100%;
 }
 .dashboard-container [class*="span"]:first-child {
-    margin-left: 0;
+	margin-left: 0;
 }
 .dashboard-wraper {
-    background: none repeat scroll 0 0 hsl(0, 0%, 93%);
-    border-radius: 5px;
-    float: left;
-    margin: 1%;
-    padding: 3px;
-    width: 17%;
-    min-height: 194px;
-    min-width: 96px;
+	background: none repeat scroll 0 0 hsl(0, 0%, 93%);
+	border-radius: 5px;
+	float: left;
+	margin: 1%;
+	padding: 3px;
+	width: 17%;
+	min-height: 194px;
+	min-width: 96px;
 }
 .dashboard-content a {
-    background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 85%);
-    border-radius: 4px;
-    box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
-    color: hsl(0, 0%, 20%);
-    display: block;
-    min-height: 89px;
-    padding: 10px;
-    text-align: center;
-    text-decoration: none;
+	background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 85%);
+	border-radius: 4px;
+	box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
+	color: hsl(0, 0%, 20%);
+	display: block;
+	min-height: 89px;
+	padding: 10px;
+	text-align: center;
+	text-decoration: none;
 }
 .dashboard-content a:hover {
-    background: linear-gradient(to bottom, hsl(0, 0%, 90%) 0%, hsl(0, 0%, 100%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    color: hsl(200, 100%, 30%);
-    text-decoration: none;
+	background: linear-gradient(to bottom, hsl(0, 0%, 90%) 0%, hsl(0, 0%, 100%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	color: hsl(200, 100%, 30%);
+	text-decoration: none;
 }
 .dashboard-title {
-    display: block;
-    padding-top: 5px;
+	display: block;
+	padding-top: 5px;
 }
 .dashboard-info {
-    background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 85%);
-    border-radius: 4px;
-    box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
-    color: hsl(0, 0%, 20%);
-    display: block;
-    font-size: 12px;
-    padding: 10px;
-    text-align: center;
+	background: linear-gradient(to bottom, hsl(0, 0%, 100%) 0%, hsl(0, 0%, 96%) 47%, hsl(0, 0%, 93%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 85%);
+	border-radius: 4px;
+	box-shadow: 0 0 3px hsla(0, 0%, 0%, 0.1) inset;
+	color: hsl(0, 0%, 20%);
+	display: block;
+	font-size: 12px;
+	padding: 10px;
+	text-align: center;
 }
 .dashboard-info span {
-    display: block;
-    text-align: center;
+	display: block;
+	text-align: center;
 }
 .dashboard-info img {
-    margin: 0 auto;
+	margin: 0 auto;
 }
 .dashboard-table {
-    border-top: 1px solid hsl(0, 0%, 87%);
-    margin-top: 5px;
-    width: 100%;
+	border-top: 1px solid hsl(0, 0%, 87%);
+	margin-top: 5px;
+	width: 100%;
 }
 .dashboard-info h5 {
-    font-size: 11px;
-    font-weight: bold;
+	font-size: 11px;
+	font-weight: bold;
 }
 .dashboard-block {
-    background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border: 1px solid hsl(0, 0%, 76%);
-    border-radius: 3px;
-    box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset;
-    margin-bottom: 20px;
+	background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border: 1px solid hsl(0, 0%, 76%);
+	border-radius: 3px;
+	box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset;
+	margin-bottom: 20px;
 }
 .dashboard-block .dashboard-block-head {
-    background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
-    border-bottom: 1px solid hsl(0, 0%, 76%);
-    border-radius: 3px 3px 0 0;
-    box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset, 0 0 3px hsl(0, 0%, 87%);
-    height: 40px;
-    position: relative;
+	background: linear-gradient(to bottom, hsl(0, 0%, 95%) 0%, hsl(0, 0%, 86%) 100%) repeat scroll 0 0 hsla(0, 0%, 0%, 0);
+	border-bottom: 1px solid hsl(0, 0%, 76%);
+	border-radius: 3px 3px 0 0;
+	box-shadow: 0 1px 0 hsl(0, 0%, 98%) inset, 0 0 3px hsl(0, 0%, 87%);
+	height: 40px;
+	position: relative;
 }
 .dashboard-block .dashboard-block-head h5 {
-    font-size: 12px;
-    margin: 0;
-    padding-left: 10px;
-    padding-top: 11px;
-    text-transform: uppercase;
+	font-size: 12px;
+	margin: 0;
+	padding-left: 10px;
+	padding-top: 11px;
+	text-transform: uppercase;
 }
 .dashboard-block .dashboard-block-content {
-    background: none repeat scroll 0 0 hsl(0, 0%, 93%);
-    border-radius: 0 0 3px 3px;
+	background: none repeat scroll 0 0 hsl(0, 0%, 93%);
+	border-radius: 0 0 3px 3px;
 }
 .dashboard-block .dashboard-block-box {
-    background: none repeat scroll 0 0 hsl(0, 0%, 100%);
-    border-top: 1px solid hsl(0, 0%, 82%);
-    box-shadow: 0 0 5px hsl(0, 0%, 87%) inset;
+	background: none repeat scroll 0 0 hsl(0, 0%, 100%);
+	border-top: 1px solid hsl(0, 0%, 82%);
+	box-shadow: 0 0 5px hsl(0, 0%, 87%) inset;
 }
 .dashboard-block .dashboard-block-content .dashboard-block-box {
-    margin-top: 0 !important;
+	margin-top: 0 !important;
 }
 .dashboard-block .dashboard-block-content .dashboard-block-box .dashboard-block-table {
-    margin-bottom: 0 !important;
+	margin-bottom: 0 !important;
 }
 .dashboard-block-table {
-    background-color: hsla(0, 0%, 0%, 0);
-    border-collapse: collapse;
-    border-spacing: 0;
-    margin-bottom: 20px;
-    max-width: 100%;
-    width: 100%;
+	background-color: hsla(0, 0%, 0%, 0);
+	border-collapse: collapse;
+	border-spacing: 0;
+	margin-bottom: 20px;
+	max-width: 100%;
+	width: 100%;
 }
 .dashboard-block-table th, .dashboard-block-table td {
-    border-top: 1px solid hsl(0, 0%, 87%);
-    line-height: 20px;
-    padding: 5px;
-    text-align: left;
-    vertical-align: middle;
+	border-top: 1px solid hsl(0, 0%, 87%);
+	line-height: 20px;
+	padding: 5px;
+	text-align: left;
+	vertical-align: middle;
 }
 .dashboard-badge {
-    background-color: hsl(0, 0%, 60%);
-    border-radius: 9px;
-    color: hsl(0, 0%, 100%);
-    font-size: 11.844px;
-    font-weight: bold;
-    line-height: 14px;
-    padding: 1px 9px 2px;
-    text-shadow: 0 -1px 0 hsla(0, 0%, 0%, 0.25);
-    vertical-align: baseline;
-    white-space: nowrap;
+	background-color: hsl(0, 0%, 60%);
+	border-radius: 9px;
+	color: hsl(0, 0%, 100%);
+	font-size: 11.844px;
+	font-weight: bold;
+	line-height: 14px;
+	padding: 1px 9px 2px;
+	text-shadow: 0 -1px 0 hsla(0, 0%, 0%, 0.25);
+	vertical-align: baseline;
+	white-space: nowrap;
 }
--- a/admin/assets/css/external_source.css
+++ b/admin/assets/css/external_source.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_source.css
--- a/admin/assets/css/external_sources.css
+++ b/admin/assets/css/external_sources.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		external_sources.css
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_document.css
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		help_documents.css
--- a/admin/assets/css/local_listing.css
+++ b/admin/assets/css/local_listing.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listing.css
--- a/admin/assets/css/local_listings.css
+++ b/admin/assets/css/local_listings.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		local_listings.css
--- a/admin/assets/css/manual_updater.css
+++ b/admin/assets/css/manual_updater.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		manual_updater.css
--- a/admin/assets/css/preacher.css
+++ b/admin/assets/css/preacher.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preacher.css
--- a/admin/assets/css/preachers.css
+++ b/admin/assets/css/preachers.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		preachers.css
--- a/admin/assets/css/series.css
+++ b/admin/assets/css/series.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series.css
--- a/admin/assets/css/series_list.css
+++ b/admin/assets/css/series_list.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		series_list.css
--- a/admin/assets/css/sermon.css
+++ b/admin/assets/css/sermon.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermon.css
--- a/admin/assets/css/sermons.css
+++ b/admin/assets/css/sermons.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons.css
--- a/admin/assets/css/statistic.css
+++ b/admin/assets/css/statistic.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistic.css
--- a/admin/assets/css/statistics.css
+++ b/admin/assets/css/statistics.css
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		statistics.css
--- a/admin/assets/images/import.gif
+++ b/admin/assets/images/import.gif
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@ -9,7 +9,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		admin.js
--- a/admin/config.xml
+++ b/admin/config.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 	<fieldset
-		addrulepath="/administrator/components/com_sermondistributor/models/rules"
-		addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+		addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+		addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 		name="global_config"
 		label="COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_LABEL"
 		description="COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_DESC">
@ -301,17 +301,17 @@
 		name="uikit_config"
 		label="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL"
 		description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC">
-		<field name="uikit_version"
+		<field name="add_jquery_framework"
 			type="radio"
-			label="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_VERSION_LABEL"
-			description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_VERSION_DESC"
+			label="COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_LABEL"
+			description="COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_DESC"
 			class="btn-group btn-group-yesno"
-			default="2">
+			default="">
 			<!-- Option Set. -->
-			<option value="2">
-				COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_V2</option>"
-			<option value="3">
-				COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_V3</option>"
+			<option value="0">
+				COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_REMOVE</option>"
+			<option value="1">
+				COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD</option>"
 		</field>
 		<field name="uikit_load"
 			type="radio"
@ -324,8 +324,6 @@
 				COM_SERMONDISTRIBUTOR_CONFIG_AUTO_LOAD</option>"
 			<option value="1">
 				COM_SERMONDISTRIBUTOR_CONFIG_FORCE_LOAD</option>"
-			<option value="3">
-				COM_SERMONDISTRIBUTOR_CONFIG_ONLY_EXTRA</option>"
 			<option value="2">
 				COM_SERMONDISTRIBUTOR_CONFIG_DONT_LOAD</option>"
 		</field>
@ -341,21 +339,6 @@
 			<option value=".min">
 				COM_SERMONDISTRIBUTOR_CONFIG_YES</option>"
 		</field>
-		<field name="uikit_style"
-			type="radio"
-			label="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_LABEL"
-			description="COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_DESC"
-			class="btn-group btn-group-yesno"
-			showon="uikit_version:2"
-			default="">
-			<!-- Option Set. -->
-			<option value="">
-				COM_SERMONDISTRIBUTOR_CONFIG_FLAT_LOAD</option>"
-			<option value=".almost-flat">
-				COM_SERMONDISTRIBUTOR_CONFIG_ALMOST_FLAT_LOAD</option>"
-			<option value=".gradient">
-				COM_SERMONDISTRIBUTOR_CONFIG_GRADIANT_LOAD</option>"
-		</field>
 	</fieldset>
 	<fieldset
 		name="encryption_config"
--- a/admin/controller.php
+++ b/admin/controller.php
@ -1,132 +0,0 @@
-<?php
-/*-------------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
- ____                                                  ____                 __               __               __
-/\  _`\                                               /\  _`\   __         /\ \__         __/\ \             /\ \__
-\ \,\L\_\     __   _ __    ___ ___     ___     ___    \ \ \/\ \/\_\    ____\ \ ,_\  _ __ /\_\ \ \____  __  __\ \ ,_\   ___   _ __
- \/_\__ \   /'__`\/\`'__\/' __` __`\  / __`\ /' _ `\   \ \ \ \ \/\ \  /',__\\ \ \/ /\`'__\/\ \ \ '__`\/\ \/\ \\ \ \/  / __`\/\`'__\
-   /\ \L\ \/\  __/\ \ \/ /\ \/\ \/\ \/\ \L\ \/\ \/\ \   \ \ \_\ \ \ \/\__, `\\ \ \_\ \ \/ \ \ \ \ \L\ \ \ \_\ \\ \ \_/\ \L\ \ \ \/
-   \ `\____\ \____\\ \_\ \ \_\ \_\ \_\ \____/\ \_\ \_\   \ \____/\ \_\/\____/ \ \__\\ \_\  \ \_\ \_,__/\ \____/ \ \__\ \____/\ \_\
-    \/_____/\/____/ \/_/  \/_/\/_/\/_/\/___/  \/_/\/_/    \/___/  \/_/\/___/   \/__/ \/_/   \/_/\/___/  \/___/   \/__/\/___/  \/_/
-
-/------------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.1.x
-	@created		22nd October, 2015
-	@package		Sermon Distributor
-	@subpackage		controller.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-
-	A sermon distributor that links to Dropbox. 
-
-/----------------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\Utilities\ArrayHelper;
-
-/**
- * General Controller of Sermondistributor component
- */
-class SermondistributorController extends BaseController
-{
-	/**
-	 * Constructor.
-	 *
-	 * @param   array  $config  An optional associative array of configuration settings.
-	 * Recognized key values include 'name', 'default_task', 'model_path', and
-	 * 'view_path' (this list is not meant to be comprehensive).
-	 *
-	 * @since   3.0
-	 */
-	public function __construct($config = array())
-	{
-		// set the default view
-		$config['default_view'] = 'sermondistributor';
-
-		parent::__construct($config);
-	}
-
-	/**
-	 * display task
-	 *
-	 * @return void
-	 */
-	function display($cachable = false, $urlparams = false)
-	{
-		// set default view if not set
-		$view   = $this->input->getCmd('view', 'sermondistributor');
-		$data	= $this->getViewRelation($view);
-		$layout	= $this->input->get('layout', null, 'WORD');
-		$id    	= $this->input->getInt('id');
-
-		// Check for edit form.
-		if(SermondistributorHelper::checkArray($data))
-		{
-			if ($data['edit'] && $layout == 'edit' && !$this->checkEditId('com_sermondistributor.edit.'.$data['view'], $id))
-			{
-				// Somehow the person just went to the form - we don't allow that.
-				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
-				$this->setMessage($this->getError(), 'error');
-				// check if item was opend from other then its own list view
-				$ref 	= $this->input->getCmd('ref', 0);
-				$refid 	= $this->input->getInt('refid', 0);
-				// set redirect
-				if ($refid > 0 && SermondistributorHelper::checkString($ref))
-				{
-					// redirect to item of ref
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.(string)$ref.'&layout=edit&id='.(int)$refid, false));
-				}
-				elseif (SermondistributorHelper::checkString($ref))
-				{
-
-					// redirect to ref
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.(string)$ref, false));
-				}
-				else
-				{
-					// normal redirect back to the list view
-					$this->setRedirect(JRoute::_('index.php?option=com_sermondistributor&view='.$data['views'], false));
-				}
-
-				return false;
-			}
-		}
-
-		return parent::display($cachable, $urlparams);
-	}
-
-	protected function getViewRelation($view)
-	{
-		// check the we have a value
-		if (SermondistributorHelper::checkString($view))
-		{
-			// the view relationships
-			$views = array(
-				'preacher' => 'preachers',
-				'sermon' => 'sermons',
-				'series' => 'series_list',
-				'statistic' => 'statistics',
-				'external_source' => 'external_sources',
-				'local_listing' => 'local_listings',
-				'help_document' => 'help_documents'
-					);
-			// check if this is a list view
-			if (in_array($view, $views))
-			{
-				// this is a list view
-				return array('edit' => false, 'view' => array_search($view,$views), 'views' => $view);
-			}
-			// check if it is an edit view
-			elseif (array_key_exists($view, $views))
-			{
-				// this is a edit view
-				return array('edit' => true, 'view' => $view, 'views' => $views[$view]);
-			}
-		}
-		return false;
-	}
-}
--- a/admin/models/forms/external_source.xml
+++ b/admin/models/forms/external_source.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -73,6 +76,7 @@
 			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -357,7 +361,7 @@
 			hint="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_OAUTHTOKEN_HINT"
 		/>
 	</fieldset>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/models/forms/filter_external_sources.xml
+++ b/admin/models/forms/filter_external_sources.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,7 +17,7 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_EXTERNAL_SOURCES"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
@ -26,21 +26,21 @@
 			name="externalsources"
 			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EXTERNALSOURCES_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="externalsourcesfilterupdatemethod"
 			name="update_method"
 			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_UPDATE_METHOD_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="externalsourcesfilterbuild"
 			name="build"
 			label="COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_BUILD_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -49,9 +49,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -75,11 +74,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_help_documents.xml
+++ b/admin/models/forms/filter_help_documents.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,46 +17,46 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_HELP_DOCUMENTS"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 		<field
 			type="accesslevel"
 			name="access"
-			label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			class="multipleAccessLevels"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
 			type="helpdocumentsfiltertype"
 			name="type"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_TYPE_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="helpdocumentsfilterlocation"
 			name="location"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_LOCATION_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="adminviewfolderlist"
 			name="admin_view"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="siteviewfolderlist"
 			name="site_view"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE_VIEW_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -65,9 +65,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -82,10 +81,10 @@
 			<option value="a.type DESC">COM_SERMONDISTRIBUTOR_FILTER_TYPE_DESCENDING</option>
 			<option value="a.location ASC">COM_SERMONDISTRIBUTOR_FILTER_LOCATION_ASCENDING</option>
 			<option value="a.location DESC">COM_SERMONDISTRIBUTOR_FILTER_LOCATION_DESCENDING</option>
-			<option value="g. ASC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_ASCENDING</option>
-			<option value="g. DESC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_DESCENDING</option>
-			<option value="h. ASC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_ASCENDING</option>
-			<option value="h. DESC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_DESCENDING</option>
+			<option value="h. ASC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_ASCENDING</option>
+			<option value="h. DESC">COM_SERMONDISTRIBUTOR_FILTER_ADMIN_VIEWS_DESCENDING</option>
+			<option value="i. ASC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_ASCENDING</option>
+			<option value="i. DESC">COM_SERMONDISTRIBUTOR_FILTER_SITE_VIEWS_DESCENDING</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
 			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
 		</field>
@ -93,11 +92,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_local_listings.xml
+++ b/admin/models/forms/filter_local_listings.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,7 +17,7 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_LOCAL_LISTINGS"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
@ -26,14 +26,14 @@
 			name="build"
 			label="COM_SERMONDISTRIBUTOR_LOCAL_LISTING_BUILD_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="externalsource"
 			name="external_source"
 			label="COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EXTERNAL_SOURCE_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -42,9 +42,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -70,11 +69,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_preachers.xml
+++ b/admin/models/forms/filter_preachers.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,18 +17,18 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_PREACHERS"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 		<field
 			type="accesslevel"
 			name="access"
-			label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			class="multipleAccessLevels"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -37,9 +37,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -59,11 +58,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_series_list.xml
+++ b/admin/models/forms/filter_series_list.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,18 +17,18 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_SERIES_LIST"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 		<field
 			type="accesslevel"
 			name="access"
-			label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			class="multipleAccessLevels"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -37,9 +37,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -57,11 +56,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_sermons.xml
+++ b/admin/models/forms/filter_sermons.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,7 +17,7 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_SERMONS"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
@ -27,49 +27,51 @@
 			label="COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES"
 			description="JOPTION_FILTER_CATEGORY_DESC"
 			multiple="true"
-			class="multipleCategories"
+			class="js-select-submit-on-change"
 			extension="com_sermondistributor.sermon"
-			onchange="this.form.submit();"
+			layout="joomla.form.field.list-fancy-select"
 			published="0,1,2"
 		/>
 		<field
 			type="accesslevel"
 			name="access"
-			label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			class="multipleAccessLevels"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
 			type="preachers"
 			name="preacher"
 			label="COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL"
-			class="multiplePreachers"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="true"
-			onchange="this.form.submit();"
+			hint="COM_SERMONDISTRIBUTOR_FILTER_SELECT_PREACHER"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="series"
 			name="series"
 			label="COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL"
-			class="multipleSeries"
+			layout="joomla.form.field.list-fancy-select"
 			multiple="true"
-			onchange="this.form.submit();"
+			hint="COM_SERMONDISTRIBUTOR_FILTER_SELECT_SERIES"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="sermonsfilterlinktype"
 			name="link_type"
 			label="COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="sermonsfiltersource"
 			name="source"
 			label="COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -78,9 +80,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -110,11 +111,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/filter_statistics.xml
+++ b/admin/models/forms/filter_statistics.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
 	<fields name="filter">
 		<field
@ -17,39 +17,39 @@
 			name="published"
 			label="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED"
 			description="COM_SERMONDISTRIBUTOR_FILTER_PUBLISHED_STATISTICS"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 		<field
 			type="accesslevel"
 			name="access"
-			label="JFIELD_ACCESS_LABEL"
-			description="JFIELD_ACCESS_DESC"
+			label="JGRID_HEADING_ACCESS"
+			hint="JOPTION_SELECT_ACCESS"
 			multiple="true"
-			class="multipleAccessLevels"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
+			layout="joomla.form.field.list-fancy-select"
 		/>
 		<field
 			type="sermon"
 			name="sermon"
 			label="COM_SERMONDISTRIBUTOR_STATISTIC_SERMON_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="preachers"
 			name="preacher"
 			label="COM_SERMONDISTRIBUTOR_STATISTIC_PREACHER_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<field
 			type="series"
 			name="series"
 			label="COM_SERMONDISTRIBUTOR_STATISTIC_SERIES_LABEL"
 			multiple="false"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 		<input type="hidden" name="form_submited" value="1"/>
 	</fields>
@ -58,9 +58,8 @@
 		<field
 			name="fullordering"
 			type="list"
-			label="COM_CONTENT_LIST_FULL_ORDERING"
-			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-			onchange="this.form.submit();"
+			label="JGLOBAL_SORT_BY"
+			class="js-select-submit-on-change"
 			default="a.id DESC"
 			validate="options"
 		>
@ -86,11 +85,9 @@
 		<field
 			name="limit"
 			type="limitbox"
-			label="COM_CONTENT_LIST_LIMIT"
-			description="COM_CONTENT_LIST_LIMIT_DESC"
-			class="input-mini"
+			label="JGLOBAL_LIST_LIMIT"
 			default="25"
-			onchange="this.form.submit();"
+			class="js-select-submit-on-change"
 		/>
 	</fields>
 </form>
--- a/admin/models/forms/help_document.xml
+++ b/admin/models/forms/help_document.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -81,6 +84,7 @@
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -139,9 +143,9 @@
 			<option value="3">
 				COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_URL</option>
 		</field>
-		<!-- Groups Field. Type: Usergroup. (joomla) -->
+		<!-- Groups Field. Type: Usergrouplist. (custom) -->
 		<field
-			type="usergroup"
+			type="usergrouplist"
 			name="groups"
 			label="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_LABEL"
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_DESCRIPTION"
@ -183,7 +187,6 @@
 			description="COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_SITE_VIEW_DESCRIPTION"
 			class="list_class"
 			multiple="false"
-			default=""
 			required="true"
 			button="false"
 		/>
@ -283,7 +286,7 @@
 			/>
 		</fieldset>
 	</fields>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/controllers/index.html
+++ b/admin/controllers/index.html
--- a/admin/models/forms/local_listing.xml
+++ b/admin/models/forms/local_listing.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -73,6 +76,7 @@
 			label="COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_LOCAL_LISTING_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -173,7 +177,7 @@
 			hint="COM_SERMONDISTRIBUTOR_LOCAL_LISTING_URL_HINT"
 		/>
 	</fieldset>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/models/forms/preacher.xml
+++ b/admin/models/forms/preacher.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -81,6 +84,7 @@
 			label="COM_SERMONDISTRIBUTOR_PREACHER_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_PREACHER_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -215,7 +219,7 @@
 			/>
 		</fieldset>
 	</fields>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/models/forms/series.xml
+++ b/admin/models/forms/series.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -81,6 +84,7 @@
 			label="COM_SERMONDISTRIBUTOR_SERIES_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_SERIES_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -203,7 +207,7 @@
 			/>
 		</fieldset>
 	</fields>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/models/forms/sermon.xml
+++ b/admin/models/forms/sermon.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -81,6 +84,7 @@
 			label="COM_SERMONDISTRIBUTOR_SERMON_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_SERMON_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -255,7 +259,6 @@
 			mode="ajax"
 			label="COM_SERMONDISTRIBUTOR_SERMON_TAGS_LABEL"
 			description="COM_SERMONDISTRIBUTOR_SERMON_TAGS_DESCRIPTION"
-			class="inputbox small"
 			published="true"
 			multiple="true"
 		/>
@ -375,7 +378,7 @@
 			/>
 		</fieldset>
 	</fields>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/models/forms/statistic.xml
+++ b/admin/models/forms/statistic.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form
-	addrulepath="/administrator/components/com_sermondistributor/models/rules"
-	addfieldpath="/administrator/components/com_sermondistributor/models/fields"
+	addruleprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Rule"
+	addfieldprefix="TrueChristianChurch\Component\Sermondistributor\Administrator\Field"
 >
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset name="details">
 		<!-- Default Fields. -->
 		<!-- Id Field. Type: Text (joomla) -->
@ -81,6 +84,7 @@
 			label="COM_SERMONDISTRIBUTOR_STATISTIC_VERSION_LABEL"
 			description="COM_SERMONDISTRIBUTOR_STATISTIC_VERSION_DESC"
 			size="6"
+			default="1"
 			readonly="true"
 			filter="unset"
 		/>
@ -202,7 +206,7 @@
 			/>
 		</fieldset>
 	</fields>
-	
+
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">
 		<!-- Asset Id Field. Type: Hidden (joomla) -->
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@ -1,84 +0,0 @@
-<?php
-/*-------------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
- ____                                                  ____                 __               __               __
-/\  _`\                                               /\  _`\   __         /\ \__         __/\ \             /\ \__
-\ \,\L\_\     __   _ __    ___ ___     ___     ___    \ \ \/\ \/\_\    ____\ \ ,_\  _ __ /\_\ \ \____  __  __\ \ ,_\   ___   _ __
- \/_\__ \   /'__`\/\`'__\/' __` __`\  / __`\ /' _ `\   \ \ \ \ \/\ \  /',__\\ \ \/ /\`'__\/\ \ \ '__`\/\ \/\ \\ \ \/  / __`\/\`'__\
-   /\ \L\ \/\  __/\ \ \/ /\ \/\ \/\ \/\ \L\ \/\ \/\ \   \ \ \_\ \ \ \/\__, `\\ \ \_\ \ \/ \ \ \ \ \L\ \ \ \_\ \\ \ \_/\ \L\ \ \ \/
-   \ `\____\ \____\\ \_\ \ \_\ \_\ \_\ \____/\ \_\ \_\   \ \____/\ \_\/\____/ \ \__\\ \_\  \ \_\ \_,__/\ \____/ \ \__\ \____/\ \_\
-    \/_____/\/____/ \/_/  \/_/\/_/\/_/\/___/  \/_/\/_/    \/___/  \/_/\/___/   \/__/ \/_/   \/_/\/___/  \/___/   \/__/\/___/  \/_/
-
-/------------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.1.x
-	@created		22nd October, 2015
-	@package		Sermon Distributor
-	@subpackage		headercheck.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-
-	A sermon distributor that links to Dropbox. 
-
-/----------------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-class sermondistributorHeaderCheck
-{
-	function js_loaded($script_name)
-	{
-		// UIkit check point
-		if (strpos($script_name,'uikit') !== false)
-		{
-			$app            	= JFactory::getApplication();
-			$getTemplateName  	= $app->getTemplate('template')->template;
-			
-			if (strpos($getTemplateName,'yoo') !== false)
-			{
-				return true;
-			}
-		}
-		
-		$document 	= JFactory::getDocument();
-		$head_data 	= $document->getHeadData();
-		foreach (array_keys($head_data['scripts']) as $script)
-		{
-			if (stristr($script, $script_name))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-	
-	function css_loaded($script_name)
-	{
-		// UIkit check point
-		if (strpos($script_name,'uikit') !== false)
-		{
-			$app            	= JFactory::getApplication();
-			$getTemplateName  	= $app->getTemplate('template')->template;
-			
-			if (strpos($getTemplateName,'yoo') !== false)
-			{
-				return true;
-			}
-		}
-		
-		$document 	= JFactory::getDocument();
-		$head_data 	= $document->getHeadData();
-		
-		foreach (array_keys($head_data['styleSheets']) as $script)
-		{
-			if (stristr($script, $script_name))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -1,91 +0,0 @@
-<?php
-/*-------------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
- ____                                                  ____                 __               __               __
-/\  _`\                                               /\  _`\   __         /\ \__         __/\ \             /\ \__
-\ \,\L\_\     __   _ __    ___ ___     ___     ___    \ \ \/\ \/\_\    ____\ \ ,_\  _ __ /\_\ \ \____  __  __\ \ ,_\   ___   _ __
- \/_\__ \   /'__`\/\`'__\/' __` __`\  / __`\ /' _ `\   \ \ \ \ \/\ \  /',__\\ \ \/ /\`'__\/\ \ \ '__`\/\ \/\ \\ \ \/  / __`\/\`'__\
-   /\ \L\ \/\  __/\ \ \/ /\ \/\ \/\ \/\ \L\ \/\ \/\ \   \ \ \_\ \ \ \/\__, `\\ \ \_\ \ \/ \ \ \ \ \L\ \ \ \_\ \\ \ \_/\ \L\ \ \ \/
-   \ `\____\ \____\\ \_\ \ \_\ \_\ \_\ \____/\ \_\ \_\   \ \____/\ \_\/\____/ \ \__\\ \_\  \ \_\ \_,__/\ \____/ \ \__\ \____/\ \_\
-    \/_____/\/____/ \/_/  \/_/\/_/\/_/\/___/  \/_/\/_/    \/___/  \/_/\/___/   \/__/ \/_/   \/_/\/___/  \/___/   \/__/\/___/  \/_/
-
-/------------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.1.x
-	@created		22nd October, 2015
-	@package		Sermon Distributor
-	@subpackage		batch_.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-
-	A sermon distributor that links to Dropbox. 
-
-/----------------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Utility class to render a list view batch selection options
- *
- * @since  3.0
- */
-abstract class JHtmlBatch_
-{
-	/**
-	 * ListSelection
-	 *
-	 * @var    array
-	 * @since  3.0
-	 */
-	protected static $ListSelection = array();
-
-	/**
-	 * Render the batch selection options.
-	 *
-	 * @return  string  The necessary HTML to display the batch selection options
-	 *
-	 * @since   3.0
-	 */
-	public static function render()
-	{
-		// Collect display data
-		$data                 = new stdClass;
-		$data->ListSelection  = static::getListSelection();
-
-		// Create a layout object and ask it to render the batch selection options
-		$layout    = new JLayoutFile('batchselection');
-		$batchHtml = $layout->render($data);
-
-		return $batchHtml;
-	}
-
-	/**
-	 * Method to add a list selection to the batch modal
-	 *
-	 * @param   string  $label      Label for the menu item.
-	 * @param   string  $name       Name for the filter. Also used as id.
-	 * @param   string  $options    Options for the select field.
-	 * @param   bool    $noDefault  Don't the label as the empty option
-	 *
-	 * @return  void
-	 *
-	 * @since   3.0
-	 */
-	public static function addListSelection($label, $name, $options, $noDefault = false)
-	{
-		array_push(static::$ListSelection, array('label' => $label, 'name' => $name, 'options' => $options, 'noDefault' => $noDefault));
-	}
-
-	/**
-	 * Returns an array of all ListSelection
-	 *
-	 * @return  array
-	 *
-	 * @since   3.0
-	 */
-	public static function getListSelection()
-	{
-		return static::$ListSelection;
-	}
-}
--- a/admin/helpers/sermondistributor.php
+++ b/admin/helpers/sermondistributor.php
--- a/admin/language/en-GB/en-GB.com_sermondistributor.ini
+++ b/admin/language/en-GB/en-GB.com_sermondistributor.ini
@ -1,16 +1,13 @@
 COM_SERMONDISTRIBUTOR="Sermon Distributor"
 COM_SERMONDISTRIBUTOR_ADD_THE_STRONGAPP_GENERATED_ACCESS_TOKENSTRONG_HERE="Add the <strong>App Generated access token</strong> here."
 COM_SERMONDISTRIBUTOR_ADD_TOKEN_HERE="ADD TOKEN HERE!"
-COM_SERMONDISTRIBUTOR_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter."
+COM_SERMONDISTRIBUTOR_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATER="All is good, please check again later"
 COM_SERMONDISTRIBUTOR_ALWAYS_BETTER_TO_ADD_THE_FILES_TO_EXTERNAL_SOURCE_AND_LET_THE_SYSTEM_CREATE_THE_SERMON_FOR_YOU_PLEASE_READ_INSTRUCTIONS_BELOW_CAREFULLY="Always better to add the files to External Source and let the system create the sermon for you. Please read instructions below carefully."
 COM_SERMONDISTRIBUTOR_ARCHIVED="Archived"
 COM_SERMONDISTRIBUTOR_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
 COM_SERMONDISTRIBUTOR_AUTHOR="Author"
-COM_SERMONDISTRIBUTOR_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading"
-COM_SERMONDISTRIBUTOR_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading"
 COM_SERMONDISTRIBUTOR_BACK="Back"
 COM_SERMONDISTRIBUTOR_BCOULD_NOT_USE_THE_GIVEN_TOKEN_OR_THE_GIVEN_BUILD_OPTION_DOES_NOT_EXISTB="<b>Could not use the given token, or the given build option does not exist.</b>"
-COM_SERMONDISTRIBUTOR_BETA_RELEASE="Beta Release"
 COM_SERMONDISTRIBUTOR_BY_USING_AN_ACCESS_TOKEN_YOU_WILL_BE_ABLE_TO_MAKE_API_CALLS_FOR_YOUR_OWN_ACCOUNT_WITHOUT_GOING_THROUGH_THE_AUTHORIZATION_FLOW_DURING_THIS_MANUAL_UPDATE_OF_THE_LOCAL_LISTINGBR_THE_TOKEN_WILL_NOT_BE_STORED_AND_FOR_SAFETY_THE_TOKEN_WILL_BE_REVOKED_ONCE_THE_UPDATE_IS_COMPLETED_SUCCESSFULLYBR_BTHIS_WILL_MEAN_IT_CAN_ONLY_BE_USED_THIS_ONCEB_YOU_WOULD_NEED_A_NEW_TOKEN_EACH_TIME_YOU_RUN_THIS_UPDATE_MANUALLY_BR_SMALLMAKE_SURE_TO_HAVE_SSL_INPLACE_ON_THIS_PAGE_WHEN_DOING_THIS_UPDATE_AS_AN_EXTRA_SECURITY_MEASURESMALL="By using an access token, you will be able to make API calls for your own account without going through the authorization flow during this manual update of the local listing.<br />The token will not be stored and for safety the token will be revoked once the update is completed successfully.<br /><b>This will mean it can only be used this once</b>, you would need a new token each time you run this update manually. <br /><small>Make sure to have SSL in-place on this page when doing this update, as an extra security measure.</small>"
 COM_SERMONDISTRIBUTOR_CATEGORIES_ACCESS_SITE="Categories (Site) Access"
 COM_SERMONDISTRIBUTOR_CATEGORIES_ACCESS_SITE_DESC="Allows the users in this group to access site categories."
@ -21,7 +18,6 @@ COM_SERMONDISTRIBUTOR_CLEAR_LOCAL_LISTING="Clear Local Listing"
 COM_SERMONDISTRIBUTOR_CLOSE_NEW="Close & New"
 COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_DESCRIPTION="Allow add to external source button to show, this will expose the external source links."
 COM_SERMONDISTRIBUTOR_CONFIG_ADD_TO_BUTTON_LABEL="External Source Button"
-COM_SERMONDISTRIBUTOR_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
 COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR="Author Info"
 COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_DESC="The email address of the author of this component."
 COM_SERMONDISTRIBUTOR_CONFIG_AUTHOR_EMAIL_LABEL="Author Email"
@ -129,15 +125,17 @@ COM_SERMONDISTRIBUTOR_CONFIG_DARK_BLUE="Dark Blue"
 COM_SERMONDISTRIBUTOR_CONFIG_DONT_LOAD="Not"
 COM_SERMONDISTRIBUTOR_CONFIG_ENCRYPTION_DESC="The encryption key for the field encryption is set here."
 COM_SERMONDISTRIBUTOR_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
-COM_SERMONDISTRIBUTOR_CONFIG_FLAT_LOAD="Flat"
 COM_SERMONDISTRIBUTOR_CONFIG_FORCE_LOAD="Force"
 COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_DESC="The Global Parameters"
 COM_SERMONDISTRIBUTOR_CONFIG_GLOBAL_LABEL="Global"
-COM_SERMONDISTRIBUTOR_CONFIG_GRADIANT_LOAD="Gradient"
 COM_SERMONDISTRIBUTOR_CONFIG_GREEN="Green"
 COM_SERMONDISTRIBUTOR_CONFIG_GRID="Grid"
 COM_SERMONDISTRIBUTOR_CONFIG_HTML_5_BASIC="HTML 5 (basic)"
 COM_SERMONDISTRIBUTOR_CONFIG_JPLAYER="jPlayer"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD="Load jQuery"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_DESC="Would you like to load the Joomla jQuery Framework?"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_LOAD_LABEL="Load Joomla jQuery"
+COM_SERMONDISTRIBUTOR_CONFIG_JQUERY_REMOVE="Remove jQuery"
 COM_SERMONDISTRIBUTOR_CONFIG_LEGACY="Legacy"
 COM_SERMONDISTRIBUTOR_CONFIG_LINES="Lines"
 COM_SERMONDISTRIBUTOR_CONFIG_LIST="List"
@ -315,18 +313,12 @@ COM_SERMONDISTRIBUTOR_CONFIG_SPACED="Spaced"
 COM_SERMONDISTRIBUTOR_CONFIG_STRIPED="Striped"
 COM_SERMONDISTRIBUTOR_CONFIG_TABLE="Table"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT="Uikit"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end frameworkfor developing fast and powerful web interfaces. For more info visit <a href="https://getuikit.com/v2/" target="_blank">version 2</a> or <a href="https://getuikit.com/" target="_blank">version 3</a>"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL="Uikit2 and Uikit3 Settings"
+COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end frameworkfor developing fast and powerful web interfaces. For more info visit <a href='https://getuikit.com/' target='_blank'>https://getuikit.com/</a>"
+COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LABEL="Uikit3 Settings"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_DESC="Set the uikit loading option."
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_LOAD_LABEL="Loading Options"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_MIN_DESC="Should the minified version of uikit files be loaded?"
 COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_MIN_LABEL="Load Minified"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_DESC="Set the css style that should be used."
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_STYLE_LABEL="css Style"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_V2="Version 2"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_V3="Version 3"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_VERSION_DESC="Select what version you would like to use"
-COM_SERMONDISTRIBUTOR_CONFIG_UIKIT_VERSION_LABEL="Uikit Versions"
 COM_SERMONDISTRIBUTOR_CONFIG_YES="Yes"
 COM_SERMONDISTRIBUTOR_CONTRIBUTOR="Contributor"
 COM_SERMONDISTRIBUTOR_CONTRIBUTORS="Contributors"
@ -347,7 +339,6 @@ COM_SERMONDISTRIBUTOR_DASHBOARD_SERMONS_CATID="Categories&nbsp;For<br />Sermons"
 COM_SERMONDISTRIBUTOR_DASHBOARD_SERMON_ADD="Add&nbsp;Sermon<br /><br />"
 COM_SERMONDISTRIBUTOR_DASHBOARD_STATISTICS="Statistics<br /><br />"
 COM_SERMONDISTRIBUTOR_DATE="Date"
-COM_SERMONDISTRIBUTOR_DOWNLOAD="download"
 COM_SERMONDISTRIBUTOR_DOWNLOAD_NAME="Download Name"
 COM_SERMONDISTRIBUTOR_EDIT_CREATED_BY="Edit Created By"
 COM_SERMONDISTRIBUTOR_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
@ -368,7 +359,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_OPTIONS="Batch process the selected External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_TIP="All changes will be applied to all selected External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE="External Sources Batch Use"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE="External Sources Create"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE_DESC="Allows the users in this group to create create external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD="External Sources Dashboard Add"
@ -388,7 +379,10 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OWN_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE="External Sources Edit State"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE_DESC="Allows the users in this group to update the state of the external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION="External Sources Edit Version"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EMPTYSTATE_BUTTON_ADD="Add your first external source"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EMPTYSTATE_CONTENT="External sources of files"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EMPTYSTATE_TITLE="No external sources have been created yet."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT="External Sources Export"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT_DESC="Allows the users in this group to export export external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT="External Sources Import"
@ -444,6 +438,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DROPBOXOPTIONS_LABEL="Options"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EDIT="Editing the External Source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_ERROR_UNIQUE_ALIAS="Another External Source has the same alias."
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_ERROR_UNIQUE_ALIAS_TRASHED="A trashed External Source has the same alias ."
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EXTERNALSOURCES_DESCRIPTION="Only one option at this time"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_EXTERNALSOURCES_LABEL="External Sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_FILETYPES_DESCRIPTION="Select the file types you would like to use from this external sources."
@ -568,7 +563,6 @@ COM_SERMONDISTRIBUTOR_FILTER_SEARCH_PREACHERS="Search the preacher items. Prefix
 COM_SERMONDISTRIBUTOR_FILTER_SEARCH_SERIES_LIST="Search the series items. Prefix with ID: to search for an item by ID."
 COM_SERMONDISTRIBUTOR_FILTER_SEARCH_SERMONS="Search the sermon items. Prefix with ID: to search for an item by ID."
 COM_SERMONDISTRIBUTOR_FILTER_SEARCH_STATISTICS="Search the statistic items. Prefix with ID: to search for an item by ID."
-COM_SERMONDISTRIBUTOR_FILTER_SELECT_ACCESS="Select Access"
 COM_SERMONDISTRIBUTOR_FILTER_SELECT_ADMIN_VIEWS="Select Admin Views"
 COM_SERMONDISTRIBUTOR_FILTER_SELECT_BUILD_OPTION="Select Build Option"
 COM_SERMONDISTRIBUTOR_FILTER_SELECT_DOWNLOAD_LINK_OPTION="Select Download Link Option"
@ -606,7 +600,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_OPTIONS="Batch process the selected Help Documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_TIP="All changes will be applied to all selected Help Documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
@ -620,7 +614,10 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_OWN_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE="Help Documents Edit State"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION="Help Documents Edit Version"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EMPTYSTATE_BUTTON_ADD="Add your first help document"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EMPTYSTATE_CONTENT="The help documentation of this component"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EMPTYSTATE_TITLE="No help documents have been created yet."
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT="Help Documents Export"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT="Help Documents Import"
@ -661,6 +658,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Help Document has the same alias ."
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_DESCRIPTION="Select a group/s"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_GROUPS_LABEL="Group/s"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENT_ID="Id"
@ -743,13 +741,10 @@ COM_SERMONDISTRIBUTOR_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import no
 COM_SERMONDISTRIBUTOR_IMPORT_UPDATE_DATA="Import Data"
 COM_SERMONDISTRIBUTOR_IMPORT_UPLOAD_BOTTON="Upload File"
 COM_SERMONDISTRIBUTOR_INACTIVE="Inactive"
-COM_SERMONDISTRIBUTOR_ISSUE="issue"
 COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_ACCESS="- Keep Original Access -"
 COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -"
 COM_SERMONDISTRIBUTOR_KEEP_ORIGINAL_STATE="- Keep Original State -"
-COM_SERMONDISTRIBUTOR_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING="Last few releases from Github is loading"
 COM_SERMONDISTRIBUTOR_LAST_UPDATE="Last Update"
-COM_SERMONDISTRIBUTOR_LATEST_RELEASE="Latest Release"
 COM_SERMONDISTRIBUTOR_LICENSE="License"
 COM_SERMONDISTRIBUTOR_LISTING_INFO="Listing Info"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING="Local Listing"
@ -759,7 +754,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_OPTIONS="Batch process the selected Local Listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_TIP="All changes will be applied to all selected Local Listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE="Local Listings Batch Use"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE="Local Listings Create"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE_DESC="Allows the users in this group to create create local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST="Local Listings Dashboard List"
@ -789,7 +784,10 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to edit url of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION="Local Listings Edit Version"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EMPTYSTATE_BUTTON_ADD="Add your first local listing"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EMPTYSTATE_CONTENT="Local Listing of files"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EMPTYSTATE_TITLE="No local listings have been created yet."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT="Local Listings Export"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT_DESC="Allows the users in this group to export export local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT="Local Listings Import"
@ -825,6 +823,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTING_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EDIT="Editing the Local Listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ERROR_UNIQUE_ALIAS="Another Local Listing has the same alias."
+COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Local Listing has the same alias ."
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EXTERNAL_SOURCE_DESCRIPTION="The external source of this listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_EXTERNAL_SOURCE_LABEL="External Source"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTING_ID="Id"
@ -871,7 +870,6 @@ COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS_DESC="Allows
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU="Manual Updater Submenu"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to submenu of Manual Updater"
 COM_SERMONDISTRIBUTOR_NEW="New"
-COM_SERMONDISTRIBUTOR_NEW_ISSUE="New Issue"
 COM_SERMONDISTRIBUTOR_NOTICE="Notice!"
 COM_SERMONDISTRIBUTOR_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied."
 COM_SERMONDISTRIBUTOR_NO_ACCESS_GRANTED="No Access Granted!"
@ -881,13 +879,8 @@ COM_SERMONDISTRIBUTOR_NO_FILES_LINKED_YET="No Files Linked Yet"
 COM_SERMONDISTRIBUTOR_NO_ID_FOUND_CAN_NOT_RESET_THE_UPDATE_STATUS="No id found, can not reset the update status!"
 COM_SERMONDISTRIBUTOR_NO_MANUAL_UPDATES_AVAILABLE="No Manual Updates Available"
 COM_SERMONDISTRIBUTOR_NUMBER_OF_FILES_LISTED="Number of Files Listed"
-COM_SERMONDISTRIBUTOR_ON_GITHUB="on Github"
-COM_SERMONDISTRIBUTOR_OPEN="Open"
-COM_SERMONDISTRIBUTOR_OPENED="opened"
-COM_SERMONDISTRIBUTOR_OPENED_THIS="opened this"
-COM_SERMONDISTRIBUTOR_OPEN_ON_GITHUB="Open on Github"
-COM_SERMONDISTRIBUTOR_OUT_OF_DATE="Out of date"
 COM_SERMONDISTRIBUTOR_PLEASE_ADD_FILES_TO_S="Please add files to (%s)"
+COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATER="Please check again later"
 COM_SERMONDISTRIBUTOR_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
 COM_SERMONDISTRIBUTOR_PREACHER="Preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS="Preachers"
@ -898,7 +891,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_OPTIONS="Batch process the selected Preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_TIP="All changes will be applied to all selected Preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE="Preachers Batch Use"
-COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE="Preachers Create"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE_DESC="Allows the users in this group to create create preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD="Preachers Dashboard Add"
@ -918,7 +911,10 @@ COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_OWN_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE="Preachers Edit State"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION="Preachers Edit Version"
-COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_EMPTYSTATE_BUTTON_ADD="Add your first preacher"
+COM_SERMONDISTRIBUTOR_PREACHERS_EMPTYSTATE_CONTENT="The Speakers/Preachers of the audio or video recordings."
+COM_SERMONDISTRIBUTOR_PREACHERS_EMPTYSTATE_TITLE="No preachers have been created yet."
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT="Preachers Export"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT_DESC="Allows the users in this group to export export preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT="Preachers Import"
@ -961,6 +957,7 @@ COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_HINT="demo@example.com"
 COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_LABEL="Email<br><small>not required</small>"
 COM_SERMONDISTRIBUTOR_PREACHER_EMAIL_MESSAGE="Error! Please add email address here."
 COM_SERMONDISTRIBUTOR_PREACHER_ERROR_UNIQUE_ALIAS="Another Preacher has the same alias."
+COM_SERMONDISTRIBUTOR_PREACHER_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Preacher has the same alias ."
 COM_SERMONDISTRIBUTOR_PREACHER_ICON_DESCRIPTION="Must be 358px x 358px"
 COM_SERMONDISTRIBUTOR_PREACHER_ICON_LABEL="Icon"
 COM_SERMONDISTRIBUTOR_PREACHER_ID="Id"
@ -986,12 +983,9 @@ COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_HINT="http://www.example.com"
 COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_LABEL="Website"
 COM_SERMONDISTRIBUTOR_PREACHER_WEBSITE_MESSAGE="Error! Please add website here."
 COM_SERMONDISTRIBUTOR_PUBLISHED="Published"
-COM_SERMONDISTRIBUTOR_RELEASED_THIS="released this"
 COM_SERMONDISTRIBUTOR_RESETTING_THE_UPDATE_STATUS_WAS_SUCCESSFUL="Resetting the update status was successful!"
 COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS="Reset Update Status"
 COM_SERMONDISTRIBUTOR_RESET_UPDATE_STATUS_CAN_NOT_BE_DONE="Reset update status can not be done."
-COM_SERMONDISTRIBUTOR_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github"
-COM_SERMONDISTRIBUTOR_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_SERMONDISTRIBUTOR_SAVE_SUCCESS="Great! Item successfully saved."
 COM_SERMONDISTRIBUTOR_SAVE_WARNING="The value already existed so please select another."
 COM_SERMONDISTRIBUTOR_SELECT_AN_ADMIN_VIEW="Select an admin view"
@ -1011,6 +1005,7 @@ COM_SERMONDISTRIBUTOR_SERIES_DESCRIPTION_LABEL="Description"
 COM_SERMONDISTRIBUTOR_SERIES_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_SERIES_EDIT="Editing the Series"
 COM_SERMONDISTRIBUTOR_SERIES_ERROR_UNIQUE_ALIAS="Another Series has the same alias."
+COM_SERMONDISTRIBUTOR_SERIES_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Series has the same alias ."
 COM_SERMONDISTRIBUTOR_SERIES_ICON_DESCRIPTION="Must be 358px x 358px"
 COM_SERMONDISTRIBUTOR_SERIES_ICON_LABEL="Icon"
 COM_SERMONDISTRIBUTOR_SERIES_ID="Id"
@ -1022,7 +1017,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_OPTIONS="Batch process the selected Series List"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_TIP="All changes will be applied to all selected Series List"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE="Series List Batch Use"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE="Series List Create"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE_DESC="Allows the users in this group to create create series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD="Series List Dashboard Add"
@ -1042,7 +1037,10 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_OWN_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE="Series List Edit State"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE_DESC="Allows the users in this group to update the state of the series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION="Series List Edit Version"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows users in this group to edit versions of version series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EMPTYSTATE_BUTTON_ADD="Add your first series"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EMPTYSTATE_CONTENT="Bundle a number of things of a similar kind or related nature coming one after another."
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EMPTYSTATE_TITLE="No series list have been created yet."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT="Series List Export"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT_DESC="Allows the users in this group to export export series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT="Series List Import"
@ -1096,7 +1094,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_ACCESS_DESC="Allows the users in this group to acc
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_OPTIONS="Batch process the selected Sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_TIP="All changes will be applied to all selected Sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE="Sermons Batch Use"
-COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE="Sermons Create"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE_DESC="Allows the users in this group to create create sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD="Sermons Dashboard Add"
@ -1116,7 +1114,10 @@ COM_SERMONDISTRIBUTOR_SERMONS_EDIT_OWN_DESC="Allows the users in this group to e
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE="Sermons Edit State"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION="Sermons Edit Version"
-COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_EMPTYSTATE_BUTTON_ADD="Add your first sermon"
+COM_SERMONDISTRIBUTOR_SERMONS_EMPTYSTATE_CONTENT="The Sermon details of the audio or video recordings."
+COM_SERMONDISTRIBUTOR_SERMONS_EMPTYSTATE_TITLE="No sermons have been created yet."
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT="Sermons Export"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT_DESC="Allows the users in this group to export export sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT="Sermons Import"
@ -1162,6 +1163,7 @@ COM_SERMONDISTRIBUTOR_SERMON_DYNAMIC_AUTOMATIC_BUILD="Dynamic Automatic Build"
 COM_SERMONDISTRIBUTOR_SERMON_EDIT="Editing the Sermon"
 COM_SERMONDISTRIBUTOR_SERMON_ENCRYPTED="Encrypted"
 COM_SERMONDISTRIBUTOR_SERMON_ERROR_UNIQUE_ALIAS="Another Sermon has the same alias."
+COM_SERMONDISTRIBUTOR_SERMON_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Sermon has the same alias ."
 COM_SERMONDISTRIBUTOR_SERMON_EXTERNAL_SOURCE="External Source"
 COM_SERMONDISTRIBUTOR_SERMON_FILES="Files"
 COM_SERMONDISTRIBUTOR_SERMON_ICON_DESCRIPTION="Must be 358px x 358px"
@ -1234,7 +1236,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_OPTIONS="Batch process the selected Statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_TIP="All changes will be applied to all selected Statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE="Statistics Batch Use"
-COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE="Statistics Create"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE_DESC="Allows the users in this group to create create statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST="Statistics Dashboard List"
@ -1252,7 +1254,10 @@ COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_OWN_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE="Statistics Edit State"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE_DESC="Allows the users in this group to update the state of the statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION="Statistics Edit Version"
-COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EMPTYSTATE_BUTTON_ADD="Add your first statistic"
+COM_SERMONDISTRIBUTOR_STATISTICS_EMPTYSTATE_CONTENT="The data on each file's statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EMPTYSTATE_TITLE="No statistics have been created yet."
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT="Statistics Export"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT_DESC="Allows the users in this group to export export statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT="Statistics Import"
@ -1289,6 +1294,7 @@ COM_SERMONDISTRIBUTOR_STATISTIC_CREATED_DATE_LABEL="Created Date"
 COM_SERMONDISTRIBUTOR_STATISTIC_DETAILS="Details"
 COM_SERMONDISTRIBUTOR_STATISTIC_EDIT="Editing the Statistic"
 COM_SERMONDISTRIBUTOR_STATISTIC_ERROR_UNIQUE_ALIAS="Another Statistic has the same alias."
+COM_SERMONDISTRIBUTOR_STATISTIC_ERROR_UNIQUE_ALIAS_TRASHED="A trashed Statistic has the same alias ."
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_DESCRIPTION="Enter the file name."
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_HINT="the_file_name.mp3"
 COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL="File Name"
@ -1334,7 +1340,6 @@ COM_SERMONDISTRIBUTOR_THE_README_IS_LOADING="The readme is loading"
 COM_SERMONDISTRIBUTOR_THE_UPDATE_IS_RUNNING="The update is running."
 COM_SERMONDISTRIBUTOR_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_SERMONDISTRIBUTOR_THIS_SOURCE_HAS_NO_LOCAL_LISTING_SET="This source has no local listing set."
-COM_SERMONDISTRIBUTOR_TOTAL_DOWNLOADS="total downloads"
 COM_SERMONDISTRIBUTOR_TRASHED="Trashed"
 COM_SERMONDISTRIBUTOR_TRASHED_ITEMS="Trashed items"
 COM_SERMONDISTRIBUTOR_TRASH_AREA="Trash Area"
@ -1347,13 +1352,10 @@ COM_SERMONDISTRIBUTOR_TYPE_SERMON="Sermon"
 COM_SERMONDISTRIBUTOR_TYPE_STATISTIC="Statistic"
 COM_SERMONDISTRIBUTOR_UNKNOWN_ERROR_HAS_OCCURRED="Unknown error has occurred."
 COM_SERMONDISTRIBUTOR_UPDATE_LOCAL_LINKS_OF_TARGET_S_EXTERNAL_SOURCE="Update Local Links of (target %s) External Source"
-COM_SERMONDISTRIBUTOR_UP_TO_DATE="Up to date"
 COM_SERMONDISTRIBUTOR_USE_BATCH="Use Batch"
 COM_SERMONDISTRIBUTOR_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_SERMONDISTRIBUTOR_VERSION="Version"
 COM_SERMONDISTRIBUTOR_VIEW_ERROR="View Error!"
-COM_SERMONDISTRIBUTOR_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
-COM_SERMONDISTRIBUTOR_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github"
 COM_SERMONDISTRIBUTOR_VIEW_UPDATE_STATUS="View Update Status"
 COM_SERMONDISTRIBUTOR_WEBSITE="Website"
 COM_SERMONDISTRIBUTOR_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS="You are currently viewing the trashed items."
--- a/admin/language/en-GB/en-GB.com_sermondistributor.sys.ini
+++ b/admin/language/en-GB/en-GB.com_sermondistributor.sys.ini
@ -15,7 +15,7 @@ COM_SERMONDISTRIBUTOR_EXPORT_DATA_DESC="Allows users in this group to export dat
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS="External Sources Access"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_ACCESS_DESC="Allows the users in this group to access access external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE="External Sources Batch Use"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE="External Sources Create"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_CREATE_DESC="Allows the users in this group to create create external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_DASHBOARD_ADD="External Sources Dashboard Add"
@ -35,7 +35,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_OWN_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE="External Sources Edit State"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_STATE_DESC="Allows the users in this group to update the state of the external source"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION="External Sources Edit Version"
-COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows users in this group to edit versions of version external sources"
+COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT="External Sources Export"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_EXPORT_DESC="Allows the users in this group to export export external sources"
 COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCES_IMPORT="External Sources Import"
@ -49,7 +49,7 @@ COM_SERMONDISTRIBUTOR_EXTERNAL_SOURCE_RESET_UPDATE_STATUS_BUTTON_ACCESS_DESC="Al
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS="Help Documents Access"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group to access access help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE="Help Documents Create"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_CREATE_DESC="Allows the users in this group to create create help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_DASHBOARD_LIST="Help Documents Dashboard List"
@ -63,7 +63,7 @@ COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_OWN_DESC="Allows the users in this gro
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE="Help Documents Edit State"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_STATE_DESC="Allows the users in this group to update the state of the help document"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION="Help Documents Edit Version"
-COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version help documents"
+COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT="Help Documents Export"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_EXPORT_DESC="Allows the users in this group to export export help documents"
 COM_SERMONDISTRIBUTOR_HELP_DOCUMENTS_IMPORT="Help Documents Import"
@ -75,7 +75,7 @@ COM_SERMONDISTRIBUTOR_IMPORT_DATA_DESC="Allows users in this group to import dat
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS="Local Listings Access"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_ACCESS_DESC="Allows the users in this group to access access local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE="Local Listings Batch Use"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE="Local Listings Create"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_CREATE_DESC="Allows the users in this group to create create local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_DASHBOARD_LIST="Local Listings Dashboard List"
@ -105,7 +105,7 @@ COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_STATE_DESC="Allows the users in this g
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL="Local Listings Edit Url"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_URL_DESC="Allows the users in this group to edit url of local listing"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION="Local Listings Edit Version"
-COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version local listings"
+COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT="Local Listings Export"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_EXPORT_DESC="Allows the users in this group to export export local listings"
 COM_SERMONDISTRIBUTOR_LOCAL_LISTINGS_IMPORT="Local Listings Import"
@ -120,13 +120,15 @@ COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS="Manual Upda
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_EXTERNAL_SOURCES_BUTTON_ACCESS_DESC="Allows the users in this group to access the external sources button."
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU="Manual Updater Submenu"
 COM_SERMONDISTRIBUTOR_MANUAL_UPDATER_SUBMENU_DESC="Allows the users in this group to submenu of Manual Updater"
-COM_SERMONDISTRIBUTOR_MENU="&#187; Sermon Distributor"
+COM_SERMONDISTRIBUTOR_MENU="Sermon Distributor"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORIES_DESC="All categories that are published"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORIES_OPTION="Categories"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORIES_TITLE="Categories"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORY_DESC="A category that is published"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORY_OPTION="Category"
 COM_SERMONDISTRIBUTOR_MENU_CATEGORY_TITLE="Category"
+COM_SERMONDISTRIBUTOR_MENU_DASHBOARD="Dashboard"
+COM_SERMONDISTRIBUTOR_MENU_MANUAL_UPDATER="Manual Updater"
 COM_SERMONDISTRIBUTOR_MENU_PREACHERS="Preachers"
 COM_SERMONDISTRIBUTOR_MENU_PREACHERS_DESC="All preachers that are published"
 COM_SERMONDISTRIBUTOR_MENU_PREACHERS_OPTION="Preachers"
@ -147,7 +149,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_DESC="Allows the users in this group to a
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE="Preachers (Site) Access"
 COM_SERMONDISTRIBUTOR_PREACHERS_ACCESS_SITE_DESC="Allows the users in this group to access site preachers."
 COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE="Preachers Batch Use"
-COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE="Preachers Create"
 COM_SERMONDISTRIBUTOR_PREACHERS_CREATE_DESC="Allows the users in this group to create create preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_DASHBOARD_ADD="Preachers Dashboard Add"
@ -167,7 +169,7 @@ COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_OWN_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE="Preachers Edit State"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the preacher"
 COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION="Preachers Edit Version"
-COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version preachers"
+COM_SERMONDISTRIBUTOR_PREACHERS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT="Preachers Export"
 COM_SERMONDISTRIBUTOR_PREACHERS_EXPORT_DESC="Allows the users in this group to export export preachers"
 COM_SERMONDISTRIBUTOR_PREACHERS_IMPORT="Preachers Import"
@ -183,7 +185,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE="Series List (Site) Access"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_ACCESS_SITE_DESC="Allows the users in this group to access site series list."
 COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE="Series List Batch Use"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE="Series List Create"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_CREATE_DESC="Allows the users in this group to create create series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_DASHBOARD_ADD="Series List Dashboard Add"
@ -203,7 +205,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_OWN_DESC="Allows the users in this group
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE="Series List Edit State"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_STATE_DESC="Allows the users in this group to update the state of the series"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION="Series List Edit Version"
-COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows users in this group to edit versions of version series list"
+COM_SERMONDISTRIBUTOR_SERIES_LIST_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT="Series List Export"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_EXPORT_DESC="Allows the users in this group to export export series list"
 COM_SERMONDISTRIBUTOR_SERIES_LIST_IMPORT="Series List Import"
@ -213,7 +215,7 @@ COM_SERMONDISTRIBUTOR_SERIES_LIST_SUBMENU_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_SERMONS_ACCESS="Sermons Access"
 COM_SERMONDISTRIBUTOR_SERMONS_ACCESS_DESC="Allows the users in this group to access access sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE="Sermons Batch Use"
-COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE="Sermons Create"
 COM_SERMONDISTRIBUTOR_SERMONS_CREATE_DESC="Allows the users in this group to create create sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_DASHBOARD_ADD="Sermons Dashboard Add"
@ -233,7 +235,7 @@ COM_SERMONDISTRIBUTOR_SERMONS_EDIT_OWN_DESC="Allows the users in this group to e
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE="Sermons Edit State"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the sermon"
 COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION="Sermons Edit Version"
-COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version sermons"
+COM_SERMONDISTRIBUTOR_SERMONS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT="Sermons Export"
 COM_SERMONDISTRIBUTOR_SERMONS_EXPORT_DESC="Allows the users in this group to export export sermons"
 COM_SERMONDISTRIBUTOR_SERMONS_IMPORT="Sermons Import"
@ -245,7 +247,7 @@ COM_SERMONDISTRIBUTOR_SERMON_ACCESS_SITE_DESC="Allows the users in this group to
 COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS="Statistics Access"
 COM_SERMONDISTRIBUTOR_STATISTICS_ACCESS_DESC="Allows the users in this group to access access statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE="Statistics Batch Use"
-COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_BATCH_USE_DESC="Allows the users in this group to use batch copy/update method of batch statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE="Statistics Create"
 COM_SERMONDISTRIBUTOR_STATISTICS_CREATE_DESC="Allows the users in this group to create create statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_DASHBOARD_LIST="Statistics Dashboard List"
@ -263,7 +265,7 @@ COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_OWN_DESC="Allows the users in this group t
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE="Statistics Edit State"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_STATE_DESC="Allows the users in this group to update the state of the statistic"
 COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION="Statistics Edit Version"
-COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version statistics"
+COM_SERMONDISTRIBUTOR_STATISTICS_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT="Statistics Export"
 COM_SERMONDISTRIBUTOR_STATISTICS_EXPORT_DESC="Allows the users in this group to export export statistics"
 COM_SERMONDISTRIBUTOR_STATISTICS_IMPORT="Statistics Import"
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -1,61 +0,0 @@
-<?php
-/*-------------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
- ____                                                  ____                 __               __               __
-/\  _`\                                               /\  _`\   __         /\ \__         __/\ \             /\ \__
-\ \,\L\_\     __   _ __    ___ ___     ___     ___    \ \ \/\ \/\_\    ____\ \ ,_\  _ __ /\_\ \ \____  __  __\ \ ,_\   ___   _ __
- \/_\__ \   /'__`\/\`'__\/' __` __`\  / __`\ /' _ `\   \ \ \ \ \/\ \  /',__\\ \ \/ /\`'__\/\ \ \ '__`\/\ \/\ \\ \ \/  / __`\/\`'__\
-   /\ \L\ \/\  __/\ \ \/ /\ \/\ \/\ \/\ \L\ \/\ \/\ \   \ \ \_\ \ \ \/\__, `\\ \ \_\ \ \/ \ \ \ \ \L\ \ \ \_\ \\ \ \_/\ \L\ \ \ \/
-   \ `\____\ \____\\ \_\ \ \_\ \_\ \_\ \____/\ \_\ \_\   \ \____/\ \_\/\____/ \ \__\\ \_\  \ \_\ \_,__/\ \____/ \ \__\ \____/\ \_\
-    \/_____/\/____/ \/_/  \/_/\/_/\/_/\/___/  \/_/\/_/    \/___/  \/_/\/___/   \/__/ \/_/   \/_/\/___/  \/___/   \/__/\/___/  \/_/
-
-/------------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.1.x
-	@created		22nd October, 2015
-	@package		Sermon Distributor
-	@subpackage		batchselection.php
-	@author			Llewellyn van der Merwe <https://www.vdm.io/>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-
-	A sermon distributor that links to Dropbox. 
-
-/----------------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('JPATH_BASE') or die;
-
-JHtmlBehavior::core();
-$divWrapper = range(1,120,2);
-$counter = 0;
-?>
-<?php if ($displayData->ListSelection) : ?>
-<div class="row-fluid">
-	<?php foreach ($displayData->ListSelection as $ListSelection) : ?>
-    <div class="control-group span6">
-    	<div class="controls">
-		<label for="<?php echo $ListSelection['name']; ?>" class="element-invisible"><?php echo $ListSelection['label']; ?></label>
-		<select name="<?php echo $ListSelection['name']; ?>" id="<?php echo $ListSelection['name']; ?>" class="span12 small">
-			<?php if (!$ListSelection['noDefault']) : ?>
-				<option value=""><?php echo $ListSelection['label']; ?></option>
-			<?php endif; ?>
-			<?php echo $ListSelection['options']; ?>
-		</select>
-      	</div>
-	</div>
-		<?php if (in_array($counter,$divWrapper)) : ?>
-</div>
-<div class="row-fluid">
-		<?php endif; ?>
-        <?php $counter++; ?>
-	<?php endforeach; ?>
-</div>
-<div class="control-group radio" id="batch-move-copy">
-	<div class="controls">
-        <label class="radio" id="batch[move_copy]c-lbl" for="batch[move_copy]c">
-        <input type="radio" value="c" id="batch[move_copy]c" name="batch[move_copy]"><?php echo JText::_('Copy'); ?></label>
-        <label class="radio" id="batch[move_copy]m-lbl" for="batch[move_copy]m">
-        <input type="radio" checked="checked" value="m" id="batch[move_copy]m" name="batch[move_copy]"><?php echo JText::_('Update'); ?></label>
-    </div>
-</div>
-<?php endif; ?>
--- a/admin/layouts/external_source/build_option_fullwidth.php
+++ b/admin/layouts/external_source/build_option_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		build_option_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_auto_externalsource'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_above.php
+++ b/admin/layouts/external_source/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'description',
 	'externalsources'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/external_source/details_fullwidth.php
+++ b/admin/layouts/external_source/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'apicronjob_note'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_left.php
+++ b/admin/layouts/external_source/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'dropboxoptions'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_right.php
+++ b/admin/layouts/external_source/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'filetypes'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/details_under.php
+++ b/admin/layouts/external_source/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,20 +38,28 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'not_required'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/external_source/publishing.php
+++ b/admin/layouts/external_source/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'modified_by'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/external_source/publlshing.php
+++ b/admin/layouts/external_source/publlshing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'title',
 	'alias'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'content'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'site_view'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'article'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,20 +38,28 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'not_required'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/help_document/metadata.php
+++ b/admin/layouts/help_document/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -22,8 +22,10 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Language\Text;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 $form = $displayData->getForm();

@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -51,7 +51,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_above.php
+++ b/admin/layouts/local_listing/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'name',
 	'size'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/local_listing/details_fullwidth.php
+++ b/admin/layouts/local_listing/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'url'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_left.php
+++ b/admin/layouts/local_listing/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'external_source'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/details_right.php
+++ b/admin/layouts/local_listing/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'build'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/publishing.php
+++ b/admin/layouts/local_listing/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'modified_by'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/local_listing/publlshing.php
+++ b/admin/layouts/local_listing/publlshing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publlshing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -46,7 +46,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_above.php
+++ b/admin/layouts/preacher/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'name',
 	'alias'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/preacher/details_fullwidth.php
+++ b/admin/layouts/preacher/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_left.php
+++ b/admin/layouts/preacher/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/details_right.php
+++ b/admin/layouts/preacher/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -43,7 +43,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'website'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/metadata.php
+++ b/admin/layouts/preacher/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -22,8 +22,10 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Language\Text;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 $form = $displayData->getForm();

@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/preacher/publishing.php
+++ b/admin/layouts/preacher/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/preacher/sermons_fullwidth.php
+++ b/admin/layouts/preacher/sermons_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php
@ -22,25 +22,32 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // set the defaults
 $items = $displayData->vvvsermons;
-$user = JFactory::getUser();
+$user = Factory::getApplication()->getIdentity();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=preacher&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=preacher&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -60,40 +67,40 @@ $can = SermondistributorHelper::getActions('sermon');
 <div class="form-vertical">
 <?php if ($can->get('sermon.create')): ?>
 	<div class="btn-group">
-		<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a>
-		<a class="btn btn-small" onclick="Joomla.submitbutton('preacher.cancel');" href="<?php echo $close_new; ?>"><span class="icon-new"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_CLOSE_NEW'); ?></a>
+		<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a>
+		<a class="btn btn-small" onclick="Joomla.submitbutton('preacher.cancel');" href="<?php echo $close_new; ?>"><span class="icon-new"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_CLOSE_NEW'); ?></a>
 	</div><br /><br />
 <?php endif; ?>
-<?php if (SermondistributorHelper::checkArray($items)): ?>
-<table class="footable table data sermons metro-blue" data-page-size="20" data-filter="#filter_sermons">
+<?php if (ArrayHelper::check($items)): ?>
+<table class="footable table data sermons" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
+		<th data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
 		</th>
-		<th data-hide="all">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
+		<th data-breakpoints="all" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -101,7 +108,9 @@ $can = SermondistributorHelper::getActions('sermon');
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getContainer()->
+			get(\Joomla\CMS\User\UserFactoryInterface::class)->
+				loadUserById($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
 	?>
 	<tr>
@ -109,7 +118,7 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php if ($canDo->get('sermon.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->name); ?>
@ -136,33 +145,33 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php endif; ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->link_type); ?>
+			<?php echo Text::_($item->link_type); ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->source); ?>
+			<?php echo Text::_($item->source); ?>
 		</td>
 		<?php if ($item->published == 1): ?>
-			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
-			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
-			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
-			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -172,17 +181,10 @@ $can = SermondistributorHelper::getActions('sermon');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="9">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/series/details_above.php
+++ b/admin/layouts/series/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'name',
 	'alias'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/series/details_fullwidth.php
+++ b/admin/layouts/series/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/details_left.php
+++ b/admin/layouts/series/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/details_right.php
+++ b/admin/layouts/series/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'scripture'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/metadata.php
+++ b/admin/layouts/series/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -22,8 +22,10 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Language\Text;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 $form = $displayData->getForm();

@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/series/publishing.php
+++ b/admin/layouts/series/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/series/sermons_fullwidth.php
+++ b/admin/layouts/series/sermons_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		sermons_fullwidth.php
@ -22,25 +22,32 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // set the defaults
 $items = $displayData->vwcsermons;
-$user = JFactory::getUser();
+$user = Factory::getApplication()->getIdentity();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=sermons&task=sermon.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=series&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=series&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -57,38 +64,38 @@ $can = SermondistributorHelper::getActions('sermon');
 ?>
 <div class="form-vertical">
 <?php if ($can->get('sermon.create')): ?>
-	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a><br /><br />
+	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo Text::_('COM_SERMONDISTRIBUTOR_NEW'); ?></a><br /><br />
 <?php endif; ?>
-<?php if (SermondistributorHelper::checkArray($items)): ?>
-<table class="footable table data sermons metro-blue" data-page-size="20" data-filter="#filter_sermons">
+<?php if (ArrayHelper::check($items)): ?>
+<table class="footable table data sermons" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
+		<th data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_PREACHER_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERIES_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SERMONS_CATEGORIES'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_LINK_TYPE_LABEL'); ?>
 		</th>
-		<th data-hide="all">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
+		<th data-breakpoints="all" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_SOURCE_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_SERMON_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -96,7 +103,9 @@ $can = SermondistributorHelper::getActions('sermon');
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getContainer()->
+			get(\Joomla\CMS\User\UserFactoryInterface::class)->
+				loadUserById($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('sermon',$item,'sermons');
 	?>
 	<tr>
@ -104,7 +113,7 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php if ($canDo->get('sermon.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $displayData->escape($item->name); ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'sermons.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $displayData->escape($item->name); ?>
@ -131,33 +140,33 @@ $can = SermondistributorHelper::getActions('sermon');
 			<?php endif; ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->link_type); ?>
+			<?php echo Text::_($item->link_type); ?>
 		</td>
 		<td>
-			<?php echo JText::_($item->source); ?>
+			<?php echo Text::_($item->source); ?>
 		</td>
 		<?php if ($item->published == 1): ?>
-			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
-			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
-			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
-			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -167,17 +176,10 @@ $can = SermondistributorHelper::getActions('sermon');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="9">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/sermon/details_above.php
+++ b/admin/layouts/sermon/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,22 +38,30 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'name',
 	'alias',
 	'preacher'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/sermon/details_fullwidth.php
+++ b/admin/layouts/sermon/details_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -42,7 +42,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_left.php
+++ b/admin/layouts/sermon/details_left.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_left.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_right.php
+++ b/admin/layouts/sermon/details_right.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_right.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -44,7 +44,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'tags'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/details_under.php
+++ b/admin/layouts/sermon/details_under.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_under.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'not_required',
 	'auto_sermons'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/admin/layouts/sermon/files_fullwidth.php
+++ b/admin/layouts/sermon/files_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		files_fullwidth.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -51,7 +51,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'url'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/metadata.php
+++ b/admin/layouts/sermon/metadata.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		metadata.php
@ -22,8 +22,10 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Language\Text;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 $form = $displayData->getForm();

@ -33,7 +35,7 @@ $fieldSets = $form->getFieldsets('metadata');

 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
-		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+		<p class="alert alert-info"><?php echo $this->escape(Text::_($fieldSet->description)); ?></p>
 	<?php endif; ?>

 	<?php
--- a/admin/layouts/sermon/publishing.php
+++ b/admin/layouts/sermon/publishing.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		publishing.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -52,7 +52,7 @@ $fields = $displayData->get($fields_tab_layout) ?: array(
 	'id'
 );

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
--- a/admin/layouts/sermon/stastics_fullwidth.php
+++ b/admin/layouts/sermon/stastics_fullwidth.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		stastics_fullwidth.php
@ -22,25 +22,32 @@

 /----------------------------------------------------------------------------------------------------------------------------------*/

+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use TrueChristianChurch\Component\Sermondistributor\Administrator\Helper\SermondistributorHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // set the defaults
 $items = $displayData->vwbstastics;
-$user = JFactory::getUser();
+$user = Factory::getApplication()->getIdentity();
 $id = $displayData->item->id;
 // set the edit URL
 $edit = "index.php?option=com_sermondistributor&view=statistics&task=statistic.edit";
 // set a return value
 $return = ($id) ? "index.php?option=com_sermondistributor&view=sermon&layout=edit&id=" . $id : "";
 // check for a return value
-$jinput = JFactory::getApplication()->input;
+$jinput = Factory::getApplication()->input;
 if ($_return = $jinput->get('return', null, 'base64'))
 {
 	$return .= "&return=" . $_return;
 }
 // check if return value was set
-if (SermondistributorHelper::checkString($return))
+if (StringHelper::check($return))
 {
 	// set the referral values
 	$ref = ($id) ? "&ref=sermon&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));
@ -52,30 +59,30 @@ else

 ?>
 <div class="form-vertical">
-<?php if (SermondistributorHelper::checkArray($items)): ?>
-<table class="footable table data statistics metro-blue" data-page-size="20" data-filter="#filter_statistics">
+<?php if (ArrayHelper::check($items)): ?>
+<table class="footable table data statistics" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL'); ?>
+		<th data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_FILENAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERMON_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERMON_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_PREACHER_LABEL'); ?>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_PREACHER_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERIES_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_SERIES_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_LABEL'); ?>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_COUNTER_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_STATUS'); ?>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
-			<?php echo JText::_('COM_SERMONDISTRIBUTOR_STATISTIC_ID'); ?>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo Text::_('COM_SERMONDISTRIBUTOR_STATISTIC_ID'); ?>
 		</th>
 	</tr>
 </thead>
@ -83,7 +90,9 @@ else
 <?php foreach ($items as $i => $item): ?>
 	<?php
 		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getContainer()->
+			get(\Joomla\CMS\User\UserFactoryInterface::class)->
+				loadUserById($item->checked_out);
 		$canDo = SermondistributorHelper::getActions('statistic',$item,'statistics');
 	?>
 	<tr>
@ -91,7 +100,7 @@ else
 			<?php if ($canDo->get('statistic.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?><?php echo $ref; ?>"><?php echo $item->filename; ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'statistics.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $item->filename; ?>
@ -118,27 +127,27 @@ else
 			<?php echo $displayData->escape($item->counter); ?>
 		</td>
 		<?php if ($item->published == 1): ?>
-			<td class="center"  data-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0): ?>
-			<td class="center"  data-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2): ?>
-			<td class="center"  data-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2): ?>
-			<td class="center"  data-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
-					<?php echo JText::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED');  ?>">
+					<?php echo Text::_('COM_SERMONDISTRIBUTOR_TRASHED'); ?>
 				</span>
 			</td>
 		<?php endif; ?>
@ -148,17 +157,10 @@ else
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="7">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php endif; ?>
 </div>
--- a/admin/layouts/statistic/details_above.php
+++ b/admin/layouts/statistic/details_above.php
@ -10,7 +10,7 @@

 /------------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.x
+	@version		5.0.x
 	@created		22nd October, 2015
 	@package		Sermon Distributor
 	@subpackage		details_above.php
@ -23,7 +23,7 @@
 /----------------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');
+defined('_JEXEC') or die;

 // get the form
 $form = $displayData->getForm();
@ -38,21 +38,29 @@ $layout_path_array = explode('.', $this->getLayoutId());
 $fields_tab_layout = 'fields_' . $layout_path_array[1];

 // get the fields
-$fields = $displayData->get($fields_tab_layout) ?: array(
+$fields = $displayData->get($fields_tab_layout) ?: [
 	'filename',
 	'sermon'
-);
+];

-$hiddenFields = $displayData->get('hidden_fields') ?: array();
+// Ensure $fields is treated as an array and count its size.
+$size = count((array) $fields);
+
+// Use a ternary operator to determine the class.
+// If there are 1 to 4 fields, set the class to divide the 12-grid column equally among the fields.
+// For more than 4 fields, default to four columns (3-grid each) for medium and larger screens.
+$css_class = ($size > 0 && $size <= 4) ? 'col-12 col-md-' . round(12 / $size) : 'col-12 col-md-3';
+
+$hiddenFields = $displayData->get('hidden_fields') ?: [];

 ?>
 <?php if ($fields && count((array) $fields)) :?>
-<div class="form-inline form-inline-header">
+<div class="row title-alias form-vertical mb-3">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
 			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 		<?php endif; ?>
-		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+		<?php echo $form->renderField($field, null, null, ['class' => $css_class . ' control-wrapper-' . $field]); ?>
 	<?php endforeach; ?>
 </div>
 <?php endif; ?>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Llewellyn van der Merwe	ab9db903ed	Update octojpack config for J5.	2024-03-05 12:26:51 +02:00
Llewellyn van der Merwe	1069746432	Moved the issue templates to the correct folder.	2024-03-05 12:04:36 +02:00
Malachi van der Merwe	d7292ab43d	Fixes indentation and text	2024-03-05 10:02:18 +00:00
Malachi van der Merwe	6923086cbb	Fixes indentation and text	2024-03-05 10:02:18 +00:00
Malachi van der Merwe	c983430461	Fixes indentation and text	2024-03-05 10:02:18 +00:00
Malachi van der Merwe	24a860fef6	Adds issue	2024-03-05 10:02:18 +00:00
Lemuel van der Merwe	961b1d0b8c	Fixes indentation and syntax in a-bug.yml	2024-03-05 11:36:26 +02:00
Lemuel van der Merwe	26ae45a46f	Adds ISSUE_TEMPLATE	2024-03-05 08:41:34 +02:00
Robot	9f0a07ff39	Stable release of v5.0.0-beta1 First release of [[[Component]]] towards Joomla 5.	2024-03-02 18:16:31 +02:00