diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
index 643cd3fa88..8757fb3486 100644
--- a/.github/workflows/test-suite.yaml
+++ b/.github/workflows/test-suite.yaml
@@ -53,7 +53,15 @@ jobs:
         run: |
           docker exec --user www-data -t cms-web /bin/bash -c "cd /var/www/cms; php vendor/bin/phpunit --log-junit results.xml"
       - name: Run Cypress
+        continue-on-error: true
         run: |
           docker exec cms-db mysql -ucms -pjenkins cms -e "INSERT INTO oauth_clients (id, secret, name, userId, authCode, clientCredentials) VALUES ('MrGPc7e3IL1hA6w13l7Ru5giygxmNiafGNhFv89d', 'Pk6DdDgu2HzSoepcMHRabY60lDEvQ9ucTejYvc5dOgNVSNaOJirCUM83oAzlwe0KBiGR2Nhi6ltclyNC1rmcq0CiJZXzE42KfeatQ4j9npr6nMIQAzMal8O8RiYrIoono306CfyvSSJRfVfKExIjj0ZyE4TUrtPezJbKmvkVDzh8aj3kbanDKatirhwpfqfVdfgsqVNjzIM9ZgKHnbrTX7nNULL3BtxxNGgDMuCuvKiJFrLSyIIz1F4SNrHwHz', 'cypress', 1, 0, 1)"
           docker exec cms-db mysql -ucms -pjenkins cms -e "INSERT INTO oauth_client_scopes (clientId, scopeId) VALUES ('MrGPc7e3IL1hA6w13l7Ru5giygxmNiafGNhFv89d', 'all') ON DUPLICATE KEY UPDATE scopeId = scopeId"
-          docker run --ipc=host --name cms-cypress --link=cms-web:web -v $(pwd)/cypress.config.js:/app/cypress.config.js -v $(pwd)/cypress:/app/cypress ghcr.io/xibosignage/xibo-cms:cypress bash -c "CYPRESS_baseUrl=http://web /app/node_modules/.bin/cypress run --config screenshotsFolder=/app/results,video=false --reporter junit --reporter-options 'mochaFile=/app/results/results_cypress_[hash].xml,toConsole=true'"
\ No newline at end of file
+          docker run --ipc=host --name cms-cypress --link=cms-web:web -v $(pwd)/cypress.config.js:/app/cypress.config.js -v $(pwd)/cypress:/app/cypress ghcr.io/xibosignage/xibo-cms:cypress bash -c "CYPRESS_baseUrl=http://web /app/node_modules/.bin/cypress run --config screenshotsFolder=/app/cypress/results,video=false --reporter junit --reporter-options 'mochaFile=/app/cypress/results/results_cypress_[hash].xml,toConsole=true'; chown -R 1001:1001 /app/cypress/results"
+      - name: Save Cypress test results as an artifact
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-test-results
+          path: cypress/results
+          run: exit 1
\ No newline at end of file
diff --git a/README.md b/README.md
index d74f0825bf..730b6ee8f4 100644
--- a/README.md
+++ b/README.md
@@ -71,11 +71,9 @@ git clone git@github.com:<your_id>/xibo-cms.git xibo-cms
 
 We maintain the following branches. To contribute to Xibo please also use the `develop` branch as your base.
 
-- develop: Work in progress toward 4.0
-- master: Currently 3.3
-- release32: Bug fixes for 3.2
-- release31: Bug fixes for 3.1
-- release30: Bug fixes 3.0
+- develop: Work in progress toward 4.0.x
+- master: Currently 4.0
+- release33: Bug fixes for 3.3
 - release23: Bug fixes for 2.3
 - release18: Archive of 1.8
 - release17: Archive of 1.7
diff --git a/composer.lock b/composer.lock
index a3b185a952..1640ab93fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1511,12 +1511,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/dasgarner/picofeed.git",
-                "reference": "cda52f4966e959e553ff30c9a8d37206b87c6011"
+                "reference": "654bdfa1a03ed1a47b0e67305580b4f8b6f9a10d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dasgarner/picofeed/zipball/cda52f4966e959e553ff30c9a8d37206b87c6011",
-                "reference": "cda52f4966e959e553ff30c9a8d37206b87c6011",
+                "url": "https://api.github.com/repos/dasgarner/picofeed/zipball/654bdfa1a03ed1a47b0e67305580b4f8b6f9a10d",
+                "reference": "654bdfa1a03ed1a47b0e67305580b4f8b6f9a10d",
                 "shasum": ""
             },
             "require": {
@@ -1558,7 +1558,7 @@
             "support": {
                 "source": "https://github.com/dasgarner/picofeed/tree/westphal/php8"
             },
-            "time": "2023-04-05T12:35:43+00:00"
+            "time": "2023-09-22T11:49:47+00:00"
         },
         {
             "name": "intervention/image",
diff --git a/cypress/e2e/report_summary.cy.js b/cypress/e2e/report_summary.cy.js
index 3dcf279833..9fad7961b5 100644
--- a/cypress/e2e/report_summary.cy.js
+++ b/cypress/e2e/report_summary.cy.js
@@ -28,7 +28,7 @@ describe('Summary by Layout, Media or Event', function() {
   });
 
   it('Range: Today, Checks duration and count of a layout stat', () => {
-    // Create and alias for load layout
+    // Create alias
     cy.intercept({
       url: '/display?start=*',
       query: {display: display1},
@@ -57,13 +57,14 @@ describe('Summary by Layout, Media or Event', function() {
 
     // Click on the Apply button
     cy.contains('Apply').should('be.visible').click();
+    // Wait for report data
+    cy.wait('@reportData');
 
     cy.get('.chart-container').should('be.visible');
 
     // Click on Tabular
     cy.contains('Tabular').should('be.visible').click();
     cy.contains('Next').should('be.visible').click();
-    cy.wait('@reportData');
 
     // Should have media stats
     cy.get('#summaryTbl tbody tr:nth-child(3) td:nth-child(1)').contains('12:00 PM'); // Period
@@ -75,6 +76,7 @@ describe('Summary by Layout, Media or Event', function() {
     const reportschedule = 'Daily Summary by Layout 1 and Display 1';
 
     // Create and alias for load layout
+    cy.intercept('/report/reportschedule/form/add*').as('reportScheduleAddForm');
     cy.intercept({
       url: '/display?start=*',
       query: {display: display1},
@@ -102,6 +104,7 @@ describe('Summary by Layout, Media or Event', function() {
     // ------
     // Create a Daily Summary Report Schedule
     cy.get('#reportAddBtn').click();
+    cy.wait('@reportScheduleAddForm');
     cy.get('#reportScheduleAddForm #name ').type(reportschedule);
 
     // Click on the select2 selection
diff --git a/cypress/e2e/schedule.cy.js b/cypress/e2e/schedule.cy.js
index 59b914f80c..4b42f5622c 100644
--- a/cypress/e2e/schedule.cy.js
+++ b/cypress/e2e/schedule.cy.js
@@ -45,7 +45,10 @@ describe('Campaigns', function() {
     });
   });
 
-  it.skip('should schedule an event campaign that has no priority, no recurrence', function() {
+  it('should schedule an event campaign that has no priority, no recurrence', function() {
+    cy.intercept('GET', '/schedule?draw=2*').as('scheduleLoad');
+    cy.intercept('GET', '/schedule/form/add?*').as('scheduleAddForm');
+
     // Set up intercepts with aliases
     cy.intercept({
       url: '/display?start=*',
@@ -64,8 +67,13 @@ describe('Campaigns', function() {
 
     // Visit the page and click on the Add Event button
     cy.visit('/schedule/view');
+    // Wait for schedule draw 2
+    cy.wait('@scheduleLoad');
+    cy.contains('Clear Filters').should('be.visible').click();
     cy.contains('Add Event').click();
+    cy.wait('@scheduleAddForm');
 
+    // Fill in Add form
     cy.get(':nth-child(3) > .col-sm-10 > .select2 > .selection > .select2-selection > .select2-selection__rendered')
       .type(display1);
     cy.wait('@loadDisplaygroupAfterSearch');
@@ -93,6 +101,10 @@ describe('Campaigns', function() {
 
     // Validate - schedule creation should be successful
     cy.visit('/schedule/view');
+    //cy.get('.select2-selection__clear').click();
+    cy.contains('Clear Filters').should('be.visible').click();
+
+
     cy.get('#DisplayList + span .select2-selection').click();
     // Type the display name
     cy.get('.select2-container--open input[type="search"]').type(display1);
@@ -106,7 +118,9 @@ describe('Campaigns', function() {
     cy.get('#schedule-grid').contains(campaignSchedule1);
   });
 
-  it.skip('should schedule an event layout that has no priority, no recurrence', function() {
+  it('should schedule an event layout that has no priority, no recurrence', function() {
+    cy.intercept('GET', '/schedule?draw=2*').as('scheduleLoad');
+    cy.intercept('GET', '/schedule/form/add?*').as('scheduleAddForm');
     cy.intercept({
       url: '/displaygroup?*',
       query: {displayGroup: display1},
@@ -123,7 +137,11 @@ describe('Campaigns', function() {
 
     // Click on the Add Event button
     cy.visit('/schedule/view');
+    // Wait for schedule draw 2
+    cy.wait('@scheduleLoad');
+    cy.contains('Clear Filters').should('be.visible').click();
     cy.contains('Add Event').click();
+    cy.wait('@scheduleAddForm');
 
     // display
     cy.get(':nth-child(3) > .col-sm-10 > .select2 > .selection > .select2-selection > .select2-selection__rendered')
@@ -154,7 +172,9 @@ describe('Campaigns', function() {
     cy.contains('Added Event');
   });
 
-  it.skip('should schedule an event command/overlay layout that has no priority, no recurrence', function() {
+  it('should schedule an event command/overlay layout that has no priority, no recurrence', function() {
+    cy.intercept('GET', '/schedule?draw=2*').as('scheduleLoad');
+    cy.intercept('GET', '/schedule/form/add?*').as('scheduleAddForm');
     cy.intercept({
       url: '/displaygroup?*',
       query: {displayGroup: display1},
@@ -167,7 +187,11 @@ describe('Campaigns', function() {
 
     // Click on the Add Event button
     cy.visit('/schedule/view');
+    // Wait for schedule draw 2
+    cy.wait('@scheduleLoad');
+    cy.contains('Clear Filters').should('be.visible').click();
     cy.contains('Add Event').click();
+    cy.wait('@scheduleAddForm');
 
     // display
     cy.get(':nth-child(3) > .col-sm-10 > .select2 > .selection > .select2-selection > .select2-selection__rendered')
@@ -209,7 +233,11 @@ describe('Campaigns', function() {
     cy.get('.modal .modal-footer').contains('Save').click();
   });
 
-  it.skip('should edit a scheduled event', function() {
+  it('should edit a scheduled event', function() {
+    cy.intercept('GET', '/schedule/data/events?*').as('scheduleDataEvent');
+    cy.intercept('GET', '/schedule?draw=2*').as('scheduleLoad2');
+    cy.intercept('GET', '/schedule?draw=3*').as('scheduleLoad3');
+    cy.intercept('GET', '/schedule/form/add?*').as('scheduleAddForm');
     cy.intercept({
       url: '/displaygroup?*',
       query: {displayGroup: display2},
@@ -221,6 +249,9 @@ describe('Campaigns', function() {
     }).as('loadLayoutSpecificCampaign');
 
     cy.visit('/schedule/view');
+    // Wait for schedule draw 2
+    cy.wait('@scheduleLoad2');
+    cy.contains('Clear Filters').should('be.visible').click();
 
     // ---------
     // Edit a schedule - add another display
@@ -245,11 +276,14 @@ describe('Campaigns', function() {
       .click();
 
     cy.get('.modal .modal-footer').contains('Save').click();
+
     cy.get('#schedule-grid tbody').contains('2');
 
-    // cy.get('#schedule-grid tbody tr').should('have.length', 2);
-    // cy.get('#schedule-grid tr:first-child .dropdown-toggle').invoke('show').click();
-    // cy.get('#schedule-grid tr:first-child .schedule_button_delete').click();
-    // cy.get('.bootbox .save-button').click();
+    cy.get('#schedule-grid tbody tr').should('have.length', 2);
+    cy.wait('@scheduleLoad3');
+    cy.wait('@scheduleDataEvent');
+    cy.get('#schedule-grid tr:first-child .dropdown-toggle').click();
+    cy.get('#schedule-grid tr:first-child .schedule_button_delete').click();
+    cy.get('.bootbox .save-button').click();
   });
 });
diff --git a/db/migrations/20220330111440_modules_table_ver_four_migration.php b/db/migrations/20220330111440_modules_table_ver_four_migration.php
index 2854cb4119..22eeb1a724 100755
--- a/db/migrations/20220330111440_modules_table_ver_four_migration.php
+++ b/db/migrations/20220330111440_modules_table_ver_four_migration.php
@@ -60,17 +60,18 @@ public function change()
 
         // Pull through old modules, having a guess at their names.
         try {
+            //phpcs:disable
             $this->execute('
-            INSERT INTO `module` (`moduleId`, `enabled`, `previewEnabled`, `defaultDuration`, `settings`)
-            SELECT DISTINCT LOWER(CASE WHEN `class` LIKE \'%Custom%\' 
-                       THEN IFNULL(installname, module)
-                       ELSE CONCAT(\'core-\', `module`)
-                   END),
-                   `enabled`,
-                   `previewEnabled`,
-                   `defaultDuration`, 
-                   `settings`
-              FROM `module_old`');
+                INSERT INTO `module` (`moduleId`, `enabled`, `previewEnabled`, `defaultDuration`, `settings`)
+                SELECT LOWER(CASE WHEN `class` LIKE \'%Custom%\' THEN IFNULL(installname, module) ELSE CONCAT(\'core-\', `module`) END),
+                    MAX(`enabled`),
+                    MAX(`previewEnabled`),
+                    MAX(`defaultDuration`),
+                    MAX(`settings`)
+                  FROM `module_old`
+                GROUP BY LOWER(CASE WHEN `class` LIKE \'%Custom%\' THEN IFNULL(installname, module) ELSE CONCAT(\'core-\', `module`) END)
+            ');
+            //phpcs:enable
 
             // Handle any specific renames
             $this->execute('UPDATE `module` SET moduleId = \'core-rss-ticker\' WHERE moduleId = \'core-ticker\'');
diff --git a/lib/Connector/AlphaVantageConnector.php b/lib/Connector/AlphaVantageConnector.php
index fa42b82251..0a02797127 100644
--- a/lib/Connector/AlphaVantageConnector.php
+++ b/lib/Connector/AlphaVantageConnector.php
@@ -305,7 +305,7 @@ protected function getStockQuote(string $symbol, ?int $isPaidPlan): array
 
                 $request = $this->getClient()->request('GET', 'https://www.alphavantage.co/query', [
                     'query' => [
-                        'function' => $isPaidPlan === 1 ? 'TIME_SERIES_DAILY' : 'TIME_SERIES_DAILY_ADJUSTED',
+                        'function' => $isPaidPlan === 1 ? 'TIME_SERIES_DAILY_ADJUSTED' : 'TIME_SERIES_DAILY',
                         'symbol' => $symbol,
                         'apikey' => $this->getSetting('apiKey')
                     ]
@@ -360,7 +360,7 @@ private function decorateWithReplacements(array $item): array
             if ($item['Change'] > 0) {
                 $item['ChangeIcon'] = 'up-arrow';
                 $item['ChangeStyle'] = 'value-up';
-            } else if ($item['Change'] < 0){
+            } else if ($item['Change'] < 0) {
                 $item['ChangeIcon'] = 'down-arrow';
                 $item['ChangeStyle'] = 'value-down';
             }
@@ -390,7 +390,10 @@ private function getCurrenciesResults(DataProviderInterface $dataProvider): void
                 'Missing Items for Currencies Module with WidgetId ' .
                 $dataProvider->getWidgetId()
             );
-            throw new InvalidArgumentException(__('Missing Items for Currencies Module. Please provide items in order to proceed.'), 'items');
+            throw new InvalidArgumentException(
+                __('Missing Items for Currencies Module. Please provide items in order to proceed.'),
+                'items'
+            );
         }
 
         // Does this require a reversed conversion?
diff --git a/lib/Controller/Layout.php b/lib/Controller/Layout.php
index 74ca66966a..40e5e93755 100644
--- a/lib/Controller/Layout.php
+++ b/lib/Controller/Layout.php
@@ -1473,7 +1473,7 @@ public function grid(Request $request, Response $response)
                         $module = $this->moduleFactory->getByType($widget->type);
                     } catch (NotFoundException $notFoundException) {
                         // This module isn't available, mark it as invalid.
-                        $widget->isValid = 0;
+                        $widget->isValid = false;
                         $widget->setUnmatchedProperty('moduleName', __('Invalid Module'));
                         $widget->setUnmatchedProperty('name', __('Invalid Module'));
                         $widget->setUnmatchedProperty('tags', []);
@@ -1504,7 +1504,7 @@ public function grid(Request $request, Response $response)
                     if (in_array('widget_validity', $embed)) {
                         $status = 0;
                         $layout->assessWidgetStatus($module, $widget, $status);
-                        $widget->isValid = $status;
+                        $widget->isValid = $status === 1;
                     }
 
                     // apply default transitions to a dynamic parameters on widget object.
@@ -1943,9 +1943,10 @@ function editBackgroundForm(Request $request, Response $response, $id)
         $sanitizedParams = $this->getSanitizer($request->getParams());
 
         // Check Permissions
-        if (!$this->getUser()->checkEditable($layout))
+        if (!$this->getUser()->checkEditable($layout)) {
             throw new AccessDeniedException();
-
+        }
+        
         // Edits always happen on Drafts, get the draft Layout using the Parent Layout ID
         if ($layout->schemaVersion < 2) {
             $resolution = $this->resolutionFactory->getByDesignerDimensions($layout->width, $layout->height);
@@ -1961,7 +1962,13 @@ function editBackgroundForm(Request $request, Response $response, $id)
         $this->getState()->setData([
             'layout' => $layout,
             'resolution' => $resolution,
-            'resolutions' => $this->resolutionFactory->query(['resolution'], ['withCurrent' => $resolution->resolutionId]),
+            'resolutions' => $this->resolutionFactory->query(
+                ['resolution'],
+                [
+                    'withCurrent' => $resolution->resolutionId,
+                    'enabled' => 1
+                ]
+            ),
             'backgroundId' => $backgroundId,
             'backgrounds' => $backgrounds,
         ]);
diff --git a/lib/Controller/Module.php b/lib/Controller/Module.php
index a707a830ed..04d939ea5e 100644
--- a/lib/Controller/Module.php
+++ b/lib/Controller/Module.php
@@ -21,12 +21,14 @@
  */
 namespace Xibo\Controller;
 
+use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response as Response;
 use Slim\Http\ServerRequest as Request;
 use Xibo\Factory\ModuleFactory;
 use Xibo\Factory\ModuleTemplateFactory;
 use Xibo\Storage\StorageServiceInterface;
 use Xibo\Support\Exception\AccessDeniedException;
+use Xibo\Support\Exception\ControllerNotImplemented;
 use Xibo\Support\Exception\GeneralException;
 use Xibo\Support\Exception\InvalidArgumentException;
 use Xibo\Support\Exception\NotFoundException;
@@ -72,7 +74,18 @@ public function displayPage(Request $request, Response $response)
     }
 
     /**
-     * A grid of modules
+     * @SWG\Get(
+     *  path="/module",
+     *  operationId="moduleSearch",
+     *  tags={"module"},
+     *  summary="Module Search",
+     *  description="Get a list of all modules available to this CMS",
+     *  @SWG\Response(
+     *      response=200,
+     *      description="successful operation",
+     *      @SWG\Schema(ref="#/definitions/Module")
+     *  )
+     * )
      * @param Request $request
      * @param Response $response
      * @return \Psr\Http\Message\ResponseInterface|Response
@@ -152,8 +165,9 @@ public function grid(Request $request, Response $response)
      *  @SWG\Response(
      *      response=200,
      *      description="successful operation",
-     *      @SWG\Schema(ref="#/definitions/Module")
+     *      @SWG\Schema(ref="#/definitions/Property")
      *  )
+     * )
      * @param Request $request
      * @param Response $response
      * @param $id
@@ -304,7 +318,25 @@ public function clearCache(Request $request, Response $response, $id)
     }
 
     /**
-     * Get a list of templates available for a particular data type
+     * @SWG\Get(
+     *  path="/module/templates/{dataType}",
+     *  operationId="moduleTemplateSearch",
+     *  tags={"module"},
+     *  summary="Module Template Search",
+     *  description="Get a list of templates available for a particular data type",
+     *  @SWG\Parameter(
+     *      name="dataType",
+     *      in="path",
+     *      description="DataType to return templates for",
+     *      type="string",
+     *      required=true
+     *   ),
+     *  @SWG\Response(
+     *      response=200,
+     *      description="An array of module templates for the provided datatype",
+     *      @SWG\Schema(ref="#/definitions/ModuleTemplate")
+     *  )
+     * )
      * @param \Slim\Http\ServerRequest $request
      * @param \Slim\Http\Response $response
      * @param string $dataType
@@ -353,14 +385,15 @@ public function templateGrid(Request $request, Response $response, string $dataT
      *          additionalProperties={"id":"string", "type":"string", "title":"string", "helpText":"string", "options":"array"}
      *      )
      *  )
+     * )
      * @param Request $request
      * @param Response $response
-     * @param $id
-     * @return \Psr\Http\Message\ResponseInterface|Response
-     * @throws AccessDeniedException
+     * @param string $dataType
+     * @param string $id
+     * @return ResponseInterface|Response
      * @throws GeneralException
      * @throws NotFoundException
-     * @throws \Xibo\Support\Exception\ControllerNotImplemented
+     * @throws ControllerNotImplemented
      */
     // phpcs:enable
     public function getTemplateProperties(Request $request, Response $response, string $dataType, string $id)
diff --git a/lib/Controller/Schedule.php b/lib/Controller/Schedule.php
index 00cc2842a7..21090dafcd 100644
--- a/lib/Controller/Schedule.php
+++ b/lib/Controller/Schedule.php
@@ -1101,7 +1101,9 @@ public function add(Request $request, Response $response)
         $this->getLog()->debug('Add Schedule');
         $sanitizedParams = $this->getSanitizer($request->getParams());
 
-        $embed = ($sanitizedParams->getString('embed') != null) ? explode(',', $sanitizedParams->getString('embed')) : [];
+        $embed = ($sanitizedParams->getString('embed') != null)
+            ? explode(',', $sanitizedParams->getString('embed'))
+            : [];
 
         // Get the custom day part to use as a default day part
         $customDayPart = $this->dayPartFactory->getCustomDayPart();
@@ -1266,17 +1268,14 @@ public function add(Request $request, Response $response)
         // API Request
         $rows = [];
         if ($this->isApi($request)) {
-
             $reminders =  $sanitizedParams->getArray('scheduleReminders', ['default' => []]);
             foreach ($reminders as $i => $reminder) {
-
                 $rows[$i]['reminder_value'] = (int) $reminder['reminder_value'];
                 $rows[$i]['reminder_type'] = (int) $reminder['reminder_type'];
                 $rows[$i]['reminder_option'] = (int) $reminder['reminder_option'];
                 $rows[$i]['reminder_isEmailHidden'] = (int) $reminder['reminder_isEmailHidden'];
             }
         } else {
-
             for ($i=0; $i < count($sanitizedParams->getIntArray('reminder_value', ['default' => []])); $i++) {
                 $rows[$i]['reminder_value'] = $sanitizedParams->getIntArray('reminder_value')[$i];
                 $rows[$i]['reminder_type'] = $sanitizedParams->getIntArray('reminder_type')[$i];
@@ -1287,7 +1286,6 @@ public function add(Request $request, Response $response)
 
         // Save new reminders
         foreach ($rows as $reminder) {
-
             // Do not add reminder if empty value provided for number of minute/hour
             if ($reminder['reminder_value'] == 0) {
                 continue;
@@ -1314,6 +1312,7 @@ public function add(Request $request, Response $response)
 
         if ($this->isSyncEvent($schedule->eventTypeId)) {
             $syncGroup = $this->syncGroupFactory->getById($schedule->syncGroupId);
+            $syncGroup->validateForSchedule($sanitizedParams);
             $schedule->updateSyncLinks($syncGroup, $sanitizedParams);
         }
 
@@ -1866,16 +1865,16 @@ public function edit(Request $request, Response $response, $id)
 
         if ($this->isSyncEvent($schedule->eventTypeId)) {
             $syncGroup = $this->syncGroupFactory->getById($schedule->syncGroupId);
+            $syncGroup->validateForSchedule($sanitizedParams);
             $schedule->updateSyncLinks($syncGroup, $sanitizedParams);
         }
 
         // Get form reminders
         $rows = [];
         for ($i=0; $i < count($sanitizedParams->getIntArray('reminder_value',['default' => []])); $i++) {
-
             $entry = [];
 
-            if ($sanitizedParams->getIntArray('reminder_scheduleReminderId')[$i] == null ) {
+            if ($sanitizedParams->getIntArray('reminder_scheduleReminderId')[$i] == null) {
                 continue;
             }
 
diff --git a/lib/Controller/StatusDashboard.php b/lib/Controller/StatusDashboard.php
index 574e7274c3..45b2689adc 100644
--- a/lib/Controller/StatusDashboard.php
+++ b/lib/Controller/StatusDashboard.php
@@ -35,6 +35,7 @@
 use Xibo\Factory\MediaFactory;
 use Xibo\Factory\UserFactory;
 use Xibo\Helper\ByteFormatter;
+use Xibo\Helper\DateFormatHelper;
 use Xibo\Service\MediaService;
 use Xibo\Storage\StorageServiceInterface;
 
@@ -367,9 +368,11 @@ public function displayPage(Request $request, Response $response)
 
                         // Pull out the content type and body
                         $result = explode('charset=', $responseGuzzle->getHeaderLine('Content-Type'));
-                        $document['encoding'] = isset($result[1]) ? $result[1] : '';
+                        $document['encoding'] = $result[1] ?? '';
                         $document['xml'] = $responseGuzzle->getBody();
 
+                        $this->getLog()->debug($document['xml']);
+
                         // Get the feed parser
                         $reader = new Reader();
                         $parser = $reader->getParser($feedUrl, $document['xml'], $document['encoding']);
@@ -381,23 +384,22 @@ public function displayPage(Request $request, Response $response)
                         $latestNews = [];
 
                         foreach ($feed->getItems() as $item) {
-                            /* @var \PicoFeed\Parser\Item $item */
-
                             // Try to get the description tag
-                            if (!$desc = $item->getTag('description')) {
+                            $desc = $item->getTag('description');
+                            if (!$desc) {
                                 // use content with tags stripped
                                 $content = strip_tags($item->getContent());
                             } else {
                                 // use description
-                                $content = (isset($desc[0]) ? $desc[0] : strip_tags($item->getContent()));
+                                $content = ($desc[0] ?? strip_tags($item->getContent()));
                             }
 
-                            $latestNews[] = array(
+                            $latestNews[] = [
                                 'title' => $item->getTitle(),
                                 'description' => $content,
                                 'link' => $item->getUrl(),
-                                'date' => Carbon::createFromTimestamp($item->getDate()->format('U'))
-                            );
+                                'date' => Carbon::instance($item->getDate())->format(DateFormatHelper::getSystemFormat()),
+                            ];
                         }
 
                         // Store in the cache for 1 day
diff --git a/lib/Controller/Widget.php b/lib/Controller/Widget.php
index 392f273a5f..53478ec8d6 100644
--- a/lib/Controller/Widget.php
+++ b/lib/Controller/Widget.php
@@ -553,7 +553,7 @@ public function editWidget(Request $request, Response $response, $id)
         foreach ($widget->mediaIds as $mediaId) {
             try {
                 $this->mediaFactory->getById($mediaId);
-            } catch (NotFoundException $notFoundException) {
+            } catch (NotFoundException) {
                 throw new InvalidArgumentException(sprintf(
                     __('Your library reference %d does not exist.'),
                     $mediaId
diff --git a/lib/Entity/DataSet.php b/lib/Entity/DataSet.php
index 6549529608..50af79f904 100644
--- a/lib/Entity/DataSet.php
+++ b/lib/Entity/DataSet.php
@@ -491,11 +491,11 @@ public function getData($filterBy = [], $options = [])
         // Sanitize the filter options provided
         // Get the Latitude and Longitude ( might be used in a formula )
         if ($displayId == 0) {
-            $displayGeoLocation = "GEOMFROMTEXT('POINT(" . $this->config->getSetting('DEFAULT_LAT') . " " . $this->config->getSetting('DEFAULT_LONG') . ")')";
-        }
-        else {
-            $displayGeoLocation = '(SELECT GeoLocation FROM `display` WHERE DisplayID = :displayId)';
-            $params['displayId'] = $displayId;
+            $displayGeoLocation =
+                "ST_GEOMFROMTEXT('POINT(" . $this->config->getSetting('DEFAULT_LAT') .
+                ' ' . $this->config->getSetting('DEFAULT_LONG') . ")')";
+        } else {
+            $displayGeoLocation = '(SELECT GeoLocation FROM `display` WHERE DisplayID =' . $displayId. ')';
         }
 
         // Build a SQL statement, based on the columns for this dataset
diff --git a/lib/Entity/DataSetColumn.php b/lib/Entity/DataSetColumn.php
index 07ef620770..8bae26a10c 100644
--- a/lib/Entity/DataSetColumn.php
+++ b/lib/Entity/DataSetColumn.php
@@ -295,6 +295,8 @@ public function validate($options = [])
         ) {
             try {
                 $formula = str_replace('[DisplayId]', 0, $this->formula);
+                $formula = str_replace('[DisplayGeoLocation]', "ST_GEOMFROMTEXT('POINT(51.504 -0.104)')", $formula);
+
                 $this->getStore()->select('
                     SELECT * 
                       FROM (
diff --git a/lib/Entity/Folder.php b/lib/Entity/Folder.php
index 99594c3569..cf69f6cd09 100644
--- a/lib/Entity/Folder.php
+++ b/lib/Entity/Folder.php
@@ -34,7 +34,7 @@
  * @package Xibo\Entity
  * @SWG\Definition()
  */
-class Folder
+class Folder implements \JsonSerializable
 {
     use EntityTrait;
 
diff --git a/lib/Entity/Module.php b/lib/Entity/Module.php
index 3a15c7fe7e..7710adcb82 100644
--- a/lib/Entity/Module.php
+++ b/lib/Entity/Module.php
@@ -176,7 +176,10 @@ class Module implements \JsonSerializable
     /** @var \Xibo\Widget\Definition\Stencil|null Stencil for this modules HTML cache */
     public $stencil;
 
-    /** @var \Xibo\Widget\Definition\Property[]|null */
+    /**
+     * @SWG\Property(description="Properties to display in the property panel and supply to stencils")
+     * @var \Xibo\Widget\Definition\Property[]|null
+     */
     public $properties;
 
     /** @var \Xibo\Widget\Definition\Asset[]|null */
@@ -247,21 +250,13 @@ class Module implements \JsonSerializable
     public $defaultDuration;
 
     /**
-     * @SWG\Property(
-     *     description="An array of additional module specific settings",
-     *     type="array",
-     *     @SWG\Items(type="string")
-     * )
+     * @SWG\Property(description="An array of additional module specific settings")
      * @var \Xibo\Widget\Definition\Property[]
      */
     public $settings = [];
 
     /**
-     * @SWG\Property(
-     *     description="An array of additional module specific group properties",
-     *     type="array",
-     *     @SWG\Items(type="string")
-     * )
+     * @SWG\Property(description="An array of additional module specific group properties")
      * @var \Xibo\Widget\Definition\PropertyGroup[]
      */
     public $propertyGroups = [];
@@ -276,13 +271,22 @@ class Module implements \JsonSerializable
      */
     public $requiredElements = [];
 
-    /** @var bool $isInstalled Is this module installed? */
+    /**
+     * @SWG\Property()
+     * @var bool $isInstalled Is this module installed?
+     */
     public $isInstalled;
 
-    /** @var bool $isError Does this module have any errors? */
+    /**
+     * @SWG\Property()
+     * @var bool $isError Does this module have any errors?
+     */
     public $isError;
 
-    /** @var string[] $errors An array of errors this module has. */
+    /**
+     * @SWG\Property()
+     * @var string[] $errors An array of errors this module has.
+     */
     public $errors;
 
     // </editor-fold>
diff --git a/lib/Entity/ModuleTemplate.php b/lib/Entity/ModuleTemplate.php
index 9af2a56510..8580d7ea1f 100644
--- a/lib/Entity/ModuleTemplate.php
+++ b/lib/Entity/ModuleTemplate.php
@@ -26,6 +26,7 @@
 use Xibo\Factory\ModuleTemplateFactory;
 use Xibo\Service\LogServiceInterface;
 use Xibo\Storage\StorageServiceInterface;
+use Xibo\Widget\Definition\Asset;
 
 /**
  * Represents a module template
@@ -36,28 +37,44 @@ class ModuleTemplate implements \JsonSerializable
     use EntityTrait;
     use ModulePropertyTrait;
 
-    /** @var string The templateId */
+    /**
+     * @SWG\Property()
+     * @var string The templateId
+     */
     public $templateId;
 
-    /** @var string Type of template (static|element|stencil) */
+    /**
+     * @SWG\Property()
+     * @var string Type of template (static|element|stencil)
+     */
     public $type;
 
-    /** @var \Xibo\Widget\Definition\Extend|null If this template extends another */
+    /**
+     * @SWG\Property()
+     * @var \Xibo\Widget\Definition\Extend|null If this template extends another
+     */
     public $extends;
 
-    /** @var string The datatype of this template */
+    /**
+     * @SWG\Property()
+     * @var string The datatype of this template
+     */
     public $dataType;
 
-    /** @var string The title */
+    /**
+     * @SWG\Property()
+     * @var string The title
+     */
     public $title;
 
     /**
-     * Icon
-     * @var string
+     * @SWG\Property()
+     * @var string Icon
      */
     public $icon;
 
     /**
+     * @SWG\Property()
      * Thumbnail
      * this is the location to a module template's thumbnail, which should be added to the installation
      * relative to the module class file.
@@ -83,26 +100,34 @@ class ModuleTemplate implements \JsonSerializable
      */
     public $showIn = 'both';
 
-    /** @var \Xibo\Widget\Definition\Property[]|null */
+    /**
+     * @SWG\Property()
+     * @var \Xibo\Widget\Definition\Property[]|null Properties
+     */
     public $properties;
 
-    /** @var bool Is Visible? */
+    /**
+     * @SWG\Property()
+     * @var bool Is Visible?
+     */
     public $isVisible = true;
 
     /**
-     * @SWG\Property(
-     *     description="An array of additional module specific group properties",
-     *     type="array",
-     *     @SWG\Items(type="string")
-     * )
+     * @SWG\Property(description="An array of additional module specific group properties")
      * @var \Xibo\Widget\Definition\PropertyGroup[]
      */
     public $propertyGroups = [];
 
-    /** @var \Xibo\Widget\Definition\Stencil|null */
+    /**
+     * @SWG\Property()
+     * @var \Xibo\Widget\Definition\Stencil|null A stencil, if needed
+     */
     public $stencil;
 
-    /** @var  */
+    /**
+     * @SWG\Property()
+     * @var Asset[]
+     */
     public $assets;
 
     /** @var string A Renderer to run if custom rendering is required. */
diff --git a/lib/Entity/SyncGroup.php b/lib/Entity/SyncGroup.php
index 72c3185939..9d4768185a 100644
--- a/lib/Entity/SyncGroup.php
+++ b/lib/Entity/SyncGroup.php
@@ -31,6 +31,7 @@
 use Xibo\Helper\DateFormatHelper;
 use Xibo\Support\Exception\InvalidArgumentException;
 use Xibo\Support\Exception\NotFoundException;
+use Xibo\Support\Sanitizer\SanitizerInterface;
 
 /**
  * @SWG\Definition()
@@ -137,7 +138,7 @@ public function __construct(
     }
 
     /**
-     * @return array[Display]
+     * @return Display[]
      * @throws NotFoundException
      */
     public function getSyncGroupMembers(): array
@@ -287,6 +288,18 @@ public function validate(): void
         }
     }
 
+    public function validateForSchedule(SanitizerInterface $sanitizer)
+    {
+        foreach ($this->getSyncGroupMembers() as $display) {
+            if (empty($sanitizer->getInt('layoutId_' . $display->displayId))) {
+                $this->getLog()->error('Sync Event : Missing Layout for DisplayID ' . $display->displayId);
+                throw new InvalidArgumentException(
+                    __('Please make sure to select a Layout for all Displays in this Sync Group.')
+                );
+            }
+        }
+    }
+
     private function add(): void
     {
         $time = Carbon::now()->format(DateFormatHelper::getSystemFormat());
diff --git a/lib/Entity/Widget.php b/lib/Entity/Widget.php
index 15879bdcee..feb4e68655 100644
--- a/lib/Entity/Widget.php
+++ b/lib/Entity/Widget.php
@@ -894,7 +894,7 @@ public function applyProperties(array $properties): Widget
                     }
                 }
 
-                // Is this a medtor selector? and if so should we assign the library media
+                // Is this a media selector? and if so should we assign the library media
                 if ($property->type === 'mediaSelector') {
                     if (!empty($value) && is_numeric($value)) {
                         $this->assignMedia(intval($value));
diff --git a/lib/Factory/FontFactory.php b/lib/Factory/FontFactory.php
index 6acd1b4e61..fdd3b602ec 100644
--- a/lib/Factory/FontFactory.php
+++ b/lib/Factory/FontFactory.php
@@ -84,7 +84,8 @@ public function createFontFromUpload(string $file, string $name, string $fileNam
                 )
             )
         );
-        $font->fileName = $fileName;
+
+        $font->fileName = preg_replace('/[^-.\w]/', '-', $fileName);
         $font->size = filesize($file);
         $font->md5 = md5_file($file);
         return $font;
diff --git a/lib/Factory/MediaFactory.php b/lib/Factory/MediaFactory.php
index 9e4a72b9b8..fbcf95bc9e 100644
--- a/lib/Factory/MediaFactory.php
+++ b/lib/Factory/MediaFactory.php
@@ -620,15 +620,18 @@ public function query($sortOrder = null, $filterBy = [])
         // Unused only?
         if ($sanitizedFilter->getInt('unusedOnly') === 1) {
             $body .= '
-                AND media.mediaId NOT IN (SELECT mediaId FROM `lkwidgetmedia`)
-                AND media.mediaId NOT IN (SELECT mediaId FROM `lkmediadisplaygroup`)
-                AND media.mediaId NOT IN (SELECT mediaId FROM `menu_category` WHERE mediaId IS NOT NULL)
-                AND media.mediaId NOT IN (SELECT mediaId FROM `menu_product` WHERE mediaId IS NOT NULL)
-                AND media.mediaId NOT IN (SELECT backgroundImageId FROM `layout` WHERE backgroundImageId IS NOT NULL)
-                AND media.type <> \'module\'
-                AND media.type <> \'font\'
-                AND media.type <> \'playersoftware\'
-                AND media.type <> \'savedreport\'
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `display_media`)
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `lkwidgetmedia`)
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `lkmediadisplaygroup`)
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `menu_category` WHERE `mediaId` IS NOT NULL)
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `menu_product` WHERE `mediaId` IS NOT NULL)
+                AND `media`.`mediaId` NOT IN (
+                    SELECT `backgroundImageId` FROM `layout` WHERE `backgroundImageId` IS NOT NULL
+                )
+                AND `media`.`type` <> \'module\'
+                AND `media`.`type` <> \'font\'
+                AND `media`.`type` <> \'playersoftware\'
+                AND `media`.`type` <> \'savedreport\'
             ';
 
             // DataSets with library images
@@ -665,6 +668,13 @@ public function query($sortOrder = null, $filterBy = [])
             }
         }
 
+        // Unlinked only?
+        if ($sanitizedFilter->getInt('unlinkedOnly') === 1) {
+            $body .= '
+                AND `media`.`mediaId` NOT IN (SELECT `mediaId` FROM `display_media`)
+            ';
+        }
+
         if ($sanitizedFilter->getString('name') != null) {
             $terms = explode(',', $sanitizedFilter->getString('name'));
             $logicalOperator = $sanitizedFilter->getString('logicalOperatorName', ['default' => 'OR']);
diff --git a/lib/Factory/ModuleXmlTrait.php b/lib/Factory/ModuleXmlTrait.php
index 834c5432ff..3f46b5db47 100644
--- a/lib/Factory/ModuleXmlTrait.php
+++ b/lib/Factory/ModuleXmlTrait.php
@@ -64,6 +64,8 @@ private function getStencils(\DOMNodeList $nodes): array
                 } else if ($childNode->nodeName === 'hbs') {
                     $stencil->hbsId = $childNode->getAttribute('id');
                     $stencil->hbs = trim($childNode->textContent);
+                } else if ($childNode->nodeName === 'head') {
+                    $stencil->head = trim($childNode->textContent);
                 } else if ($childNode->nodeName === 'style') {
                     $stencil->style = trim($childNode->textContent);
                 } else if ($childNode->nodeName === 'elements') {
@@ -77,7 +79,11 @@ private function getStencils(\DOMNodeList $nodes): array
                 }
             }
 
-            if ($stencil->twig !== null || $stencil->hbs !== null || $stencil->style !== null) {
+            if ($stencil->twig !== null
+                || $stencil->hbs !== null
+                || $stencil->head !== null
+                || $stencil->style !== null
+            ) {
                 $stencils[] = $stencil;
             }
         }
@@ -421,6 +427,7 @@ private function getExtends(\DOMNodeList $nodes): array
                 $extend->template = trim($node->textContent);
                 $extend->override = $node->getAttribute('override');
                 $extend->with = $node->getAttribute('with');
+                $extend->escapeHtml = $node->getAttribute('escapeHtml') !== 'false';
                 $extends[] = $extend;
             }
         }
diff --git a/lib/Factory/ResolutionFactory.php b/lib/Factory/ResolutionFactory.php
index e8867e9187..d34aa187ff 100644
--- a/lib/Factory/ResolutionFactory.php
+++ b/lib/Factory/ResolutionFactory.php
@@ -148,9 +148,9 @@ public function query($sortOrder = null, $filterBy = [])
             $sortOrder = ['resolution'];
         }
 
-        $entities = array();
+        $entities = [];
 
-        $params = array();
+        $params = [];
         $select  = '
           SELECT `resolution`.resolutionId,
               `resolution`.resolution,
@@ -168,7 +168,17 @@ public function query($sortOrder = null, $filterBy = [])
            WHERE 1 = 1
         ';
 
-        if ($parsedFilter->getInt('enabled', ['default' => -1]) != -1) {
+        if ($parsedFilter->getInt('enabled', ['default' => -1]) != -1
+            && $parsedFilter->getInt('withCurrent') !== null
+        ) {
+            $body .= ' AND ( enabled = :enabled OR `resolution`.resolutionId = :withCurrent) ';
+            $params['enabled'] = $parsedFilter->getInt('enabled');
+            $params['withCurrent'] = $parsedFilter->getInt('withCurrent');
+        }
+
+        if ($parsedFilter->getInt('enabled', ['default' => -1]) != -1
+            && $parsedFilter->getInt('withCurrent') === null
+        ) {
             $body .= ' AND enabled = :enabled ';
             $params['enabled'] = $parsedFilter->getInt('enabled');
         }
diff --git a/lib/Helper/Environment.php b/lib/Helper/Environment.php
index 3d0e78480e..b437915c91 100644
--- a/lib/Helper/Environment.php
+++ b/lib/Helper/Environment.php
@@ -30,7 +30,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '4.0.3';
+    public static $WEBSITE_VERSION_NAME = '4.0.4';
     public static $XMDS_VERSION = '7';
     public static $XLF_VERSION = 4;
     public static $VERSION_REQUIRED = '8.1.0';
diff --git a/lib/Helper/Install.php b/lib/Helper/Install.php
index fb628d555f..77f00859f2 100644
--- a/lib/Helper/Install.php
+++ b/lib/Helper/Install.php
@@ -1,8 +1,8 @@
 <?php
-/**
- * Copyright (C) 2022 Xibo Signage Ltd
+/*
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -414,6 +414,11 @@ public function step7(Request $request, Response $response) : Response
             $library_location = $library_location . '/';
         }
 
+        // Attempt to create fonts sub-folder in Library location
+        if (!mkdir($library_location . 'fonts', 0777, true)) {
+            throw new InstallationError(__('Could not create the fonts sub-folder under Library Location directory for you. Please ensure the webserver has permission to create a folder in this location, or create the folder manually and grant permission for the webserver to write to the folder.'));//phpcs:ignore
+        }
+
         try {
             $dbh = $store->getConnection();
 
diff --git a/lib/Service/MediaService.php b/lib/Service/MediaService.php
index e373d252cd..7fb0e601ee 100644
--- a/lib/Service/MediaService.php
+++ b/lib/Service/MediaService.php
@@ -354,7 +354,8 @@ public function removeExpiredFiles()
             [
                 'expires' => Carbon::now()->format('U'),
                 'allModules' => 1,
-                'length' => 100
+                'unlinkedOnly' => 1,
+                'length' => 100,
             ]
         ) as $entry) {
             // If the media type is a module, then pretend it's a generic file
diff --git a/lib/Widget/Definition/Element.php b/lib/Widget/Definition/Element.php
index 8f674413b0..9c5ac232bc 100644
--- a/lib/Widget/Definition/Element.php
+++ b/lib/Widget/Definition/Element.php
@@ -23,6 +23,7 @@
 namespace Xibo\Widget\Definition;
 
 /**
+ * @SWG\Definition()
  * A class representing an instance of an element template
  */
 class Element implements \JsonSerializable
diff --git a/lib/Widget/Definition/Extend.php b/lib/Widget/Definition/Extend.php
index f1d434d42f..c27503ae53 100644
--- a/lib/Widget/Definition/Extend.php
+++ b/lib/Widget/Definition/Extend.php
@@ -23,6 +23,7 @@
 namespace Xibo\Widget\Definition;
 
 /**
+ * @SWG\Definition()
  * A class representing one template extending another
  */
 class Extend implements \JsonSerializable
@@ -30,6 +31,7 @@ class Extend implements \JsonSerializable
     public $template;
     public $override;
     public $with;
+    public $escapeHtml;
 
     /** @inheritDoc */
     public function jsonSerialize(): array
@@ -38,6 +40,7 @@ public function jsonSerialize(): array
             'template' => $this->template,
             'override' => $this->override,
             'with' => $this->with,
+            'escapeHtml' => $this->escapeHtml,
         ];
     }
 }
diff --git a/lib/Widget/Definition/LegacyType.php b/lib/Widget/Definition/LegacyType.php
index 2fd85d3a86..1917aaf420 100644
--- a/lib/Widget/Definition/LegacyType.php
+++ b/lib/Widget/Definition/LegacyType.php
@@ -24,6 +24,7 @@
 
 /**
  * A Legacy Type
+ * @SWG\Definition()
  */
 class LegacyType implements \JsonSerializable
 {
diff --git a/lib/Widget/Definition/Option.php b/lib/Widget/Definition/Option.php
index 92b6717010..3335e843e8 100644
--- a/lib/Widget/Definition/Option.php
+++ b/lib/Widget/Definition/Option.php
@@ -23,14 +23,33 @@
 namespace Xibo\Widget\Definition;
 
 /**
- * Option
- * typically used when paired with a dropdown
+ * Option: typically used when paired with a dropdown
+ * @SWG\Definition()
  */
 class Option implements \JsonSerializable
 {
+    /**
+     * @SWG\Property(description="Name")
+     * @var string
+     */
     public $name;
+
+    /**
+     * @SWG\Property(description="Image: optional image asset")
+     * @var string
+     */
     public $image;
+
+    /**
+     * @SWG\Property(description="Set")
+     * @var string[]
+     */
     public $set = [];
+
+    /**
+     * * @SWG\Property(description="Title: shown in the dropdown/select")
+     * @var string
+     */
     public $title;
 
     /**
diff --git a/lib/Widget/Definition/Property.php b/lib/Widget/Definition/Property.php
index 1283abf168..067382e3c5 100644
--- a/lib/Widget/Definition/Property.php
+++ b/lib/Widget/Definition/Property.php
@@ -32,17 +32,41 @@
 
 /**
  * A Property
+ * @SWG\Definition()
  */
 class Property implements \JsonSerializable
 {
+    /**
+     * @SWG\Property(description="ID, saved as a widget option")
+     * @var string
+     */
     public $id;
+
+    /**
+     * @SWG\Property(description="Type, determines the field type")
+     * @var string
+     */
     public $type;
+
+    /**
+     * @SWG\Property(description="Title: shown in the property panel")
+     * @var string
+     */
     public $title;
+
+    /**
+     * @SWG\Property(description="Help Text: shown in the property panel")
+     * @var string
+     */
     public $helpText;
 
     /** @var \Xibo\Widget\Definition\Rule  */
     public $validation;
 
+    /**
+     * @SWG\Property()
+     * @var string An optional default value
+     */
     public $default;
 
     /** @var \Xibo\Widget\Definition\Option[] */
diff --git a/lib/Widget/Definition/PropertyGroup.php b/lib/Widget/Definition/PropertyGroup.php
index fda9869589..8b230959ca 100644
--- a/lib/Widget/Definition/PropertyGroup.php
+++ b/lib/Widget/Definition/PropertyGroup.php
@@ -24,6 +24,7 @@
 
 /**
  * A class representing an instance of a group property to put a property in assigned Tab
+ * @SWG\Definition()
  */
 class PropertyGroup implements \JsonSerializable
 {
diff --git a/lib/Widget/Definition/Rule.php b/lib/Widget/Definition/Rule.php
index 8eed936d18..3f08d69df9 100644
--- a/lib/Widget/Definition/Rule.php
+++ b/lib/Widget/Definition/Rule.php
@@ -24,6 +24,7 @@
 
 /**
  * A rule to apply to a property
+ * @SWG\Definition()
  */
 class Rule implements \JsonSerializable
 {
diff --git a/lib/Widget/Definition/Stencil.php b/lib/Widget/Definition/Stencil.php
index e8de1676a0..5ea0433229 100644
--- a/lib/Widget/Definition/Stencil.php
+++ b/lib/Widget/Definition/Stencil.php
@@ -23,6 +23,7 @@
 namespace Xibo\Widget\Definition;
 
 /**
+ * @SWG\Definition()
  * A Stencil is a template which is rendered in the server and/or client
  * it can optionally have properties and/or elements
  */
@@ -37,6 +38,9 @@ class Stencil implements \JsonSerializable
     /** @var string|null */
     public $hbs;
 
+    /** @var string|null */
+    public $head;
+
     /** @var string|null */
     public $style;
 
@@ -58,6 +62,7 @@ public function jsonSerialize(): array
         return [
             'hbsId' => $this->hbsId,
             'hbs' => $this->hbs,
+            'head' => $this->head,
             'style' => $this->style,
             'width' => $this->width,
             'height' => $this->height,
diff --git a/lib/Widget/Definition/Test.php b/lib/Widget/Definition/Test.php
index 9446839110..e24952ea76 100644
--- a/lib/Widget/Definition/Test.php
+++ b/lib/Widget/Definition/Test.php
@@ -24,6 +24,7 @@
 
 /**
  * Represents a test/group of conditions
+ * @SWG\Definition()
  */
 class Test implements \JsonSerializable
 {
diff --git a/lib/Widget/IcsProvider.php b/lib/Widget/IcsProvider.php
index d7f94a9795..5644794b5e 100644
--- a/lib/Widget/IcsProvider.php
+++ b/lib/Widget/IcsProvider.php
@@ -51,7 +51,7 @@ public function fetchData(DataProviderInterface $dataProvider): WidgetProviderIn
         // Do we have a feed configured?
         $uri = $dataProvider->getProperty('uri');
         if (empty($uri)) {
-            throw new InvalidArgumentException('Please enter a the URI to a valid ICS feed.', 'uri');
+            throw new InvalidArgumentException(__('Please enter the URI to a valid ICS feed.'), 'uri');
         }
 
         // Create an ICal helper and pass it the contents of the file.
diff --git a/lib/Widget/Render/WidgetHtmlRenderer.php b/lib/Widget/Render/WidgetHtmlRenderer.php
index 90b3f72349..315ffcbd75 100644
--- a/lib/Widget/Render/WidgetHtmlRenderer.php
+++ b/lib/Widget/Render/WidgetHtmlRenderer.php
@@ -570,6 +570,12 @@ private function render(
                         'gapBetweenHbs' => $module->stencil->gapBetweenHbs,
                     ];
                 }
+                if ($module->stencil->head !== null) {
+                    $twig['head'][] = $this->twig->fetchFromString(
+                        $this->decorateTranslations($module->stencil->head),
+                        $module->getPropertyValues()
+                    );
+                }
                 if ($module->stencil->style !== null) {
                     $twig['style'][] = $module->stencil->style;
                 }
@@ -620,6 +626,7 @@ private function render(
         foreach ($moduleTemplates as $moduleTemplate) {
             // Handle extends.
             $extension = $moduleTemplate->getUnmatchedProperty('extends');
+            $isExtensionHasHead = false;
             $isExtensionHasStyle = false;
 
             // Render out any hbs
@@ -642,6 +649,7 @@ private function render(
                     'extends' => [
                         'override' => $moduleTemplate->extends?->override,
                         'with' => $moduleTemplate->extends?->with,
+                        'escapeHtml' => $moduleTemplate->extends?->escapeHtml,
                     ],
                 ];
             } else if ($extension !== null) {
@@ -654,15 +662,29 @@ private function render(
                     'extends' => [
                         'override' => $moduleTemplate->extends?->override,
                         'with' => $moduleTemplate->extends?->with,
+                        'escapeHtml' => $moduleTemplate->extends?->escapeHtml,
                     ],
                 ];
 
+                if ($extension->stencil->head !== null) {
+                    $twig['head'][] = $extension->stencil->head;
+                    $isExtensionHasHead = true;
+                }
+
                 if ($extension->stencil->style !== null) {
                     $twig['style'][] = $extension->stencil->style;
                     $isExtensionHasStyle = true;
                 }
             }
 
+            // Render the module template's head, if present and not already output by the extension
+            if ($moduleTemplate->stencil !== null
+                && $moduleTemplate->stencil->head !== null
+                && !$isExtensionHasHead
+            ) {
+                $twig['head'][] = $moduleTemplate->stencil->head;
+            }
+
             // Render the module template's style, if present and not already output by the extension
             if ($moduleTemplate->stencil !== null
                 && $moduleTemplate->stencil->style !== null
diff --git a/lib/Widget/RssProvider.php b/lib/Widget/RssProvider.php
index 760c879103..28d5ced00d 100644
--- a/lib/Widget/RssProvider.php
+++ b/lib/Widget/RssProvider.php
@@ -51,7 +51,7 @@ public function fetchData(DataProviderInterface $dataProvider): WidgetProviderIn
     {
         $uri = $dataProvider->getProperty('uri');
         if (empty($uri)) {
-            throw new InvalidArgumentException(__('Please enter a the URI to a valid RSS feed.'), 'uri');
+            throw new InvalidArgumentException(__('Please enter the URI to a valid RSS feed.'), 'uri');
         }
 
         $picoFeedLoggingEnabled = Environment::isDevMode();
diff --git a/lib/routes.php b/lib/routes.php
index a4e7737b37..dbf3337453 100644
--- a/lib/routes.php
+++ b/lib/routes.php
@@ -531,13 +531,8 @@
     ->addMiddleware(new \Xibo\Middleware\FeatureAuth($app->getContainer(), ['proof-of-play']))
     ->setName('stats.export');
 
-/**
- * Log
- * @SWG\Tag(
- *  name="log",
- *  description="Logs"
- * )
- */
+// Log (no APIs)
+// -------------
 $app->group('', function (RouteCollectorProxy $group) {
     $group->get('/log', ['\Xibo\Controller\Logging', 'grid'])->setName('log.search');
     $group->delete('/log', ['\Xibo\Controller\Logging', 'truncate'])->setName('log.truncate');
@@ -719,13 +714,8 @@
     $group->delete('/daypart/{id}', ['\Xibo\Controller\DayPart','delete'])->setName('daypart.delete');
 })->addMiddleware(new \Xibo\Middleware\FeatureAuth($app->getContainer(), ['daypart.modify']));
 
-/**
- * Tasks
- * @SWG\Tag(
- *  name="task",
- *  description="Tasks"
- * )
- */
+// Tasks (no APIs)
+// ----
 $app->group('', function (RouteCollectorProxy $group) {
     $group->get('/task', ['\Xibo\Controller\Task', 'grid'])->setName('task.search');
     $group->post('/task', ['\Xibo\Controller\Task', 'add'])->setName('task.add');
@@ -734,14 +724,8 @@
     $group->post('/task/{id}/run', ['\Xibo\Controller\Task', 'runNow'])->setName('task.runNow');
 })->addMiddleware(new \Xibo\Middleware\FeatureAuth($app->getContainer(), ['task.view']));
 
-/**
- * Report schedule
- * @SWG\Tag(
- *  name="report",
- *  description="Report schedule"
- * )
- */
-
+// Report schedule (no APIs)
+// -------------------------
 $app->get('/report/reportschedule', ['\Xibo\Controller\ScheduleReport','reportScheduleGrid'])->setName('reportschedule.search');
 $app->group('', function (RouteCollectorProxy $group) {
     $group->post('/report/reportschedule', ['\Xibo\Controller\ScheduleReport','reportScheduleAdd'])->setName('reportschedule.add');
@@ -799,13 +783,8 @@
     $group->get('/tag/usage/{id}', ['\Xibo\Controller\Tag', 'usage'])->setName('tag.usage');
 })->addMiddleware(new \Xibo\Middleware\FeatureAuth($app->getContainer(), ['tag.view']));
 
-/**
- * Actions
- * @SWG\Tag(
- *  name="actions",
- *  description="Actions"
- * )
- */
+// Actions (no APIs)
+// -----------------
 $app->get('/action', ['\Xibo\Controller\Action', 'grid'])->setName('action.search');
 $app->group('', function (RouteCollectorProxy $group) {
     $group->post('/action', ['\Xibo\Controller\Action', 'add'])->setName('action.add');
diff --git a/locale/af.mo b/locale/af.mo
index 69b57885a5..576f48aba1 100644
Binary files a/locale/af.mo and b/locale/af.mo differ
diff --git a/locale/ar.mo b/locale/ar.mo
index 6aa2c759b4..90cd02f295 100644
Binary files a/locale/ar.mo and b/locale/ar.mo differ
diff --git a/locale/bg.mo b/locale/bg.mo
index 350404a9de..3830651f4c 100644
Binary files a/locale/bg.mo and b/locale/bg.mo differ
diff --git a/locale/ca.mo b/locale/ca.mo
index 69536763d9..8a2ca65ee6 100644
Binary files a/locale/ca.mo and b/locale/ca.mo differ
diff --git a/locale/cs.mo b/locale/cs.mo
index b7b7de06ff..439425c9bf 100644
Binary files a/locale/cs.mo and b/locale/cs.mo differ
diff --git a/locale/da.mo b/locale/da.mo
index c248b4ce38..7ed4280e20 100644
Binary files a/locale/da.mo and b/locale/da.mo differ
diff --git a/locale/de.mo b/locale/de.mo
index 4ea8ed6a38..4dc8be57b4 100644
Binary files a/locale/de.mo and b/locale/de.mo differ
diff --git a/locale/default.pot b/locale/default.pot
index 471e7b360e..b2b229cf9b 100644
--- a/locale/default.pot
+++ b/locale/default.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-19 13:41+0100\n"
+"POT-Creation-Date: 2023-10-09 08:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: locale/moduletranslate.php:3 locale/dbtranslate.php:73
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1864
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:429
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1741
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:433
 msgid "Audio"
 msgstr ""
 
@@ -27,17 +27,17 @@ msgstr ""
 msgid "Upload Audio files to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:5 locale/moduletranslate.php:346
-#: locale/moduletranslate.php:374 locale/moduletranslate.php:404
-#: locale/moduletranslate.php:410 locale/moduletranslate.php:522
-#: locale/moduletranslate.php:528 locale/moduletranslate.php:673
+#: locale/moduletranslate.php:5 locale/moduletranslate.php:348
+#: locale/moduletranslate.php:376 locale/moduletranslate.php:406
+#: locale/moduletranslate.php:412 locale/moduletranslate.php:524
+#: locale/moduletranslate.php:530 locale/moduletranslate.php:675
 msgid "Valid Extensions"
 msgstr ""
 
-#: locale/moduletranslate.php:6 locale/moduletranslate.php:347
-#: locale/moduletranslate.php:375 locale/moduletranslate.php:405
-#: locale/moduletranslate.php:411 locale/moduletranslate.php:523
-#: locale/moduletranslate.php:529 locale/moduletranslate.php:674
+#: locale/moduletranslate.php:6 locale/moduletranslate.php:349
+#: locale/moduletranslate.php:377 locale/moduletranslate.php:407
+#: locale/moduletranslate.php:413 locale/moduletranslate.php:525
+#: locale/moduletranslate.php:531 locale/moduletranslate.php:676
 msgid ""
 "The Extensions allowed on files uploaded using this module. Comma Separated."
 msgstr ""
@@ -49,10 +49,10 @@ msgid ""
 "select to Loop set a higher duration."
 msgstr ""
 
-#: locale/moduletranslate.php:8 locale/moduletranslate.php:682
+#: locale/moduletranslate.php:8 locale/moduletranslate.php:684
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:105
 #: cache/ea/ea83fd6b5caea08dc04b78466d82213e.php:171
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1467
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1432
 msgid "Loop?"
 msgstr ""
 
@@ -69,7 +69,7 @@ msgstr ""
 msgid "A module for displaying a calendar based on an iCal feed"
 msgstr ""
 
-#: locale/moduletranslate.php:12 locale/moduletranslate.php:534
+#: locale/moduletranslate.php:12 locale/moduletranslate.php:536
 msgid "Cache Period (mins)"
 msgstr ""
 
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Please enter the number of minutes you would like to cache ICS feeds."
 msgstr ""
 
-#: locale/moduletranslate.php:14 locale/moduletranslate.php:536
+#: locale/moduletranslate.php:14 locale/moduletranslate.php:538
 msgid "Feed URL"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgid ""
 "events should be returned, for example 2 days or 1 week."
 msgstr ""
 
-#: locale/moduletranslate.php:26 locale/moduletranslate.php:1211
+#: locale/moduletranslate.php:26 locale/moduletranslate.php:1232
 #: cache/88/880da8bf57750f4e35ce30624c0c6d79.php:585
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:253
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:138
@@ -139,7 +139,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: locale/moduletranslate.php:27 locale/moduletranslate.php:1212
+#: locale/moduletranslate.php:27 locale/moduletranslate.php:1233
 #: cache/88/880da8bf57750f4e35ce30624c0c6d79.php:600
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:257
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:153
@@ -198,40 +198,40 @@ msgid "Does the calendar feed come from Windows - if unsure leave unselected."
 msgstr ""
 
 #: locale/moduletranslate.php:38 locale/moduletranslate.php:312
-#: locale/moduletranslate.php:471 locale/moduletranslate.php:491
-#: locale/moduletranslate.php:515 locale/moduletranslate.php:541
+#: locale/moduletranslate.php:473 locale/moduletranslate.php:493
+#: locale/moduletranslate.php:517 locale/moduletranslate.php:543
 msgid "Duration is per item"
 msgstr ""
 
 #: locale/moduletranslate.php:39 locale/moduletranslate.php:313
-#: locale/moduletranslate.php:472 locale/moduletranslate.php:516
-#: locale/moduletranslate.php:542
+#: locale/moduletranslate.php:474 locale/moduletranslate.php:518
+#: locale/moduletranslate.php:544
 msgid "The duration specified is per item otherwise it is per feed."
 msgstr ""
 
-#: locale/moduletranslate.php:40 locale/moduletranslate.php:517
+#: locale/moduletranslate.php:40 locale/moduletranslate.php:519
 #: cache/12/128a25d2a51c15a82cded4869488f710.php:190
 msgid "Number of items"
 msgstr ""
 
-#: locale/moduletranslate.php:41 locale/moduletranslate.php:518
+#: locale/moduletranslate.php:41 locale/moduletranslate.php:520
 msgid "The number of items you want to display."
 msgstr ""
 
-#: locale/moduletranslate.php:42 locale/moduletranslate.php:468
-#: locale/moduletranslate.php:519 locale/moduletranslate.php:540
+#: locale/moduletranslate.php:42 locale/moduletranslate.php:470
+#: locale/moduletranslate.php:521 locale/moduletranslate.php:542
 msgid "When duration is per item then number of items must be 1 or higher"
 msgstr ""
 
 #: locale/moduletranslate.php:43 locale/moduletranslate.php:285
 #: locale/moduletranslate.php:293 locale/moduletranslate.php:327
-#: locale/moduletranslate.php:571 locale/moduletranslate.php:633
+#: locale/moduletranslate.php:573 locale/moduletranslate.php:635
 msgid "Update Interval (mins)"
 msgstr ""
 
 #: locale/moduletranslate.php:44 locale/moduletranslate.php:286
 #: locale/moduletranslate.php:294 locale/moduletranslate.php:328
-#: locale/moduletranslate.php:572 locale/moduletranslate.php:634
+#: locale/moduletranslate.php:574 locale/moduletranslate.php:636
 msgid ""
 "Please enter the update interval in minutes. This should be kept as high as "
 "possible. For example, if the data will only change once per hour this could "
@@ -266,7 +266,7 @@ msgid "Code to be triggered when no events are ongoing at the moment."
 msgstr ""
 
 #: locale/moduletranslate.php:51
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2136
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2013
 msgid "Canvas"
 msgstr ""
 
@@ -312,54 +312,54 @@ msgstr ""
 #: locale/moduletranslate.php:61 locale/moduletranslate.php:122
 #: locale/moduletranslate.php:158 locale/moduletranslate.php:188
 #: locale/moduletranslate.php:218 locale/moduletranslate.php:248
-#: locale/moduletranslate.php:275 locale/moduletranslate.php:362
-#: locale/moduletranslate.php:422 locale/moduletranslate.php:623
-#: locale/moduletranslate.php:736 locale/moduletranslate.php:798
-#: locale/moduletranslate.php:815 locale/moduletranslate.php:838
-#: locale/moduletranslate.php:2138 locale/moduletranslate.php:2172
-#: locale/moduletranslate.php:2190 locale/moduletranslate.php:2297
-#: locale/moduletranslate.php:2313 locale/moduletranslate.php:2361
-#: locale/moduletranslate.php:2384 locale/moduletranslate.php:2407
-#: locale/moduletranslate.php:2430 locale/moduletranslate.php:2453
-#: locale/moduletranslate.php:2476 locale/moduletranslate.php:2499
-#: locale/moduletranslate.php:2522 locale/moduletranslate.php:2545
-#: locale/moduletranslate.php:2568 locale/moduletranslate.php:2591
-#: locale/moduletranslate.php:2614 locale/moduletranslate.php:2637
-#: locale/moduletranslate.php:2671
+#: locale/moduletranslate.php:275 locale/moduletranslate.php:364
+#: locale/moduletranslate.php:424 locale/moduletranslate.php:625
+#: locale/moduletranslate.php:738 locale/moduletranslate.php:800
+#: locale/moduletranslate.php:817 locale/moduletranslate.php:840
+#: locale/moduletranslate.php:1630 locale/moduletranslate.php:2195
+#: locale/moduletranslate.php:2229 locale/moduletranslate.php:2247
+#: locale/moduletranslate.php:2354 locale/moduletranslate.php:2370
+#: locale/moduletranslate.php:2418 locale/moduletranslate.php:2441
+#: locale/moduletranslate.php:2464 locale/moduletranslate.php:2487
+#: locale/moduletranslate.php:2510 locale/moduletranslate.php:2533
+#: locale/moduletranslate.php:2556 locale/moduletranslate.php:2579
+#: locale/moduletranslate.php:2602 locale/moduletranslate.php:2625
+#: locale/moduletranslate.php:2648 locale/moduletranslate.php:2671
+#: locale/moduletranslate.php:2694 locale/moduletranslate.php:2728
 msgid "Horizontal Align"
 msgstr ""
 
 #: locale/moduletranslate.php:62 locale/moduletranslate.php:123
 #: locale/moduletranslate.php:159 locale/moduletranslate.php:189
 #: locale/moduletranslate.php:219 locale/moduletranslate.php:249
-#: locale/moduletranslate.php:276 locale/moduletranslate.php:363
-#: locale/moduletranslate.php:624 locale/moduletranslate.php:737
-#: locale/moduletranslate.php:799 locale/moduletranslate.php:816
-#: locale/moduletranslate.php:839
+#: locale/moduletranslate.php:276 locale/moduletranslate.php:365
+#: locale/moduletranslate.php:626 locale/moduletranslate.php:739
+#: locale/moduletranslate.php:801 locale/moduletranslate.php:818
+#: locale/moduletranslate.php:841
 msgid "How should this widget be horizontally aligned?"
 msgstr ""
 
 #: locale/moduletranslate.php:63 locale/moduletranslate.php:124
 #: locale/moduletranslate.php:160 locale/moduletranslate.php:190
 #: locale/moduletranslate.php:220 locale/moduletranslate.php:250
-#: locale/moduletranslate.php:277 locale/moduletranslate.php:364
-#: locale/moduletranslate.php:424 locale/moduletranslate.php:625
-#: locale/moduletranslate.php:738 locale/moduletranslate.php:800
-#: locale/moduletranslate.php:817 locale/moduletranslate.php:840
-#: locale/moduletranslate.php:2139 locale/moduletranslate.php:2173
-#: locale/moduletranslate.php:2192 locale/moduletranslate.php:2298
-#: locale/moduletranslate.php:2314 locale/moduletranslate.php:2363
-#: locale/moduletranslate.php:2386 locale/moduletranslate.php:2409
-#: locale/moduletranslate.php:2432 locale/moduletranslate.php:2455
-#: locale/moduletranslate.php:2478 locale/moduletranslate.php:2501
-#: locale/moduletranslate.php:2524 locale/moduletranslate.php:2547
-#: locale/moduletranslate.php:2570 locale/moduletranslate.php:2593
-#: locale/moduletranslate.php:2616 locale/moduletranslate.php:2639
-#: locale/moduletranslate.php:2673
+#: locale/moduletranslate.php:277 locale/moduletranslate.php:366
+#: locale/moduletranslate.php:426 locale/moduletranslate.php:627
+#: locale/moduletranslate.php:740 locale/moduletranslate.php:802
+#: locale/moduletranslate.php:819 locale/moduletranslate.php:842
+#: locale/moduletranslate.php:1632 locale/moduletranslate.php:2196
+#: locale/moduletranslate.php:2230 locale/moduletranslate.php:2249
+#: locale/moduletranslate.php:2355 locale/moduletranslate.php:2371
+#: locale/moduletranslate.php:2420 locale/moduletranslate.php:2443
+#: locale/moduletranslate.php:2466 locale/moduletranslate.php:2489
+#: locale/moduletranslate.php:2512 locale/moduletranslate.php:2535
+#: locale/moduletranslate.php:2558 locale/moduletranslate.php:2581
+#: locale/moduletranslate.php:2604 locale/moduletranslate.php:2627
+#: locale/moduletranslate.php:2650 locale/moduletranslate.php:2673
+#: locale/moduletranslate.php:2696 locale/moduletranslate.php:2730
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:167
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1114
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1375
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1507
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1075
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1340
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1472
 #: cache/4c/4c1de7ab59196b70ffa9f9da4d4e3b9c.php:407
 msgid "Left"
 msgstr ""
@@ -367,93 +367,93 @@ msgstr ""
 #: locale/moduletranslate.php:64 locale/moduletranslate.php:125
 #: locale/moduletranslate.php:161 locale/moduletranslate.php:191
 #: locale/moduletranslate.php:221 locale/moduletranslate.php:251
-#: locale/moduletranslate.php:278 locale/moduletranslate.php:365
-#: locale/moduletranslate.php:414 locale/moduletranslate.php:419
-#: locale/moduletranslate.php:425 locale/moduletranslate.php:626
-#: locale/moduletranslate.php:739 locale/moduletranslate.php:801
-#: locale/moduletranslate.php:818 locale/moduletranslate.php:841
-#: locale/moduletranslate.php:2193
+#: locale/moduletranslate.php:278 locale/moduletranslate.php:367
+#: locale/moduletranslate.php:416 locale/moduletranslate.php:421
+#: locale/moduletranslate.php:427 locale/moduletranslate.php:628
+#: locale/moduletranslate.php:741 locale/moduletranslate.php:803
+#: locale/moduletranslate.php:820 locale/moduletranslate.php:843
+#: locale/moduletranslate.php:1633 locale/moduletranslate.php:2250
 msgid "Centre"
 msgstr ""
 
 #: locale/moduletranslate.php:65 locale/moduletranslate.php:126
 #: locale/moduletranslate.php:162 locale/moduletranslate.php:192
 #: locale/moduletranslate.php:222 locale/moduletranslate.php:252
-#: locale/moduletranslate.php:279 locale/moduletranslate.php:366
-#: locale/moduletranslate.php:426 locale/moduletranslate.php:627
-#: locale/moduletranslate.php:740 locale/moduletranslate.php:802
-#: locale/moduletranslate.php:819 locale/moduletranslate.php:842
-#: locale/moduletranslate.php:2141 locale/moduletranslate.php:2175
-#: locale/moduletranslate.php:2194 locale/moduletranslate.php:2300
-#: locale/moduletranslate.php:2316 locale/moduletranslate.php:2365
-#: locale/moduletranslate.php:2388 locale/moduletranslate.php:2411
-#: locale/moduletranslate.php:2434 locale/moduletranslate.php:2457
-#: locale/moduletranslate.php:2480 locale/moduletranslate.php:2503
-#: locale/moduletranslate.php:2526 locale/moduletranslate.php:2549
-#: locale/moduletranslate.php:2572 locale/moduletranslate.php:2595
-#: locale/moduletranslate.php:2618 locale/moduletranslate.php:2641
-#: locale/moduletranslate.php:2675
+#: locale/moduletranslate.php:279 locale/moduletranslate.php:368
+#: locale/moduletranslate.php:428 locale/moduletranslate.php:629
+#: locale/moduletranslate.php:742 locale/moduletranslate.php:804
+#: locale/moduletranslate.php:821 locale/moduletranslate.php:844
+#: locale/moduletranslate.php:1634 locale/moduletranslate.php:2198
+#: locale/moduletranslate.php:2232 locale/moduletranslate.php:2251
+#: locale/moduletranslate.php:2357 locale/moduletranslate.php:2373
+#: locale/moduletranslate.php:2422 locale/moduletranslate.php:2445
+#: locale/moduletranslate.php:2468 locale/moduletranslate.php:2491
+#: locale/moduletranslate.php:2514 locale/moduletranslate.php:2537
+#: locale/moduletranslate.php:2560 locale/moduletranslate.php:2583
+#: locale/moduletranslate.php:2606 locale/moduletranslate.php:2629
+#: locale/moduletranslate.php:2652 locale/moduletranslate.php:2675
+#: locale/moduletranslate.php:2698 locale/moduletranslate.php:2732
 msgid "Right"
 msgstr ""
 
 #: locale/moduletranslate.php:66 locale/moduletranslate.php:127
 #: locale/moduletranslate.php:163 locale/moduletranslate.php:193
 #: locale/moduletranslate.php:223 locale/moduletranslate.php:253
-#: locale/moduletranslate.php:280 locale/moduletranslate.php:367
-#: locale/moduletranslate.php:427 locale/moduletranslate.php:628
-#: locale/moduletranslate.php:741 locale/moduletranslate.php:803
-#: locale/moduletranslate.php:820 locale/moduletranslate.php:843
-#: locale/moduletranslate.php:2142 locale/moduletranslate.php:2176
-#: locale/moduletranslate.php:2195 locale/moduletranslate.php:2301
-#: locale/moduletranslate.php:2317 locale/moduletranslate.php:2366
-#: locale/moduletranslate.php:2389 locale/moduletranslate.php:2412
-#: locale/moduletranslate.php:2435 locale/moduletranslate.php:2458
-#: locale/moduletranslate.php:2481 locale/moduletranslate.php:2504
-#: locale/moduletranslate.php:2527 locale/moduletranslate.php:2550
-#: locale/moduletranslate.php:2573 locale/moduletranslate.php:2596
-#: locale/moduletranslate.php:2619 locale/moduletranslate.php:2642
-#: locale/moduletranslate.php:2676
+#: locale/moduletranslate.php:280 locale/moduletranslate.php:369
+#: locale/moduletranslate.php:429 locale/moduletranslate.php:630
+#: locale/moduletranslate.php:743 locale/moduletranslate.php:805
+#: locale/moduletranslate.php:822 locale/moduletranslate.php:845
+#: locale/moduletranslate.php:1635 locale/moduletranslate.php:2199
+#: locale/moduletranslate.php:2233 locale/moduletranslate.php:2252
+#: locale/moduletranslate.php:2358 locale/moduletranslate.php:2374
+#: locale/moduletranslate.php:2423 locale/moduletranslate.php:2446
+#: locale/moduletranslate.php:2469 locale/moduletranslate.php:2492
+#: locale/moduletranslate.php:2515 locale/moduletranslate.php:2538
+#: locale/moduletranslate.php:2561 locale/moduletranslate.php:2584
+#: locale/moduletranslate.php:2607 locale/moduletranslate.php:2630
+#: locale/moduletranslate.php:2653 locale/moduletranslate.php:2676
+#: locale/moduletranslate.php:2699 locale/moduletranslate.php:2733
 msgid "Vertical Align"
 msgstr ""
 
 #: locale/moduletranslate.php:67 locale/moduletranslate.php:128
 #: locale/moduletranslate.php:164 locale/moduletranslate.php:194
 #: locale/moduletranslate.php:224 locale/moduletranslate.php:254
-#: locale/moduletranslate.php:281 locale/moduletranslate.php:368
-#: locale/moduletranslate.php:629 locale/moduletranslate.php:742
-#: locale/moduletranslate.php:804 locale/moduletranslate.php:821
-#: locale/moduletranslate.php:844 locale/moduletranslate.php:2367
-#: locale/moduletranslate.php:2390 locale/moduletranslate.php:2413
-#: locale/moduletranslate.php:2436 locale/moduletranslate.php:2459
-#: locale/moduletranslate.php:2482 locale/moduletranslate.php:2505
-#: locale/moduletranslate.php:2528 locale/moduletranslate.php:2551
-#: locale/moduletranslate.php:2574 locale/moduletranslate.php:2597
-#: locale/moduletranslate.php:2620 locale/moduletranslate.php:2643
-#: locale/moduletranslate.php:2677
+#: locale/moduletranslate.php:281 locale/moduletranslate.php:370
+#: locale/moduletranslate.php:631 locale/moduletranslate.php:744
+#: locale/moduletranslate.php:806 locale/moduletranslate.php:823
+#: locale/moduletranslate.php:846 locale/moduletranslate.php:2424
+#: locale/moduletranslate.php:2447 locale/moduletranslate.php:2470
+#: locale/moduletranslate.php:2493 locale/moduletranslate.php:2516
+#: locale/moduletranslate.php:2539 locale/moduletranslate.php:2562
+#: locale/moduletranslate.php:2585 locale/moduletranslate.php:2608
+#: locale/moduletranslate.php:2631 locale/moduletranslate.php:2654
+#: locale/moduletranslate.php:2677 locale/moduletranslate.php:2700
+#: locale/moduletranslate.php:2734
 msgid "How should this widget be vertically aligned?"
 msgstr ""
 
 #: locale/moduletranslate.php:68 locale/moduletranslate.php:129
 #: locale/moduletranslate.php:165 locale/moduletranslate.php:195
 #: locale/moduletranslate.php:225 locale/moduletranslate.php:255
-#: locale/moduletranslate.php:282 locale/moduletranslate.php:369
-#: locale/moduletranslate.php:429 locale/moduletranslate.php:630
-#: locale/moduletranslate.php:743 locale/moduletranslate.php:805
-#: locale/moduletranslate.php:822 locale/moduletranslate.php:845
-#: locale/moduletranslate.php:2143 locale/moduletranslate.php:2177
-#: locale/moduletranslate.php:2197 locale/moduletranslate.php:2302
-#: locale/moduletranslate.php:2318 locale/moduletranslate.php:2368
-#: locale/moduletranslate.php:2391 locale/moduletranslate.php:2414
-#: locale/moduletranslate.php:2437 locale/moduletranslate.php:2460
-#: locale/moduletranslate.php:2483 locale/moduletranslate.php:2506
-#: locale/moduletranslate.php:2529 locale/moduletranslate.php:2552
-#: locale/moduletranslate.php:2575 locale/moduletranslate.php:2598
-#: locale/moduletranslate.php:2621 locale/moduletranslate.php:2644
-#: locale/moduletranslate.php:2678
+#: locale/moduletranslate.php:282 locale/moduletranslate.php:371
+#: locale/moduletranslate.php:431 locale/moduletranslate.php:632
+#: locale/moduletranslate.php:745 locale/moduletranslate.php:807
+#: locale/moduletranslate.php:824 locale/moduletranslate.php:847
+#: locale/moduletranslate.php:1637 locale/moduletranslate.php:2200
+#: locale/moduletranslate.php:2234 locale/moduletranslate.php:2254
+#: locale/moduletranslate.php:2359 locale/moduletranslate.php:2375
+#: locale/moduletranslate.php:2425 locale/moduletranslate.php:2448
+#: locale/moduletranslate.php:2471 locale/moduletranslate.php:2494
+#: locale/moduletranslate.php:2517 locale/moduletranslate.php:2540
+#: locale/moduletranslate.php:2563 locale/moduletranslate.php:2586
+#: locale/moduletranslate.php:2609 locale/moduletranslate.php:2632
+#: locale/moduletranslate.php:2655 locale/moduletranslate.php:2678
+#: locale/moduletranslate.php:2701 locale/moduletranslate.php:2735
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:152
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1110
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1371
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1499
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1071
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1336
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1464
 #: cache/4c/4c1de7ab59196b70ffa9f9da4d4e3b9c.php:411
 msgid "Top"
 msgstr ""
@@ -461,40 +461,40 @@ msgstr ""
 #: locale/moduletranslate.php:69 locale/moduletranslate.php:130
 #: locale/moduletranslate.php:166 locale/moduletranslate.php:196
 #: locale/moduletranslate.php:226 locale/moduletranslate.php:256
-#: locale/moduletranslate.php:283 locale/moduletranslate.php:370
-#: locale/moduletranslate.php:430 locale/moduletranslate.php:631
-#: locale/moduletranslate.php:744 locale/moduletranslate.php:806
-#: locale/moduletranslate.php:823 locale/moduletranslate.php:846
-#: locale/moduletranslate.php:2144 locale/moduletranslate.php:2178
-#: locale/moduletranslate.php:2198 locale/moduletranslate.php:2303
-#: locale/moduletranslate.php:2319 locale/moduletranslate.php:2369
-#: locale/moduletranslate.php:2392 locale/moduletranslate.php:2415
-#: locale/moduletranslate.php:2438 locale/moduletranslate.php:2461
-#: locale/moduletranslate.php:2484 locale/moduletranslate.php:2507
-#: locale/moduletranslate.php:2530 locale/moduletranslate.php:2553
-#: locale/moduletranslate.php:2576 locale/moduletranslate.php:2599
-#: locale/moduletranslate.php:2622 locale/moduletranslate.php:2645
-#: locale/moduletranslate.php:2679
+#: locale/moduletranslate.php:283 locale/moduletranslate.php:372
+#: locale/moduletranslate.php:432 locale/moduletranslate.php:633
+#: locale/moduletranslate.php:746 locale/moduletranslate.php:808
+#: locale/moduletranslate.php:825 locale/moduletranslate.php:848
+#: locale/moduletranslate.php:1638 locale/moduletranslate.php:2201
+#: locale/moduletranslate.php:2235 locale/moduletranslate.php:2255
+#: locale/moduletranslate.php:2360 locale/moduletranslate.php:2376
+#: locale/moduletranslate.php:2426 locale/moduletranslate.php:2449
+#: locale/moduletranslate.php:2472 locale/moduletranslate.php:2495
+#: locale/moduletranslate.php:2518 locale/moduletranslate.php:2541
+#: locale/moduletranslate.php:2564 locale/moduletranslate.php:2587
+#: locale/moduletranslate.php:2610 locale/moduletranslate.php:2633
+#: locale/moduletranslate.php:2656 locale/moduletranslate.php:2679
+#: locale/moduletranslate.php:2702 locale/moduletranslate.php:2736
 msgid "Middle"
 msgstr ""
 
 #: locale/moduletranslate.php:70 locale/moduletranslate.php:131
 #: locale/moduletranslate.php:167 locale/moduletranslate.php:197
 #: locale/moduletranslate.php:227 locale/moduletranslate.php:257
-#: locale/moduletranslate.php:284 locale/moduletranslate.php:371
-#: locale/moduletranslate.php:431 locale/moduletranslate.php:632
-#: locale/moduletranslate.php:745 locale/moduletranslate.php:807
-#: locale/moduletranslate.php:824 locale/moduletranslate.php:847
-#: locale/moduletranslate.php:2145 locale/moduletranslate.php:2179
-#: locale/moduletranslate.php:2199 locale/moduletranslate.php:2304
-#: locale/moduletranslate.php:2320 locale/moduletranslate.php:2370
-#: locale/moduletranslate.php:2393 locale/moduletranslate.php:2416
-#: locale/moduletranslate.php:2439 locale/moduletranslate.php:2462
-#: locale/moduletranslate.php:2485 locale/moduletranslate.php:2508
-#: locale/moduletranslate.php:2531 locale/moduletranslate.php:2554
-#: locale/moduletranslate.php:2577 locale/moduletranslate.php:2600
-#: locale/moduletranslate.php:2623 locale/moduletranslate.php:2646
-#: locale/moduletranslate.php:2680
+#: locale/moduletranslate.php:284 locale/moduletranslate.php:373
+#: locale/moduletranslate.php:433 locale/moduletranslate.php:634
+#: locale/moduletranslate.php:747 locale/moduletranslate.php:809
+#: locale/moduletranslate.php:826 locale/moduletranslate.php:849
+#: locale/moduletranslate.php:1639 locale/moduletranslate.php:2202
+#: locale/moduletranslate.php:2236 locale/moduletranslate.php:2256
+#: locale/moduletranslate.php:2361 locale/moduletranslate.php:2377
+#: locale/moduletranslate.php:2427 locale/moduletranslate.php:2450
+#: locale/moduletranslate.php:2473 locale/moduletranslate.php:2496
+#: locale/moduletranslate.php:2519 locale/moduletranslate.php:2542
+#: locale/moduletranslate.php:2565 locale/moduletranslate.php:2588
+#: locale/moduletranslate.php:2611 locale/moduletranslate.php:2634
+#: locale/moduletranslate.php:2657 locale/moduletranslate.php:2680
+#: locale/moduletranslate.php:2703 locale/moduletranslate.php:2737
 msgid "Bottom"
 msgstr ""
 
@@ -556,21 +556,21 @@ msgstr ""
 msgid "Localised - Month name, day of month, day of week, year, time"
 msgstr ""
 
-#: locale/moduletranslate.php:85 locale/moduletranslate.php:358
-#: locale/moduletranslate.php:1228 locale/moduletranslate.php:1248
-#: locale/moduletranslate.php:1290 locale/moduletranslate.php:1336
-#: locale/moduletranslate.php:1383 locale/moduletranslate.php:1428
-#: locale/moduletranslate.php:1475 locale/moduletranslate.php:1522
-#: locale/moduletranslate.php:1558 locale/moduletranslate.php:2149
+#: locale/moduletranslate.php:85 locale/moduletranslate.php:360
+#: locale/moduletranslate.php:1249 locale/moduletranslate.php:1269
+#: locale/moduletranslate.php:1311 locale/moduletranslate.php:1357
+#: locale/moduletranslate.php:1404 locale/moduletranslate.php:1449
+#: locale/moduletranslate.php:1496 locale/moduletranslate.php:1543
+#: locale/moduletranslate.php:1579 locale/moduletranslate.php:2206
 msgid "Language"
 msgstr ""
 
-#: locale/moduletranslate.php:86 locale/moduletranslate.php:359
-#: locale/moduletranslate.php:1229 locale/moduletranslate.php:1249
-#: locale/moduletranslate.php:1291 locale/moduletranslate.php:1337
-#: locale/moduletranslate.php:1384 locale/moduletranslate.php:1429
-#: locale/moduletranslate.php:1476 locale/moduletranslate.php:1523
-#: locale/moduletranslate.php:1559 locale/moduletranslate.php:2150
+#: locale/moduletranslate.php:86 locale/moduletranslate.php:361
+#: locale/moduletranslate.php:1250 locale/moduletranslate.php:1270
+#: locale/moduletranslate.php:1312 locale/moduletranslate.php:1358
+#: locale/moduletranslate.php:1405 locale/moduletranslate.php:1450
+#: locale/moduletranslate.php:1497 locale/moduletranslate.php:1544
+#: locale/moduletranslate.php:1580 locale/moduletranslate.php:2207
 msgid "Select the language you would like to use."
 msgstr ""
 
@@ -744,40 +744,40 @@ msgstr ""
 msgid "A module for displaying a custom Countdown timer"
 msgstr ""
 
-#: locale/moduletranslate.php:152 locale/moduletranslate.php:790
-#: locale/moduletranslate.php:984 locale/moduletranslate.php:1606
-#: locale/moduletranslate.php:1607 locale/moduletranslate.php:2334
-#: locale/moduletranslate.php:2335 locale/moduletranslate.php:2693
+#: locale/moduletranslate.php:152 locale/moduletranslate.php:792
+#: locale/moduletranslate.php:986 locale/moduletranslate.php:1645
+#: locale/moduletranslate.php:1646 locale/moduletranslate.php:2391
+#: locale/moduletranslate.php:2392 locale/moduletranslate.php:2750
 msgid "Original Width"
 msgstr ""
 
-#: locale/moduletranslate.php:153 locale/moduletranslate.php:791
-#: locale/moduletranslate.php:985 locale/moduletranslate.php:1608
-#: locale/moduletranslate.php:2336 locale/moduletranslate.php:2694
+#: locale/moduletranslate.php:153 locale/moduletranslate.php:793
+#: locale/moduletranslate.php:987 locale/moduletranslate.php:1647
+#: locale/moduletranslate.php:2393 locale/moduletranslate.php:2751
 msgid ""
 "This is the intended width of the template and is used to scale the Widget "
 "within its region when the template is applied."
 msgstr ""
 
-#: locale/moduletranslate.php:154 locale/moduletranslate.php:792
-#: locale/moduletranslate.php:986 locale/moduletranslate.php:1609
-#: locale/moduletranslate.php:2337 locale/moduletranslate.php:2695
+#: locale/moduletranslate.php:154 locale/moduletranslate.php:794
+#: locale/moduletranslate.php:988 locale/moduletranslate.php:1648
+#: locale/moduletranslate.php:2394 locale/moduletranslate.php:2752
 msgid "Original Height"
 msgstr ""
 
-#: locale/moduletranslate.php:155 locale/moduletranslate.php:793
-#: locale/moduletranslate.php:987 locale/moduletranslate.php:1610
-#: locale/moduletranslate.php:2338 locale/moduletranslate.php:2696
+#: locale/moduletranslate.php:155 locale/moduletranslate.php:795
+#: locale/moduletranslate.php:989 locale/moduletranslate.php:1649
+#: locale/moduletranslate.php:2395 locale/moduletranslate.php:2753
 msgid ""
 "This is the intended height of the template and is used to scale the Widget "
 "within its region when the template is applied."
 msgstr ""
 
-#: locale/moduletranslate.php:156 locale/moduletranslate.php:988
+#: locale/moduletranslate.php:156 locale/moduletranslate.php:990
 msgid "mainTemplate"
 msgstr ""
 
-#: locale/moduletranslate.php:157 locale/moduletranslate.php:990
+#: locale/moduletranslate.php:157 locale/moduletranslate.php:992
 msgid "styleSheet"
 msgstr ""
 
@@ -815,7 +815,7 @@ msgid "A module for showing Currency pairs and exchange rates"
 msgstr ""
 
 #: locale/moduletranslate.php:260 locale/moduletranslate.php:299
-#: locale/moduletranslate.php:612
+#: locale/moduletranslate.php:614
 #: cache/68/683636238aff529d5a7b7478118dede4.php:99
 #: cache/68/683636238aff529d5a7b7478118dede4.php:146
 #: cache/8e/8e4c9c1886827e5f797c4436d4051e48.php:637
@@ -847,113 +847,113 @@ msgid ""
 "compare/base - USD/GBP becomes GBP/USD."
 msgstr ""
 
-#: locale/moduletranslate.php:267 locale/moduletranslate.php:615
-#: locale/moduletranslate.php:875 locale/moduletranslate.php:980
-#: locale/moduletranslate.php:994 locale/moduletranslate.php:1001
-#: locale/moduletranslate.php:1226 locale/moduletranslate.php:1605
-#: locale/moduletranslate.php:2148 locale/moduletranslate.php:2260
-#: locale/moduletranslate.php:2261 locale/moduletranslate.php:2349
-#: locale/moduletranslate.php:2372 locale/moduletranslate.php:2395
-#: locale/moduletranslate.php:2418 locale/moduletranslate.php:2441
-#: locale/moduletranslate.php:2464 locale/moduletranslate.php:2487
-#: locale/moduletranslate.php:2510 locale/moduletranslate.php:2533
-#: locale/moduletranslate.php:2556 locale/moduletranslate.php:2579
-#: locale/moduletranslate.php:2602 locale/moduletranslate.php:2625
-#: locale/moduletranslate.php:2648 locale/moduletranslate.php:2689
-#: locale/moduletranslate.php:2704 locale/moduletranslate.php:2711
+#: locale/moduletranslate.php:267 locale/moduletranslate.php:617
+#: locale/moduletranslate.php:877 locale/moduletranslate.php:982
+#: locale/moduletranslate.php:996 locale/moduletranslate.php:1003
+#: locale/moduletranslate.php:1247 locale/moduletranslate.php:1644
+#: locale/moduletranslate.php:2205 locale/moduletranslate.php:2317
+#: locale/moduletranslate.php:2318 locale/moduletranslate.php:2406
+#: locale/moduletranslate.php:2429 locale/moduletranslate.php:2452
+#: locale/moduletranslate.php:2475 locale/moduletranslate.php:2498
+#: locale/moduletranslate.php:2521 locale/moduletranslate.php:2544
+#: locale/moduletranslate.php:2567 locale/moduletranslate.php:2590
+#: locale/moduletranslate.php:2613 locale/moduletranslate.php:2636
+#: locale/moduletranslate.php:2659 locale/moduletranslate.php:2682
+#: locale/moduletranslate.php:2705 locale/moduletranslate.php:2746
+#: locale/moduletranslate.php:2761 locale/moduletranslate.php:2768
 #: cache/3c/3cff55fb510343a28bcab4eebabcb98a.php:283
 #: cache/68/683636238aff529d5a7b7478118dede4.php:2886
 #: cache/ee/ee0c1651752b1209943673ee1794a659.php:283
 msgid "Date Format"
 msgstr ""
 
-#: locale/moduletranslate.php:268 locale/moduletranslate.php:616
-#: locale/moduletranslate.php:876 locale/moduletranslate.php:981
-#: locale/moduletranslate.php:995 locale/moduletranslate.php:1002
-#: locale/moduletranslate.php:1227 locale/moduletranslate.php:2262
-#: locale/moduletranslate.php:2350 locale/moduletranslate.php:2373
-#: locale/moduletranslate.php:2396 locale/moduletranslate.php:2419
-#: locale/moduletranslate.php:2442 locale/moduletranslate.php:2465
-#: locale/moduletranslate.php:2488 locale/moduletranslate.php:2511
-#: locale/moduletranslate.php:2534 locale/moduletranslate.php:2557
-#: locale/moduletranslate.php:2580 locale/moduletranslate.php:2603
-#: locale/moduletranslate.php:2626 locale/moduletranslate.php:2649
-#: locale/moduletranslate.php:2690 locale/moduletranslate.php:2705
-#: locale/moduletranslate.php:2712
+#: locale/moduletranslate.php:268 locale/moduletranslate.php:618
+#: locale/moduletranslate.php:878 locale/moduletranslate.php:983
+#: locale/moduletranslate.php:997 locale/moduletranslate.php:1004
+#: locale/moduletranslate.php:1248 locale/moduletranslate.php:2319
+#: locale/moduletranslate.php:2407 locale/moduletranslate.php:2430
+#: locale/moduletranslate.php:2453 locale/moduletranslate.php:2476
+#: locale/moduletranslate.php:2499 locale/moduletranslate.php:2522
+#: locale/moduletranslate.php:2545 locale/moduletranslate.php:2568
+#: locale/moduletranslate.php:2591 locale/moduletranslate.php:2614
+#: locale/moduletranslate.php:2637 locale/moduletranslate.php:2660
+#: locale/moduletranslate.php:2683 locale/moduletranslate.php:2706
+#: locale/moduletranslate.php:2747 locale/moduletranslate.php:2762
+#: locale/moduletranslate.php:2769
 msgid "The format to apply to all dates returned by the Widget."
 msgstr ""
 
-#: locale/moduletranslate.php:269 locale/moduletranslate.php:524
-#: locale/moduletranslate.php:617
+#: locale/moduletranslate.php:269 locale/moduletranslate.php:526
+#: locale/moduletranslate.php:619
 msgid "Duration is per page"
 msgstr ""
 
-#: locale/moduletranslate.php:270 locale/moduletranslate.php:618
+#: locale/moduletranslate.php:270 locale/moduletranslate.php:620
 msgid ""
 "The duration specified is per page/item otherwise the widget duration is "
 "divided between the number of pages/items."
 msgstr ""
 
-#: locale/moduletranslate.php:271 locale/moduletranslate.php:619
-#: locale/moduletranslate.php:665 locale/moduletranslate.php:867
-#: locale/moduletranslate.php:900 locale/moduletranslate.php:919
-#: locale/moduletranslate.php:937 locale/moduletranslate.php:951
-#: locale/moduletranslate.php:963 locale/moduletranslate.php:1066
-#: locale/moduletranslate.php:1205 locale/moduletranslate.php:1218
-#: locale/moduletranslate.php:2273 locale/moduletranslate.php:2357
-#: locale/moduletranslate.php:2380 locale/moduletranslate.php:2403
-#: locale/moduletranslate.php:2426 locale/moduletranslate.php:2449
-#: locale/moduletranslate.php:2472 locale/moduletranslate.php:2495
-#: locale/moduletranslate.php:2518 locale/moduletranslate.php:2541
-#: locale/moduletranslate.php:2564 locale/moduletranslate.php:2587
-#: locale/moduletranslate.php:2610 locale/moduletranslate.php:2633
-#: locale/moduletranslate.php:2667
+#: locale/moduletranslate.php:271 locale/moduletranslate.php:621
+#: locale/moduletranslate.php:667 locale/moduletranslate.php:869
+#: locale/moduletranslate.php:902 locale/moduletranslate.php:921
+#: locale/moduletranslate.php:939 locale/moduletranslate.php:953
+#: locale/moduletranslate.php:965 locale/moduletranslate.php:1069
+#: locale/moduletranslate.php:1208 locale/moduletranslate.php:1222
+#: locale/moduletranslate.php:1239 locale/moduletranslate.php:2330
+#: locale/moduletranslate.php:2414 locale/moduletranslate.php:2437
+#: locale/moduletranslate.php:2460 locale/moduletranslate.php:2483
+#: locale/moduletranslate.php:2506 locale/moduletranslate.php:2529
+#: locale/moduletranslate.php:2552 locale/moduletranslate.php:2575
+#: locale/moduletranslate.php:2598 locale/moduletranslate.php:2621
+#: locale/moduletranslate.php:2644 locale/moduletranslate.php:2667
+#: locale/moduletranslate.php:2690 locale/moduletranslate.php:2724
 msgid "Effect"
 msgstr ""
 
-#: locale/moduletranslate.php:272 locale/moduletranslate.php:620
-#: locale/moduletranslate.php:666 locale/moduletranslate.php:868
-#: locale/moduletranslate.php:901 locale/moduletranslate.php:920
-#: locale/moduletranslate.php:938 locale/moduletranslate.php:952
-#: locale/moduletranslate.php:964 locale/moduletranslate.php:1067
-#: locale/moduletranslate.php:1206 locale/moduletranslate.php:1219
-#: locale/moduletranslate.php:2274 locale/moduletranslate.php:2358
-#: locale/moduletranslate.php:2381 locale/moduletranslate.php:2404
-#: locale/moduletranslate.php:2427 locale/moduletranslate.php:2450
-#: locale/moduletranslate.php:2473 locale/moduletranslate.php:2496
-#: locale/moduletranslate.php:2519 locale/moduletranslate.php:2542
-#: locale/moduletranslate.php:2565 locale/moduletranslate.php:2588
-#: locale/moduletranslate.php:2611 locale/moduletranslate.php:2634
-#: locale/moduletranslate.php:2668
+#: locale/moduletranslate.php:272 locale/moduletranslate.php:622
+#: locale/moduletranslate.php:668 locale/moduletranslate.php:870
+#: locale/moduletranslate.php:903 locale/moduletranslate.php:922
+#: locale/moduletranslate.php:940 locale/moduletranslate.php:954
+#: locale/moduletranslate.php:966 locale/moduletranslate.php:1070
+#: locale/moduletranslate.php:1209 locale/moduletranslate.php:1223
+#: locale/moduletranslate.php:1240 locale/moduletranslate.php:2331
+#: locale/moduletranslate.php:2415 locale/moduletranslate.php:2438
+#: locale/moduletranslate.php:2461 locale/moduletranslate.php:2484
+#: locale/moduletranslate.php:2507 locale/moduletranslate.php:2530
+#: locale/moduletranslate.php:2553 locale/moduletranslate.php:2576
+#: locale/moduletranslate.php:2599 locale/moduletranslate.php:2622
+#: locale/moduletranslate.php:2645 locale/moduletranslate.php:2668
+#: locale/moduletranslate.php:2691 locale/moduletranslate.php:2725
 msgid "Please select the effect that will be used to transition between items."
 msgstr ""
 
-#: locale/moduletranslate.php:273 locale/moduletranslate.php:621
-#: locale/moduletranslate.php:667 locale/moduletranslate.php:869
-#: locale/moduletranslate.php:902 locale/moduletranslate.php:921
-#: locale/moduletranslate.php:939 locale/moduletranslate.php:953
-#: locale/moduletranslate.php:965 locale/moduletranslate.php:1068
-#: locale/moduletranslate.php:1207 locale/moduletranslate.php:1220
-#: locale/moduletranslate.php:2275 locale/moduletranslate.php:2359
-#: locale/moduletranslate.php:2382 locale/moduletranslate.php:2405
-#: locale/moduletranslate.php:2428 locale/moduletranslate.php:2451
-#: locale/moduletranslate.php:2474 locale/moduletranslate.php:2497
-#: locale/moduletranslate.php:2520 locale/moduletranslate.php:2543
-#: locale/moduletranslate.php:2566 locale/moduletranslate.php:2589
-#: locale/moduletranslate.php:2612 locale/moduletranslate.php:2635
-#: locale/moduletranslate.php:2669
+#: locale/moduletranslate.php:273 locale/moduletranslate.php:623
+#: locale/moduletranslate.php:669 locale/moduletranslate.php:871
+#: locale/moduletranslate.php:904 locale/moduletranslate.php:923
+#: locale/moduletranslate.php:941 locale/moduletranslate.php:955
+#: locale/moduletranslate.php:967 locale/moduletranslate.php:1071
+#: locale/moduletranslate.php:1210 locale/moduletranslate.php:1224
+#: locale/moduletranslate.php:1241 locale/moduletranslate.php:2332
+#: locale/moduletranslate.php:2416 locale/moduletranslate.php:2439
+#: locale/moduletranslate.php:2462 locale/moduletranslate.php:2485
+#: locale/moduletranslate.php:2508 locale/moduletranslate.php:2531
+#: locale/moduletranslate.php:2554 locale/moduletranslate.php:2577
+#: locale/moduletranslate.php:2600 locale/moduletranslate.php:2623
+#: locale/moduletranslate.php:2646 locale/moduletranslate.php:2669
+#: locale/moduletranslate.php:2692 locale/moduletranslate.php:2726
 msgid "Speed"
 msgstr ""
 
-#: locale/moduletranslate.php:274 locale/moduletranslate.php:622
-#: locale/moduletranslate.php:668 locale/moduletranslate.php:2276
-#: locale/moduletranslate.php:2360 locale/moduletranslate.php:2383
-#: locale/moduletranslate.php:2406 locale/moduletranslate.php:2429
-#: locale/moduletranslate.php:2452 locale/moduletranslate.php:2475
-#: locale/moduletranslate.php:2498 locale/moduletranslate.php:2521
-#: locale/moduletranslate.php:2544 locale/moduletranslate.php:2567
-#: locale/moduletranslate.php:2590 locale/moduletranslate.php:2613
-#: locale/moduletranslate.php:2636 locale/moduletranslate.php:2670
+#: locale/moduletranslate.php:274 locale/moduletranslate.php:624
+#: locale/moduletranslate.php:670 locale/moduletranslate.php:2333
+#: locale/moduletranslate.php:2417 locale/moduletranslate.php:2440
+#: locale/moduletranslate.php:2463 locale/moduletranslate.php:2486
+#: locale/moduletranslate.php:2509 locale/moduletranslate.php:2532
+#: locale/moduletranslate.php:2555 locale/moduletranslate.php:2578
+#: locale/moduletranslate.php:2601 locale/moduletranslate.php:2624
+#: locale/moduletranslate.php:2647 locale/moduletranslate.php:2670
+#: locale/moduletranslate.php:2693 locale/moduletranslate.php:2727
 msgid ""
 "The transition speed of the selected effect in milliseconds (normal = 1000) "
 "or the Marquee Speed in a low to high scale (normal = 1)."
@@ -980,8 +980,7 @@ msgstr ""
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:399
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:174
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:249
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1696
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1800
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1629
 #: cache/1b/1b54f8dd2f1a33488bb30d63484f87f7.php:146
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:412
 #: cache/05/05600263dc8230138bb0f89338bbef69.php:89
@@ -1000,8 +999,8 @@ msgstr ""
 msgid "Select the dashboards type below"
 msgstr ""
 
-#: locale/moduletranslate.php:291 locale/moduletranslate.php:706
-#: locale/moduletranslate.php:864
+#: locale/moduletranslate.php:291 locale/moduletranslate.php:708
+#: locale/moduletranslate.php:866
 #: cache/4f/4f86b68b499f4cd831a26849e7ca7d16.php:113
 #: cache/fb/fb4bc86a9035b6ec146f3221bdb0c2c1.php:118
 #: cache/71/7116c27ed9d9118b32072e096012ea7b.php:118
@@ -1013,23 +1012,19 @@ msgstr ""
 msgid "The Location (URL) of the dashboard webpage"
 msgstr ""
 
-#: locale/moduletranslate.php:295
-msgid "Dataset"
+#: locale/moduletranslate.php:295 locale/moduletranslate.php:297
+msgid "DataSet"
 msgstr ""
 
 #: locale/moduletranslate.php:296
 msgid "Display DataSet content"
 msgstr ""
 
-#: locale/moduletranslate.php:297
-msgid "DataSet"
-msgstr ""
-
 #: locale/moduletranslate.php:298
 msgid "Please select the DataSet to use as a source of data for this template."
 msgstr ""
 
-#: locale/moduletranslate.php:300 locale/moduletranslate.php:503
+#: locale/moduletranslate.php:300 locale/moduletranslate.php:505
 msgid "Lower Row Limit"
 msgstr ""
 
@@ -1038,15 +1033,15 @@ msgid ""
 "Please enter the Lower Row Limit for this DataSet (enter 0 for no limit)."
 msgstr ""
 
-#: locale/moduletranslate.php:302 locale/moduletranslate.php:505
+#: locale/moduletranslate.php:302 locale/moduletranslate.php:507
 msgid "Lower limit must be 0 or above"
 msgstr ""
 
-#: locale/moduletranslate.php:303 locale/moduletranslate.php:506
+#: locale/moduletranslate.php:303 locale/moduletranslate.php:508
 msgid "Lower limit must be lower than the upper limit"
 msgstr ""
 
-#: locale/moduletranslate.php:304 locale/moduletranslate.php:507
+#: locale/moduletranslate.php:304 locale/moduletranslate.php:509
 msgid "Upper Row Limit"
 msgstr ""
 
@@ -1055,11 +1050,11 @@ msgid ""
 "Please enter the Upper Row Limit for this DataSet (enter 0 for no limit)."
 msgstr ""
 
-#: locale/moduletranslate.php:306 locale/moduletranslate.php:509
+#: locale/moduletranslate.php:306 locale/moduletranslate.php:511
 msgid "Upper limit must be 0 or above"
 msgstr ""
 
-#: locale/moduletranslate.php:307 locale/moduletranslate.php:510
+#: locale/moduletranslate.php:307 locale/moduletranslate.php:512
 msgid "When duration is per item the upper limit must be greater than 1"
 msgstr ""
 
@@ -1067,14 +1062,14 @@ msgstr ""
 msgid "Randomise?"
 msgstr ""
 
-#: locale/moduletranslate.php:309 locale/moduletranslate.php:550
+#: locale/moduletranslate.php:309 locale/moduletranslate.php:552
 msgid ""
 "Should the order of the feed be randomised? When enabled each time the "
 "Widget is shown the items will be randomly shuffled and displayed in a "
 "random order."
 msgstr ""
 
-#: locale/moduletranslate.php:310 locale/moduletranslate.php:538
+#: locale/moduletranslate.php:310 locale/moduletranslate.php:540
 msgid "Number of Items"
 msgstr ""
 
@@ -1175,11 +1170,11 @@ msgstr ""
 msgid "Embed HTML and JavaScript"
 msgstr ""
 
-#: locale/moduletranslate.php:333 locale/moduletranslate.php:708
+#: locale/moduletranslate.php:333 locale/moduletranslate.php:710
 msgid "Background transparent?"
 msgstr ""
 
-#: locale/moduletranslate.php:334 locale/moduletranslate.php:709
+#: locale/moduletranslate.php:334 locale/moduletranslate.php:711
 msgid ""
 "Should the Widget be shown with a transparent background? Also requires the "
 "embedded content to have a transparent background."
@@ -1193,7 +1188,7 @@ msgstr ""
 msgid "Should the embedded content be scaled along with the layout?"
 msgstr ""
 
-#: locale/moduletranslate.php:337 locale/moduletranslate.php:710
+#: locale/moduletranslate.php:337 locale/moduletranslate.php:712
 msgid "Preload?"
 msgstr ""
 
@@ -1207,101 +1202,113 @@ msgstr ""
 msgid "HTML to embed"
 msgstr ""
 
-#: locale/moduletranslate.php:340 locale/moduletranslate.php:658
+#: locale/moduletranslate.php:340 locale/moduletranslate.php:660
 msgid "Enter text or HTML in the box below."
 msgstr ""
 
-#: locale/moduletranslate.php:341 locale/moduletranslate.php:2270
+#: locale/moduletranslate.php:341 locale/moduletranslate.php:2327
 msgid "Custom Style Sheets"
 msgstr ""
 
 #: locale/moduletranslate.php:342
-msgid "HEAD content to embed"
+msgid "JavaScript"
 msgstr ""
 
 #: locale/moduletranslate.php:343
-msgid "Please include script tags."
+msgid ""
+"Add JavaScript to be included in the HTML. Do not use [] array notation as "
+"this is reserved for library references. Do not include script tags."
 msgstr ""
 
-#: locale/moduletranslate.php:344 locale/dbtranslate.php:58
-msgid "Flash"
+#: locale/moduletranslate.php:344
+msgid "HEAD content to embed"
 msgstr ""
 
 #: locale/moduletranslate.php:345
+msgid ""
+"Add content to appear within the HEAD tags on this embedded HTML. Please "
+"include script tags."
+msgstr ""
+
+#: locale/moduletranslate.php:346 locale/dbtranslate.php:58
+msgid "Flash"
+msgstr ""
+
+#: locale/moduletranslate.php:347
 msgid "Upload SWF files to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:348 locale/dbtranslate.php:99
+#: locale/moduletranslate.php:350 locale/dbtranslate.php:99
 msgid "Weather"
 msgstr ""
 
-#: locale/moduletranslate.php:349
+#: locale/moduletranslate.php:351
 msgid "A module for displaying weather information. Uses the Forecast API"
 msgstr ""
 
-#: locale/moduletranslate.php:350 locale/moduletranslate.php:383
+#: locale/moduletranslate.php:352 locale/moduletranslate.php:385
 msgid "Use the Display Location"
 msgstr ""
 
-#: locale/moduletranslate.php:351 locale/moduletranslate.php:384
+#: locale/moduletranslate.php:353 locale/moduletranslate.php:386
 msgid "Use the location configured on the display"
 msgstr ""
 
-#: locale/moduletranslate.php:352 locale/moduletranslate.php:385
+#: locale/moduletranslate.php:354 locale/moduletranslate.php:387
 #: cache/09/09fa06e4cbb20e5f65e2075bff1da423.php:554
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:620
 #: cache/70/70af2bbd82243291558c9b83caec5b48.php:346
 msgid "Latitude"
 msgstr ""
 
-#: locale/moduletranslate.php:353 locale/moduletranslate.php:386
+#: locale/moduletranslate.php:355 locale/moduletranslate.php:388
 msgid "The Latitude for this widget"
 msgstr ""
 
-#: locale/moduletranslate.php:354 locale/moduletranslate.php:387
+#: locale/moduletranslate.php:356 locale/moduletranslate.php:389
 #: cache/09/09fa06e4cbb20e5f65e2075bff1da423.php:558
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:624
 #: cache/70/70af2bbd82243291558c9b83caec5b48.php:361
 msgid "Longitude"
 msgstr ""
 
-#: locale/moduletranslate.php:355 locale/moduletranslate.php:388
+#: locale/moduletranslate.php:357 locale/moduletranslate.php:390
 msgid "The Longitude for this widget"
 msgstr ""
 
-#: locale/moduletranslate.php:356 locale/moduletranslate.php:2322
+#: locale/moduletranslate.php:358 locale/moduletranslate.php:2379
 msgid "Units"
 msgstr ""
 
-#: locale/moduletranslate.php:357
+#: locale/moduletranslate.php:359
 msgid "Select the units you would like to use."
 msgstr ""
 
-#: locale/moduletranslate.php:360
+#: locale/moduletranslate.php:362
 msgid "Only show Daytime weather conditions"
 msgstr ""
 
-#: locale/moduletranslate.php:361
+#: locale/moduletranslate.php:363
 msgid "Tick if you would like to only show the Daytime weather conditions."
 msgstr ""
 
-#: locale/moduletranslate.php:372 locale/dbtranslate.php:71
+#: locale/moduletranslate.php:374 locale/dbtranslate.php:71
 msgid "Generic File"
 msgstr ""
 
-#: locale/moduletranslate.php:373 locale/dbtranslate.php:72
+#: locale/moduletranslate.php:375 locale/dbtranslate.php:72
 msgid "A generic file to be stored in the library"
 msgstr ""
 
-#: locale/moduletranslate.php:376 locale/dbtranslate.php:91
+#: locale/moduletranslate.php:378 locale/dbtranslate.php:91
 msgid "Google Traffic"
 msgstr ""
 
-#: locale/moduletranslate.php:377
+#: locale/moduletranslate.php:379
 msgid "A module for displaying traffic information using Google Maps"
 msgstr ""
 
-#: locale/moduletranslate.php:378
+#: locale/moduletranslate.php:380
 #: cache/58/582bf6a35fd9661de4021ae6aad02414.php:84
 #: cache/63/63cb0689ed9b3c5e21eb5af0b40e433a.php:71
 #: cache/26/26b74efc874b3a8a5a7cf3ed2a22c6ba.php:145
@@ -1312,19 +1319,19 @@ msgstr ""
 msgid "API Key"
 msgstr ""
 
-#: locale/moduletranslate.php:379
+#: locale/moduletranslate.php:381
 msgid "Enter your API Key from Google Maps."
 msgstr ""
 
-#: locale/moduletranslate.php:380
+#: locale/moduletranslate.php:382
 msgid "Minimum recommended duration"
 msgstr ""
 
-#: locale/moduletranslate.php:381
+#: locale/moduletranslate.php:383
 msgid "Please enter a minimum recommended duration in seconds for this Module."
 msgstr ""
 
-#: locale/moduletranslate.php:382
+#: locale/moduletranslate.php:384
 msgid ""
 "This module uses the Google Traffic JavaScript API which is a paid-for API "
 "from Google. Charges will apply each time the map is loaded in the CMS "
@@ -1332,284 +1339,289 @@ msgid ""
 "duration."
 msgstr ""
 
-#: locale/moduletranslate.php:389
+#: locale/moduletranslate.php:391
 msgid "Zoom"
 msgstr ""
 
-#: locale/moduletranslate.php:390
+#: locale/moduletranslate.php:392
 msgid ""
 "How far should the map be zoomed in? The higher the number the closer, 1 "
 "represents the entire globe."
 msgstr ""
 
-#: locale/moduletranslate.php:391
+#: locale/moduletranslate.php:393
 msgid ""
 "This module is rendered on the Player which means the Player must have an "
 "internet connection."
 msgstr ""
 
-#: locale/moduletranslate.php:392
+#: locale/moduletranslate.php:394
 msgid ""
 "The Traffic Widget has not been configured yet, please ask your CMS "
 "Administrator to look at it for you."
 msgstr ""
 
-#: locale/moduletranslate.php:393
+#: locale/moduletranslate.php:395
 msgid ""
 "You have entered a duration lower than the recommended minimum, this could "
 "cause significant API charges."
 msgstr ""
 
-#: locale/moduletranslate.php:394 locale/dbtranslate.php:93
+#: locale/moduletranslate.php:396 locale/dbtranslate.php:93
 msgid "HLS"
 msgstr ""
 
-#: locale/moduletranslate.php:395
+#: locale/moduletranslate.php:397
 msgid "A module for displaying HLS video streams"
 msgstr ""
 
-#: locale/moduletranslate.php:396 locale/moduletranslate.php:434
-#: locale/moduletranslate.php:675
+#: locale/moduletranslate.php:398 locale/moduletranslate.php:436
+#: locale/moduletranslate.php:677
 msgid "Default Mute?"
 msgstr ""
 
-#: locale/moduletranslate.php:397 locale/moduletranslate.php:435
+#: locale/moduletranslate.php:399 locale/moduletranslate.php:437
 msgid "Should new widgets default to Muted?"
 msgstr ""
 
-#: locale/moduletranslate.php:398 locale/moduletranslate.php:436
+#: locale/moduletranslate.php:400 locale/moduletranslate.php:438
 msgid "Video Path"
 msgstr ""
 
-#: locale/moduletranslate.php:399
+#: locale/moduletranslate.php:401
 msgid ""
 "A URL to the HLS video stream. Requires Player running Windows 8.1 or later, "
 "or Android 6 or later. Earlier Android devices may play HLS via the "
 "LocalVideo widget."
 msgstr ""
 
-#: locale/moduletranslate.php:400 locale/moduletranslate.php:442
-#: locale/moduletranslate.php:688
+#: locale/moduletranslate.php:402 locale/moduletranslate.php:444
+#: locale/moduletranslate.php:690
 msgid "Mute?"
 msgstr ""
 
-#: locale/moduletranslate.php:401 locale/moduletranslate.php:443
-#: locale/moduletranslate.php:689
+#: locale/moduletranslate.php:403 locale/moduletranslate.php:445
+#: locale/moduletranslate.php:691
 msgid "Should the video be muted?"
 msgstr ""
 
-#: locale/moduletranslate.php:402
+#: locale/moduletranslate.php:404
 msgid "HTML Package"
 msgstr ""
 
-#: locale/moduletranslate.php:403
+#: locale/moduletranslate.php:405
 msgid "Upload a complete package to distribute to Players"
 msgstr ""
 
-#: locale/moduletranslate.php:406
+#: locale/moduletranslate.php:408
 msgid "Nominated File"
 msgstr ""
 
-#: locale/moduletranslate.php:407
+#: locale/moduletranslate.php:409
 msgid ""
 "Enter a nominated file name that player will attempt to open after "
 "extracting the .htz archive"
 msgstr ""
 
-#: locale/moduletranslate.php:408 locale/moduletranslate.php:555
-#: locale/moduletranslate.php:863 locale/moduletranslate.php:1020
-#: locale/moduletranslate.php:2180 locale/dbtranslate.php:52
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1856
+#: locale/moduletranslate.php:410 locale/moduletranslate.php:557
+#: locale/moduletranslate.php:865 locale/moduletranslate.php:1023
+#: locale/moduletranslate.php:2237 locale/dbtranslate.php:52
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1733
 #: lib/Widget/DataType/Product.php:52 lib/Widget/DataType/Article.php:77
 #: lib/Widget/DataType/ProductCategory.php:43
 msgid "Image"
 msgstr ""
 
-#: locale/moduletranslate.php:409
+#: locale/moduletranslate.php:411
 msgid "Upload Image files to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:412 locale/moduletranslate.php:677
+#: locale/moduletranslate.php:414 locale/moduletranslate.php:679
 msgid "Default Scale type"
 msgstr ""
 
-#: locale/moduletranslate.php:413 locale/moduletranslate.php:896
-#: locale/moduletranslate.php:915 locale/moduletranslate.php:933
+#: locale/moduletranslate.php:415 locale/moduletranslate.php:898
+#: locale/moduletranslate.php:917 locale/moduletranslate.php:935
 msgid "How should images be scaled by default?"
 msgstr ""
 
-#: locale/moduletranslate.php:415 locale/moduletranslate.php:420
-#: locale/moduletranslate.php:441 locale/moduletranslate.php:680
-#: locale/moduletranslate.php:687 locale/moduletranslate.php:1628
-#: locale/moduletranslate.php:1655 locale/moduletranslate.php:1682
-#: locale/moduletranslate.php:1715 locale/moduletranslate.php:1748
-#: locale/moduletranslate.php:1773 locale/moduletranslate.php:1798
-#: locale/moduletranslate.php:1825 locale/moduletranslate.php:1850
-#: locale/moduletranslate.php:1881 locale/moduletranslate.php:1912
-#: locale/moduletranslate.php:1941 locale/moduletranslate.php:1966
-#: locale/moduletranslate.php:1991 locale/moduletranslate.php:2022
-#: locale/moduletranslate.php:2053 locale/moduletranslate.php:2076
-#: locale/moduletranslate.php:2099
+#: locale/moduletranslate.php:417 locale/moduletranslate.php:422
+#: locale/moduletranslate.php:443 locale/moduletranslate.php:682
+#: locale/moduletranslate.php:689 locale/moduletranslate.php:1658
+#: locale/moduletranslate.php:1685 locale/moduletranslate.php:1712
+#: locale/moduletranslate.php:1739 locale/moduletranslate.php:1772
+#: locale/moduletranslate.php:1805 locale/moduletranslate.php:1830
+#: locale/moduletranslate.php:1855 locale/moduletranslate.php:1882
+#: locale/moduletranslate.php:1907 locale/moduletranslate.php:1938
+#: locale/moduletranslate.php:1969 locale/moduletranslate.php:1998
+#: locale/moduletranslate.php:2023 locale/moduletranslate.php:2048
+#: locale/moduletranslate.php:2079 locale/moduletranslate.php:2110
+#: locale/moduletranslate.php:2133 locale/moduletranslate.php:2156
 msgid "Stretch"
 msgstr ""
 
-#: locale/moduletranslate.php:416 locale/moduletranslate.php:421
-#: locale/moduletranslate.php:1627 locale/moduletranslate.php:1654
-#: locale/moduletranslate.php:1681 locale/moduletranslate.php:1714
-#: locale/moduletranslate.php:1747 locale/moduletranslate.php:1772
-#: locale/moduletranslate.php:1797 locale/moduletranslate.php:1824
-#: locale/moduletranslate.php:1849 locale/moduletranslate.php:1880
-#: locale/moduletranslate.php:1911 locale/moduletranslate.php:1940
-#: locale/moduletranslate.php:1965 locale/moduletranslate.php:1990
-#: locale/moduletranslate.php:2021 locale/moduletranslate.php:2052
-#: locale/moduletranslate.php:2075 locale/moduletranslate.php:2098
+#: locale/moduletranslate.php:418 locale/moduletranslate.php:423
+#: locale/moduletranslate.php:1657 locale/moduletranslate.php:1684
+#: locale/moduletranslate.php:1711 locale/moduletranslate.php:1738
+#: locale/moduletranslate.php:1771 locale/moduletranslate.php:1804
+#: locale/moduletranslate.php:1829 locale/moduletranslate.php:1854
+#: locale/moduletranslate.php:1881 locale/moduletranslate.php:1906
+#: locale/moduletranslate.php:1937 locale/moduletranslate.php:1968
+#: locale/moduletranslate.php:1997 locale/moduletranslate.php:2022
+#: locale/moduletranslate.php:2047 locale/moduletranslate.php:2078
+#: locale/moduletranslate.php:2109 locale/moduletranslate.php:2132
+#: locale/moduletranslate.php:2155
 msgid "Fit"
 msgstr ""
 
-#: locale/moduletranslate.php:417 locale/moduletranslate.php:438
-#: locale/moduletranslate.php:684 locale/moduletranslate.php:2185
+#: locale/moduletranslate.php:419 locale/moduletranslate.php:440
+#: locale/moduletranslate.php:686 locale/moduletranslate.php:1625
+#: locale/moduletranslate.php:2242
 msgid "Scale type"
 msgstr ""
 
-#: locale/moduletranslate.php:418 locale/moduletranslate.php:2186
+#: locale/moduletranslate.php:420 locale/moduletranslate.php:1626
+#: locale/moduletranslate.php:2243
 msgid "How should this image be scaled?"
 msgstr ""
 
-#: locale/moduletranslate.php:423 locale/moduletranslate.php:2191
+#: locale/moduletranslate.php:425 locale/moduletranslate.php:1631
+#: locale/moduletranslate.php:2248
 msgid "How should this image be aligned?"
 msgstr ""
 
-#: locale/moduletranslate.php:428 locale/moduletranslate.php:2196
+#: locale/moduletranslate.php:430 locale/moduletranslate.php:1636
+#: locale/moduletranslate.php:2253
 msgid "How should this image be vertically aligned?"
 msgstr ""
 
-#: locale/moduletranslate.php:432 locale/dbtranslate.php:66
+#: locale/moduletranslate.php:434 locale/dbtranslate.php:66
 msgid "Local Video"
 msgstr ""
 
-#: locale/moduletranslate.php:433
+#: locale/moduletranslate.php:435
 msgid ""
 "Display Video that only exists on the Display by providing a local file path "
 "or URL"
 msgstr ""
 
-#: locale/moduletranslate.php:437
+#: locale/moduletranslate.php:439
 msgid "A local file path or URL to the video. This can be a RTSP stream."
 msgstr ""
 
-#: locale/moduletranslate.php:439 locale/moduletranslate.php:685
+#: locale/moduletranslate.php:441 locale/moduletranslate.php:687
 msgid "How should this video be scaled?"
 msgstr ""
 
-#: locale/moduletranslate.php:440 locale/moduletranslate.php:679
-#: locale/moduletranslate.php:686
+#: locale/moduletranslate.php:442 locale/moduletranslate.php:681
+#: locale/moduletranslate.php:688
 msgid "Aspect"
 msgstr ""
 
-#: locale/moduletranslate.php:444 locale/moduletranslate.php:690
-#: locale/moduletranslate.php:701
+#: locale/moduletranslate.php:446 locale/moduletranslate.php:692
+#: locale/moduletranslate.php:703
 msgid "Show Full Screen?"
 msgstr ""
 
-#: locale/moduletranslate.php:445 locale/moduletranslate.php:691
-#: locale/moduletranslate.php:702
+#: locale/moduletranslate.php:447 locale/moduletranslate.php:693
+#: locale/moduletranslate.php:704
 msgid ""
 "Should the video expand over the top of existing content and show in full "
 "screen?"
 msgstr ""
 
-#: locale/moduletranslate.php:446
+#: locale/moduletranslate.php:448
 msgid ""
 "Please note that video scaling and video streaming via RTSP is only "
 "supported by Android, webOS and Linux players at the current time. The HLS "
 "streaming Widget can be used to show compatible video streams on Windows."
 msgstr ""
 
-#: locale/moduletranslate.php:447 locale/moduletranslate.php:448
+#: locale/moduletranslate.php:449 locale/moduletranslate.php:450
 msgid "Mastodon"
 msgstr ""
 
-#: locale/moduletranslate.php:449
+#: locale/moduletranslate.php:451
 msgid "Default Server URL"
 msgstr ""
 
-#: locale/moduletranslate.php:450
+#: locale/moduletranslate.php:452
 msgid "The default URL for the mastodon instance."
 msgstr ""
 
-#: locale/moduletranslate.php:451
+#: locale/moduletranslate.php:453
 #: cache/4a/4a2f889fbf2991697d3f56cba8939557.php:135
 msgid "Cache Period for Images"
 msgstr ""
 
-#: locale/moduletranslate.php:452
+#: locale/moduletranslate.php:454
 msgid ""
 "Please enter the number of hours you would like to cache mastodon images."
 msgstr ""
 
-#: locale/moduletranslate.php:453
+#: locale/moduletranslate.php:455
 #: cache/e5/e5c3ab4b73473f74411baea5286e8687.php:130
 #: cache/63/63cb0689ed9b3c5e21eb5af0b40e433a.php:101
 #: cache/4a/4a2f889fbf2991697d3f56cba8939557.php:120
 msgid "Cache Period"
 msgstr ""
 
-#: locale/moduletranslate.php:454
+#: locale/moduletranslate.php:456
 msgid ""
 "Please enter the number of seconds you would like to cache mastodon search "
 "results."
 msgstr ""
 
-#: locale/moduletranslate.php:455
+#: locale/moduletranslate.php:457
 msgid "Hashtag"
 msgstr ""
 
-#: locale/moduletranslate.php:456
+#: locale/moduletranslate.php:458
 msgid ""
 "Test your search by using a Hashtag to return results from the mastodon URL "
 "provided in the module settings."
 msgstr ""
 
-#: locale/moduletranslate.php:457
+#: locale/moduletranslate.php:459
 msgid "Search on"
 msgstr ""
 
-#: locale/moduletranslate.php:458
+#: locale/moduletranslate.php:460
 msgid "Show only local/remote server posts."
 msgstr ""
 
-#: locale/moduletranslate.php:459
+#: locale/moduletranslate.php:461
 msgid "All known servers"
 msgstr ""
 
-#: locale/moduletranslate.php:460
+#: locale/moduletranslate.php:462
 msgid "Local server"
 msgstr ""
 
-#: locale/moduletranslate.php:461
+#: locale/moduletranslate.php:463
 msgid "Remote servers"
 msgstr ""
 
-#: locale/moduletranslate.php:462
+#: locale/moduletranslate.php:464
 msgid "Server"
 msgstr ""
 
-#: locale/moduletranslate.php:463
+#: locale/moduletranslate.php:465
 msgid "Leave empty to use the one from settings."
 msgstr ""
 
-#: locale/moduletranslate.php:464 locale/moduletranslate.php:2328
+#: locale/moduletranslate.php:466 locale/moduletranslate.php:2385
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:360
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:333
 #: cache/58/582bf6a35fd9661de4021ae6aad02414.php:198
 msgid "Username"
 msgstr ""
 
-#: locale/moduletranslate.php:465
+#: locale/moduletranslate.php:467
 msgid "Provide Mastodon username to get public statuses from the account."
 msgstr ""
 
-#: locale/moduletranslate.php:466
+#: locale/moduletranslate.php:468
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:566
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:539
 #: lib/Report/DistributionReport.php:490
@@ -1618,94 +1630,94 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: locale/moduletranslate.php:467
+#: locale/moduletranslate.php:469
 msgid "The number of posts to return (default = 15)."
 msgstr ""
 
-#: locale/moduletranslate.php:469
+#: locale/moduletranslate.php:471
 msgid "Only posts with attached media?"
 msgstr ""
 
-#: locale/moduletranslate.php:470
+#: locale/moduletranslate.php:472
 msgid "Return only posts which included attached media."
 msgstr ""
 
-#: locale/moduletranslate.php:473
+#: locale/moduletranslate.php:475
 msgid "Remove Mentions?"
 msgstr ""
 
-#: locale/moduletranslate.php:474
+#: locale/moduletranslate.php:476
 msgid "Should mentions (@someone) be removed from the Mastodon Post?"
 msgstr ""
 
-#: locale/moduletranslate.php:475
+#: locale/moduletranslate.php:477
 msgid "Remove Hashtags?"
 msgstr ""
 
-#: locale/moduletranslate.php:476
+#: locale/moduletranslate.php:478
 msgid "Should Hashtags (#something) be removed from the Mastodon Post?"
 msgstr ""
 
-#: locale/moduletranslate.php:477
+#: locale/moduletranslate.php:479
 msgid "Remove URLs?"
 msgstr ""
 
-#: locale/moduletranslate.php:478
+#: locale/moduletranslate.php:480
 msgid ""
 "Should URLs be removed from the Mastodon Post? Most URLs do not compliment "
 "digital signage."
 msgstr ""
 
-#: locale/moduletranslate.php:479
+#: locale/moduletranslate.php:481
 msgid "Menu Board: Category"
 msgstr ""
 
-#: locale/moduletranslate.php:480
+#: locale/moduletranslate.php:482
 msgid "Display categories from a Menu Board"
 msgstr ""
 
-#: locale/moduletranslate.php:481 locale/moduletranslate.php:487
+#: locale/moduletranslate.php:483 locale/moduletranslate.php:489
 msgid "Menu"
 msgstr ""
 
-#: locale/moduletranslate.php:482 locale/moduletranslate.php:488
+#: locale/moduletranslate.php:484 locale/moduletranslate.php:490
 msgid "Please select the Menu to use as a source of data for this template."
 msgstr ""
 
-#: locale/moduletranslate.php:483 locale/moduletranslate.php:489
+#: locale/moduletranslate.php:485 locale/moduletranslate.php:491
 #: cache/4f/4f86b68b499f4cd831a26849e7ca7d16.php:109
 #: cache/fb/fb4bc86a9035b6ec146f3221bdb0c2c1.php:103
 #: cache/71/7116c27ed9d9118b32072e096012ea7b.php:103
 msgid "Category"
 msgstr ""
 
-#: locale/moduletranslate.php:484 locale/moduletranslate.php:490
+#: locale/moduletranslate.php:486 locale/moduletranslate.php:492
 msgid ""
 "Please select the Category to use as a source of data for this template."
 msgstr ""
 
-#: locale/moduletranslate.php:485
+#: locale/moduletranslate.php:487
 msgid "Menu Board: Products"
 msgstr ""
 
-#: locale/moduletranslate.php:486
+#: locale/moduletranslate.php:488
 msgid "Display products from a Menu Board"
 msgstr ""
 
-#: locale/moduletranslate.php:492
+#: locale/moduletranslate.php:494
 msgid "The duration specified is per item otherwise it is per menu."
 msgstr ""
 
-#: locale/moduletranslate.php:493
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1713
+#: locale/moduletranslate.php:495
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1646
 msgid "Sort by"
 msgstr ""
 
-#: locale/moduletranslate.php:494
+#: locale/moduletranslate.php:496
 msgid "How should we sort the menu items?"
 msgstr ""
 
-#: locale/moduletranslate.php:495
+#: locale/moduletranslate.php:497
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:475
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:555
 #: cache/04/04b4b8b9bb93bf0580422332c142abff.php:211
@@ -1717,9 +1729,9 @@ msgstr ""
 msgid "Display Order"
 msgstr ""
 
-#: locale/moduletranslate.php:496 locale/moduletranslate.php:949
-#: locale/moduletranslate.php:2277 locale/moduletranslate.php:2280
-#: locale/moduletranslate.php:2681
+#: locale/moduletranslate.php:498 locale/moduletranslate.php:951
+#: locale/moduletranslate.php:2334 locale/moduletranslate.php:2337
+#: locale/moduletranslate.php:2738
 #: cache/a2/a25dbce646a9a1ed849b53f6d93ed8cb.php:99
 #: cache/39/39cc315464ac8c34ba79db4a07dcc832.php:188
 #: cache/3d/3d685e4b4f0f4e045b5cc2697b26574d.php:160
@@ -1780,13 +1792,12 @@ msgstr ""
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:242
 #: cache/e3/e3e074211e42eadb55ae8cb6ceeaa722.php:108
 #: cache/e3/e3e074211e42eadb55ae8cb6ceeaa722.php:147
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1451
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1537
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1688
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1722
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1796
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2064
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2144
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1416
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1502
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1621
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1655
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1941
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2025
 #: cache/1b/1b54f8dd2f1a33488bb30d63484f87f7.php:142
 #: cache/23/235acc51022bf578b604ce47dd2743a4.php:145
 #: cache/23/23114ff234f79ee13968407a57f6252d.php:100
@@ -1858,7 +1869,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: locale/moduletranslate.php:497 locale/moduletranslate.php:2284
+#: locale/moduletranslate.php:499 locale/moduletranslate.php:2341
 #: cache/04/04b4b8b9bb93bf0580422332c142abff.php:203
 #: cache/d4/d41eb57456e7d0ead8c455e4652b975c.php:148
 #: cache/fd/fd08b6cb6765ac676b671e9c5a7afe27.php:148
@@ -1866,7 +1877,7 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
-#: locale/moduletranslate.php:498
+#: locale/moduletranslate.php:500
 #: cache/39/39cc315464ac8c34ba79db4a07dcc832.php:351
 #: cache/3d/3d2cccf3b2d4ef70fb5cca66b9b93574.php:183
 #: cache/91/91982ff1ff9899125ec30731f264a8f4.php:157
@@ -1929,528 +1940,528 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: locale/moduletranslate.php:499
+#: locale/moduletranslate.php:501
 msgid "Sort descending?"
 msgstr ""
 
-#: locale/moduletranslate.php:500
+#: locale/moduletranslate.php:502
 msgid "Show Unavailable Products?"
 msgstr ""
 
-#: locale/moduletranslate.php:501
+#: locale/moduletranslate.php:503
 msgid "Should the currently unavailable products appear in the menu?"
 msgstr ""
 
-#: locale/moduletranslate.php:502
+#: locale/moduletranslate.php:504
 msgid ""
 "Row limits can be used to return a subset of menu items. For example if you "
 "wanted the 10th to the 20th item you could put 10 and 20."
 msgstr ""
 
-#: locale/moduletranslate.php:504
+#: locale/moduletranslate.php:506
 msgid "Provide a Lower Row Limit."
 msgstr ""
 
-#: locale/moduletranslate.php:508
+#: locale/moduletranslate.php:510
 msgid "Provide an Upper Row Limit."
 msgstr ""
 
-#: locale/moduletranslate.php:511 locale/dbtranslate.php:77
+#: locale/moduletranslate.php:513 locale/dbtranslate.php:77
 msgid "Notification"
 msgstr ""
 
-#: locale/moduletranslate.php:512
+#: locale/moduletranslate.php:514
 msgid "Display messages created in the Notification Drawer of the CMS"
 msgstr ""
 
-#: locale/moduletranslate.php:513
+#: locale/moduletranslate.php:515
 msgid "Age"
 msgstr ""
 
-#: locale/moduletranslate.php:514
+#: locale/moduletranslate.php:516
 msgid "What is the maximum notification age in minutes, 0 for no restrictions."
 msgstr ""
 
-#: locale/moduletranslate.php:520 locale/dbtranslate.php:75
+#: locale/moduletranslate.php:522 locale/dbtranslate.php:75
 msgid "PDF"
 msgstr ""
 
-#: locale/moduletranslate.php:521
+#: locale/moduletranslate.php:523
 msgid "Upload PDF files to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:525
+#: locale/moduletranslate.php:527
 msgid "The duration specified is per page otherwise it is per document."
 msgstr ""
 
-#: locale/moduletranslate.php:526 locale/dbtranslate.php:59
+#: locale/moduletranslate.php:528 locale/dbtranslate.php:59
 msgid "PowerPoint"
 msgstr ""
 
-#: locale/moduletranslate.php:527
+#: locale/moduletranslate.php:529
 msgid "Upload a PowerPoint file to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:530
+#: locale/moduletranslate.php:532
 msgid "RSS Ticker"
 msgstr ""
 
-#: locale/moduletranslate.php:531
+#: locale/moduletranslate.php:533
 msgid "Display articles from an RSS feed"
 msgstr ""
 
-#: locale/moduletranslate.php:532 locale/moduletranslate.php:573
+#: locale/moduletranslate.php:534 locale/moduletranslate.php:575
 msgid "Update Interval Images (mins)"
 msgstr ""
 
-#: locale/moduletranslate.php:533
+#: locale/moduletranslate.php:535
 msgid ""
 "Please enter the update interval for images in minutes. This should be kept "
 "as high as possible. For example, if the data will only change once per hour "
 "this could be set to 60."
 msgstr ""
 
-#: locale/moduletranslate.php:535
+#: locale/moduletranslate.php:537
 msgid "Please enter the number of minutes you would like to cache RSS feeds."
 msgstr ""
 
-#: locale/moduletranslate.php:537
+#: locale/moduletranslate.php:539
 msgid "The Link for the RSS feed"
 msgstr ""
 
-#: locale/moduletranslate.php:539
+#: locale/moduletranslate.php:541
 msgid "The Number of RSS items you want to display"
 msgstr ""
 
-#: locale/moduletranslate.php:543
+#: locale/moduletranslate.php:545
 msgid "Take items from the"
 msgstr ""
 
-#: locale/moduletranslate.php:544
+#: locale/moduletranslate.php:546
 msgid "Take the items from the beginning or the end of the list"
 msgstr ""
 
-#: locale/moduletranslate.php:545
+#: locale/moduletranslate.php:547
 msgid "Start of the Feed"
 msgstr ""
 
-#: locale/moduletranslate.php:546
+#: locale/moduletranslate.php:548
 msgid "End of the Feed"
 msgstr ""
 
-#: locale/moduletranslate.php:547
+#: locale/moduletranslate.php:549
 msgid "Reverse Order"
 msgstr ""
 
-#: locale/moduletranslate.php:548
+#: locale/moduletranslate.php:550
 msgid "Should we reverse the order of the feed items?"
 msgstr ""
 
-#: locale/moduletranslate.php:549
+#: locale/moduletranslate.php:551
 msgid "Randomise"
 msgstr ""
 
-#: locale/moduletranslate.php:551
+#: locale/moduletranslate.php:553
 msgid "Image Tag"
 msgstr ""
 
-#: locale/moduletranslate.php:552
+#: locale/moduletranslate.php:554
 msgid "Choose the tag in the feed to get an image URL"
 msgstr ""
 
-#: locale/moduletranslate.php:553
+#: locale/moduletranslate.php:555
 msgid "Enclosure"
 msgstr ""
 
-#: locale/moduletranslate.php:554
+#: locale/moduletranslate.php:556
 msgid "Media Content"
 msgstr ""
 
-#: locale/moduletranslate.php:556 locale/moduletranslate.php:2652
+#: locale/moduletranslate.php:558 locale/moduletranslate.php:2709
 #: cache/8e/8e4c9c1886827e5f797c4436d4051e48.php:126
 #: cache/8e/8e4c9c1886827e5f797c4436d4051e48.php:719
 msgid "Custom"
 msgstr ""
 
-#: locale/moduletranslate.php:557
+#: locale/moduletranslate.php:559
 msgid "Custom Tag"
 msgstr ""
 
-#: locale/moduletranslate.php:558
+#: locale/moduletranslate.php:560
 msgid ""
 "A valid tag name which appears in this feed and will be used to get an image "
 "URL."
 msgstr ""
 
-#: locale/moduletranslate.php:559
+#: locale/moduletranslate.php:561
 msgid "Custom Tag Attribute"
 msgstr ""
 
-#: locale/moduletranslate.php:560
+#: locale/moduletranslate.php:562
 msgid ""
 "If the image URL is on an attribute of the custom tag, provide the attribute "
 "name."
 msgstr ""
 
-#: locale/moduletranslate.php:561
+#: locale/moduletranslate.php:563
 msgid "Allowable Attributes"
 msgstr ""
 
-#: locale/moduletranslate.php:562
+#: locale/moduletranslate.php:564
 msgid ""
 "A comma separated list of attributes that should not be stripped from the "
 "incoming feed."
 msgstr ""
 
-#: locale/moduletranslate.php:563
+#: locale/moduletranslate.php:565
 msgid "Strip Tags"
 msgstr ""
 
-#: locale/moduletranslate.php:564
+#: locale/moduletranslate.php:566
 msgid ""
 "A comma separated list of HTML tags that should be stripped from the feed in "
 "addition to the default ones."
 msgstr ""
 
-#: locale/moduletranslate.php:565
+#: locale/moduletranslate.php:567
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:405
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:378
 msgid "User Agent"
 msgstr ""
 
-#: locale/moduletranslate.php:566
+#: locale/moduletranslate.php:568
 msgid ""
 "Optionally set specific User Agent for this request, provide only the value, "
 "relevant header will be added automatically."
 msgstr ""
 
-#: locale/moduletranslate.php:567
+#: locale/moduletranslate.php:569
 msgid "Decode HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:568
+#: locale/moduletranslate.php:570
 msgid "Should we decode the HTML entities in this feed before parsing it?"
 msgstr ""
 
-#: locale/moduletranslate.php:569
+#: locale/moduletranslate.php:571
 msgid "Disable Date Sort"
 msgstr ""
 
-#: locale/moduletranslate.php:570
+#: locale/moduletranslate.php:572
 msgid "Should the date sort applied to the feed be disabled?"
 msgstr ""
 
-#: locale/moduletranslate.php:574
+#: locale/moduletranslate.php:576
 msgid ""
 "Override the update interval for images. This should be kept as high as "
 "possible and can be set for all Tickers in Module Settings."
 msgstr ""
 
-#: locale/moduletranslate.php:575 locale/dbtranslate.php:64
+#: locale/moduletranslate.php:577 locale/dbtranslate.php:64
 msgid "Shell Command"
 msgstr ""
 
-#: locale/moduletranslate.php:576
+#: locale/moduletranslate.php:578
 msgid ""
 "Instruct a Display to execute a command using the operating system shell"
 msgstr ""
 
-#: locale/moduletranslate.php:577
+#: locale/moduletranslate.php:579
 msgid "Command Type"
 msgstr ""
 
-#: locale/moduletranslate.php:578
+#: locale/moduletranslate.php:580
 msgid "Pick a command type"
 msgstr ""
 
-#: locale/moduletranslate.php:579 locale/moduletranslate.php:581
+#: locale/moduletranslate.php:581 locale/moduletranslate.php:583
 msgid "Stored Command"
 msgstr ""
 
-#: locale/moduletranslate.php:580
+#: locale/moduletranslate.php:582
 msgid "Create Command"
 msgstr ""
 
-#: locale/moduletranslate.php:582
+#: locale/moduletranslate.php:584
 msgid "Pick a stored command"
 msgstr ""
 
-#: locale/moduletranslate.php:583
+#: locale/moduletranslate.php:585
 msgid "Use global command?"
 msgstr ""
 
-#: locale/moduletranslate.php:584
+#: locale/moduletranslate.php:586
 msgid "Use a global command to work with all the player types."
 msgstr ""
 
-#: locale/moduletranslate.php:585
+#: locale/moduletranslate.php:587
 msgid "Global Command"
 msgstr ""
 
-#: locale/moduletranslate.php:586
+#: locale/moduletranslate.php:588
 msgid ""
 "Enter a global (Android/Linux/Tizen/webOS/Windows) Command Line compatible "
 "command"
 msgstr ""
 
-#: locale/moduletranslate.php:587
+#: locale/moduletranslate.php:589
 msgid "Android Command"
 msgstr ""
 
-#: locale/moduletranslate.php:588
+#: locale/moduletranslate.php:590
 msgid "Enter an Android Command Line compatible command"
 msgstr ""
 
-#: locale/moduletranslate.php:589
+#: locale/moduletranslate.php:591
 msgid "Linux Command"
 msgstr ""
 
-#: locale/moduletranslate.php:590
+#: locale/moduletranslate.php:592
 msgid "Enter a Linux Command Line compatible command"
 msgstr ""
 
-#: locale/moduletranslate.php:591
+#: locale/moduletranslate.php:593
 msgid "Tizen Command"
 msgstr ""
 
-#: locale/moduletranslate.php:592
+#: locale/moduletranslate.php:594
 msgid "Enter a Tizen Command Line compatible command"
 msgstr ""
 
-#: locale/moduletranslate.php:593
+#: locale/moduletranslate.php:595
 msgid "webOS Command"
 msgstr ""
 
-#: locale/moduletranslate.php:594
+#: locale/moduletranslate.php:596
 msgid "Enter a webOS Command Line compatible command"
 msgstr ""
 
-#: locale/moduletranslate.php:595
+#: locale/moduletranslate.php:597
 msgid "Windows Command"
 msgstr ""
 
-#: locale/moduletranslate.php:596
+#: locale/moduletranslate.php:598
 msgid "Enter a Windows Command Line compatible command"
 msgstr ""
 
-#: locale/moduletranslate.php:597
+#: locale/moduletranslate.php:599
 msgid "Launch the command via Windows Command Line"
 msgstr ""
 
-#: locale/moduletranslate.php:598
+#: locale/moduletranslate.php:600
 msgid ""
 "On Windows, should the player launch this command through the windows "
 "command line (cmd.exe)? This is useful for batch files. If you try to "
 "terminate this command only the command line will be terminated."
 msgstr ""
 
-#: locale/moduletranslate.php:599
+#: locale/moduletranslate.php:601
 msgid ""
 "If you set a duration in the advanced tab additional options for how the "
 "command is terminated will become available below this message."
 msgstr ""
 
-#: locale/moduletranslate.php:600
+#: locale/moduletranslate.php:602
 msgid "Terminate the command once the duration elapses?"
 msgstr ""
 
-#: locale/moduletranslate.php:601
+#: locale/moduletranslate.php:603
 msgid ""
 "Should the player forcefully terminate the command after the duration "
 "specified. Leave unchecked to let the command terminate naturally."
 msgstr ""
 
-#: locale/moduletranslate.php:602
+#: locale/moduletranslate.php:604
 msgid "Use taskkill to terminate commands?"
 msgstr ""
 
-#: locale/moduletranslate.php:603
+#: locale/moduletranslate.php:605
 msgid "On Windows, should the player use taskkill to terminate commands."
 msgstr ""
 
-#: locale/moduletranslate.php:604
+#: locale/moduletranslate.php:606
 msgid "Spacer"
 msgstr ""
 
-#: locale/moduletranslate.php:605
+#: locale/moduletranslate.php:607
 msgid "A module for making region empty for the duration"
 msgstr ""
 
-#: locale/moduletranslate.php:606
+#: locale/moduletranslate.php:608
 msgid "SSP"
 msgstr ""
 
-#: locale/moduletranslate.php:607
+#: locale/moduletranslate.php:609
 msgid ""
 "Manually schedule SSP content from the SSP connector via select partners."
 msgstr ""
 
-#: locale/moduletranslate.php:608
+#: locale/moduletranslate.php:610
 #: cache/60/6096ddd2496c1f25a148669f286abbeb.php:226
 msgid "Partner"
 msgstr ""
 
-#: locale/moduletranslate.php:609
+#: locale/moduletranslate.php:611
 msgid "Choose from the partners that support this type of scheduling."
 msgstr ""
 
-#: locale/moduletranslate.php:610 locale/dbtranslate.php:85
+#: locale/moduletranslate.php:612 locale/dbtranslate.php:85
 msgid "Stocks"
 msgstr ""
 
-#: locale/moduletranslate.php:611 locale/dbtranslate.php:81
+#: locale/moduletranslate.php:613 locale/dbtranslate.php:81
 msgid "A module for showing Stock quotes"
 msgstr ""
 
-#: locale/moduletranslate.php:613
+#: locale/moduletranslate.php:615
 msgid "Stock Symbols"
 msgstr ""
 
-#: locale/moduletranslate.php:614
+#: locale/moduletranslate.php:616
 msgid ""
 "A comma separated list of Stock Ticker Symbols, e.g. GOOGL,NVDA,AMZN. For "
 "the best results enter no more than 5 items."
 msgstr ""
 
-#: locale/moduletranslate.php:635
+#: locale/moduletranslate.php:637
 #: cache/3d/3d685e4b4f0f4e045b5cc2697b26574d.php:82
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:335
 #: cache/3c/3cafc6063c2a786736bea5bbf9d4cb6f.php:180
 #: cache/eb/eb0b05526f681e297aa747d8a42bfc36.php:64
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:419
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1062
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1074
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1236
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2029
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1023
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1035
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1193
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1906
 #: cache/34/3453edc522f8d2c6d1d154ad55500693.php:66
 #: lib/Entity/Schedule.php:1967
 msgid "Playlist"
 msgstr ""
 
-#: locale/moduletranslate.php:636
+#: locale/moduletranslate.php:638
 msgid "Display widgets from one or more Playlists"
 msgstr ""
 
-#: locale/moduletranslate.php:637
+#: locale/moduletranslate.php:639
 msgid ""
 "Please select one or more Playlists to embed. If selecting more than one use "
 "the Configuration tab to adjust how each Playlist is combined."
 msgstr ""
 
-#: locale/moduletranslate.php:638
+#: locale/moduletranslate.php:640
 msgid ""
 "Optionally set Spot options to expand or shrink each Playlist to a "
 "particular size or duration. Leave the Spot options empty to use the count "
 "of Widgets in each Playlist."
 msgstr ""
 
-#: locale/moduletranslate.php:639
+#: locale/moduletranslate.php:641
 msgid ""
 "Setting Spots to 0 will omit the first Playlist from the play order, and "
 "will be used as a Spot Fill option."
 msgstr ""
 
-#: locale/moduletranslate.php:640
+#: locale/moduletranslate.php:642
 msgid "Playlist Ordering"
 msgstr ""
 
-#: locale/moduletranslate.php:641
+#: locale/moduletranslate.php:643
 msgid "How would you like the Widgets on these Playlists to be ordered?"
 msgstr ""
 
-#: locale/moduletranslate.php:642
+#: locale/moduletranslate.php:644
 msgid ""
 "Play all - Playlists will play in their entirety one after the other in the "
 "order they appear on the General tab"
 msgstr ""
 
-#: locale/moduletranslate.php:643
+#: locale/moduletranslate.php:645
 msgid ""
 "Round Robin - take one Widget from each Playlist in the order they appear on "
 "the General tab and repeat"
 msgstr ""
 
-#: locale/moduletranslate.php:644
+#: locale/moduletranslate.php:646
 msgid ""
 "Auto - ensure Widgets are played evenly from each Playlist using the total "
 "count of Widgets on all Playlists"
 msgstr ""
 
-#: locale/moduletranslate.php:645
+#: locale/moduletranslate.php:647
 msgid "Remaining Widgets"
 msgstr ""
 
-#: locale/moduletranslate.php:646
+#: locale/moduletranslate.php:648
 msgid ""
 "If there are Widgets left unordered at the end, what should be done with "
 "these Widgets?"
 msgstr ""
 
-#: locale/moduletranslate.php:647
+#: locale/moduletranslate.php:649
 msgid "Add - After ordering any remaining Widgets are to be added to the end"
 msgstr ""
 
-#: locale/moduletranslate.php:648
+#: locale/moduletranslate.php:650
 msgid ""
 "Discard - Uses the Playlist with the least Widgets and ignores remaining "
 "Widgets on the longer Playlists"
 msgstr ""
 
-#: locale/moduletranslate.php:649
+#: locale/moduletranslate.php:651
 msgid ""
 "Repeat - Uses the Playlist with the most Widgets and repeats remaining "
 "Widgets on the shorter Playlists"
 msgstr ""
 
-#: locale/moduletranslate.php:650
+#: locale/moduletranslate.php:652
 msgid "Enable cycle based playback?"
 msgstr ""
 
-#: locale/moduletranslate.php:651
+#: locale/moduletranslate.php:653
 msgid ""
 "When cycle based playback is enabled only 1 Widget from this Sub-Playlist "
 "will be played each time the Layout is shown. The same Widget will be shown "
 "until the 'Play count' is achieved."
 msgstr ""
 
-#: locale/moduletranslate.php:652
+#: locale/moduletranslate.php:654
 #: cache/f5/f5c7640aa7fbb9ab7e2caec1a409d7c2.php:241
 #: cache/0b/0bf1ec6ab33ef0ba5938df774146f8dc.php:244
 msgid "Play count"
 msgstr ""
 
-#: locale/moduletranslate.php:653
+#: locale/moduletranslate.php:655
 msgid ""
 "In cycle based playback, how many plays should each Widget have before "
 "moving on?"
 msgstr ""
 
-#: locale/moduletranslate.php:654
+#: locale/moduletranslate.php:656
 msgid "Random Widget each cycle?"
 msgstr ""
 
-#: locale/moduletranslate.php:655
+#: locale/moduletranslate.php:657
 msgid ""
 "When enabled the next Widget to play will be chosen at random from the "
 "available Widgets."
 msgstr ""
 
-#: locale/moduletranslate.php:656
+#: locale/moduletranslate.php:658
 msgid "Rich Text"
 msgstr ""
 
-#: locale/moduletranslate.php:657
+#: locale/moduletranslate.php:659
 msgid "Add Text directly to a Layout"
 msgstr ""
 
-#: locale/moduletranslate.php:659
+#: locale/moduletranslate.php:661
 msgid ""
 "Enter the text to display. The red rectangle reflects the size of the region "
 "you are editing. Shift+Enter will drop a single line. Enter alone starts a "
 "new paragraph."
 msgstr ""
 
-#: locale/moduletranslate.php:660
+#: locale/moduletranslate.php:662
 #: cache/a2/a25dbce646a9a1ed849b53f6d93ed8cb.php:144
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:320
 #: cache/c8/c82ad061a984295661821ddeb6ffb8c0.php:222
@@ -2469,502 +2480,504 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: locale/moduletranslate.php:661
+#: locale/moduletranslate.php:663
 msgid "Choose media"
 msgstr ""
 
-#: locale/moduletranslate.php:662 locale/moduletranslate.php:890
-#: locale/moduletranslate.php:1032 locale/moduletranslate.php:1061
-#: locale/moduletranslate.php:1239 locale/moduletranslate.php:1614
-#: locale/moduletranslate.php:2343 locale/moduletranslate.php:2700
+#: locale/moduletranslate.php:664 locale/moduletranslate.php:892
+#: locale/moduletranslate.php:1035 locale/moduletranslate.php:1064
+#: locale/moduletranslate.php:1260 locale/moduletranslate.php:1653
+#: locale/moduletranslate.php:2400 locale/moduletranslate.php:2757
 msgid "Optional JavaScript"
 msgstr ""
 
-#: locale/moduletranslate.php:663 locale/moduletranslate.php:829
-#: locale/moduletranslate.php:852 locale/moduletranslate.php:877
-#: locale/moduletranslate.php:978 locale/moduletranslate.php:992
-#: locale/moduletranslate.php:999 locale/moduletranslate.php:1048
-#: locale/moduletranslate.php:1064 locale/moduletranslate.php:1090
-#: locale/moduletranslate.php:1230 locale/moduletranslate.php:1263
-#: locale/moduletranslate.php:1266 locale/moduletranslate.php:1271
-#: locale/moduletranslate.php:1274 locale/moduletranslate.php:1277
-#: locale/moduletranslate.php:1280 locale/moduletranslate.php:1305
-#: locale/moduletranslate.php:1308 locale/moduletranslate.php:1313
-#: locale/moduletranslate.php:1316 locale/moduletranslate.php:1319
-#: locale/moduletranslate.php:1322 locale/moduletranslate.php:1354
-#: locale/moduletranslate.php:1357 locale/moduletranslate.php:1362
-#: locale/moduletranslate.php:1365 locale/moduletranslate.php:1368
-#: locale/moduletranslate.php:1371 locale/moduletranslate.php:1403
-#: locale/moduletranslate.php:1406 locale/moduletranslate.php:1411
-#: locale/moduletranslate.php:1414 locale/moduletranslate.php:1417
-#: locale/moduletranslate.php:1420 locale/moduletranslate.php:1445
-#: locale/moduletranslate.php:1448 locale/moduletranslate.php:1451
-#: locale/moduletranslate.php:1455 locale/moduletranslate.php:1458
-#: locale/moduletranslate.php:1461 locale/moduletranslate.php:1464
-#: locale/moduletranslate.php:1467 locale/moduletranslate.php:1492
-#: locale/moduletranslate.php:1495 locale/moduletranslate.php:1498
-#: locale/moduletranslate.php:1502 locale/moduletranslate.php:1505
-#: locale/moduletranslate.php:1508 locale/moduletranslate.php:1511
-#: locale/moduletranslate.php:1514 locale/moduletranslate.php:1534
-#: locale/moduletranslate.php:1537 locale/moduletranslate.php:1541
-#: locale/moduletranslate.php:1544 locale/moduletranslate.php:1547
-#: locale/moduletranslate.php:1550 locale/moduletranslate.php:1570
-#: locale/moduletranslate.php:1573 locale/moduletranslate.php:1577
-#: locale/moduletranslate.php:1580 locale/moduletranslate.php:1583
-#: locale/moduletranslate.php:1586 locale/moduletranslate.php:2687
-#: locale/moduletranslate.php:2702 locale/moduletranslate.php:2709
+#: locale/moduletranslate.php:665 locale/moduletranslate.php:831
+#: locale/moduletranslate.php:854 locale/moduletranslate.php:879
+#: locale/moduletranslate.php:980 locale/moduletranslate.php:994
+#: locale/moduletranslate.php:1001 locale/moduletranslate.php:1051
+#: locale/moduletranslate.php:1067 locale/moduletranslate.php:1093
+#: locale/moduletranslate.php:1220 locale/moduletranslate.php:1251
+#: locale/moduletranslate.php:1284 locale/moduletranslate.php:1287
+#: locale/moduletranslate.php:1292 locale/moduletranslate.php:1295
+#: locale/moduletranslate.php:1298 locale/moduletranslate.php:1301
+#: locale/moduletranslate.php:1326 locale/moduletranslate.php:1329
+#: locale/moduletranslate.php:1334 locale/moduletranslate.php:1337
+#: locale/moduletranslate.php:1340 locale/moduletranslate.php:1343
+#: locale/moduletranslate.php:1375 locale/moduletranslate.php:1378
+#: locale/moduletranslate.php:1383 locale/moduletranslate.php:1386
+#: locale/moduletranslate.php:1389 locale/moduletranslate.php:1392
+#: locale/moduletranslate.php:1424 locale/moduletranslate.php:1427
+#: locale/moduletranslate.php:1432 locale/moduletranslate.php:1435
+#: locale/moduletranslate.php:1438 locale/moduletranslate.php:1441
+#: locale/moduletranslate.php:1466 locale/moduletranslate.php:1469
+#: locale/moduletranslate.php:1472 locale/moduletranslate.php:1476
+#: locale/moduletranslate.php:1479 locale/moduletranslate.php:1482
+#: locale/moduletranslate.php:1485 locale/moduletranslate.php:1488
+#: locale/moduletranslate.php:1513 locale/moduletranslate.php:1516
+#: locale/moduletranslate.php:1519 locale/moduletranslate.php:1523
+#: locale/moduletranslate.php:1526 locale/moduletranslate.php:1529
+#: locale/moduletranslate.php:1532 locale/moduletranslate.php:1535
+#: locale/moduletranslate.php:1555 locale/moduletranslate.php:1558
+#: locale/moduletranslate.php:1562 locale/moduletranslate.php:1565
+#: locale/moduletranslate.php:1568 locale/moduletranslate.php:1571
+#: locale/moduletranslate.php:1591 locale/moduletranslate.php:1594
+#: locale/moduletranslate.php:1598 locale/moduletranslate.php:1601
+#: locale/moduletranslate.php:1604 locale/moduletranslate.php:1607
+#: locale/moduletranslate.php:2744 locale/moduletranslate.php:2759
+#: locale/moduletranslate.php:2766
 #: cache/3c/3cafc6063c2a786736bea5bbf9d4cb6f.php:238
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1397
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1362
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:104
 msgid "Background Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:664 locale/moduletranslate.php:830
-#: locale/moduletranslate.php:853 locale/moduletranslate.php:878
-#: locale/moduletranslate.php:979 locale/moduletranslate.php:993
-#: locale/moduletranslate.php:1000 locale/moduletranslate.php:1065
-#: locale/moduletranslate.php:1231 locale/moduletranslate.php:2688
-#: locale/moduletranslate.php:2703 locale/moduletranslate.php:2710
+#: locale/moduletranslate.php:666 locale/moduletranslate.php:832
+#: locale/moduletranslate.php:855 locale/moduletranslate.php:880
+#: locale/moduletranslate.php:981 locale/moduletranslate.php:995
+#: locale/moduletranslate.php:1002 locale/moduletranslate.php:1068
+#: locale/moduletranslate.php:1221 locale/moduletranslate.php:1252
+#: locale/moduletranslate.php:2745 locale/moduletranslate.php:2760
+#: locale/moduletranslate.php:2767
 msgid ""
 "The selected effect works best with a background colour. Optionally add one "
 "here."
 msgstr ""
 
-#: locale/moduletranslate.php:669
+#: locale/moduletranslate.php:671
 msgid "Marquee Selector"
 msgstr ""
 
-#: locale/moduletranslate.php:670
+#: locale/moduletranslate.php:672
 msgid ""
 "The selector to use for stacking marquee items in a line when scrolling Left/"
 "Right."
 msgstr ""
 
-#: locale/moduletranslate.php:671 locale/dbtranslate.php:54
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1872
+#: locale/moduletranslate.php:673 locale/dbtranslate.php:54
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1749
 msgid "Video"
 msgstr ""
 
-#: locale/moduletranslate.php:672
+#: locale/moduletranslate.php:674
 msgid "Upload Video files to assign to Layouts"
 msgstr ""
 
-#: locale/moduletranslate.php:676
+#: locale/moduletranslate.php:678
 msgid "Should new Video Widgets default to Muted?"
 msgstr ""
 
-#: locale/moduletranslate.php:678
+#: locale/moduletranslate.php:680
 msgid "How should new Video Widgets be scaled by default?"
 msgstr ""
 
-#: locale/moduletranslate.php:681
+#: locale/moduletranslate.php:683
 msgid ""
 "This video will play for %media.duration% seconds. Cut the video short by "
 "setting a shorter duration in the Advanced tab. Wait on the last frame or "
 "set to Loop by setting a higher duration in the Advanced tab."
 msgstr ""
 
-#: locale/moduletranslate.php:683
+#: locale/moduletranslate.php:685
 msgid "Should the video loop if it finishes before the provided duration?"
 msgstr ""
 
-#: locale/moduletranslate.php:692 locale/dbtranslate.php:56
+#: locale/moduletranslate.php:694 locale/dbtranslate.php:56
 msgid "Video In"
 msgstr ""
 
-#: locale/moduletranslate.php:693
+#: locale/moduletranslate.php:695
 msgid "Display input from an external source"
 msgstr ""
 
-#: locale/moduletranslate.php:694
+#: locale/moduletranslate.php:696
 msgid "Input"
 msgstr ""
 
-#: locale/moduletranslate.php:695
+#: locale/moduletranslate.php:697
 msgid "Which device input should be shown"
 msgstr ""
 
-#: locale/moduletranslate.php:696
+#: locale/moduletranslate.php:698
 msgid "HDMI"
 msgstr ""
 
-#: locale/moduletranslate.php:697
+#: locale/moduletranslate.php:699
 msgid "RGB"
 msgstr ""
 
-#: locale/moduletranslate.php:698
+#: locale/moduletranslate.php:700
 msgid "DVI"
 msgstr ""
 
-#: locale/moduletranslate.php:699
+#: locale/moduletranslate.php:701
 msgid "DP"
 msgstr ""
 
-#: locale/moduletranslate.php:700
+#: locale/moduletranslate.php:702
 msgid "OPS"
 msgstr ""
 
-#: locale/moduletranslate.php:703
+#: locale/moduletranslate.php:705
 msgid ""
 "This Module is compatible with webOS, Tizen and Philips SOC Players only"
 msgstr ""
 
-#: locale/moduletranslate.php:704 locale/dbtranslate.php:61
+#: locale/moduletranslate.php:706 locale/dbtranslate.php:61
 msgid "Webpage"
 msgstr ""
 
-#: locale/moduletranslate.php:705
+#: locale/moduletranslate.php:707
 msgid "Embed a Webpage"
 msgstr ""
 
-#: locale/moduletranslate.php:707
+#: locale/moduletranslate.php:709
 msgid "The Location (URL) of the webpage"
 msgstr ""
 
-#: locale/moduletranslate.php:711
+#: locale/moduletranslate.php:713
 msgid ""
 "Should this Widget be loaded entirely off screen so that it is ready when "
 "shown? Dynamic content will start running off screen."
 msgstr ""
 
-#: locale/moduletranslate.php:712
+#: locale/moduletranslate.php:714
 #: cache/eb/ebcff77a4e266af34134679c91af4d2d.php:88
 #: cache/0a/0ae358955c92f467744fc6cf0f8f5624.php:118
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1611
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1568
 #: cache/cd/cdf12d9a1fc3b5db7965cfa8f9bb8d13.php:118
 msgid "Options"
 msgstr ""
 
-#: locale/moduletranslate.php:713
+#: locale/moduletranslate.php:715
 msgid "How should this web page be embedded?"
 msgstr ""
 
-#: locale/moduletranslate.php:714
+#: locale/moduletranslate.php:716
 msgid "Open Natively"
 msgstr ""
 
-#: locale/moduletranslate.php:715
+#: locale/moduletranslate.php:717
 msgid "Manual Position"
 msgstr ""
 
-#: locale/moduletranslate.php:716
+#: locale/moduletranslate.php:718
 msgid "Best Fit"
 msgstr ""
 
-#: locale/moduletranslate.php:717
+#: locale/moduletranslate.php:719
 msgid "Page Width"
 msgstr ""
 
-#: locale/moduletranslate.php:718
+#: locale/moduletranslate.php:720
 msgid "The width of the page. Leave empty to use the region width."
 msgstr ""
 
-#: locale/moduletranslate.php:719
+#: locale/moduletranslate.php:721
 msgid "Page Height"
 msgstr ""
 
-#: locale/moduletranslate.php:720
+#: locale/moduletranslate.php:722
 msgid "The height of the page. Leave empty to use the region height."
 msgstr ""
 
-#: locale/moduletranslate.php:721
+#: locale/moduletranslate.php:723
 msgid "Offset Top"
 msgstr ""
 
-#: locale/moduletranslate.php:722
+#: locale/moduletranslate.php:724
 msgid "The starting point from the top in pixels"
 msgstr ""
 
-#: locale/moduletranslate.php:723
+#: locale/moduletranslate.php:725
 msgid "Offset Left"
 msgstr ""
 
-#: locale/moduletranslate.php:724
+#: locale/moduletranslate.php:726
 msgid "The starting point from the left in pixels"
 msgstr ""
 
-#: locale/moduletranslate.php:725
+#: locale/moduletranslate.php:727
 msgid "Scale Percentage"
 msgstr ""
 
-#: locale/moduletranslate.php:726
+#: locale/moduletranslate.php:728
 msgid "The Percentage to Scale this Webpage (0 - 100)"
 msgstr ""
 
-#: locale/moduletranslate.php:727
+#: locale/moduletranslate.php:729
 msgid "Trigger on page load error"
 msgstr ""
 
-#: locale/moduletranslate.php:728
+#: locale/moduletranslate.php:730
 msgid ""
 "Code to be triggered when the page to be loaded returns an error, e.g. a 404 "
 "not found."
 msgstr ""
 
-#: locale/moduletranslate.php:729
+#: locale/moduletranslate.php:731
 msgid "World Clock - Analogue"
 msgstr ""
 
-#: locale/moduletranslate.php:730
+#: locale/moduletranslate.php:732
 msgid "Analogue World Clock"
 msgstr ""
 
-#: locale/moduletranslate.php:731 locale/moduletranslate.php:785
-#: locale/moduletranslate.php:810 locale/moduletranslate.php:833
+#: locale/moduletranslate.php:733 locale/moduletranslate.php:787
+#: locale/moduletranslate.php:812 locale/moduletranslate.php:835
 msgid "Clocks"
 msgstr ""
 
-#: locale/moduletranslate.php:732 locale/moduletranslate.php:794
-#: locale/moduletranslate.php:811 locale/moduletranslate.php:834
+#: locale/moduletranslate.php:734 locale/moduletranslate.php:796
+#: locale/moduletranslate.php:813 locale/moduletranslate.php:836
 msgid "Clock Columns"
 msgstr ""
 
-#: locale/moduletranslate.php:733 locale/moduletranslate.php:795
-#: locale/moduletranslate.php:812 locale/moduletranslate.php:835
+#: locale/moduletranslate.php:735 locale/moduletranslate.php:797
+#: locale/moduletranslate.php:814 locale/moduletranslate.php:837
 msgid "Number of columns to display"
 msgstr ""
 
-#: locale/moduletranslate.php:734 locale/moduletranslate.php:796
-#: locale/moduletranslate.php:813 locale/moduletranslate.php:836
+#: locale/moduletranslate.php:736 locale/moduletranslate.php:798
+#: locale/moduletranslate.php:815 locale/moduletranslate.php:838
 msgid "Clock Rows"
 msgstr ""
 
-#: locale/moduletranslate.php:735 locale/moduletranslate.php:797
-#: locale/moduletranslate.php:814 locale/moduletranslate.php:837
+#: locale/moduletranslate.php:737 locale/moduletranslate.php:799
+#: locale/moduletranslate.php:816 locale/moduletranslate.php:839
 msgid "Number of rows to display"
 msgstr ""
 
-#: locale/moduletranslate.php:746
+#: locale/moduletranslate.php:748
 msgid "Analogue Clock Settings"
 msgstr ""
 
-#: locale/moduletranslate.php:747
+#: locale/moduletranslate.php:749
 msgid "Background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:748 locale/moduletranslate.php:1049
-#: locale/moduletranslate.php:1091
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1401
+#: locale/moduletranslate.php:750 locale/moduletranslate.php:1052
+#: locale/moduletranslate.php:1094
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1366
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:109
 msgid "Use the colour picker to select the background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:749
+#: locale/moduletranslate.php:751
 msgid "Face colour"
 msgstr ""
 
-#: locale/moduletranslate.php:750
+#: locale/moduletranslate.php:752
 msgid "Use the colour picker to select the face colour"
 msgstr ""
 
-#: locale/moduletranslate.php:751
+#: locale/moduletranslate.php:753
 msgid "Case colour"
 msgstr ""
 
-#: locale/moduletranslate.php:752
+#: locale/moduletranslate.php:754
 msgid "Use the colour picker to select the case colour"
 msgstr ""
 
-#: locale/moduletranslate.php:753
+#: locale/moduletranslate.php:755
 msgid "Hour hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:754
+#: locale/moduletranslate.php:756
 msgid "Use the colour picker to select the hour hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:755
+#: locale/moduletranslate.php:757
 msgid "Minute hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:756
+#: locale/moduletranslate.php:758
 msgid "Use the colour picker to select the minute hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:757
+#: locale/moduletranslate.php:759
 msgid "Show seconds hand?"
 msgstr ""
 
-#: locale/moduletranslate.php:758
+#: locale/moduletranslate.php:760
 msgid "Tick if you would like to show the seconds hand"
 msgstr ""
 
-#: locale/moduletranslate.php:759
+#: locale/moduletranslate.php:761
 msgid "Seconds hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:760
+#: locale/moduletranslate.php:762
 msgid "Use the colour picker to select the seconds hand colour"
 msgstr ""
 
-#: locale/moduletranslate.php:761
+#: locale/moduletranslate.php:763
 msgid "Dial centre colour"
 msgstr ""
 
-#: locale/moduletranslate.php:762
+#: locale/moduletranslate.php:764
 msgid "Use the colour picker to select the dial centre colour"
 msgstr ""
 
-#: locale/moduletranslate.php:763
+#: locale/moduletranslate.php:765
 msgid "Show steps?"
 msgstr ""
 
-#: locale/moduletranslate.php:764
+#: locale/moduletranslate.php:766
 msgid "Tick if you would like to show the clock steps"
 msgstr ""
 
-#: locale/moduletranslate.php:765
+#: locale/moduletranslate.php:767
 msgid "Steps colour"
 msgstr ""
 
-#: locale/moduletranslate.php:766
+#: locale/moduletranslate.php:768
 msgid "Use the colour picker to select the steps colour"
 msgstr ""
 
-#: locale/moduletranslate.php:767
+#: locale/moduletranslate.php:769
 msgid "Secondary steps colour"
 msgstr ""
 
-#: locale/moduletranslate.php:768
+#: locale/moduletranslate.php:770
 msgid "Use the colour picker to select the secondary steps colour"
 msgstr ""
 
-#: locale/moduletranslate.php:769
+#: locale/moduletranslate.php:771
 msgid "Detailed look?"
 msgstr ""
 
-#: locale/moduletranslate.php:770
+#: locale/moduletranslate.php:772
 msgid ""
 "Tick if you would like to show a more detailed look for the clock ( using "
 "shadows and 3D effects )"
 msgstr ""
 
-#: locale/moduletranslate.php:771
+#: locale/moduletranslate.php:773
 msgid "Show inner digital clock?"
 msgstr ""
 
-#: locale/moduletranslate.php:772
+#: locale/moduletranslate.php:774
 msgid "Tick if you would like to show a small inner digital clock"
 msgstr ""
 
-#: locale/moduletranslate.php:773
+#: locale/moduletranslate.php:775
 msgid "Digital clock text colour"
 msgstr ""
 
-#: locale/moduletranslate.php:774
+#: locale/moduletranslate.php:776
 msgid "Use the colour picker to select the digital clock text colour"
 msgstr ""
 
-#: locale/moduletranslate.php:775
+#: locale/moduletranslate.php:777
 msgid "Digital clock background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:776
+#: locale/moduletranslate.php:778
 msgid "Use the colour picker to select the digital clock background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:777
+#: locale/moduletranslate.php:779
 msgid "Show label?"
 msgstr ""
 
-#: locale/moduletranslate.php:778
+#: locale/moduletranslate.php:780
 msgid "Tick if you would like to show the timezone label"
 msgstr ""
 
-#: locale/moduletranslate.php:779
+#: locale/moduletranslate.php:781
 msgid "Label text colour"
 msgstr ""
 
-#: locale/moduletranslate.php:780
+#: locale/moduletranslate.php:782
 msgid "Use the colour picker to select the label text colour"
 msgstr ""
 
-#: locale/moduletranslate.php:781
+#: locale/moduletranslate.php:783
 msgid "Label background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:782
+#: locale/moduletranslate.php:784
 msgid "Use the colour picker to select the label background colour"
 msgstr ""
 
-#: locale/moduletranslate.php:783
+#: locale/moduletranslate.php:785
 msgid "World Clock - Custom"
 msgstr ""
 
-#: locale/moduletranslate.php:784
+#: locale/moduletranslate.php:786
 msgid "Custom World Clock"
 msgstr ""
 
-#: locale/moduletranslate.php:786
+#: locale/moduletranslate.php:788
 msgid "Template - HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:787
+#: locale/moduletranslate.php:789
 msgid ""
 "Enter text or HTML in the box below. Use squared brackets for elements to be "
 "replaced (e.g. [HH:mm] for time, or [label] to show the timezone name"
 msgstr ""
 
-#: locale/moduletranslate.php:788
+#: locale/moduletranslate.php:790
 msgid "Template - Stylesheet"
 msgstr ""
 
-#: locale/moduletranslate.php:789
+#: locale/moduletranslate.php:791
 msgid "Enter CSS styling in the box below."
 msgstr ""
 
-#: locale/moduletranslate.php:808
+#: locale/moduletranslate.php:810
 msgid "World Clock - Time and Date"
 msgstr ""
 
-#: locale/moduletranslate.php:809
+#: locale/moduletranslate.php:811
 msgid "Time and Date World Clock"
 msgstr ""
 
-#: locale/moduletranslate.php:825 locale/moduletranslate.php:848
+#: locale/moduletranslate.php:827 locale/moduletranslate.php:850
 msgid "Label Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:826 locale/moduletranslate.php:849
+#: locale/moduletranslate.php:828 locale/moduletranslate.php:851
 msgid "The color of the label"
 msgstr ""
 
-#: locale/moduletranslate.php:827 locale/moduletranslate.php:850
+#: locale/moduletranslate.php:829 locale/moduletranslate.php:852
 msgid "Date/Time Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:828 locale/moduletranslate.php:851
-#: locale/moduletranslate.php:1617 locale/moduletranslate.php:1644
-#: locale/moduletranslate.php:1671 locale/moduletranslate.php:1698
-#: locale/moduletranslate.php:1731 locale/moduletranslate.php:1764
-#: locale/moduletranslate.php:1789 locale/moduletranslate.php:1814
-#: locale/moduletranslate.php:1841 locale/moduletranslate.php:1866
-#: locale/moduletranslate.php:1897 locale/moduletranslate.php:1928
-#: locale/moduletranslate.php:1957 locale/moduletranslate.php:1982
-#: locale/moduletranslate.php:2007 locale/moduletranslate.php:2038
-#: locale/moduletranslate.php:2092
+#: locale/moduletranslate.php:830 locale/moduletranslate.php:853
+#: locale/moduletranslate.php:1674 locale/moduletranslate.php:1701
+#: locale/moduletranslate.php:1728 locale/moduletranslate.php:1755
+#: locale/moduletranslate.php:1788 locale/moduletranslate.php:1821
+#: locale/moduletranslate.php:1846 locale/moduletranslate.php:1871
+#: locale/moduletranslate.php:1898 locale/moduletranslate.php:1923
+#: locale/moduletranslate.php:1954 locale/moduletranslate.php:1985
+#: locale/moduletranslate.php:2014 locale/moduletranslate.php:2039
+#: locale/moduletranslate.php:2064 locale/moduletranslate.php:2095
+#: locale/moduletranslate.php:2149
 msgid "The color of the text"
 msgstr ""
 
-#: locale/moduletranslate.php:831
+#: locale/moduletranslate.php:833
 msgid "World Clock - Text"
 msgstr ""
 
-#: locale/moduletranslate.php:832
+#: locale/moduletranslate.php:834
 msgid "Text World Clock"
 msgstr ""
 
-#: locale/moduletranslate.php:854
+#: locale/moduletranslate.php:856
 msgid "Hello World - with Data"
 msgstr ""
 
-#: locale/moduletranslate.php:855
+#: locale/moduletranslate.php:857
 msgid "Here it is, the obligatory Hello World example, with data"
 msgstr ""
 
-#: locale/moduletranslate.php:857 locale/moduletranslate.php:911
-#: locale/moduletranslate.php:930 locale/moduletranslate.php:947
-#: locale/moduletranslate.php:961 locale/dbtranslate.php:147
+#: locale/moduletranslate.php:859 locale/moduletranslate.php:913
+#: locale/moduletranslate.php:932 locale/moduletranslate.php:949
+#: locale/moduletranslate.php:963 locale/dbtranslate.php:147
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:116
 #: cache/f6/f60761fa1e2b5ad016f9d13f094f9488.php:56
 #: cache/cd/cdfcf24fb200643d729a7d42581ab314.php:204
@@ -2973,13 +2986,13 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: locale/moduletranslate.php:858 locale/moduletranslate.php:1209
-#: locale/moduletranslate.php:1588 lib/Widget/DataType/Article.php:70
+#: locale/moduletranslate.php:860 locale/moduletranslate.php:1230
+#: locale/moduletranslate.php:1609 lib/Widget/DataType/Article.php:70
 #: lib/Widget/DataType/Event.php:61
 msgid "Summary"
 msgstr ""
 
-#: locale/moduletranslate.php:859
+#: locale/moduletranslate.php:861
 #: cache/6e/6e8678de8ffffc5ed3b935eb9c3f6eb0.php:165
 #: cache/64/6468accf3a0fea12fced661d430c769f.php:269
 #: cache/8e/8e4c9c1886827e5f797c4436d4051e48.php:106
@@ -2987,7 +3000,7 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
-#: locale/moduletranslate.php:860
+#: locale/moduletranslate.php:862
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:120
 #: cache/cd/cdfcf24fb200643d729a7d42581ab314.php:219
 #: cache/fa/faa7a864be7733d5d543f560dd13d215.php:219
@@ -2995,10 +3008,10 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#: locale/moduletranslate.php:861 locale/moduletranslate.php:1015
-#: locale/moduletranslate.php:1604 locale/moduletranslate.php:2146
-#: locale/moduletranslate.php:2147 locale/moduletranslate.php:2258
-#: locale/moduletranslate.php:2269 locale/moduletranslate.php:2329
+#: locale/moduletranslate.php:863 locale/moduletranslate.php:1018
+#: locale/moduletranslate.php:1643 locale/moduletranslate.php:2203
+#: locale/moduletranslate.php:2204 locale/moduletranslate.php:2315
+#: locale/moduletranslate.php:2326 locale/moduletranslate.php:2386
 #: locale/dbtranslate.php:33 cache/04/04b11bf7b7a8190d66899471a8930ffd.php:350
 #: cache/66/661d79c5da6d14a0db85cd0980868ff7.php:166
 #: cache/0e/0ed8020e97c517a55ad881cfc5dd0b4c.php:184
@@ -3007,185 +3020,192 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: locale/moduletranslate.php:862 lib/Widget/DataType/Article.php:76
+#: locale/moduletranslate.php:864 lib/Widget/DataType/Article.php:76
 msgid "Published Date"
 msgstr ""
 
-#: locale/moduletranslate.php:865 lib/Widget/DataType/Article.php:73
+#: locale/moduletranslate.php:867 lib/Widget/DataType/Article.php:73
 msgid "Permalink"
 msgstr ""
 
-#: locale/moduletranslate.php:866
+#: locale/moduletranslate.php:868
 msgid "Articles shown with custom HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:870 locale/moduletranslate.php:903
-#: locale/moduletranslate.php:922 locale/moduletranslate.php:940
-#: locale/moduletranslate.php:954 locale/moduletranslate.php:966
-#: locale/moduletranslate.php:1069 locale/moduletranslate.php:1221
+#: locale/moduletranslate.php:872 locale/moduletranslate.php:905
+#: locale/moduletranslate.php:924 locale/moduletranslate.php:942
+#: locale/moduletranslate.php:956 locale/moduletranslate.php:968
+#: locale/moduletranslate.php:1072 locale/moduletranslate.php:1225
+#: locale/moduletranslate.php:1242
 msgid ""
 "The transition speed of the selected effect in milliseconds (normal = 1000) "
 "or the Marquee Speed in a low to high scale (normal = 1)"
 msgstr ""
 
-#: locale/moduletranslate.php:871 locale/moduletranslate.php:1062
-#: locale/moduletranslate.php:1222
+#: locale/moduletranslate.php:873 locale/moduletranslate.php:1065
+#: locale/moduletranslate.php:1218 locale/moduletranslate.php:1243
 msgid "Show items side by side?"
 msgstr ""
 
-#: locale/moduletranslate.php:872 locale/moduletranslate.php:1063
-#: locale/moduletranslate.php:1223
+#: locale/moduletranslate.php:874 locale/moduletranslate.php:1066
+#: locale/moduletranslate.php:1219 locale/moduletranslate.php:1244
 msgid "Should items be shown side by side?"
 msgstr ""
 
-#: locale/moduletranslate.php:873 locale/moduletranslate.php:1070
-#: locale/moduletranslate.php:1224
+#: locale/moduletranslate.php:875 locale/moduletranslate.php:1073
+#: locale/moduletranslate.php:1226 locale/moduletranslate.php:1245
 msgid "Items per page"
 msgstr ""
 
-#: locale/moduletranslate.php:874
+#: locale/moduletranslate.php:876
 msgid ""
 "If an effect has been selected from the General tab, how many pages should "
 "we split the items across? If you don't enter anything here 1 item will be "
 "put on each page."
 msgstr ""
 
-#: locale/moduletranslate.php:879
+#: locale/moduletranslate.php:881
 msgid "Text direction"
 msgstr ""
 
-#: locale/moduletranslate.php:880
+#: locale/moduletranslate.php:882
 msgid "Which direction does the text in the feed use?"
 msgstr ""
 
-#: locale/moduletranslate.php:881
+#: locale/moduletranslate.php:883
 msgid "Left to Right (LTR)"
 msgstr ""
 
-#: locale/moduletranslate.php:882
+#: locale/moduletranslate.php:884
 msgid "Right to Left (RTL)"
 msgstr ""
 
-#: locale/moduletranslate.php:883 locale/moduletranslate.php:1035
-#: locale/moduletranslate.php:1056 locale/moduletranslate.php:1077
-#: locale/moduletranslate.php:1099 locale/moduletranslate.php:1114
-#: locale/moduletranslate.php:1129 locale/moduletranslate.php:1144
-#: locale/moduletranslate.php:1159 locale/moduletranslate.php:1174
-#: locale/moduletranslate.php:1189 locale/moduletranslate.php:1232
-#: locale/moduletranslate.php:2698
+#: locale/moduletranslate.php:885 locale/moduletranslate.php:1038
+#: locale/moduletranslate.php:1059 locale/moduletranslate.php:1080
+#: locale/moduletranslate.php:1102 locale/moduletranslate.php:1117
+#: locale/moduletranslate.php:1132 locale/moduletranslate.php:1147
+#: locale/moduletranslate.php:1162 locale/moduletranslate.php:1177
+#: locale/moduletranslate.php:1192 locale/moduletranslate.php:1214
+#: locale/moduletranslate.php:1253 locale/moduletranslate.php:2755
 msgid "Item Template"
 msgstr ""
 
-#: locale/moduletranslate.php:884 locale/moduletranslate.php:1036
-#: locale/moduletranslate.php:1057 locale/moduletranslate.php:1078
-#: locale/moduletranslate.php:1100 locale/moduletranslate.php:1115
-#: locale/moduletranslate.php:1130 locale/moduletranslate.php:1145
-#: locale/moduletranslate.php:1160 locale/moduletranslate.php:1175
-#: locale/moduletranslate.php:1190 locale/moduletranslate.php:1233
+#: locale/moduletranslate.php:886 locale/moduletranslate.php:1039
+#: locale/moduletranslate.php:1060 locale/moduletranslate.php:1081
+#: locale/moduletranslate.php:1103 locale/moduletranslate.php:1118
+#: locale/moduletranslate.php:1133 locale/moduletranslate.php:1148
+#: locale/moduletranslate.php:1163 locale/moduletranslate.php:1178
+#: locale/moduletranslate.php:1193 locale/moduletranslate.php:1215
+#: locale/moduletranslate.php:1254
 msgid "Enter text in the box below, used to display each article."
 msgstr ""
 
-#: locale/moduletranslate.php:885 locale/moduletranslate.php:1058
-#: locale/moduletranslate.php:1234 locale/moduletranslate.php:2265
+#: locale/moduletranslate.php:887 locale/moduletranslate.php:1061
+#: locale/moduletranslate.php:1216 locale/moduletranslate.php:1255
+#: locale/moduletranslate.php:2322
 msgid "Snippets"
 msgstr ""
 
-#: locale/moduletranslate.php:886 locale/moduletranslate.php:2266
+#: locale/moduletranslate.php:888 locale/moduletranslate.php:2323
 msgid "Choose element to add to template"
 msgstr ""
 
-#: locale/moduletranslate.php:887 locale/moduletranslate.php:904
-#: locale/moduletranslate.php:923 locale/moduletranslate.php:941
-#: locale/moduletranslate.php:955 locale/moduletranslate.php:967
-#: locale/moduletranslate.php:1037 locale/moduletranslate.php:1072
-#: locale/moduletranslate.php:1079 locale/moduletranslate.php:1101
-#: locale/moduletranslate.php:1116 locale/moduletranslate.php:1131
-#: locale/moduletranslate.php:1146 locale/moduletranslate.php:1161
-#: locale/moduletranslate.php:1176 locale/moduletranslate.php:1191
-#: locale/moduletranslate.php:1236 locale/moduletranslate.php:2271
+#: locale/moduletranslate.php:889 locale/moduletranslate.php:906
+#: locale/moduletranslate.php:925 locale/moduletranslate.php:943
+#: locale/moduletranslate.php:957 locale/moduletranslate.php:969
+#: locale/moduletranslate.php:1040 locale/moduletranslate.php:1075
+#: locale/moduletranslate.php:1082 locale/moduletranslate.php:1104
+#: locale/moduletranslate.php:1119 locale/moduletranslate.php:1134
+#: locale/moduletranslate.php:1149 locale/moduletranslate.php:1164
+#: locale/moduletranslate.php:1179 locale/moduletranslate.php:1194
+#: locale/moduletranslate.php:1228 locale/moduletranslate.php:1257
+#: locale/moduletranslate.php:2328
 msgid "No data message"
 msgstr ""
 
-#: locale/moduletranslate.php:888 locale/moduletranslate.php:905
-#: locale/moduletranslate.php:924 locale/moduletranslate.php:942
-#: locale/moduletranslate.php:956 locale/moduletranslate.php:968
-#: locale/moduletranslate.php:1038 locale/moduletranslate.php:1073
-#: locale/moduletranslate.php:1080 locale/moduletranslate.php:1102
-#: locale/moduletranslate.php:1117 locale/moduletranslate.php:1132
-#: locale/moduletranslate.php:1147 locale/moduletranslate.php:1162
-#: locale/moduletranslate.php:1177 locale/moduletranslate.php:1192
-#: locale/moduletranslate.php:1237
+#: locale/moduletranslate.php:890 locale/moduletranslate.php:907
+#: locale/moduletranslate.php:926 locale/moduletranslate.php:944
+#: locale/moduletranslate.php:958 locale/moduletranslate.php:970
+#: locale/moduletranslate.php:1041 locale/moduletranslate.php:1076
+#: locale/moduletranslate.php:1083 locale/moduletranslate.php:1105
+#: locale/moduletranslate.php:1120 locale/moduletranslate.php:1135
+#: locale/moduletranslate.php:1150 locale/moduletranslate.php:1165
+#: locale/moduletranslate.php:1180 locale/moduletranslate.php:1195
+#: locale/moduletranslate.php:1229 locale/moduletranslate.php:1258
 msgid "A message to display when no data is returned from the source"
 msgstr ""
 
-#: locale/moduletranslate.php:889 locale/moduletranslate.php:1030
-#: locale/moduletranslate.php:1031 locale/moduletranslate.php:1060
-#: locale/moduletranslate.php:1238 locale/moduletranslate.php:2342
+#: locale/moduletranslate.php:891 locale/moduletranslate.php:1033
+#: locale/moduletranslate.php:1034 locale/moduletranslate.php:1063
+#: locale/moduletranslate.php:1259 locale/moduletranslate.php:2399
 msgid "Optional Stylesheet Template"
 msgstr ""
 
-#: locale/moduletranslate.php:891 locale/moduletranslate.php:906
-#: locale/moduletranslate.php:925 locale/moduletranslate.php:943
-#: locale/moduletranslate.php:957 locale/moduletranslate.php:969
+#: locale/moduletranslate.php:893 locale/moduletranslate.php:908
+#: locale/moduletranslate.php:927 locale/moduletranslate.php:945
+#: locale/moduletranslate.php:959 locale/moduletranslate.php:971
 msgid "Copyright"
 msgstr ""
 
-#: locale/moduletranslate.php:892 locale/moduletranslate.php:907
-#: locale/moduletranslate.php:926 locale/moduletranslate.php:944
-#: locale/moduletranslate.php:958 locale/moduletranslate.php:970
+#: locale/moduletranslate.php:894 locale/moduletranslate.php:909
+#: locale/moduletranslate.php:928 locale/moduletranslate.php:946
+#: locale/moduletranslate.php:960 locale/moduletranslate.php:972
 msgid "Copyright information to display as the last item in this feed."
 msgstr ""
 
-#: locale/moduletranslate.php:893
+#: locale/moduletranslate.php:895
 msgid "Image only"
 msgstr ""
 
-#: locale/moduletranslate.php:894 locale/moduletranslate.php:909
-#: locale/moduletranslate.php:928 locale/moduletranslate.php:946
-#: locale/moduletranslate.php:960 locale/moduletranslate.php:1620
-#: locale/moduletranslate.php:1647 locale/moduletranslate.php:1674
-#: locale/moduletranslate.php:1701 locale/moduletranslate.php:1734
-#: locale/moduletranslate.php:1767 locale/moduletranslate.php:1792
-#: locale/moduletranslate.php:1817 locale/moduletranslate.php:1844
-#: locale/moduletranslate.php:1869 locale/moduletranslate.php:1900
-#: locale/moduletranslate.php:1931 locale/moduletranslate.php:1960
-#: locale/moduletranslate.php:1985 locale/moduletranslate.php:2010
-#: locale/moduletranslate.php:2041 locale/dbtranslate.php:138
+#: locale/moduletranslate.php:896 locale/moduletranslate.php:911
+#: locale/moduletranslate.php:930 locale/moduletranslate.php:948
+#: locale/moduletranslate.php:962 locale/moduletranslate.php:1677
+#: locale/moduletranslate.php:1704 locale/moduletranslate.php:1731
+#: locale/moduletranslate.php:1758 locale/moduletranslate.php:1791
+#: locale/moduletranslate.php:1824 locale/moduletranslate.php:1849
+#: locale/moduletranslate.php:1874 locale/moduletranslate.php:1901
+#: locale/moduletranslate.php:1926 locale/moduletranslate.php:1957
+#: locale/moduletranslate.php:1988 locale/moduletranslate.php:2017
+#: locale/moduletranslate.php:2042 locale/moduletranslate.php:2067
+#: locale/moduletranslate.php:2098 locale/dbtranslate.php:138
 msgid "Background"
 msgstr ""
 
-#: locale/moduletranslate.php:895 locale/moduletranslate.php:914
-#: locale/moduletranslate.php:932
+#: locale/moduletranslate.php:897 locale/moduletranslate.php:916
+#: locale/moduletranslate.php:934
 msgid "Image Fit"
 msgstr ""
 
-#: locale/moduletranslate.php:897 locale/moduletranslate.php:916
-#: locale/moduletranslate.php:934 locale/moduletranslate.php:2188
+#: locale/moduletranslate.php:899 locale/moduletranslate.php:918
+#: locale/moduletranslate.php:936 locale/moduletranslate.php:1628
+#: locale/moduletranslate.php:2245
 msgid "Contain"
 msgstr ""
 
-#: locale/moduletranslate.php:898 locale/moduletranslate.php:917
-#: locale/moduletranslate.php:935 locale/moduletranslate.php:2189
+#: locale/moduletranslate.php:900 locale/moduletranslate.php:919
+#: locale/moduletranslate.php:937 locale/moduletranslate.php:1629
+#: locale/moduletranslate.php:2246
 msgid "Cover"
 msgstr ""
 
-#: locale/moduletranslate.php:899 locale/moduletranslate.php:918
-#: locale/moduletranslate.php:936 locale/moduletranslate.php:2187
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2446
+#: locale/moduletranslate.php:901 locale/moduletranslate.php:920
+#: locale/moduletranslate.php:938 locale/moduletranslate.php:1627
+#: locale/moduletranslate.php:2244
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2327
 msgid "Fill"
 msgstr ""
 
-#: locale/moduletranslate.php:908
+#: locale/moduletranslate.php:910
 msgid "Image overlaid with the Feed Content on the Left"
 msgstr ""
 
-#: locale/moduletranslate.php:910 locale/moduletranslate.php:929
+#: locale/moduletranslate.php:912 locale/moduletranslate.php:931
 msgid "Background (content)"
 msgstr ""
 
-#: locale/moduletranslate.php:912 locale/moduletranslate.php:948
-#: locale/moduletranslate.php:1210 locale/moduletranslate.php:2278
-#: locale/moduletranslate.php:2283 locale/moduletranslate.php:2326
+#: locale/moduletranslate.php:914 locale/moduletranslate.php:950
+#: locale/moduletranslate.php:1231 locale/moduletranslate.php:2335
+#: locale/moduletranslate.php:2340 locale/moduletranslate.php:2383
 #: locale/dbtranslate.php:148 cache/a2/a25dbce646a9a1ed849b53f6d93ed8cb.php:114
 #: cache/39/39cc315464ac8c34ba79db4a07dcc832.php:203
 #: cache/91/91982ff1ff9899125ec30731f264a8f4.php:165
@@ -3243,274 +3263,284 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: locale/moduletranslate.php:913 locale/moduletranslate.php:931
-#: locale/moduletranslate.php:950 locale/moduletranslate.php:962
-#: locale/moduletranslate.php:975 locale/moduletranslate.php:1045
-#: locale/moduletranslate.php:1087 locale/moduletranslate.php:1109
-#: locale/moduletranslate.php:1124 locale/moduletranslate.php:1139
-#: locale/moduletranslate.php:1154 locale/moduletranslate.php:1169
-#: locale/moduletranslate.php:1184 locale/moduletranslate.php:1199
-#: locale/moduletranslate.php:1595 locale/moduletranslate.php:2118
-#: locale/moduletranslate.php:2154 locale/moduletranslate.php:2293
-#: locale/moduletranslate.php:2307
+#: locale/moduletranslate.php:915 locale/moduletranslate.php:933
+#: locale/moduletranslate.php:952 locale/moduletranslate.php:964
+#: locale/moduletranslate.php:977 locale/moduletranslate.php:1048
+#: locale/moduletranslate.php:1090 locale/moduletranslate.php:1112
+#: locale/moduletranslate.php:1127 locale/moduletranslate.php:1142
+#: locale/moduletranslate.php:1157 locale/moduletranslate.php:1172
+#: locale/moduletranslate.php:1187 locale/moduletranslate.php:1202
+#: locale/moduletranslate.php:1616 locale/moduletranslate.php:2175
+#: locale/moduletranslate.php:2211 locale/moduletranslate.php:2350
+#: locale/moduletranslate.php:2364
 msgid "Font Size"
 msgstr ""
 
-#: locale/moduletranslate.php:927
+#: locale/moduletranslate.php:929
 msgid "Image overlaid with the Title"
 msgstr ""
 
-#: locale/moduletranslate.php:945
+#: locale/moduletranslate.php:947
 msgid "Prominent title with description and name separator"
 msgstr ""
 
-#: locale/moduletranslate.php:959
+#: locale/moduletranslate.php:961
 msgid "Title Only"
 msgstr ""
 
-#: locale/moduletranslate.php:971
+#: locale/moduletranslate.php:973
 msgid "Currency Name"
 msgstr ""
 
-#: locale/moduletranslate.php:972 locale/moduletranslate.php:2683
+#: locale/moduletranslate.php:974 locale/moduletranslate.php:2740
 msgid "Last Trade Price"
 msgstr ""
 
-#: locale/moduletranslate.php:973 locale/moduletranslate.php:2684
+#: locale/moduletranslate.php:975 locale/moduletranslate.php:2741
 msgid "Change Percentage"
 msgstr ""
 
-#: locale/moduletranslate.php:974
+#: locale/moduletranslate.php:976
 msgid "Change Icon"
 msgstr ""
 
-#: locale/moduletranslate.php:976
+#: locale/moduletranslate.php:978
 msgid "Currency Logo"
 msgstr ""
 
-#: locale/moduletranslate.php:977
+#: locale/moduletranslate.php:979
 msgid "Currencies Custom HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:982 locale/moduletranslate.php:996
-#: locale/moduletranslate.php:1003 locale/moduletranslate.php:2691
-#: locale/moduletranslate.php:2706 locale/moduletranslate.php:2713
+#: locale/moduletranslate.php:984 locale/moduletranslate.php:998
+#: locale/moduletranslate.php:1005 locale/moduletranslate.php:2748
+#: locale/moduletranslate.php:2763 locale/moduletranslate.php:2770
 msgid "Items per Page"
 msgstr ""
 
-#: locale/moduletranslate.php:983 locale/moduletranslate.php:997
-#: locale/moduletranslate.php:1004 locale/moduletranslate.php:2692
-#: locale/moduletranslate.php:2707 locale/moduletranslate.php:2714
+#: locale/moduletranslate.php:985 locale/moduletranslate.php:999
+#: locale/moduletranslate.php:1006 locale/moduletranslate.php:2749
+#: locale/moduletranslate.php:2764 locale/moduletranslate.php:2771
 msgid "This is the intended number of items on each page."
 msgstr ""
 
-#: locale/moduletranslate.php:989
+#: locale/moduletranslate.php:991
 msgid "itemTemplate"
 msgstr ""
 
-#: locale/moduletranslate.php:991
+#: locale/moduletranslate.php:993
 msgid "Currencies 1"
 msgstr ""
 
-#: locale/moduletranslate.php:998
+#: locale/moduletranslate.php:1000
 msgid "Currencies 2"
 msgstr ""
 
-#: locale/moduletranslate.php:1005 locale/dbtranslate.php:31
+#: locale/moduletranslate.php:1007
+msgid "Dashboard Image"
+msgstr ""
+
+#: locale/moduletranslate.php:1008 locale/dbtranslate.php:31
 msgid "String"
 msgstr ""
 
-#: locale/moduletranslate.php:1006 locale/moduletranslate.php:1011
-#: locale/moduletranslate.php:1016 locale/moduletranslate.php:1021
-#: locale/moduletranslate.php:1026
+#: locale/moduletranslate.php:1009 locale/moduletranslate.php:1014
+#: locale/moduletranslate.php:1019 locale/moduletranslate.php:1024
+#: locale/moduletranslate.php:1029
 msgid ""
 "Please choose a Dataset from the Configure tab to be able to customise this "
 "element."
 msgstr ""
 
-#: locale/moduletranslate.php:1007 locale/moduletranslate.php:1012
-#: locale/moduletranslate.php:1017 locale/moduletranslate.php:1022
-#: locale/moduletranslate.php:1027
+#: locale/moduletranslate.php:1010 locale/moduletranslate.php:1015
+#: locale/moduletranslate.php:1020 locale/moduletranslate.php:1025
+#: locale/moduletranslate.php:1030
 msgid "No field is available for that type of DataSet element."
 msgstr ""
 
-#: locale/moduletranslate.php:1008 locale/moduletranslate.php:1013
-#: locale/moduletranslate.php:1018 locale/moduletranslate.php:1023
-#: locale/moduletranslate.php:1028 locale/moduletranslate.php:1203
+#: locale/moduletranslate.php:1011 locale/moduletranslate.php:1016
+#: locale/moduletranslate.php:1021 locale/moduletranslate.php:1026
+#: locale/moduletranslate.php:1031 locale/moduletranslate.php:1206
 msgid "Select DataSet Field"
 msgstr ""
 
-#: locale/moduletranslate.php:1009 locale/moduletranslate.php:1014
-#: locale/moduletranslate.php:1019 locale/moduletranslate.php:1024
-#: locale/moduletranslate.php:1029 locale/moduletranslate.php:1204
+#: locale/moduletranslate.php:1012 locale/moduletranslate.php:1017
+#: locale/moduletranslate.php:1022 locale/moduletranslate.php:1027
+#: locale/moduletranslate.php:1032 locale/moduletranslate.php:1207
 msgid "Please choose a DataSet field for this element."
 msgstr ""
 
-#: locale/moduletranslate.php:1010 locale/dbtranslate.php:32
+#: locale/moduletranslate.php:1013 locale/dbtranslate.php:32
 msgid "Number"
 msgstr ""
 
-#: locale/moduletranslate.php:1025
+#: locale/moduletranslate.php:1028
 msgid "HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:1033 locale/moduletranslate.php:1055
-#: locale/moduletranslate.php:1075 locale/moduletranslate.php:1097
-#: locale/moduletranslate.php:1112 locale/moduletranslate.php:1127
-#: locale/moduletranslate.php:1142 locale/moduletranslate.php:1157
-#: locale/moduletranslate.php:1172 locale/moduletranslate.php:1187
-#: locale/moduletranslate.php:1202
+#: locale/moduletranslate.php:1036 locale/moduletranslate.php:1058
+#: locale/moduletranslate.php:1078 locale/moduletranslate.php:1100
+#: locale/moduletranslate.php:1115 locale/moduletranslate.php:1130
+#: locale/moduletranslate.php:1145 locale/moduletranslate.php:1160
+#: locale/moduletranslate.php:1175 locale/moduletranslate.php:1190
+#: locale/moduletranslate.php:1205 locale/moduletranslate.php:1213
 msgid "Select a dataset to display appearance options."
 msgstr ""
 
-#: locale/moduletranslate.php:1034 locale/moduletranslate.php:1076
-#: locale/moduletranslate.php:1098 locale/moduletranslate.php:1113
-#: locale/moduletranslate.php:1128 locale/moduletranslate.php:1143
-#: locale/moduletranslate.php:1158 locale/moduletranslate.php:1173
-#: locale/moduletranslate.php:1188
+#: locale/moduletranslate.php:1037 locale/moduletranslate.php:1079
+#: locale/moduletranslate.php:1101 locale/moduletranslate.php:1116
+#: locale/moduletranslate.php:1131 locale/moduletranslate.php:1146
+#: locale/moduletranslate.php:1161 locale/moduletranslate.php:1176
+#: locale/moduletranslate.php:1191
 msgid ""
 "Below you can select the columns to be shown in the table - drag and drop to "
 "reorder and to move between lists."
 msgstr ""
 
-#: locale/moduletranslate.php:1039 locale/moduletranslate.php:1081
-#: locale/moduletranslate.php:1103 locale/moduletranslate.php:1118
-#: locale/moduletranslate.php:1133 locale/moduletranslate.php:1148
-#: locale/moduletranslate.php:1163 locale/moduletranslate.php:1178
-#: locale/moduletranslate.php:1193
-msgid "Show the table headings?"
-msgstr ""
-
-#: locale/moduletranslate.php:1040 locale/moduletranslate.php:1082
-#: locale/moduletranslate.php:1104 locale/moduletranslate.php:1119
-#: locale/moduletranslate.php:1134 locale/moduletranslate.php:1149
-#: locale/moduletranslate.php:1164 locale/moduletranslate.php:1179
-#: locale/moduletranslate.php:1194
-msgid "Should the Table headings be shown?"
-msgstr ""
-
-#: locale/moduletranslate.php:1041 locale/moduletranslate.php:1083
-#: locale/moduletranslate.php:1105 locale/moduletranslate.php:1120
-#: locale/moduletranslate.php:1135 locale/moduletranslate.php:1150
-#: locale/moduletranslate.php:1165 locale/moduletranslate.php:1180
-#: locale/moduletranslate.php:1195
-msgid "Rows per page"
-msgstr ""
-
 #: locale/moduletranslate.php:1042 locale/moduletranslate.php:1084
 #: locale/moduletranslate.php:1106 locale/moduletranslate.php:1121
 #: locale/moduletranslate.php:1136 locale/moduletranslate.php:1151
 #: locale/moduletranslate.php:1166 locale/moduletranslate.php:1181
 #: locale/moduletranslate.php:1196
-msgid "Please enter the number of rows per page. 0 for no pages."
+msgid "Show the table headings?"
 msgstr ""
 
 #: locale/moduletranslate.php:1043 locale/moduletranslate.php:1085
 #: locale/moduletranslate.php:1107 locale/moduletranslate.php:1122
 #: locale/moduletranslate.php:1137 locale/moduletranslate.php:1152
 #: locale/moduletranslate.php:1167 locale/moduletranslate.php:1182
-#: locale/moduletranslate.php:1197 locale/dbtranslate.php:69
-#: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:93
-msgid "Font"
+#: locale/moduletranslate.php:1197
+msgid "Should the Table headings be shown?"
 msgstr ""
 
 #: locale/moduletranslate.php:1044 locale/moduletranslate.php:1086
 #: locale/moduletranslate.php:1108 locale/moduletranslate.php:1123
 #: locale/moduletranslate.php:1138 locale/moduletranslate.php:1153
 #: locale/moduletranslate.php:1168 locale/moduletranslate.php:1183
-#: locale/moduletranslate.php:1198 locale/moduletranslate.php:2116
-#: locale/moduletranslate.php:2152
-msgid "Select a custom font - leave empty to use the default font."
+#: locale/moduletranslate.php:1198
+msgid "Rows per page"
+msgstr ""
+
+#: locale/moduletranslate.php:1045 locale/moduletranslate.php:1087
+#: locale/moduletranslate.php:1109 locale/moduletranslate.php:1124
+#: locale/moduletranslate.php:1139 locale/moduletranslate.php:1154
+#: locale/moduletranslate.php:1169 locale/moduletranslate.php:1184
+#: locale/moduletranslate.php:1199
+msgid "Please enter the number of rows per page. 0 for no pages."
 msgstr ""
 
 #: locale/moduletranslate.php:1046 locale/moduletranslate.php:1088
 #: locale/moduletranslate.php:1110 locale/moduletranslate.php:1125
 #: locale/moduletranslate.php:1140 locale/moduletranslate.php:1155
 #: locale/moduletranslate.php:1170 locale/moduletranslate.php:1185
-#: locale/moduletranslate.php:1200
-msgid "Set the font size"
+#: locale/moduletranslate.php:1200 locale/dbtranslate.php:69
+#: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:93
+msgid "Font"
 msgstr ""
 
 #: locale/moduletranslate.php:1047 locale/moduletranslate.php:1089
-#: locale/moduletranslate.php:1258 locale/moduletranslate.php:1300
-#: locale/moduletranslate.php:1349 locale/moduletranslate.php:1398
-#: locale/moduletranslate.php:1441 locale/moduletranslate.php:1488
-#: locale/moduletranslate.php:1530 locale/moduletranslate.php:1566
-msgid "Colours"
+#: locale/moduletranslate.php:1111 locale/moduletranslate.php:1126
+#: locale/moduletranslate.php:1141 locale/moduletranslate.php:1156
+#: locale/moduletranslate.php:1171 locale/moduletranslate.php:1186
+#: locale/moduletranslate.php:1201 locale/moduletranslate.php:2173
+#: locale/moduletranslate.php:2209
+msgid "Select a custom font - leave empty to use the default font."
+msgstr ""
+
+#: locale/moduletranslate.php:1049 locale/moduletranslate.php:1091
+#: locale/moduletranslate.php:1113 locale/moduletranslate.php:1128
+#: locale/moduletranslate.php:1143 locale/moduletranslate.php:1158
+#: locale/moduletranslate.php:1173 locale/moduletranslate.php:1188
+#: locale/moduletranslate.php:1203
+msgid "Set the font size"
 msgstr ""
 
 #: locale/moduletranslate.php:1050 locale/moduletranslate.php:1092
+#: locale/moduletranslate.php:1279 locale/moduletranslate.php:1321
+#: locale/moduletranslate.php:1370 locale/moduletranslate.php:1419
+#: locale/moduletranslate.php:1462 locale/moduletranslate.php:1509
+#: locale/moduletranslate.php:1551 locale/moduletranslate.php:1587
+msgid "Colours"
+msgstr ""
+
+#: locale/moduletranslate.php:1053 locale/moduletranslate.php:1095
 msgid "Border Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1051 locale/moduletranslate.php:1093
+#: locale/moduletranslate.php:1054 locale/moduletranslate.php:1096
 msgid "Use the colour picker to select the border colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1052 locale/moduletranslate.php:1094
+#: locale/moduletranslate.php:1055 locale/moduletranslate.php:1097
 msgid "Font Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1053 locale/moduletranslate.php:1095
+#: locale/moduletranslate.php:1056 locale/moduletranslate.php:1098
 msgid "Use the colour picker to select the font colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1054
+#: locale/moduletranslate.php:1057
 msgid "Dataset Custom HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:1059 locale/moduletranslate.php:1235
+#: locale/moduletranslate.php:1062 locale/moduletranslate.php:1217
+#: locale/moduletranslate.php:1256
 msgid "Choose data type snippet"
 msgstr ""
 
-#: locale/moduletranslate.php:1071 locale/moduletranslate.php:1225
+#: locale/moduletranslate.php:1074 locale/moduletranslate.php:1227
+#: locale/moduletranslate.php:1246
 msgid ""
 "If an effect has been selected, how many pages should we split the items "
 "across? If you don't enter anything here 1 item will be put on each page."
 msgstr ""
 
-#: locale/moduletranslate.php:1074
+#: locale/moduletranslate.php:1077
 msgid "Plain Table (Customisable)"
 msgstr ""
 
-#: locale/moduletranslate.php:1096
+#: locale/moduletranslate.php:1099
 msgid "A light green background with darker green borders. White heading text."
 msgstr ""
 
-#: locale/moduletranslate.php:1111
+#: locale/moduletranslate.php:1114
 msgid "Simple white table with rounded rows."
 msgstr ""
 
-#: locale/moduletranslate.php:1126
+#: locale/moduletranslate.php:1129
 msgid "Striped blue table with darker blue header."
 msgstr ""
 
-#: locale/moduletranslate.php:1141
+#: locale/moduletranslate.php:1144
 msgid "White striped table with orange header."
 msgstr ""
 
-#: locale/moduletranslate.php:1156
+#: locale/moduletranslate.php:1159
 msgid "White and grey table with split rows."
 msgstr ""
 
-#: locale/moduletranslate.php:1171
+#: locale/moduletranslate.php:1174
 msgid "A dark table with round borders and yellow heading text."
 msgstr ""
 
-#: locale/moduletranslate.php:1186
+#: locale/moduletranslate.php:1189
 msgid "Round cells with multi colours and a full coloured header."
 msgstr ""
 
-#: locale/moduletranslate.php:1201
-msgid "Dataset Image Slideshow"
+#: locale/moduletranslate.php:1204
+msgid "Image Slideshow"
 msgstr ""
 
-#: locale/moduletranslate.php:1208
+#: locale/moduletranslate.php:1211
 msgid ""
 "The transition speed of the selected effect in milliseconds (normal = 1000)"
 msgstr ""
 
-#: locale/moduletranslate.php:1213
+#: locale/moduletranslate.php:1212
+msgid "String template with placeholders"
+msgstr ""
+
+#: locale/moduletranslate.php:1234
 #: cache/3c/3c7bd12ad2faa21d9e80b1c4ee69d3b4.php:63
 #: cache/09/09ce3b6a0541b31d12645b44531faf96.php:63
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:63
@@ -3518,1091 +3548,1118 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: locale/moduletranslate.php:1214
+#: locale/moduletranslate.php:1235
 msgid "Calendar Detailed Event"
 msgstr ""
 
-#: locale/moduletranslate.php:1215
+#: locale/moduletranslate.php:1236
 msgid "Calendar Simple Event"
 msgstr ""
 
-#: locale/moduletranslate.php:1216
+#: locale/moduletranslate.php:1237
 msgid "Calendar Event Row"
 msgstr ""
 
-#: locale/moduletranslate.php:1217
+#: locale/moduletranslate.php:1238
 msgid "Events shown with custom HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:1240
+#: locale/moduletranslate.php:1261
 msgid "Daily Calendar - Light"
 msgstr ""
 
-#: locale/moduletranslate.php:1241 locale/moduletranslate.php:1283
-#: locale/moduletranslate.php:1325 locale/moduletranslate.php:1374
-#: locale/moduletranslate.php:1423 locale/moduletranslate.php:1470
-#: locale/moduletranslate.php:1517 locale/moduletranslate.php:1553
+#: locale/moduletranslate.php:1262 locale/moduletranslate.php:1304
+#: locale/moduletranslate.php:1346 locale/moduletranslate.php:1395
+#: locale/moduletranslate.php:1444 locale/moduletranslate.php:1491
+#: locale/moduletranslate.php:1538 locale/moduletranslate.php:1574
 msgid ""
 "This is an advanced template which may not work on devices with an older "
 "browser."
 msgstr ""
 
-#: locale/moduletranslate.php:1242 locale/moduletranslate.php:1284
-#: locale/moduletranslate.php:1326 locale/moduletranslate.php:1375
+#: locale/moduletranslate.php:1263 locale/moduletranslate.php:1305
+#: locale/moduletranslate.php:1347 locale/moduletranslate.php:1396
 msgid "First hour slot"
 msgstr ""
 
-#: locale/moduletranslate.php:1243 locale/moduletranslate.php:1285
-#: locale/moduletranslate.php:1327 locale/moduletranslate.php:1376
+#: locale/moduletranslate.php:1264 locale/moduletranslate.php:1306
+#: locale/moduletranslate.php:1348 locale/moduletranslate.php:1397
 msgid ""
 "This view features a grid running from midnight to midnight. Use the first "
 "slot to shorten the time window shown."
 msgstr ""
 
-#: locale/moduletranslate.php:1244 locale/moduletranslate.php:1286
-#: locale/moduletranslate.php:1328 locale/moduletranslate.php:1377
+#: locale/moduletranslate.php:1265 locale/moduletranslate.php:1307
+#: locale/moduletranslate.php:1349 locale/moduletranslate.php:1398
 msgid "Last hour slot"
 msgstr ""
 
-#: locale/moduletranslate.php:1245 locale/moduletranslate.php:1287
-#: locale/moduletranslate.php:1329 locale/moduletranslate.php:1378
+#: locale/moduletranslate.php:1266 locale/moduletranslate.php:1308
+#: locale/moduletranslate.php:1350 locale/moduletranslate.php:1399
 msgid ""
 "This view features a grid running from midnight to midnight. Use the last "
 "slot to shorten the time window shown."
 msgstr ""
 
-#: locale/moduletranslate.php:1246 locale/moduletranslate.php:1288
-#: locale/moduletranslate.php:1334 locale/moduletranslate.php:1381
-#: locale/moduletranslate.php:1426 locale/moduletranslate.php:1473
-#: locale/moduletranslate.php:1520 locale/moduletranslate.php:1556
+#: locale/moduletranslate.php:1267 locale/moduletranslate.php:1309
+#: locale/moduletranslate.php:1355 locale/moduletranslate.php:1402
+#: locale/moduletranslate.php:1447 locale/moduletranslate.php:1494
+#: locale/moduletranslate.php:1541 locale/moduletranslate.php:1577
 msgid "Time Format"
 msgstr ""
 
-#: locale/moduletranslate.php:1247 locale/moduletranslate.php:1289
-#: locale/moduletranslate.php:1335 locale/moduletranslate.php:1382
-#: locale/moduletranslate.php:1427 locale/moduletranslate.php:1474
-#: locale/moduletranslate.php:1521 locale/moduletranslate.php:1557
+#: locale/moduletranslate.php:1268 locale/moduletranslate.php:1310
+#: locale/moduletranslate.php:1356 locale/moduletranslate.php:1403
+#: locale/moduletranslate.php:1448 locale/moduletranslate.php:1495
+#: locale/moduletranslate.php:1542 locale/moduletranslate.php:1578
 msgid "The format to apply to event time (default HH:mm)."
 msgstr ""
 
-#: locale/moduletranslate.php:1250 locale/moduletranslate.php:1292
-#: locale/moduletranslate.php:1330 locale/moduletranslate.php:1385
-#: locale/moduletranslate.php:1430 locale/moduletranslate.php:1477
+#: locale/moduletranslate.php:1271 locale/moduletranslate.php:1313
+#: locale/moduletranslate.php:1351 locale/moduletranslate.php:1406
+#: locale/moduletranslate.php:1451 locale/moduletranslate.php:1498
 msgid "Start at the current time?"
 msgstr ""
 
-#: locale/moduletranslate.php:1251 locale/moduletranslate.php:1293
-#: locale/moduletranslate.php:1331 locale/moduletranslate.php:1386
-#: locale/moduletranslate.php:1431 locale/moduletranslate.php:1478
+#: locale/moduletranslate.php:1272 locale/moduletranslate.php:1314
+#: locale/moduletranslate.php:1352 locale/moduletranslate.php:1407
+#: locale/moduletranslate.php:1452 locale/moduletranslate.php:1499
 msgid ""
 "Should the calendar start at the current time, or at the time of the first "
 "event?"
 msgstr ""
 
-#: locale/moduletranslate.php:1252 locale/moduletranslate.php:1294
-#: locale/moduletranslate.php:1338 locale/moduletranslate.php:1387
-#: locale/moduletranslate.php:1524 locale/moduletranslate.php:1560
+#: locale/moduletranslate.php:1273 locale/moduletranslate.php:1315
+#: locale/moduletranslate.php:1359 locale/moduletranslate.php:1408
+#: locale/moduletranslate.php:1545 locale/moduletranslate.php:1581
 msgid "Show now marker?"
 msgstr ""
 
-#: locale/moduletranslate.php:1253 locale/moduletranslate.php:1295
-#: locale/moduletranslate.php:1339 locale/moduletranslate.php:1388
-#: locale/moduletranslate.php:1525 locale/moduletranslate.php:1561
+#: locale/moduletranslate.php:1274 locale/moduletranslate.php:1316
+#: locale/moduletranslate.php:1360 locale/moduletranslate.php:1409
+#: locale/moduletranslate.php:1546 locale/moduletranslate.php:1582
 msgid "Should the calendar show a marker for the current time?"
 msgstr ""
 
-#: locale/moduletranslate.php:1254 locale/moduletranslate.php:1296
-#: locale/moduletranslate.php:1340 locale/moduletranslate.php:1389
-#: locale/moduletranslate.php:1434 locale/moduletranslate.php:1481
-#: locale/moduletranslate.php:1528 locale/moduletranslate.php:1564
+#: locale/moduletranslate.php:1275 locale/moduletranslate.php:1317
+#: locale/moduletranslate.php:1361 locale/moduletranslate.php:1410
+#: locale/moduletranslate.php:1455 locale/moduletranslate.php:1502
+#: locale/moduletranslate.php:1549 locale/moduletranslate.php:1585
 msgid "Text scale"
 msgstr ""
 
-#: locale/moduletranslate.php:1255 locale/moduletranslate.php:1297
-#: locale/moduletranslate.php:1341 locale/moduletranslate.php:1390
-#: locale/moduletranslate.php:1435 locale/moduletranslate.php:1482
-#: locale/moduletranslate.php:1529 locale/moduletranslate.php:1565
+#: locale/moduletranslate.php:1276 locale/moduletranslate.php:1318
+#: locale/moduletranslate.php:1362 locale/moduletranslate.php:1411
+#: locale/moduletranslate.php:1456 locale/moduletranslate.php:1503
+#: locale/moduletranslate.php:1550 locale/moduletranslate.php:1586
 msgid "Set the scale for the text element on the calendar."
 msgstr ""
 
-#: locale/moduletranslate.php:1256 locale/moduletranslate.php:1298
-#: locale/moduletranslate.php:1347 locale/moduletranslate.php:1396
+#: locale/moduletranslate.php:1277 locale/moduletranslate.php:1319
+#: locale/moduletranslate.php:1368 locale/moduletranslate.php:1417
 msgid "Grid step"
 msgstr ""
 
-#: locale/moduletranslate.php:1257 locale/moduletranslate.php:1299
-#: locale/moduletranslate.php:1348 locale/moduletranslate.php:1397
+#: locale/moduletranslate.php:1278 locale/moduletranslate.php:1320
+#: locale/moduletranslate.php:1369 locale/moduletranslate.php:1418
 msgid "Duration, in minutes, for each row in the grid."
 msgstr ""
 
-#: locale/moduletranslate.php:1259 locale/moduletranslate.php:1301
-#: locale/moduletranslate.php:1350 locale/moduletranslate.php:1399
-#: locale/moduletranslate.php:1442 locale/moduletranslate.php:1489
-#: locale/moduletranslate.php:1531 locale/moduletranslate.php:1567
+#: locale/moduletranslate.php:1280 locale/moduletranslate.php:1322
+#: locale/moduletranslate.php:1371 locale/moduletranslate.php:1420
+#: locale/moduletranslate.php:1463 locale/moduletranslate.php:1510
+#: locale/moduletranslate.php:1552 locale/moduletranslate.php:1588
 msgid "Use the colour pickers to override the element colours."
 msgstr ""
 
-#: locale/moduletranslate.php:1260 locale/moduletranslate.php:1302
-#: locale/moduletranslate.php:1351 locale/moduletranslate.php:1400
-#: locale/moduletranslate.php:1443 locale/moduletranslate.php:1490
-#: locale/moduletranslate.php:1532 locale/moduletranslate.php:1568
+#: locale/moduletranslate.php:1281 locale/moduletranslate.php:1323
+#: locale/moduletranslate.php:1372 locale/moduletranslate.php:1421
+#: locale/moduletranslate.php:1464 locale/moduletranslate.php:1511
+#: locale/moduletranslate.php:1553 locale/moduletranslate.php:1589
 msgid "Grid Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1261 locale/moduletranslate.php:1303
-#: locale/moduletranslate.php:1352 locale/moduletranslate.php:1401
+#: locale/moduletranslate.php:1282 locale/moduletranslate.php:1324
+#: locale/moduletranslate.php:1373 locale/moduletranslate.php:1422
 msgid "Grid Text Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1262 locale/moduletranslate.php:1304
-#: locale/moduletranslate.php:1353 locale/moduletranslate.php:1402
-#: locale/moduletranslate.php:1447 locale/moduletranslate.php:1494
-#: locale/moduletranslate.php:1533 locale/moduletranslate.php:1569
+#: locale/moduletranslate.php:1283 locale/moduletranslate.php:1325
+#: locale/moduletranslate.php:1374 locale/moduletranslate.php:1423
+#: locale/moduletranslate.php:1468 locale/moduletranslate.php:1515
+#: locale/moduletranslate.php:1554 locale/moduletranslate.php:1590
 msgid "Header (Weekdays)"
 msgstr ""
 
-#: locale/moduletranslate.php:1264 locale/moduletranslate.php:1267
-#: locale/moduletranslate.php:1272 locale/moduletranslate.php:1275
-#: locale/moduletranslate.php:1278 locale/moduletranslate.php:1281
-#: locale/moduletranslate.php:1306 locale/moduletranslate.php:1309
-#: locale/moduletranslate.php:1314 locale/moduletranslate.php:1317
-#: locale/moduletranslate.php:1320 locale/moduletranslate.php:1323
-#: locale/moduletranslate.php:1355 locale/moduletranslate.php:1358
-#: locale/moduletranslate.php:1363 locale/moduletranslate.php:1366
-#: locale/moduletranslate.php:1369 locale/moduletranslate.php:1372
-#: locale/moduletranslate.php:1404 locale/moduletranslate.php:1407
-#: locale/moduletranslate.php:1412 locale/moduletranslate.php:1415
-#: locale/moduletranslate.php:1418 locale/moduletranslate.php:1421
-#: locale/moduletranslate.php:1446 locale/moduletranslate.php:1449
-#: locale/moduletranslate.php:1452 locale/moduletranslate.php:1456
-#: locale/moduletranslate.php:1459 locale/moduletranslate.php:1462
-#: locale/moduletranslate.php:1465 locale/moduletranslate.php:1468
-#: locale/moduletranslate.php:1493 locale/moduletranslate.php:1496
-#: locale/moduletranslate.php:1499 locale/moduletranslate.php:1503
-#: locale/moduletranslate.php:1506 locale/moduletranslate.php:1509
-#: locale/moduletranslate.php:1512 locale/moduletranslate.php:1515
-#: locale/moduletranslate.php:1535 locale/moduletranslate.php:1542
-#: locale/moduletranslate.php:1545 locale/moduletranslate.php:1548
-#: locale/moduletranslate.php:1551 locale/moduletranslate.php:1571
-#: locale/moduletranslate.php:1578 locale/moduletranslate.php:1581
-#: locale/moduletranslate.php:1584 locale/moduletranslate.php:1587
+#: locale/moduletranslate.php:1285 locale/moduletranslate.php:1288
+#: locale/moduletranslate.php:1293 locale/moduletranslate.php:1296
+#: locale/moduletranslate.php:1299 locale/moduletranslate.php:1302
+#: locale/moduletranslate.php:1327 locale/moduletranslate.php:1330
+#: locale/moduletranslate.php:1335 locale/moduletranslate.php:1338
+#: locale/moduletranslate.php:1341 locale/moduletranslate.php:1344
+#: locale/moduletranslate.php:1376 locale/moduletranslate.php:1379
+#: locale/moduletranslate.php:1384 locale/moduletranslate.php:1387
+#: locale/moduletranslate.php:1390 locale/moduletranslate.php:1393
+#: locale/moduletranslate.php:1425 locale/moduletranslate.php:1428
+#: locale/moduletranslate.php:1433 locale/moduletranslate.php:1436
+#: locale/moduletranslate.php:1439 locale/moduletranslate.php:1442
+#: locale/moduletranslate.php:1467 locale/moduletranslate.php:1470
+#: locale/moduletranslate.php:1473 locale/moduletranslate.php:1477
+#: locale/moduletranslate.php:1480 locale/moduletranslate.php:1483
+#: locale/moduletranslate.php:1486 locale/moduletranslate.php:1489
+#: locale/moduletranslate.php:1514 locale/moduletranslate.php:1517
+#: locale/moduletranslate.php:1520 locale/moduletranslate.php:1524
+#: locale/moduletranslate.php:1527 locale/moduletranslate.php:1530
+#: locale/moduletranslate.php:1533 locale/moduletranslate.php:1536
+#: locale/moduletranslate.php:1556 locale/moduletranslate.php:1563
+#: locale/moduletranslate.php:1566 locale/moduletranslate.php:1569
+#: locale/moduletranslate.php:1572 locale/moduletranslate.php:1592
+#: locale/moduletranslate.php:1599 locale/moduletranslate.php:1602
+#: locale/moduletranslate.php:1605 locale/moduletranslate.php:1608
 msgid "Text Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1265 locale/moduletranslate.php:1307
-#: locale/moduletranslate.php:1356 locale/moduletranslate.php:1405
-#: locale/moduletranslate.php:1450 locale/moduletranslate.php:1497
-#: locale/moduletranslate.php:1536 locale/moduletranslate.php:1572
+#: locale/moduletranslate.php:1286 locale/moduletranslate.php:1328
+#: locale/moduletranslate.php:1377 locale/moduletranslate.php:1426
+#: locale/moduletranslate.php:1471 locale/moduletranslate.php:1518
+#: locale/moduletranslate.php:1557 locale/moduletranslate.php:1593
 msgid "Calendar Days"
 msgstr ""
 
-#: locale/moduletranslate.php:1268 locale/moduletranslate.php:1310
-#: locale/moduletranslate.php:1359 locale/moduletranslate.php:1408
-#: locale/moduletranslate.php:1453 locale/moduletranslate.php:1500
-#: locale/moduletranslate.php:1538 locale/moduletranslate.php:1574
+#: locale/moduletranslate.php:1289 locale/moduletranslate.php:1331
+#: locale/moduletranslate.php:1380 locale/moduletranslate.php:1429
+#: locale/moduletranslate.php:1474 locale/moduletranslate.php:1521
+#: locale/moduletranslate.php:1559 locale/moduletranslate.php:1595
 msgid "Current day text Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1269 locale/moduletranslate.php:1311
-#: locale/moduletranslate.php:1360 locale/moduletranslate.php:1409
-#: locale/moduletranslate.php:1539 locale/moduletranslate.php:1575
+#: locale/moduletranslate.php:1290 locale/moduletranslate.php:1332
+#: locale/moduletranslate.php:1381 locale/moduletranslate.php:1430
+#: locale/moduletranslate.php:1560 locale/moduletranslate.php:1596
 msgid "Now marker Colour"
 msgstr ""
 
-#: locale/moduletranslate.php:1270 locale/moduletranslate.php:1312
-#: locale/moduletranslate.php:1361 locale/moduletranslate.php:1410
-#: locale/moduletranslate.php:1457 locale/moduletranslate.php:1504
-#: locale/moduletranslate.php:1540 locale/moduletranslate.php:1576
+#: locale/moduletranslate.php:1291 locale/moduletranslate.php:1333
+#: locale/moduletranslate.php:1382 locale/moduletranslate.php:1431
+#: locale/moduletranslate.php:1478 locale/moduletranslate.php:1525
+#: locale/moduletranslate.php:1561 locale/moduletranslate.php:1597
 msgid "Events"
 msgstr ""
 
-#: locale/moduletranslate.php:1273 locale/moduletranslate.php:1315
-#: locale/moduletranslate.php:1364 locale/moduletranslate.php:1413
-#: locale/moduletranslate.php:1460 locale/moduletranslate.php:1507
-#: locale/moduletranslate.php:1543 locale/moduletranslate.php:1579
+#: locale/moduletranslate.php:1294 locale/moduletranslate.php:1336
+#: locale/moduletranslate.php:1385 locale/moduletranslate.php:1434
+#: locale/moduletranslate.php:1481 locale/moduletranslate.php:1528
+#: locale/moduletranslate.php:1564 locale/moduletranslate.php:1600
 msgid "All day events"
 msgstr ""
 
-#: locale/moduletranslate.php:1276 locale/moduletranslate.php:1318
-#: locale/moduletranslate.php:1367 locale/moduletranslate.php:1416
-#: locale/moduletranslate.php:1463 locale/moduletranslate.php:1510
-#: locale/moduletranslate.php:1546 locale/moduletranslate.php:1582
+#: locale/moduletranslate.php:1297 locale/moduletranslate.php:1339
+#: locale/moduletranslate.php:1388 locale/moduletranslate.php:1437
+#: locale/moduletranslate.php:1484 locale/moduletranslate.php:1531
+#: locale/moduletranslate.php:1567 locale/moduletranslate.php:1603
 msgid "Multiple days events"
 msgstr ""
 
-#: locale/moduletranslate.php:1279 locale/moduletranslate.php:1321
-#: locale/moduletranslate.php:1370 locale/moduletranslate.php:1419
-#: locale/moduletranslate.php:1466 locale/moduletranslate.php:1513
+#: locale/moduletranslate.php:1300 locale/moduletranslate.php:1342
+#: locale/moduletranslate.php:1391 locale/moduletranslate.php:1440
+#: locale/moduletranslate.php:1487 locale/moduletranslate.php:1534
 msgid "Aditional days container"
 msgstr ""
 
-#: locale/moduletranslate.php:1282
+#: locale/moduletranslate.php:1303
 msgid "Daily Calendar - Dark"
 msgstr ""
 
-#: locale/moduletranslate.php:1324
+#: locale/moduletranslate.php:1345
 msgid "Weekly Calendar - Light"
 msgstr ""
 
-#: locale/moduletranslate.php:1332 locale/moduletranslate.php:1379
-#: locale/moduletranslate.php:1424 locale/moduletranslate.php:1471
+#: locale/moduletranslate.php:1353 locale/moduletranslate.php:1400
+#: locale/moduletranslate.php:1445 locale/moduletranslate.php:1492
 msgid "Exclude weekend days?"
 msgstr ""
 
-#: locale/moduletranslate.php:1333 locale/moduletranslate.php:1380
-#: locale/moduletranslate.php:1425 locale/moduletranslate.php:1472
+#: locale/moduletranslate.php:1354 locale/moduletranslate.php:1401
+#: locale/moduletranslate.php:1446 locale/moduletranslate.php:1493
 msgid "Saturdays and Sundays wont be shown."
 msgstr ""
 
-#: locale/moduletranslate.php:1342 locale/moduletranslate.php:1391
-#: locale/moduletranslate.php:1436 locale/moduletranslate.php:1483
+#: locale/moduletranslate.php:1363 locale/moduletranslate.php:1412
+#: locale/moduletranslate.php:1457 locale/moduletranslate.php:1504
 msgid "Week name length"
 msgstr ""
 
-#: locale/moduletranslate.php:1343 locale/moduletranslate.php:1392
-#: locale/moduletranslate.php:1437 locale/moduletranslate.php:1484
+#: locale/moduletranslate.php:1364 locale/moduletranslate.php:1413
+#: locale/moduletranslate.php:1458 locale/moduletranslate.php:1505
 msgid "Please select the length for the week names."
 msgstr ""
 
-#: locale/moduletranslate.php:1344 locale/moduletranslate.php:1393
-#: locale/moduletranslate.php:1438 locale/moduletranslate.php:1485
+#: locale/moduletranslate.php:1365 locale/moduletranslate.php:1414
+#: locale/moduletranslate.php:1459 locale/moduletranslate.php:1506
 msgid "Short"
 msgstr ""
 
-#: locale/moduletranslate.php:1345 locale/moduletranslate.php:1394
-#: locale/moduletranslate.php:1439 locale/moduletranslate.php:1486
+#: locale/moduletranslate.php:1366 locale/moduletranslate.php:1415
+#: locale/moduletranslate.php:1460 locale/moduletranslate.php:1507
 msgid "Medium"
 msgstr ""
 
-#: locale/moduletranslate.php:1346 locale/moduletranslate.php:1395
-#: locale/moduletranslate.php:1440 locale/moduletranslate.php:1487
+#: locale/moduletranslate.php:1367 locale/moduletranslate.php:1416
+#: locale/moduletranslate.php:1461 locale/moduletranslate.php:1508
 msgid "Long"
 msgstr ""
 
-#: locale/moduletranslate.php:1373
+#: locale/moduletranslate.php:1394
 msgid "Weekly Calendar - Dark"
 msgstr ""
 
-#: locale/moduletranslate.php:1422
+#: locale/moduletranslate.php:1443
 msgid "Monthly Calendar - Light"
 msgstr ""
 
-#: locale/moduletranslate.php:1432 locale/moduletranslate.php:1479
+#: locale/moduletranslate.php:1453 locale/moduletranslate.php:1500
 #: locale/dbtranslate.php:145
 msgid "Show header?"
 msgstr ""
 
-#: locale/moduletranslate.php:1433 locale/moduletranslate.php:1480
+#: locale/moduletranslate.php:1454 locale/moduletranslate.php:1501
 msgid "Should the selected template have a header?"
 msgstr ""
 
-#: locale/moduletranslate.php:1444 locale/moduletranslate.php:1491
+#: locale/moduletranslate.php:1465 locale/moduletranslate.php:1512
 msgid "Header (Month)"
 msgstr ""
 
-#: locale/moduletranslate.php:1454 locale/moduletranslate.php:1501
+#: locale/moduletranslate.php:1475 locale/moduletranslate.php:1522
 msgid "Other Month Days"
 msgstr ""
 
-#: locale/moduletranslate.php:1469
+#: locale/moduletranslate.php:1490
 msgid "Monthly Calendar - Dark"
 msgstr ""
 
-#: locale/moduletranslate.php:1516
+#: locale/moduletranslate.php:1537
 msgid "Schedule Calendar - Light"
 msgstr ""
 
-#: locale/moduletranslate.php:1518 locale/moduletranslate.php:1549
-#: locale/moduletranslate.php:1554 locale/moduletranslate.php:1585
+#: locale/moduletranslate.php:1539 locale/moduletranslate.php:1570
+#: locale/moduletranslate.php:1575 locale/moduletranslate.php:1606
 msgid "No events message"
 msgstr ""
 
-#: locale/moduletranslate.php:1519 locale/moduletranslate.php:1555
+#: locale/moduletranslate.php:1540 locale/moduletranslate.php:1576
 msgid "Message to be shown if no events are returned."
 msgstr ""
 
-#: locale/moduletranslate.php:1526 locale/moduletranslate.php:1562
+#: locale/moduletranslate.php:1547 locale/moduletranslate.php:1583
 msgid "Show event description?"
 msgstr ""
 
-#: locale/moduletranslate.php:1527 locale/moduletranslate.php:1563
+#: locale/moduletranslate.php:1548 locale/moduletranslate.php:1584
 msgid "Should events with descriptions display them?"
 msgstr ""
 
-#: locale/moduletranslate.php:1552
+#: locale/moduletranslate.php:1573
 msgid "Schedule Calendar - Dark"
 msgstr ""
 
-#: locale/moduletranslate.php:1589
+#: locale/moduletranslate.php:1610
 msgid "Temperature"
 msgstr ""
 
-#: locale/moduletranslate.php:1590
+#: locale/moduletranslate.php:1611
 msgid "Min. Temperature"
 msgstr ""
 
-#: locale/moduletranslate.php:1591
+#: locale/moduletranslate.php:1612
 msgid "Max. Temperature"
 msgstr ""
 
-#: locale/moduletranslate.php:1592
+#: locale/moduletranslate.php:1613
 msgid "Humidity Percent"
 msgstr ""
 
-#: locale/moduletranslate.php:1593
+#: locale/moduletranslate.php:1614
 msgid "Icon"
 msgstr ""
 
-#: locale/moduletranslate.php:1594 locale/moduletranslate.php:2117
-#: locale/moduletranslate.php:2153 locale/moduletranslate.php:2294
-#: locale/moduletranslate.php:2308
+#: locale/moduletranslate.php:1615 locale/moduletranslate.php:2174
+#: locale/moduletranslate.php:2210 locale/moduletranslate.php:2351
+#: locale/moduletranslate.php:2365
 msgid "Font Color"
 msgstr ""
 
-#: locale/moduletranslate.php:1596
+#: locale/moduletranslate.php:1617
 msgid "Wind Direction"
 msgstr ""
 
-#: locale/moduletranslate.php:1597
+#: locale/moduletranslate.php:1618
 msgid "Wind Speed"
 msgstr ""
 
-#: locale/moduletranslate.php:1598
+#: locale/moduletranslate.php:1619
 msgid "Wind Speed Unit"
 msgstr ""
 
-#: locale/moduletranslate.php:1599
+#: locale/moduletranslate.php:1620
 msgid "Attribution"
 msgstr ""
 
-#: locale/moduletranslate.php:1600 locale/moduletranslate.php:1624
-#: locale/moduletranslate.php:1651 locale/moduletranslate.php:1678
-#: locale/moduletranslate.php:1711 locale/moduletranslate.php:1744
-#: locale/moduletranslate.php:1769 locale/moduletranslate.php:1794
-#: locale/moduletranslate.php:1821 locale/moduletranslate.php:1846
-#: locale/moduletranslate.php:1877 locale/moduletranslate.php:1908
-#: locale/moduletranslate.php:1937 locale/moduletranslate.php:1962
-#: locale/moduletranslate.php:1987 locale/moduletranslate.php:2018
-#: locale/moduletranslate.php:2049 locale/moduletranslate.php:2072
-#: locale/moduletranslate.php:2095
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1405
+#: locale/moduletranslate.php:1621 locale/moduletranslate.php:1654
+#: locale/moduletranslate.php:1681 locale/moduletranslate.php:1708
+#: locale/moduletranslate.php:1735 locale/moduletranslate.php:1768
+#: locale/moduletranslate.php:1801 locale/moduletranslate.php:1826
+#: locale/moduletranslate.php:1851 locale/moduletranslate.php:1878
+#: locale/moduletranslate.php:1903 locale/moduletranslate.php:1934
+#: locale/moduletranslate.php:1965 locale/moduletranslate.php:1994
+#: locale/moduletranslate.php:2019 locale/moduletranslate.php:2044
+#: locale/moduletranslate.php:2075 locale/moduletranslate.php:2106
+#: locale/moduletranslate.php:2129 locale/moduletranslate.php:2152
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1370
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:121
 msgid "Background Image"
 msgstr ""
 
-#: locale/moduletranslate.php:1601 locale/moduletranslate.php:2200
-#: locale/moduletranslate.php:2225
-msgid "Round Border"
-msgstr ""
-
-#: locale/moduletranslate.php:1602 locale/moduletranslate.php:2201
-#: locale/moduletranslate.php:2226
-msgid "Should the square have rounded corners?"
-msgstr ""
-
-#: locale/moduletranslate.php:1603 locale/moduletranslate.php:2202
-#: locale/moduletranslate.php:2227
-msgid "Border Radius"
-msgstr ""
-
-#: locale/moduletranslate.php:1611
-msgid "Current Forecast Template"
-msgstr ""
-
-#: locale/moduletranslate.php:1612
-msgid "Daily Forecast Template"
+#: locale/moduletranslate.php:1622
+msgid "Select from Library"
 msgstr ""
 
-#: locale/moduletranslate.php:1613
-msgid "CSS Style Sheet"
+#: locale/moduletranslate.php:1623
+msgid "Should the background image be coming from library?"
 msgstr ""
 
-#: locale/moduletranslate.php:1615 locale/moduletranslate.php:1812
-msgid "Landscape - Current day, 4 day forecast"
+#: locale/moduletranslate.php:1624
+msgid "Background from Library"
 msgstr ""
 
-#: locale/moduletranslate.php:1616 locale/moduletranslate.php:1643
-#: locale/moduletranslate.php:1670 locale/moduletranslate.php:1697
-#: locale/moduletranslate.php:1730 locale/moduletranslate.php:1763
-#: locale/moduletranslate.php:1788 locale/moduletranslate.php:1813
-#: locale/moduletranslate.php:1840 locale/moduletranslate.php:1865
-#: locale/moduletranslate.php:1896 locale/moduletranslate.php:1927
-#: locale/moduletranslate.php:1956 locale/moduletranslate.php:1981
-#: locale/moduletranslate.php:2006 locale/moduletranslate.php:2037
-#: locale/moduletranslate.php:2091 locale/moduletranslate.php:2113
-#: locale/moduletranslate.php:2114 locale/dbtranslate.php:48
-#: lib/Widget/DataType/SocialMedia.php:65
-msgid "Text"
+#: locale/moduletranslate.php:1640 locale/moduletranslate.php:2257
+#: locale/moduletranslate.php:2282
+msgid "Round Border"
 msgstr ""
 
-#: locale/moduletranslate.php:1618 locale/moduletranslate.php:1645
-#: locale/moduletranslate.php:1672 locale/moduletranslate.php:1699
-#: locale/moduletranslate.php:1732 locale/moduletranslate.php:1765
-#: locale/moduletranslate.php:1790 locale/moduletranslate.php:1815
-#: locale/moduletranslate.php:1842 locale/moduletranslate.php:1867
-#: locale/moduletranslate.php:1898 locale/moduletranslate.php:1929
-#: locale/moduletranslate.php:1958 locale/moduletranslate.php:1983
-#: locale/moduletranslate.php:2008 locale/moduletranslate.php:2039
-#: locale/moduletranslate.php:2093
-msgid "Icons"
+#: locale/moduletranslate.php:1641 locale/moduletranslate.php:2258
+#: locale/moduletranslate.php:2283
+msgid "Should the square have rounded corners?"
 msgstr ""
 
-#: locale/moduletranslate.php:1619 locale/moduletranslate.php:1646
-#: locale/moduletranslate.php:1673 locale/moduletranslate.php:1700
-#: locale/moduletranslate.php:1733 locale/moduletranslate.php:1766
-#: locale/moduletranslate.php:1791 locale/moduletranslate.php:1816
-#: locale/moduletranslate.php:1843 locale/moduletranslate.php:1868
-#: locale/moduletranslate.php:1899 locale/moduletranslate.php:1930
-#: locale/moduletranslate.php:1959 locale/moduletranslate.php:1984
-#: locale/moduletranslate.php:2009 locale/moduletranslate.php:2040
-#: locale/moduletranslate.php:2094
-msgid "The color of the icons"
+#: locale/moduletranslate.php:1642 locale/moduletranslate.php:2259
+#: locale/moduletranslate.php:2284
+msgid "Border Radius"
 msgstr ""
 
-#: locale/moduletranslate.php:1621 locale/moduletranslate.php:1648
-#: locale/moduletranslate.php:1675 locale/moduletranslate.php:1702
-#: locale/moduletranslate.php:1735 locale/moduletranslate.php:1768
-#: locale/moduletranslate.php:1793 locale/moduletranslate.php:1818
-#: locale/moduletranslate.php:1845 locale/moduletranslate.php:1870
-#: locale/moduletranslate.php:1901 locale/moduletranslate.php:1932
-#: locale/moduletranslate.php:1961 locale/moduletranslate.php:1986
-#: locale/moduletranslate.php:2011 locale/moduletranslate.php:2042
-msgid "The color of the background"
+#: locale/moduletranslate.php:1650
+msgid "Current Forecast Template"
 msgstr ""
 
-#: locale/moduletranslate.php:1622 locale/moduletranslate.php:1649
-#: locale/moduletranslate.php:1676 locale/moduletranslate.php:1703
-#: locale/moduletranslate.php:1736 locale/moduletranslate.php:1819
-#: locale/moduletranslate.php:1871 locale/moduletranslate.php:1902
-msgid "Shadow"
+#: locale/moduletranslate.php:1651
+msgid "Daily Forecast Template"
 msgstr ""
 
-#: locale/moduletranslate.php:1623 locale/moduletranslate.php:1650
-#: locale/moduletranslate.php:1677 locale/moduletranslate.php:1704
-#: locale/moduletranslate.php:1737 locale/moduletranslate.php:1820
-#: locale/moduletranslate.php:1872 locale/moduletranslate.php:1903
-msgid "The color of the shadow"
+#: locale/moduletranslate.php:1652
+msgid "CSS Style Sheet"
 msgstr ""
 
-#: locale/moduletranslate.php:1625 locale/moduletranslate.php:1652
-#: locale/moduletranslate.php:1679 locale/moduletranslate.php:1712
-#: locale/moduletranslate.php:1745 locale/moduletranslate.php:1770
-#: locale/moduletranslate.php:1795 locale/moduletranslate.php:1822
-#: locale/moduletranslate.php:1847 locale/moduletranslate.php:1878
-#: locale/moduletranslate.php:1909 locale/moduletranslate.php:1938
-#: locale/moduletranslate.php:1963 locale/moduletranslate.php:1988
-#: locale/moduletranslate.php:2019 locale/moduletranslate.php:2050
-#: locale/moduletranslate.php:2073 locale/moduletranslate.php:2096
+#: locale/moduletranslate.php:1655 locale/moduletranslate.php:1682
+#: locale/moduletranslate.php:1709 locale/moduletranslate.php:1736
+#: locale/moduletranslate.php:1769 locale/moduletranslate.php:1802
+#: locale/moduletranslate.php:1827 locale/moduletranslate.php:1852
+#: locale/moduletranslate.php:1879 locale/moduletranslate.php:1904
+#: locale/moduletranslate.php:1935 locale/moduletranslate.php:1966
+#: locale/moduletranslate.php:1995 locale/moduletranslate.php:2020
+#: locale/moduletranslate.php:2045 locale/moduletranslate.php:2076
+#: locale/moduletranslate.php:2107 locale/moduletranslate.php:2130
+#: locale/moduletranslate.php:2153
 msgid "The background image to use"
 msgstr ""
 
-#: locale/moduletranslate.php:1626 locale/moduletranslate.php:1653
-#: locale/moduletranslate.php:1680 locale/moduletranslate.php:1713
-#: locale/moduletranslate.php:1746 locale/moduletranslate.php:1771
-#: locale/moduletranslate.php:1796 locale/moduletranslate.php:1823
-#: locale/moduletranslate.php:1848 locale/moduletranslate.php:1879
-#: locale/moduletranslate.php:1910 locale/moduletranslate.php:1939
-#: locale/moduletranslate.php:1964 locale/moduletranslate.php:1989
-#: locale/moduletranslate.php:2020 locale/moduletranslate.php:2051
-#: locale/moduletranslate.php:2074 locale/moduletranslate.php:2097
+#: locale/moduletranslate.php:1656 locale/moduletranslate.php:1683
+#: locale/moduletranslate.php:1710 locale/moduletranslate.php:1737
+#: locale/moduletranslate.php:1770 locale/moduletranslate.php:1803
+#: locale/moduletranslate.php:1828 locale/moduletranslate.php:1853
+#: locale/moduletranslate.php:1880 locale/moduletranslate.php:1905
+#: locale/moduletranslate.php:1936 locale/moduletranslate.php:1967
+#: locale/moduletranslate.php:1996 locale/moduletranslate.php:2021
+#: locale/moduletranslate.php:2046 locale/moduletranslate.php:2077
+#: locale/moduletranslate.php:2108 locale/moduletranslate.php:2131
+#: locale/moduletranslate.php:2154
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:572
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:322
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:556
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:628
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:295
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:529
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2594
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2475
 #: cache/38/38e5186bcfa9917c4ec02d8c626e2552.php:361
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:400
 msgid "None"
 msgstr ""
 
-#: locale/moduletranslate.php:1629 locale/moduletranslate.php:1656
-#: locale/moduletranslate.php:1683 locale/moduletranslate.php:1716
-#: locale/moduletranslate.php:1749 locale/moduletranslate.php:1774
-#: locale/moduletranslate.php:1799 locale/moduletranslate.php:1826
-#: locale/moduletranslate.php:1851 locale/moduletranslate.php:1882
-#: locale/moduletranslate.php:1913 locale/moduletranslate.php:1942
-#: locale/moduletranslate.php:1967 locale/moduletranslate.php:1992
-#: locale/moduletranslate.php:2023 locale/moduletranslate.php:2054
-#: locale/moduletranslate.php:2077 locale/moduletranslate.php:2100
-#: locale/moduletranslate.php:2140 locale/moduletranslate.php:2174
-#: locale/moduletranslate.php:2299 locale/moduletranslate.php:2315
-#: locale/moduletranslate.php:2364 locale/moduletranslate.php:2387
-#: locale/moduletranslate.php:2410 locale/moduletranslate.php:2433
-#: locale/moduletranslate.php:2456 locale/moduletranslate.php:2479
-#: locale/moduletranslate.php:2502 locale/moduletranslate.php:2525
-#: locale/moduletranslate.php:2548 locale/moduletranslate.php:2571
-#: locale/moduletranslate.php:2594 locale/moduletranslate.php:2617
-#: locale/moduletranslate.php:2640 locale/moduletranslate.php:2674
+#: locale/moduletranslate.php:1659 locale/moduletranslate.php:1686
+#: locale/moduletranslate.php:1713 locale/moduletranslate.php:1740
+#: locale/moduletranslate.php:1773 locale/moduletranslate.php:1806
+#: locale/moduletranslate.php:1831 locale/moduletranslate.php:1856
+#: locale/moduletranslate.php:1883 locale/moduletranslate.php:1908
+#: locale/moduletranslate.php:1939 locale/moduletranslate.php:1970
+#: locale/moduletranslate.php:1999 locale/moduletranslate.php:2024
+#: locale/moduletranslate.php:2049 locale/moduletranslate.php:2080
+#: locale/moduletranslate.php:2111 locale/moduletranslate.php:2134
+#: locale/moduletranslate.php:2157 locale/moduletranslate.php:2197
+#: locale/moduletranslate.php:2231 locale/moduletranslate.php:2356
+#: locale/moduletranslate.php:2372 locale/moduletranslate.php:2421
+#: locale/moduletranslate.php:2444 locale/moduletranslate.php:2467
+#: locale/moduletranslate.php:2490 locale/moduletranslate.php:2513
+#: locale/moduletranslate.php:2536 locale/moduletranslate.php:2559
+#: locale/moduletranslate.php:2582 locale/moduletranslate.php:2605
+#: locale/moduletranslate.php:2628 locale/moduletranslate.php:2651
+#: locale/moduletranslate.php:2674 locale/moduletranslate.php:2697
+#: locale/moduletranslate.php:2731
 msgid "Center"
 msgstr ""
 
-#: locale/moduletranslate.php:1630 locale/moduletranslate.php:1657
-#: locale/moduletranslate.php:1684 locale/moduletranslate.php:1717
-#: locale/moduletranslate.php:1750 locale/moduletranslate.php:1775
-#: locale/moduletranslate.php:1800 locale/moduletranslate.php:1827
-#: locale/moduletranslate.php:1852 locale/moduletranslate.php:1883
-#: locale/moduletranslate.php:1914 locale/moduletranslate.php:1943
-#: locale/moduletranslate.php:1968 locale/moduletranslate.php:1993
-#: locale/moduletranslate.php:2024 locale/moduletranslate.php:2055
-#: locale/moduletranslate.php:2078 locale/moduletranslate.php:2101
+#: locale/moduletranslate.php:1660 locale/moduletranslate.php:1687
+#: locale/moduletranslate.php:1714 locale/moduletranslate.php:1741
+#: locale/moduletranslate.php:1774 locale/moduletranslate.php:1807
+#: locale/moduletranslate.php:1832 locale/moduletranslate.php:1857
+#: locale/moduletranslate.php:1884 locale/moduletranslate.php:1909
+#: locale/moduletranslate.php:1940 locale/moduletranslate.php:1971
+#: locale/moduletranslate.php:2000 locale/moduletranslate.php:2025
+#: locale/moduletranslate.php:2050 locale/moduletranslate.php:2081
+#: locale/moduletranslate.php:2112 locale/moduletranslate.php:2135
+#: locale/moduletranslate.php:2158
 msgid "Backgrounds"
 msgstr ""
 
-#: locale/moduletranslate.php:1631 locale/moduletranslate.php:1658
-#: locale/moduletranslate.php:1685 locale/moduletranslate.php:1718
-#: locale/moduletranslate.php:1751 locale/moduletranslate.php:1776
-#: locale/moduletranslate.php:1801 locale/moduletranslate.php:1828
-#: locale/moduletranslate.php:1853 locale/moduletranslate.php:1884
-#: locale/moduletranslate.php:1915 locale/moduletranslate.php:1944
-#: locale/moduletranslate.php:1969 locale/moduletranslate.php:1994
-#: locale/moduletranslate.php:2025 locale/moduletranslate.php:2056
-#: locale/moduletranslate.php:2079 locale/moduletranslate.php:2102
+#: locale/moduletranslate.php:1661 locale/moduletranslate.php:1688
+#: locale/moduletranslate.php:1715 locale/moduletranslate.php:1742
+#: locale/moduletranslate.php:1775 locale/moduletranslate.php:1808
+#: locale/moduletranslate.php:1833 locale/moduletranslate.php:1858
+#: locale/moduletranslate.php:1885 locale/moduletranslate.php:1910
+#: locale/moduletranslate.php:1941 locale/moduletranslate.php:1972
+#: locale/moduletranslate.php:2001 locale/moduletranslate.php:2026
+#: locale/moduletranslate.php:2051 locale/moduletranslate.php:2082
+#: locale/moduletranslate.php:2113 locale/moduletranslate.php:2136
+#: locale/moduletranslate.php:2159
 msgid ""
 "Select images from the media library to replace the default weather "
 "backgrounds."
 msgstr ""
 
-#: locale/moduletranslate.php:1632 locale/moduletranslate.php:1659
-#: locale/moduletranslate.php:1686 locale/moduletranslate.php:1719
-#: locale/moduletranslate.php:1752 locale/moduletranslate.php:1777
-#: locale/moduletranslate.php:1802 locale/moduletranslate.php:1829
-#: locale/moduletranslate.php:1854 locale/moduletranslate.php:1885
-#: locale/moduletranslate.php:1916 locale/moduletranslate.php:1945
-#: locale/moduletranslate.php:1970 locale/moduletranslate.php:1995
-#: locale/moduletranslate.php:2026 locale/moduletranslate.php:2057
-#: locale/moduletranslate.php:2080 locale/moduletranslate.php:2103
-msgid "Cloudy"
+#: locale/moduletranslate.php:1662 locale/moduletranslate.php:1689
+#: locale/moduletranslate.php:1716 locale/moduletranslate.php:1743
+#: locale/moduletranslate.php:1776 locale/moduletranslate.php:1809
+#: locale/moduletranslate.php:1834 locale/moduletranslate.php:1859
+#: locale/moduletranslate.php:1886 locale/moduletranslate.php:1911
+#: locale/moduletranslate.php:1942 locale/moduletranslate.php:1973
+#: locale/moduletranslate.php:2002 locale/moduletranslate.php:2027
+#: locale/moduletranslate.php:2052 locale/moduletranslate.php:2083
+#: locale/moduletranslate.php:2114 locale/moduletranslate.php:2137
+#: locale/moduletranslate.php:2160
+msgid "Cloudy"
+msgstr ""
+
+#: locale/moduletranslate.php:1663 locale/moduletranslate.php:1690
+#: locale/moduletranslate.php:1717 locale/moduletranslate.php:1744
+#: locale/moduletranslate.php:1777 locale/moduletranslate.php:1810
+#: locale/moduletranslate.php:1835 locale/moduletranslate.php:1860
+#: locale/moduletranslate.php:1887 locale/moduletranslate.php:1912
+#: locale/moduletranslate.php:1943 locale/moduletranslate.php:1974
+#: locale/moduletranslate.php:2003 locale/moduletranslate.php:2028
+#: locale/moduletranslate.php:2053 locale/moduletranslate.php:2084
+#: locale/moduletranslate.php:2115 locale/moduletranslate.php:2138
+#: locale/moduletranslate.php:2161
+msgid "Cloudy day"
+msgstr ""
+
+#: locale/moduletranslate.php:1664 locale/moduletranslate.php:1691
+#: locale/moduletranslate.php:1718 locale/moduletranslate.php:1745
+#: locale/moduletranslate.php:1778 locale/moduletranslate.php:1811
+#: locale/moduletranslate.php:1836 locale/moduletranslate.php:1861
+#: locale/moduletranslate.php:1888 locale/moduletranslate.php:1913
+#: locale/moduletranslate.php:1944 locale/moduletranslate.php:1975
+#: locale/moduletranslate.php:2004 locale/moduletranslate.php:2029
+#: locale/moduletranslate.php:2054 locale/moduletranslate.php:2085
+#: locale/moduletranslate.php:2116 locale/moduletranslate.php:2139
+#: locale/moduletranslate.php:2162
+#: cache/eb/eb722a59dac7c3fddd70255e2c4c5f1d.php:69
+msgid "Clear"
+msgstr ""
+
+#: locale/moduletranslate.php:1665 locale/moduletranslate.php:1692
+#: locale/moduletranslate.php:1719 locale/moduletranslate.php:1746
+#: locale/moduletranslate.php:1779 locale/moduletranslate.php:1812
+#: locale/moduletranslate.php:1837 locale/moduletranslate.php:1862
+#: locale/moduletranslate.php:1889 locale/moduletranslate.php:1914
+#: locale/moduletranslate.php:1945 locale/moduletranslate.php:1976
+#: locale/moduletranslate.php:2005 locale/moduletranslate.php:2030
+#: locale/moduletranslate.php:2055 locale/moduletranslate.php:2086
+#: locale/moduletranslate.php:2117 locale/moduletranslate.php:2140
+#: locale/moduletranslate.php:2163
+msgid "Fog"
+msgstr ""
+
+#: locale/moduletranslate.php:1666 locale/moduletranslate.php:1693
+#: locale/moduletranslate.php:1720 locale/moduletranslate.php:1747
+#: locale/moduletranslate.php:1780 locale/moduletranslate.php:1813
+#: locale/moduletranslate.php:1838 locale/moduletranslate.php:1863
+#: locale/moduletranslate.php:1890 locale/moduletranslate.php:1915
+#: locale/moduletranslate.php:1946 locale/moduletranslate.php:1977
+#: locale/moduletranslate.php:2006 locale/moduletranslate.php:2031
+#: locale/moduletranslate.php:2056 locale/moduletranslate.php:2087
+#: locale/moduletranslate.php:2118 locale/moduletranslate.php:2141
+#: locale/moduletranslate.php:2164
+msgid "Hail"
+msgstr ""
+
+#: locale/moduletranslate.php:1667 locale/moduletranslate.php:1694
+#: locale/moduletranslate.php:1721 locale/moduletranslate.php:1748
+#: locale/moduletranslate.php:1781 locale/moduletranslate.php:1814
+#: locale/moduletranslate.php:1839 locale/moduletranslate.php:1864
+#: locale/moduletranslate.php:1891 locale/moduletranslate.php:1916
+#: locale/moduletranslate.php:1947 locale/moduletranslate.php:1978
+#: locale/moduletranslate.php:2007 locale/moduletranslate.php:2032
+#: locale/moduletranslate.php:2057 locale/moduletranslate.php:2088
+#: locale/moduletranslate.php:2119 locale/moduletranslate.php:2142
+#: locale/moduletranslate.php:2165
+msgid "Clear night"
+msgstr ""
+
+#: locale/moduletranslate.php:1668 locale/moduletranslate.php:1695
+#: locale/moduletranslate.php:1722 locale/moduletranslate.php:1749
+#: locale/moduletranslate.php:1782 locale/moduletranslate.php:1815
+#: locale/moduletranslate.php:1840 locale/moduletranslate.php:1865
+#: locale/moduletranslate.php:1892 locale/moduletranslate.php:1917
+#: locale/moduletranslate.php:1948 locale/moduletranslate.php:1979
+#: locale/moduletranslate.php:2008 locale/moduletranslate.php:2033
+#: locale/moduletranslate.php:2058 locale/moduletranslate.php:2089
+#: locale/moduletranslate.php:2120 locale/moduletranslate.php:2143
+#: locale/moduletranslate.php:2166
+msgid "Cloudy night"
+msgstr ""
+
+#: locale/moduletranslate.php:1669 locale/moduletranslate.php:1696
+#: locale/moduletranslate.php:1723 locale/moduletranslate.php:1750
+#: locale/moduletranslate.php:1783 locale/moduletranslate.php:1816
+#: locale/moduletranslate.php:1841 locale/moduletranslate.php:1866
+#: locale/moduletranslate.php:1893 locale/moduletranslate.php:1918
+#: locale/moduletranslate.php:1949 locale/moduletranslate.php:1980
+#: locale/moduletranslate.php:2009 locale/moduletranslate.php:2034
+#: locale/moduletranslate.php:2059 locale/moduletranslate.php:2090
+#: locale/moduletranslate.php:2121 locale/moduletranslate.php:2144
+#: locale/moduletranslate.php:2167
+msgid "Raining"
 msgstr ""
 
-#: locale/moduletranslate.php:1633 locale/moduletranslate.php:1660
-#: locale/moduletranslate.php:1687 locale/moduletranslate.php:1720
-#: locale/moduletranslate.php:1753 locale/moduletranslate.php:1778
-#: locale/moduletranslate.php:1803 locale/moduletranslate.php:1830
-#: locale/moduletranslate.php:1855 locale/moduletranslate.php:1886
-#: locale/moduletranslate.php:1917 locale/moduletranslate.php:1946
-#: locale/moduletranslate.php:1971 locale/moduletranslate.php:1996
-#: locale/moduletranslate.php:2027 locale/moduletranslate.php:2058
-#: locale/moduletranslate.php:2081 locale/moduletranslate.php:2104
-msgid "Cloudy day"
+#: locale/moduletranslate.php:1670 locale/moduletranslate.php:1697
+#: locale/moduletranslate.php:1724 locale/moduletranslate.php:1751
+#: locale/moduletranslate.php:1784 locale/moduletranslate.php:1817
+#: locale/moduletranslate.php:1842 locale/moduletranslate.php:1867
+#: locale/moduletranslate.php:1894 locale/moduletranslate.php:1919
+#: locale/moduletranslate.php:1950 locale/moduletranslate.php:1981
+#: locale/moduletranslate.php:2010 locale/moduletranslate.php:2035
+#: locale/moduletranslate.php:2060 locale/moduletranslate.php:2091
+#: locale/moduletranslate.php:2122 locale/moduletranslate.php:2145
+#: locale/moduletranslate.php:2168
+msgid "Snowing"
 msgstr ""
 
-#: locale/moduletranslate.php:1634 locale/moduletranslate.php:1661
-#: locale/moduletranslate.php:1688 locale/moduletranslate.php:1721
-#: locale/moduletranslate.php:1754 locale/moduletranslate.php:1779
-#: locale/moduletranslate.php:1804 locale/moduletranslate.php:1831
-#: locale/moduletranslate.php:1856 locale/moduletranslate.php:1887
-#: locale/moduletranslate.php:1918 locale/moduletranslate.php:1947
-#: locale/moduletranslate.php:1972 locale/moduletranslate.php:1997
-#: locale/moduletranslate.php:2028 locale/moduletranslate.php:2059
-#: locale/moduletranslate.php:2082 locale/moduletranslate.php:2105
-#: cache/eb/eb722a59dac7c3fddd70255e2c4c5f1d.php:69
-msgid "Clear"
+#: locale/moduletranslate.php:1671 locale/moduletranslate.php:1698
+#: locale/moduletranslate.php:1725 locale/moduletranslate.php:1752
+#: locale/moduletranslate.php:1785 locale/moduletranslate.php:1818
+#: locale/moduletranslate.php:1843 locale/moduletranslate.php:1868
+#: locale/moduletranslate.php:1895 locale/moduletranslate.php:1920
+#: locale/moduletranslate.php:1951 locale/moduletranslate.php:1982
+#: locale/moduletranslate.php:2011 locale/moduletranslate.php:2036
+#: locale/moduletranslate.php:2061 locale/moduletranslate.php:2092
+#: locale/moduletranslate.php:2123 locale/moduletranslate.php:2146
+#: locale/moduletranslate.php:2169
+msgid "Windy"
 msgstr ""
 
-#: locale/moduletranslate.php:1635 locale/moduletranslate.php:1662
-#: locale/moduletranslate.php:1689 locale/moduletranslate.php:1722
-#: locale/moduletranslate.php:1755 locale/moduletranslate.php:1780
-#: locale/moduletranslate.php:1805 locale/moduletranslate.php:1832
-#: locale/moduletranslate.php:1857 locale/moduletranslate.php:1888
-#: locale/moduletranslate.php:1919 locale/moduletranslate.php:1948
-#: locale/moduletranslate.php:1973 locale/moduletranslate.php:1998
-#: locale/moduletranslate.php:2029 locale/moduletranslate.php:2060
-#: locale/moduletranslate.php:2083 locale/moduletranslate.php:2106
-msgid "Fog"
+#: locale/moduletranslate.php:1672 locale/moduletranslate.php:1869
+msgid "Landscape - Current day, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1636 locale/moduletranslate.php:1663
-#: locale/moduletranslate.php:1690 locale/moduletranslate.php:1723
-#: locale/moduletranslate.php:1756 locale/moduletranslate.php:1781
-#: locale/moduletranslate.php:1806 locale/moduletranslate.php:1833
-#: locale/moduletranslate.php:1858 locale/moduletranslate.php:1889
-#: locale/moduletranslate.php:1920 locale/moduletranslate.php:1949
-#: locale/moduletranslate.php:1974 locale/moduletranslate.php:1999
-#: locale/moduletranslate.php:2030 locale/moduletranslate.php:2061
-#: locale/moduletranslate.php:2084 locale/moduletranslate.php:2107
-msgid "Hail"
+#: locale/moduletranslate.php:1673 locale/moduletranslate.php:1700
+#: locale/moduletranslate.php:1727 locale/moduletranslate.php:1754
+#: locale/moduletranslate.php:1787 locale/moduletranslate.php:1820
+#: locale/moduletranslate.php:1845 locale/moduletranslate.php:1870
+#: locale/moduletranslate.php:1897 locale/moduletranslate.php:1922
+#: locale/moduletranslate.php:1953 locale/moduletranslate.php:1984
+#: locale/moduletranslate.php:2013 locale/moduletranslate.php:2038
+#: locale/moduletranslate.php:2063 locale/moduletranslate.php:2094
+#: locale/moduletranslate.php:2148 locale/moduletranslate.php:2170
+#: locale/moduletranslate.php:2171 locale/dbtranslate.php:48
+#: lib/Widget/DataType/SocialMedia.php:65
+msgid "Text"
 msgstr ""
 
-#: locale/moduletranslate.php:1637 locale/moduletranslate.php:1664
-#: locale/moduletranslate.php:1691 locale/moduletranslate.php:1724
-#: locale/moduletranslate.php:1757 locale/moduletranslate.php:1782
-#: locale/moduletranslate.php:1807 locale/moduletranslate.php:1834
-#: locale/moduletranslate.php:1859 locale/moduletranslate.php:1890
-#: locale/moduletranslate.php:1921 locale/moduletranslate.php:1950
-#: locale/moduletranslate.php:1975 locale/moduletranslate.php:2000
-#: locale/moduletranslate.php:2031 locale/moduletranslate.php:2062
-#: locale/moduletranslate.php:2085 locale/moduletranslate.php:2108
-msgid "Clear night"
+#: locale/moduletranslate.php:1675 locale/moduletranslate.php:1702
+#: locale/moduletranslate.php:1729 locale/moduletranslate.php:1756
+#: locale/moduletranslate.php:1789 locale/moduletranslate.php:1822
+#: locale/moduletranslate.php:1847 locale/moduletranslate.php:1872
+#: locale/moduletranslate.php:1899 locale/moduletranslate.php:1924
+#: locale/moduletranslate.php:1955 locale/moduletranslate.php:1986
+#: locale/moduletranslate.php:2015 locale/moduletranslate.php:2040
+#: locale/moduletranslate.php:2065 locale/moduletranslate.php:2096
+#: locale/moduletranslate.php:2150
+msgid "Icons"
 msgstr ""
 
-#: locale/moduletranslate.php:1638 locale/moduletranslate.php:1665
-#: locale/moduletranslate.php:1692 locale/moduletranslate.php:1725
-#: locale/moduletranslate.php:1758 locale/moduletranslate.php:1783
-#: locale/moduletranslate.php:1808 locale/moduletranslate.php:1835
-#: locale/moduletranslate.php:1860 locale/moduletranslate.php:1891
-#: locale/moduletranslate.php:1922 locale/moduletranslate.php:1951
-#: locale/moduletranslate.php:1976 locale/moduletranslate.php:2001
-#: locale/moduletranslate.php:2032 locale/moduletranslate.php:2063
-#: locale/moduletranslate.php:2086 locale/moduletranslate.php:2109
-msgid "Cloudy night"
+#: locale/moduletranslate.php:1676 locale/moduletranslate.php:1703
+#: locale/moduletranslate.php:1730 locale/moduletranslate.php:1757
+#: locale/moduletranslate.php:1790 locale/moduletranslate.php:1823
+#: locale/moduletranslate.php:1848 locale/moduletranslate.php:1873
+#: locale/moduletranslate.php:1900 locale/moduletranslate.php:1925
+#: locale/moduletranslate.php:1956 locale/moduletranslate.php:1987
+#: locale/moduletranslate.php:2016 locale/moduletranslate.php:2041
+#: locale/moduletranslate.php:2066 locale/moduletranslate.php:2097
+#: locale/moduletranslate.php:2151
+msgid "The color of the icons"
 msgstr ""
 
-#: locale/moduletranslate.php:1639 locale/moduletranslate.php:1666
-#: locale/moduletranslate.php:1693 locale/moduletranslate.php:1726
-#: locale/moduletranslate.php:1759 locale/moduletranslate.php:1784
-#: locale/moduletranslate.php:1809 locale/moduletranslate.php:1836
-#: locale/moduletranslate.php:1861 locale/moduletranslate.php:1892
-#: locale/moduletranslate.php:1923 locale/moduletranslate.php:1952
-#: locale/moduletranslate.php:1977 locale/moduletranslate.php:2002
-#: locale/moduletranslate.php:2033 locale/moduletranslate.php:2064
-#: locale/moduletranslate.php:2087 locale/moduletranslate.php:2110
-msgid "Raining"
+#: locale/moduletranslate.php:1678 locale/moduletranslate.php:1705
+#: locale/moduletranslate.php:1732 locale/moduletranslate.php:1759
+#: locale/moduletranslate.php:1792 locale/moduletranslate.php:1825
+#: locale/moduletranslate.php:1850 locale/moduletranslate.php:1875
+#: locale/moduletranslate.php:1902 locale/moduletranslate.php:1927
+#: locale/moduletranslate.php:1958 locale/moduletranslate.php:1989
+#: locale/moduletranslate.php:2018 locale/moduletranslate.php:2043
+#: locale/moduletranslate.php:2068 locale/moduletranslate.php:2099
+msgid "The color of the background"
 msgstr ""
 
-#: locale/moduletranslate.php:1640 locale/moduletranslate.php:1667
-#: locale/moduletranslate.php:1694 locale/moduletranslate.php:1727
-#: locale/moduletranslate.php:1760 locale/moduletranslate.php:1785
-#: locale/moduletranslate.php:1810 locale/moduletranslate.php:1837
-#: locale/moduletranslate.php:1862 locale/moduletranslate.php:1893
-#: locale/moduletranslate.php:1924 locale/moduletranslate.php:1953
-#: locale/moduletranslate.php:1978 locale/moduletranslate.php:2003
-#: locale/moduletranslate.php:2034 locale/moduletranslate.php:2065
-#: locale/moduletranslate.php:2088 locale/moduletranslate.php:2111
-msgid "Snowing"
+#: locale/moduletranslate.php:1679 locale/moduletranslate.php:1706
+#: locale/moduletranslate.php:1733 locale/moduletranslate.php:1760
+#: locale/moduletranslate.php:1793 locale/moduletranslate.php:1876
+#: locale/moduletranslate.php:1928 locale/moduletranslate.php:1959
+msgid "Shadow"
 msgstr ""
 
-#: locale/moduletranslate.php:1641 locale/moduletranslate.php:1668
-#: locale/moduletranslate.php:1695 locale/moduletranslate.php:1728
-#: locale/moduletranslate.php:1761 locale/moduletranslate.php:1786
-#: locale/moduletranslate.php:1811 locale/moduletranslate.php:1838
-#: locale/moduletranslate.php:1863 locale/moduletranslate.php:1894
-#: locale/moduletranslate.php:1925 locale/moduletranslate.php:1954
-#: locale/moduletranslate.php:1979 locale/moduletranslate.php:2004
-#: locale/moduletranslate.php:2035 locale/moduletranslate.php:2066
-#: locale/moduletranslate.php:2089 locale/moduletranslate.php:2112
-msgid "Windy"
+#: locale/moduletranslate.php:1680 locale/moduletranslate.php:1707
+#: locale/moduletranslate.php:1734 locale/moduletranslate.php:1761
+#: locale/moduletranslate.php:1794 locale/moduletranslate.php:1877
+#: locale/moduletranslate.php:1929 locale/moduletranslate.php:1960
+msgid "The color of the shadow"
 msgstr ""
 
-#: locale/moduletranslate.php:1642
+#: locale/moduletranslate.php:1699
 msgid "Landscape - Current day, summary"
 msgstr ""
 
-#: locale/moduletranslate.php:1669
+#: locale/moduletranslate.php:1726
 msgid "Landscape - Current day"
 msgstr ""
 
-#: locale/moduletranslate.php:1696 locale/moduletranslate.php:1864
+#: locale/moduletranslate.php:1753 locale/moduletranslate.php:1921
 msgid "Landscape - Current day detailed, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1705 locale/moduletranslate.php:1738
-#: locale/moduletranslate.php:2012 locale/moduletranslate.php:2043
-#: locale/moduletranslate.php:2068
+#: locale/moduletranslate.php:1762 locale/moduletranslate.php:1795
+#: locale/moduletranslate.php:2069 locale/moduletranslate.php:2100
+#: locale/moduletranslate.php:2125
 msgid "Footer Background"
 msgstr ""
 
-#: locale/moduletranslate.php:1706 locale/moduletranslate.php:1739
-#: locale/moduletranslate.php:2013 locale/moduletranslate.php:2044
-#: locale/moduletranslate.php:2069
+#: locale/moduletranslate.php:1763 locale/moduletranslate.php:1796
+#: locale/moduletranslate.php:2070 locale/moduletranslate.php:2101
+#: locale/moduletranslate.php:2126
 msgid "The color of the footer background"
 msgstr ""
 
-#: locale/moduletranslate.php:1707 locale/moduletranslate.php:1740
-#: locale/moduletranslate.php:1873 locale/moduletranslate.php:1904
-#: locale/moduletranslate.php:1933 locale/moduletranslate.php:2014
-#: locale/moduletranslate.php:2045 locale/moduletranslate.php:2070
+#: locale/moduletranslate.php:1764 locale/moduletranslate.php:1797
+#: locale/moduletranslate.php:1930 locale/moduletranslate.php:1961
+#: locale/moduletranslate.php:1990 locale/moduletranslate.php:2071
+#: locale/moduletranslate.php:2102 locale/moduletranslate.php:2127
 msgid "Footer Text"
 msgstr ""
 
-#: locale/moduletranslate.php:1708 locale/moduletranslate.php:1741
-#: locale/moduletranslate.php:1874 locale/moduletranslate.php:1905
-#: locale/moduletranslate.php:1934 locale/moduletranslate.php:2015
-#: locale/moduletranslate.php:2046 locale/moduletranslate.php:2071
+#: locale/moduletranslate.php:1765 locale/moduletranslate.php:1798
+#: locale/moduletranslate.php:1931 locale/moduletranslate.php:1962
+#: locale/moduletranslate.php:1991 locale/moduletranslate.php:2072
+#: locale/moduletranslate.php:2103 locale/moduletranslate.php:2128
 msgid "The color of the footer text"
 msgstr ""
 
-#: locale/moduletranslate.php:1709 locale/moduletranslate.php:1742
-#: locale/moduletranslate.php:1875 locale/moduletranslate.php:1906
-#: locale/moduletranslate.php:1935 locale/moduletranslate.php:2016
-#: locale/moduletranslate.php:2047
+#: locale/moduletranslate.php:1766 locale/moduletranslate.php:1799
+#: locale/moduletranslate.php:1932 locale/moduletranslate.php:1963
+#: locale/moduletranslate.php:1992 locale/moduletranslate.php:2073
+#: locale/moduletranslate.php:2104
 msgid "Footer Icons"
 msgstr ""
 
-#: locale/moduletranslate.php:1710 locale/moduletranslate.php:1743
-#: locale/moduletranslate.php:1876 locale/moduletranslate.php:1907
-#: locale/moduletranslate.php:1936 locale/moduletranslate.php:2017
-#: locale/moduletranslate.php:2048
+#: locale/moduletranslate.php:1767 locale/moduletranslate.php:1800
+#: locale/moduletranslate.php:1933 locale/moduletranslate.php:1964
+#: locale/moduletranslate.php:1993 locale/moduletranslate.php:2074
+#: locale/moduletranslate.php:2105
 msgid "The color of the footer icons"
 msgstr ""
 
-#: locale/moduletranslate.php:1729
+#: locale/moduletranslate.php:1786
 msgid "Portrait - Current day, 2 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1762
+#: locale/moduletranslate.php:1819
 msgid "Landscape - Current day detailed table, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1787
+#: locale/moduletranslate.php:1844
 msgid "Square - Current day"
 msgstr ""
 
-#: locale/moduletranslate.php:1839
+#: locale/moduletranslate.php:1896
 msgid "Portrait - Current day, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1895
+#: locale/moduletranslate.php:1952
 msgid "Portrait - Current day, 3 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1926
+#: locale/moduletranslate.php:1983
 msgid "Landscape - Current day detailed, 3 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1955
+#: locale/moduletranslate.php:2012
 msgid "Landscape - Current day details, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:1980
+#: locale/moduletranslate.php:2037
 msgid "Portrait - Current day details, 4 day forecast"
 msgstr ""
 
-#: locale/moduletranslate.php:2005
+#: locale/moduletranslate.php:2062
 msgid "Square - Forecast squared with background"
 msgstr ""
 
-#: locale/moduletranslate.php:2036
+#: locale/moduletranslate.php:2093
 msgid "Square - Detailed weather"
 msgstr ""
 
-#: locale/moduletranslate.php:2067
+#: locale/moduletranslate.php:2124
 msgid "Scale - Weather background only"
 msgstr ""
 
-#: locale/moduletranslate.php:2090
+#: locale/moduletranslate.php:2147
 msgid "Landscape - Weather fullscreen"
 msgstr ""
 
-#: locale/moduletranslate.php:2115 locale/moduletranslate.php:2151
+#: locale/moduletranslate.php:2172 locale/moduletranslate.php:2208
 msgid "Font Family"
 msgstr ""
 
-#: locale/moduletranslate.php:2119 locale/moduletranslate.php:2155
+#: locale/moduletranslate.php:2176 locale/moduletranslate.php:2212
 msgid "Line Height"
 msgstr ""
 
-#: locale/moduletranslate.php:2120 locale/moduletranslate.php:2156
+#: locale/moduletranslate.php:2177 locale/moduletranslate.php:2213
 msgid "Bold"
 msgstr ""
 
-#: locale/moduletranslate.php:2121 locale/moduletranslate.php:2157
+#: locale/moduletranslate.php:2178 locale/moduletranslate.php:2214
 msgid "Should the text be bold?"
 msgstr ""
 
-#: locale/moduletranslate.php:2122 locale/moduletranslate.php:2158
+#: locale/moduletranslate.php:2179 locale/moduletranslate.php:2215
 msgid "Italics"
 msgstr ""
 
-#: locale/moduletranslate.php:2123 locale/moduletranslate.php:2159
+#: locale/moduletranslate.php:2180 locale/moduletranslate.php:2216
 msgid "Should the text be italicised?"
 msgstr ""
 
-#: locale/moduletranslate.php:2124 locale/moduletranslate.php:2160
+#: locale/moduletranslate.php:2181 locale/moduletranslate.php:2217
 msgid "Underline"
 msgstr ""
 
-#: locale/moduletranslate.php:2125 locale/moduletranslate.php:2161
+#: locale/moduletranslate.php:2182 locale/moduletranslate.php:2218
 msgid "Should the text be underlined?"
 msgstr ""
 
-#: locale/moduletranslate.php:2126 locale/moduletranslate.php:2162
+#: locale/moduletranslate.php:2183 locale/moduletranslate.php:2219
 msgid "Text Wrap"
 msgstr ""
 
-#: locale/moduletranslate.php:2127 locale/moduletranslate.php:2163
+#: locale/moduletranslate.php:2184 locale/moduletranslate.php:2220
 msgid "Should the text wrap to the next line?"
 msgstr ""
 
-#: locale/moduletranslate.php:2128
+#: locale/moduletranslate.php:2185
 msgid "Justify"
 msgstr ""
 
-#: locale/moduletranslate.php:2129
+#: locale/moduletranslate.php:2186
 msgid "Should the text be justified?"
 msgstr ""
 
-#: locale/moduletranslate.php:2130 locale/moduletranslate.php:2164
+#: locale/moduletranslate.php:2187 locale/moduletranslate.php:2221
 msgid "Show Overflow"
 msgstr ""
 
-#: locale/moduletranslate.php:2131 locale/moduletranslate.php:2165
+#: locale/moduletranslate.php:2188 locale/moduletranslate.php:2222
 msgid "Should the widget overflow the region?"
 msgstr ""
 
-#: locale/moduletranslate.php:2132 locale/moduletranslate.php:2166
+#: locale/moduletranslate.php:2189 locale/moduletranslate.php:2223
 msgid "Text Shadow"
 msgstr ""
 
-#: locale/moduletranslate.php:2133 locale/moduletranslate.php:2167
+#: locale/moduletranslate.php:2190 locale/moduletranslate.php:2224
 msgid "Should the text have a shadow?"
 msgstr ""
 
-#: locale/moduletranslate.php:2134 locale/moduletranslate.php:2168
+#: locale/moduletranslate.php:2191 locale/moduletranslate.php:2225
 msgid "Text Shadow Color"
 msgstr ""
 
-#: locale/moduletranslate.php:2135 locale/moduletranslate.php:2169
+#: locale/moduletranslate.php:2192 locale/moduletranslate.php:2226
 msgid "Shadow X Offset"
 msgstr ""
 
-#: locale/moduletranslate.php:2136 locale/moduletranslate.php:2170
+#: locale/moduletranslate.php:2193 locale/moduletranslate.php:2227
 msgid "Shadow Y Offset"
 msgstr ""
 
-#: locale/moduletranslate.php:2137 locale/moduletranslate.php:2171
+#: locale/moduletranslate.php:2194 locale/moduletranslate.php:2228
 msgid "Shadow Blur"
 msgstr ""
 
-#: locale/moduletranslate.php:2181
+#: locale/moduletranslate.php:2238
 msgid "Image URL"
 msgstr ""
 
-#: locale/moduletranslate.php:2182
+#: locale/moduletranslate.php:2239
 msgid "Enter the URL of the image you want to use."
 msgstr ""
 
-#: locale/moduletranslate.php:2183
+#: locale/moduletranslate.php:2240
 msgid "Opacity"
 msgstr ""
 
-#: locale/moduletranslate.php:2184
+#: locale/moduletranslate.php:2241
 msgid "Should the image have some transparency? Choose from 0 to 100."
 msgstr ""
 
-#: locale/moduletranslate.php:2203
+#: locale/moduletranslate.php:2260
 msgid "Line"
 msgstr ""
 
-#: locale/moduletranslate.php:2204
+#: locale/moduletranslate.php:2261
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:182
 #: cache/3c/3c7bd12ad2faa21d9e80b1c4ee69d3b4.php:201
 #: cache/09/09ce3b6a0541b31d12645b44531faf96.php:245
 #: cache/f6/f60761fa1e2b5ad016f9d13f094f9488.php:103
 #: cache/65/651e2483d1426d8b1b7ce3fef030fb15.php:103
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:138
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1102
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1379
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1515
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1730
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1063
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1344
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1480
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1663
 #: cache/4c/4c1de7ab59196b70ffa9f9da4d4e3b9c.php:415
 msgid "Width"
 msgstr ""
 
-#: locale/moduletranslate.php:2205
+#: locale/moduletranslate.php:2262
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:567
 msgid "Color"
 msgstr ""
 
-#: locale/moduletranslate.php:2206
+#: locale/moduletranslate.php:2263
 msgid "Style"
 msgstr ""
 
-#: locale/moduletranslate.php:2207
+#: locale/moduletranslate.php:2264
 msgid "Solid"
 msgstr ""
 
-#: locale/moduletranslate.php:2208
+#: locale/moduletranslate.php:2265
 msgid "Dotted"
 msgstr ""
 
-#: locale/moduletranslate.php:2209
+#: locale/moduletranslate.php:2266
 msgid "Dashed"
 msgstr ""
 
-#: locale/moduletranslate.php:2210
+#: locale/moduletranslate.php:2267
 msgid "Double"
 msgstr ""
 
-#: locale/moduletranslate.php:2211
+#: locale/moduletranslate.php:2268
 msgid "Tip1 Type"
 msgstr ""
 
-#: locale/moduletranslate.php:2212 locale/moduletranslate.php:2218
+#: locale/moduletranslate.php:2269 locale/moduletranslate.php:2275
 msgid "Squared"
 msgstr ""
 
-#: locale/moduletranslate.php:2213 locale/moduletranslate.php:2219
+#: locale/moduletranslate.php:2270 locale/moduletranslate.php:2276
 msgid "Diamond"
 msgstr ""
 
-#: locale/moduletranslate.php:2214 locale/moduletranslate.php:2220
+#: locale/moduletranslate.php:2271 locale/moduletranslate.php:2277
 msgid "Line Arrow"
 msgstr ""
 
-#: locale/moduletranslate.php:2215 locale/moduletranslate.php:2221
+#: locale/moduletranslate.php:2272 locale/moduletranslate.php:2278
 msgid "Solid Arrow"
 msgstr ""
 
-#: locale/moduletranslate.php:2216 locale/moduletranslate.php:2222
-#: locale/moduletranslate.php:2232
+#: locale/moduletranslate.php:2273 locale/moduletranslate.php:2279
+#: locale/moduletranslate.php:2289
 msgid "Circle"
 msgstr ""
 
-#: locale/moduletranslate.php:2217
+#: locale/moduletranslate.php:2274
 msgid "Tip2 Type"
 msgstr ""
 
-#: locale/moduletranslate.php:2223
+#: locale/moduletranslate.php:2280
 msgid "Rectangle"
 msgstr ""
 
-#: locale/moduletranslate.php:2224 locale/moduletranslate.php:2233
-#: locale/moduletranslate.php:2239 locale/moduletranslate.php:2245
-#: locale/moduletranslate.php:2251
+#: locale/moduletranslate.php:2281 locale/moduletranslate.php:2290
+#: locale/moduletranslate.php:2296 locale/moduletranslate.php:2302
+#: locale/moduletranslate.php:2308
 msgid "Background Color"
 msgstr ""
 
-#: locale/moduletranslate.php:2228 locale/moduletranslate.php:2234
-#: locale/moduletranslate.php:2240 locale/moduletranslate.php:2246
-#: locale/moduletranslate.php:2252
+#: locale/moduletranslate.php:2285 locale/moduletranslate.php:2291
+#: locale/moduletranslate.php:2297 locale/moduletranslate.php:2303
+#: locale/moduletranslate.php:2309
 msgid "Show Outline"
 msgstr ""
 
-#: locale/moduletranslate.php:2229
+#: locale/moduletranslate.php:2286
 msgid "Should the square have an outline?"
 msgstr ""
 
-#: locale/moduletranslate.php:2230 locale/moduletranslate.php:2236
-#: locale/moduletranslate.php:2242 locale/moduletranslate.php:2248
-#: locale/moduletranslate.php:2254
+#: locale/moduletranslate.php:2287 locale/moduletranslate.php:2293
+#: locale/moduletranslate.php:2299 locale/moduletranslate.php:2305
+#: locale/moduletranslate.php:2311
 msgid "Outline Color"
 msgstr ""
 
-#: locale/moduletranslate.php:2231 locale/moduletranslate.php:2237
-#: locale/moduletranslate.php:2243 locale/moduletranslate.php:2249
-#: locale/moduletranslate.php:2255
+#: locale/moduletranslate.php:2288 locale/moduletranslate.php:2294
+#: locale/moduletranslate.php:2300 locale/moduletranslate.php:2306
+#: locale/moduletranslate.php:2312
 msgid "Outline Width"
 msgstr ""
 
-#: locale/moduletranslate.php:2235
+#: locale/moduletranslate.php:2292
 msgid "Should the circle have an outline?"
 msgstr ""
 
-#: locale/moduletranslate.php:2238
+#: locale/moduletranslate.php:2295
 msgid "Triangle"
 msgstr ""
 
-#: locale/moduletranslate.php:2241
+#: locale/moduletranslate.php:2298
 msgid "Should the triangle have an outline?"
 msgstr ""
 
-#: locale/moduletranslate.php:2244
+#: locale/moduletranslate.php:2301
 msgid "Pentagon"
 msgstr ""
 
-#: locale/moduletranslate.php:2247
+#: locale/moduletranslate.php:2304
 msgid "Should the pentagon have an outline?"
 msgstr ""
 
-#: locale/moduletranslate.php:2250
+#: locale/moduletranslate.php:2307
 msgid "Hexagon"
 msgstr ""
 
-#: locale/moduletranslate.php:2253
+#: locale/moduletranslate.php:2310
 msgid "Should the hexagon have an outline?"
 msgstr ""
 
-#: locale/moduletranslate.php:2256 locale/moduletranslate.php:2267
+#: locale/moduletranslate.php:2313 locale/moduletranslate.php:2324
 #: cache/39/394b19a8eebf2eb1d9628eb62cde032c.php:116
 #: cache/c5/c5ca1344d07a74a91c5de3a21d4c2de4.php:107
 #: cache/fa/fa9935428c44daef4d95e4b582124caa.php:116
 msgid "Subject"
 msgstr ""
 
-#: locale/moduletranslate.php:2257 locale/moduletranslate.php:2268
+#: locale/moduletranslate.php:2314 locale/moduletranslate.php:2325
 msgid "Body"
 msgstr ""
 
-#: locale/moduletranslate.php:2259
+#: locale/moduletranslate.php:2316
 #: cache/09/09fa06e4cbb20e5f65e2075bff1da423.php:594
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:708
 #: cache/d2/d2fa8bed4d1e30769527c78081442bfc.php:178
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1746
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1679
 #: cache/23/238f0b98d7f96aca9a850e8b230fe1fb.php:291
 #: lib/Widget/DataType/Article.php:75
 msgid "Created Date"
 msgstr ""
 
-#: locale/moduletranslate.php:2263 locale/moduletranslate.php:2341
-#: locale/moduletranslate.php:2697
+#: locale/moduletranslate.php:2320 locale/moduletranslate.php:2398
+#: locale/moduletranslate.php:2754
 msgid "Main Template"
 msgstr ""
 
-#: locale/moduletranslate.php:2264
+#: locale/moduletranslate.php:2321
 msgid ""
 "The template for formatting your notifications. Enter [Subject] and [Body] "
 "with your desired formatting. Enter text or HTML in the box below."
 msgstr ""
 
-#: locale/moduletranslate.php:2272
+#: locale/moduletranslate.php:2329
 msgid ""
 "A message to display when there are no notifications to show. Enter text or "
 "HTML in the box below."
 msgstr ""
 
-#: locale/moduletranslate.php:2279
+#: locale/moduletranslate.php:2336
 msgid "Category Photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2281
+#: locale/moduletranslate.php:2338
 msgid "Dim when unavailable?"
 msgstr ""
 
-#: locale/moduletranslate.php:2282
+#: locale/moduletranslate.php:2339
 msgid "Dim Color"
 msgstr ""
 
-#: locale/moduletranslate.php:2285 locale/moduletranslate.php:2309
+#: locale/moduletranslate.php:2342 locale/moduletranslate.php:2366
 msgid "Currency Code"
 msgstr ""
 
-#: locale/moduletranslate.php:2286 locale/moduletranslate.php:2310
+#: locale/moduletranslate.php:2343 locale/moduletranslate.php:2367
 msgid "The 3 digit currency code to apply to the price, e.g. USD/GBP/EUR"
 msgstr ""
 
-#: locale/moduletranslate.php:2287 locale/moduletranslate.php:2295
-#: locale/moduletranslate.php:2311
+#: locale/moduletranslate.php:2344 locale/moduletranslate.php:2352
+#: locale/moduletranslate.php:2368
 msgid "Prefix"
 msgstr ""
 
-#: locale/moduletranslate.php:2288 locale/moduletranslate.php:2296
-#: locale/moduletranslate.php:2312
+#: locale/moduletranslate.php:2345 locale/moduletranslate.php:2353
+#: locale/moduletranslate.php:2369
 msgid "Suffix"
 msgstr ""
 
-#: locale/moduletranslate.php:2289
+#: locale/moduletranslate.php:2346
 msgid "Allergy info"
 msgstr ""
 
-#: locale/moduletranslate.php:2290 lib/Widget/DataType/SocialMedia.php:73
+#: locale/moduletranslate.php:2347 lib/Widget/DataType/SocialMedia.php:73
 msgid "Photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2291
+#: locale/moduletranslate.php:2348
 msgid "Options: Name"
 msgstr ""
 
-#: locale/moduletranslate.php:2292 locale/moduletranslate.php:2306
+#: locale/moduletranslate.php:2349 locale/moduletranslate.php:2363
 msgid "Option slot"
 msgstr ""
 
-#: locale/moduletranslate.php:2305
+#: locale/moduletranslate.php:2362
 msgid "Options: Value"
 msgstr ""
 
-#: locale/moduletranslate.php:2321
+#: locale/moduletranslate.php:2378
 #: cache/04/04b4b8b9bb93bf0580422332c142abff.php:223
 #: cache/d4/d41eb57456e7d0ead8c455e4652b975c.php:178
 #: cache/fd/fd08b6cb6765ac676b671e9c5a7afe27.php:178
@@ -4610,277 +4667,277 @@ msgstr ""
 msgid "Calories"
 msgstr ""
 
-#: locale/moduletranslate.php:2323
+#: locale/moduletranslate.php:2380
 msgid "Units margin"
 msgstr ""
 
-#: locale/moduletranslate.php:2324
+#: locale/moduletranslate.php:2381
 msgid "Units color"
 msgstr ""
 
-#: locale/moduletranslate.php:2325
+#: locale/moduletranslate.php:2382
 msgid "Profile Photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2327
+#: locale/moduletranslate.php:2384
 msgid "Screen name"
 msgstr ""
 
-#: locale/moduletranslate.php:2330
+#: locale/moduletranslate.php:2387
 msgid "Post Photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2331
+#: locale/moduletranslate.php:2388
 msgid "Post"
 msgstr ""
 
-#: locale/moduletranslate.php:2332
+#: locale/moduletranslate.php:2389
 msgid "Vintage Photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2333
+#: locale/moduletranslate.php:2390
 msgid "Post - Dark"
 msgstr ""
 
-#: locale/moduletranslate.php:2339
+#: locale/moduletranslate.php:2396
 msgid "Original Padding"
 msgstr ""
 
-#: locale/moduletranslate.php:2340
+#: locale/moduletranslate.php:2397
 msgid ""
 "This is the intended padding of the template and is used to position the "
 "Widget within its region when the template is applied."
 msgstr ""
 
-#: locale/moduletranslate.php:2344
+#: locale/moduletranslate.php:2401
 msgid "Content Type"
 msgstr ""
 
-#: locale/moduletranslate.php:2345
+#: locale/moduletranslate.php:2402
 msgid "This is the intended tweet content type."
 msgstr ""
 
-#: locale/moduletranslate.php:2346
+#: locale/moduletranslate.php:2403
 msgid "All Posts"
 msgstr ""
 
-#: locale/moduletranslate.php:2347
+#: locale/moduletranslate.php:2404
 msgid "Posts with text only content"
 msgstr ""
 
-#: locale/moduletranslate.php:2348
+#: locale/moduletranslate.php:2405
 msgid "Posts with text and image content"
 msgstr ""
 
-#: locale/moduletranslate.php:2351 locale/moduletranslate.php:2374
-#: locale/moduletranslate.php:2397 locale/moduletranslate.php:2420
-#: locale/moduletranslate.php:2443 locale/moduletranslate.php:2466
-#: locale/moduletranslate.php:2489 locale/moduletranslate.php:2512
-#: locale/moduletranslate.php:2535 locale/moduletranslate.php:2558
-#: locale/moduletranslate.php:2581 locale/moduletranslate.php:2604
-#: locale/moduletranslate.php:2627
+#: locale/moduletranslate.php:2408 locale/moduletranslate.php:2431
+#: locale/moduletranslate.php:2454 locale/moduletranslate.php:2477
+#: locale/moduletranslate.php:2500 locale/moduletranslate.php:2523
+#: locale/moduletranslate.php:2546 locale/moduletranslate.php:2569
+#: locale/moduletranslate.php:2592 locale/moduletranslate.php:2615
+#: locale/moduletranslate.php:2638 locale/moduletranslate.php:2661
+#: locale/moduletranslate.php:2684
 msgid "Items Per Page"
 msgstr ""
 
-#: locale/moduletranslate.php:2352 locale/moduletranslate.php:2375
-#: locale/moduletranslate.php:2398 locale/moduletranslate.php:2421
-#: locale/moduletranslate.php:2444 locale/moduletranslate.php:2467
-#: locale/moduletranslate.php:2490 locale/moduletranslate.php:2513
-#: locale/moduletranslate.php:2536 locale/moduletranslate.php:2559
-#: locale/moduletranslate.php:2582 locale/moduletranslate.php:2605
-#: locale/moduletranslate.php:2628
+#: locale/moduletranslate.php:2409 locale/moduletranslate.php:2432
+#: locale/moduletranslate.php:2455 locale/moduletranslate.php:2478
+#: locale/moduletranslate.php:2501 locale/moduletranslate.php:2524
+#: locale/moduletranslate.php:2547 locale/moduletranslate.php:2570
+#: locale/moduletranslate.php:2593 locale/moduletranslate.php:2616
+#: locale/moduletranslate.php:2639 locale/moduletranslate.php:2662
+#: locale/moduletranslate.php:2685
 msgid "The number of items to show per page (default = 5)."
 msgstr ""
 
-#: locale/moduletranslate.php:2353 locale/moduletranslate.php:2376
-#: locale/moduletranslate.php:2399 locale/moduletranslate.php:2422
-#: locale/moduletranslate.php:2445 locale/moduletranslate.php:2468
-#: locale/moduletranslate.php:2491 locale/moduletranslate.php:2514
-#: locale/moduletranslate.php:2537 locale/moduletranslate.php:2560
-#: locale/moduletranslate.php:2583 locale/moduletranslate.php:2606
-#: locale/moduletranslate.php:2629
+#: locale/moduletranslate.php:2410 locale/moduletranslate.php:2433
+#: locale/moduletranslate.php:2456 locale/moduletranslate.php:2479
+#: locale/moduletranslate.php:2502 locale/moduletranslate.php:2525
+#: locale/moduletranslate.php:2548 locale/moduletranslate.php:2571
+#: locale/moduletranslate.php:2594 locale/moduletranslate.php:2617
+#: locale/moduletranslate.php:2640 locale/moduletranslate.php:2663
+#: locale/moduletranslate.php:2686
 msgid "Items direction"
 msgstr ""
 
-#: locale/moduletranslate.php:2354 locale/moduletranslate.php:2377
-#: locale/moduletranslate.php:2400 locale/moduletranslate.php:2423
-#: locale/moduletranslate.php:2446 locale/moduletranslate.php:2469
-#: locale/moduletranslate.php:2492 locale/moduletranslate.php:2515
-#: locale/moduletranslate.php:2538 locale/moduletranslate.php:2561
-#: locale/moduletranslate.php:2584 locale/moduletranslate.php:2607
-#: locale/moduletranslate.php:2630
+#: locale/moduletranslate.php:2411 locale/moduletranslate.php:2434
+#: locale/moduletranslate.php:2457 locale/moduletranslate.php:2480
+#: locale/moduletranslate.php:2503 locale/moduletranslate.php:2526
+#: locale/moduletranslate.php:2549 locale/moduletranslate.php:2572
+#: locale/moduletranslate.php:2595 locale/moduletranslate.php:2618
+#: locale/moduletranslate.php:2641 locale/moduletranslate.php:2664
+#: locale/moduletranslate.php:2687
 msgid "The display order if there's more than one item."
 msgstr ""
 
-#: locale/moduletranslate.php:2355 locale/moduletranslate.php:2378
-#: locale/moduletranslate.php:2401 locale/moduletranslate.php:2424
-#: locale/moduletranslate.php:2447 locale/moduletranslate.php:2470
-#: locale/moduletranslate.php:2493 locale/moduletranslate.php:2516
-#: locale/moduletranslate.php:2539 locale/moduletranslate.php:2562
-#: locale/moduletranslate.php:2585 locale/moduletranslate.php:2608
-#: locale/moduletranslate.php:2631
+#: locale/moduletranslate.php:2412 locale/moduletranslate.php:2435
+#: locale/moduletranslate.php:2458 locale/moduletranslate.php:2481
+#: locale/moduletranslate.php:2504 locale/moduletranslate.php:2527
+#: locale/moduletranslate.php:2550 locale/moduletranslate.php:2573
+#: locale/moduletranslate.php:2596 locale/moduletranslate.php:2619
+#: locale/moduletranslate.php:2642 locale/moduletranslate.php:2665
+#: locale/moduletranslate.php:2688
 msgid "Horizontal"
 msgstr ""
 
-#: locale/moduletranslate.php:2356 locale/moduletranslate.php:2379
-#: locale/moduletranslate.php:2402 locale/moduletranslate.php:2425
-#: locale/moduletranslate.php:2448 locale/moduletranslate.php:2471
-#: locale/moduletranslate.php:2494 locale/moduletranslate.php:2517
-#: locale/moduletranslate.php:2540 locale/moduletranslate.php:2563
-#: locale/moduletranslate.php:2586 locale/moduletranslate.php:2609
-#: locale/moduletranslate.php:2632
+#: locale/moduletranslate.php:2413 locale/moduletranslate.php:2436
+#: locale/moduletranslate.php:2459 locale/moduletranslate.php:2482
+#: locale/moduletranslate.php:2505 locale/moduletranslate.php:2528
+#: locale/moduletranslate.php:2551 locale/moduletranslate.php:2574
+#: locale/moduletranslate.php:2597 locale/moduletranslate.php:2620
+#: locale/moduletranslate.php:2643 locale/moduletranslate.php:2666
+#: locale/moduletranslate.php:2689
 msgid "Vertical"
 msgstr ""
 
-#: locale/moduletranslate.php:2362 locale/moduletranslate.php:2385
-#: locale/moduletranslate.php:2408 locale/moduletranslate.php:2431
-#: locale/moduletranslate.php:2454 locale/moduletranslate.php:2477
-#: locale/moduletranslate.php:2500 locale/moduletranslate.php:2523
-#: locale/moduletranslate.php:2546 locale/moduletranslate.php:2569
-#: locale/moduletranslate.php:2592 locale/moduletranslate.php:2615
-#: locale/moduletranslate.php:2638 locale/moduletranslate.php:2672
+#: locale/moduletranslate.php:2419 locale/moduletranslate.php:2442
+#: locale/moduletranslate.php:2465 locale/moduletranslate.php:2488
+#: locale/moduletranslate.php:2511 locale/moduletranslate.php:2534
+#: locale/moduletranslate.php:2557 locale/moduletranslate.php:2580
+#: locale/moduletranslate.php:2603 locale/moduletranslate.php:2626
+#: locale/moduletranslate.php:2649 locale/moduletranslate.php:2672
+#: locale/moduletranslate.php:2695 locale/moduletranslate.php:2729
 msgid "How should this widget be aligned?"
 msgstr ""
 
-#: locale/moduletranslate.php:2371
+#: locale/moduletranslate.php:2428
 msgid "Template 1 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2394
+#: locale/moduletranslate.php:2451
 msgid "Template 2 - text, profile image, photo"
 msgstr ""
 
-#: locale/moduletranslate.php:2417
+#: locale/moduletranslate.php:2474
 msgid "Template 3 - text"
 msgstr ""
 
-#: locale/moduletranslate.php:2440
+#: locale/moduletranslate.php:2497
 msgid "Template 4 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2463
+#: locale/moduletranslate.php:2520
 msgid "Template 5 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2486
+#: locale/moduletranslate.php:2543
 msgid "Template 6 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2509
+#: locale/moduletranslate.php:2566
 msgid "Template 7 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2532
+#: locale/moduletranslate.php:2589
 msgid "Template 8 - text, profile image"
 msgstr ""
 
-#: locale/moduletranslate.php:2555
+#: locale/moduletranslate.php:2612
 msgid "Template 9 - text, logo"
 msgstr ""
 
-#: locale/moduletranslate.php:2578
+#: locale/moduletranslate.php:2635
 msgid "Template 10 - text, photo, logo"
 msgstr ""
 
-#: locale/moduletranslate.php:2601
+#: locale/moduletranslate.php:2658
 msgid "Template 11 - text, logo"
 msgstr ""
 
-#: locale/moduletranslate.php:2624
+#: locale/moduletranslate.php:2681
 msgid "Template 12 - text, profile image, logo"
 msgstr ""
 
-#: locale/moduletranslate.php:2647
+#: locale/moduletranslate.php:2704
 msgid "Metro Social"
 msgstr ""
 
-#: locale/moduletranslate.php:2650
+#: locale/moduletranslate.php:2707
 msgid "Colours Template"
 msgstr ""
 
-#: locale/moduletranslate.php:2651
+#: locale/moduletranslate.php:2708
 msgid ""
 "Select the template colours you would like to apply values to the colours "
 "below."
 msgstr ""
 
-#: locale/moduletranslate.php:2653
+#: locale/moduletranslate.php:2710
 msgid "Colours 1 - Default"
 msgstr ""
 
-#: locale/moduletranslate.php:2654
+#: locale/moduletranslate.php:2711
 msgid "Colours 2 - Full"
 msgstr ""
 
-#: locale/moduletranslate.php:2655
+#: locale/moduletranslate.php:2712
 msgid "Colours 3 - Gray Scale"
 msgstr ""
 
-#: locale/moduletranslate.php:2656
+#: locale/moduletranslate.php:2713
 msgid "Colours 4 - Light"
 msgstr ""
 
-#: locale/moduletranslate.php:2657
+#: locale/moduletranslate.php:2714
 msgid "Colours 5 - Soft"
 msgstr ""
 
-#: locale/moduletranslate.php:2658
+#: locale/moduletranslate.php:2715
 msgid "Colours 6 - Vivid"
 msgstr ""
 
-#: locale/moduletranslate.php:2659
+#: locale/moduletranslate.php:2716
 msgid "Color 1"
 msgstr ""
 
-#: locale/moduletranslate.php:2660
+#: locale/moduletranslate.php:2717
 msgid "Color 2"
 msgstr ""
 
-#: locale/moduletranslate.php:2661
+#: locale/moduletranslate.php:2718
 msgid "Color 3"
 msgstr ""
 
-#: locale/moduletranslate.php:2662
+#: locale/moduletranslate.php:2719
 msgid "Color 4"
 msgstr ""
 
-#: locale/moduletranslate.php:2663
+#: locale/moduletranslate.php:2720
 msgid "Color 5"
 msgstr ""
 
-#: locale/moduletranslate.php:2664
+#: locale/moduletranslate.php:2721
 msgid "Color 6"
 msgstr ""
 
-#: locale/moduletranslate.php:2665
+#: locale/moduletranslate.php:2722
 msgid "Color 7"
 msgstr ""
 
-#: locale/moduletranslate.php:2666
+#: locale/moduletranslate.php:2723
 msgid "Color 8"
 msgstr ""
 
-#: locale/moduletranslate.php:2682
+#: locale/moduletranslate.php:2739
 msgid "Symbol"
 msgstr ""
 
-#: locale/moduletranslate.php:2685
+#: locale/moduletranslate.php:2742
 msgid "Stock Icon"
 msgstr ""
 
-#: locale/moduletranslate.php:2686
+#: locale/moduletranslate.php:2743
 msgid "Stocks Custom HTML"
 msgstr ""
 
-#: locale/moduletranslate.php:2699
+#: locale/moduletranslate.php:2756
 msgid "Optional Stylesheet"
 msgstr ""
 
-#: locale/moduletranslate.php:2701
+#: locale/moduletranslate.php:2758
 msgid "Stocks 1"
 msgstr ""
 
-#: locale/moduletranslate.php:2708
+#: locale/moduletranslate.php:2765
 msgid "Stocks 2"
 msgstr ""
 
@@ -4888,7 +4945,7 @@ msgstr ""
 msgid "Fade In"
 msgstr ""
 
-#: locale/dbtranslate.php:27 cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2622
+#: locale/dbtranslate.php:27 cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2503
 msgid "Fade Out"
 msgstr ""
 
@@ -5351,10 +5408,9 @@ msgstr ""
 #: cache/e3/e31b4df8534304ebbf1261cf4fb5314c.php:65
 #: cache/33/33968a0a5a1ed14133e2cd23ec95b9a9.php:65
 #: cache/74/746ec3a82f78da39c0d83b4d24c675b3.php:71
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:843
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:864
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1265
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1834
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:827
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:848
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1222
 #: cache/1b/1b54f8dd2f1a33488bb30d63484f87f7.php:68
 #: cache/23/235acc51022bf578b604ce47dd2743a4.php:68
 #: cache/23/23114ff234f79ee13968407a57f6252d.php:65
@@ -5470,7 +5526,7 @@ msgstr ""
 #: cache/9c/9cd9c506c8127381b3a38d63834ca951.php:72
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:107
 #: cache/e3/e31b4df8534304ebbf1261cf4fb5314c.php:69
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:728
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:720
 #: cache/58/581725fc73e075b270eb8c5ca975df6c.php:69
 #: cache/73/7380f2a38e77dc7c928531f9d5420936.php:69
 #: cache/c0/c0e9fb4708e939b6f7beb146f0d68435.php:69
@@ -5591,9 +5647,9 @@ msgstr ""
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:71
 #: cache/33/33968a0a5a1ed14133e2cd23ec95b9a9.php:69
 #: cache/74/746ec3a82f78da39c0d83b4d24c675b3.php:75
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1261
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1218
 #: cache/1b/1b54f8dd2f1a33488bb30d63484f87f7.php:72
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:373
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:377
 #: cache/23/235acc51022bf578b604ce47dd2743a4.php:72
 #: cache/23/23114ff234f79ee13968407a57f6252d.php:69
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:71
@@ -5748,7 +5804,7 @@ msgstr ""
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:92
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:138
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:55
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1090
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1051
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:55
 #: cache/23/23114ff234f79ee13968407a57f6252d.php:84
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:138
@@ -5967,7 +6023,7 @@ msgstr ""
 #: cache/a9/a9e5683d775fba4115fbe1530a299060.php:91
 #: cache/d7/d7326d049226360861decd025d796004.php:91
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:161
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:949
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:933
 #: cache/51/516db3616cec383813b2ba8f7cef0b6d.php:133
 #: cache/c0/c0957d7f61132493ea43a4e545472a41.php:91
 #: cache/0b/0bf1ec6ab33ef0ba5938df774146f8dc.php:126
@@ -6011,8 +6067,8 @@ msgstr ""
 #: cache/b1/b1c2db71469950cfdd34c323d05aa155.php:99
 #: cache/5e/5ec96adf0346509994d4c975eac80689.php:102
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:175
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:941
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2175
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:925
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2056
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:166
 #: cache/63/63a123f42a16165e90cd9f604b2de4bd.php:122
 #: cache/0b/0bf1ec6ab33ef0ba5938df774146f8dc.php:141
@@ -6062,7 +6118,6 @@ msgstr ""
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:269
 #: cache/e3/e3e074211e42eadb55ae8cb6ceeaa722.php:55
 #: cache/e3/e3e074211e42eadb55ae8cb6ceeaa722.php:85
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1804
 #: cache/23/238f0b98d7f96aca9a850e8b230fe1fb.php:175
 #: cache/23/238f0b98d7f96aca9a850e8b230fe1fb.php:261
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:200
@@ -6331,9 +6386,9 @@ msgstr ""
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:383
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:389
 #: cache/9e/9e2a80ecdd8879e59308a644c1f6721f.php:204
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1220
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1232
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2045
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1177
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1189
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1922
 #: cache/38/38e5186bcfa9917c4ec02d8c626e2552.php:188
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:204
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:343
@@ -6343,9 +6398,9 @@ msgid "Layout"
 msgstr ""
 
 #: cache/3d/3d685e4b4f0f4e045b5cc2697b26574d.php:88
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1070
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1228
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2553
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1031
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1185
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2434
 msgid "Widget"
 msgstr ""
 
@@ -6380,7 +6435,7 @@ msgstr ""
 #: lib/Controller/Applications.php:173 lib/Controller/Resolution.php:161
 #: lib/Controller/Display.php:831 lib/Controller/MenuBoardProduct.php:191
 #: lib/Controller/PlayerSoftware.php:158 lib/Controller/Command.php:152
-#: lib/Controller/DataSetRss.php:167 lib/Controller/Schedule.php:2361
+#: lib/Controller/DataSetRss.php:167 lib/Controller/Schedule.php:2360
 #: lib/Controller/UserGroup.php:157 lib/Controller/DayPart.php:154
 msgid "Edit"
 msgstr ""
@@ -6394,9 +6449,10 @@ msgstr ""
 #: cache/17/17a063cd6b023f6b3259fc5bb6f3383f.php:68
 #: cache/25/257d7652c0b04ca6e480ad5c9beaa3c2.php:242
 #: cache/74/746ec3a82f78da39c0d83b4d24c675b3.php:65
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:748
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:847
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1039
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:736
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:813
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:831
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1000
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:164
 #: cache/34/3453edc522f8d2c6d1d154ad55500693.php:325
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:559
@@ -6422,8 +6478,8 @@ msgstr ""
 #: lib/Controller/MenuBoardProduct.php:207
 #: lib/Controller/PlayerSoftware.php:165 lib/Controller/PlayerSoftware.php:174
 #: lib/Controller/Command.php:161 lib/Controller/Command.php:170
-#: lib/Controller/DataSetRss.php:175 lib/Controller/Schedule.php:2367
-#: lib/Controller/Schedule.php:2376 lib/Controller/UserGroup.php:165
+#: lib/Controller/DataSetRss.php:175 lib/Controller/Schedule.php:2366
+#: lib/Controller/Schedule.php:2375 lib/Controller/UserGroup.php:165
 #: lib/Controller/DayPart.php:161 lib/Controller/DayPart.php:167
 msgid "Delete"
 msgstr ""
@@ -6437,7 +6493,7 @@ msgstr ""
 #: cache/d2/d2fa8bed4d1e30769527c78081442bfc.php:186
 #: cache/fb/fb12c90670ac105c9ea03fcc99876e87.php:104
 #: cache/fb/fb12c90670ac105c9ea03fcc99876e87.php:171
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1700
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1633
 #: cache/f3/f3286f195f132c53823b9bb1068e5cc9.php:137
 #: cache/f3/f3286f195f132c53823b9bb1068e5cc9.php:208
 #: cache/8d/8de7dd9661211f3ba39933b564d76990.php:409
@@ -6505,12 +6561,12 @@ msgid "Region Options"
 msgstr ""
 
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:72
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1094
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1055
 msgid "Positioning"
 msgstr ""
 
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:76
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1098
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1059
 #: cache/4a/4a1316556dbf2c1f6276a15abb899508.php:189
 msgid "Transition"
 msgstr ""
@@ -6563,10 +6619,10 @@ msgstr ""
 #: cache/f6/f60761fa1e2b5ad016f9d13f094f9488.php:118
 #: cache/65/651e2483d1426d8b1b7ce3fef030fb15.php:118
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:142
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1106
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1383
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1523
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1734
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1067
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1348
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1488
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1667
 #: cache/4c/4c1de7ab59196b70ffa9f9da4d4e3b9c.php:419
 msgid "Height"
 msgstr ""
@@ -6576,11 +6632,11 @@ msgid "Height of the Region"
 msgstr ""
 
 #: cache/3d/3d43e8adbd5d771e55b4c097d061edee.php:212
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1122
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1347
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1433
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1491
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2132
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1083
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1304
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1398
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1456
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2009
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:197
 msgid "Layer"
 msgstr ""
@@ -6624,7 +6680,7 @@ msgstr ""
 #: cache/e7/e796ca1083ad3813266a62e6854798e8.php:91
 #: cache/68/683636238aff529d5a7b7478118dede4.php:1115
 #: cache/d5/d548e4848346b34fa2915d684010817b.php:245
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1561
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1526
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:870
 #: cache/11/1140e2fe8d16f9c5bd7224da78abee20.php:91
 msgid "Enable Stats Collection?"
@@ -6648,7 +6704,7 @@ msgstr ""
 #: cache/09/09ce3b6a0541b31d12645b44531faf96.php:321
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:290
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:280
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1569
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1534
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:338
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:492
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:506
@@ -6671,7 +6727,7 @@ msgstr ""
 #: cache/68/683636238aff529d5a7b7478118dede4.php:1947
 #: cache/68/683636238aff529d5a7b7478118dede4.php:3469
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:295
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1573
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1538
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:492
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:506
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:575
@@ -6690,7 +6746,7 @@ msgstr ""
 #: cache/68/683636238aff529d5a7b7478118dede4.php:1235
 #: cache/68/683636238aff529d5a7b7478118dede4.php:1291
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:300
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1577
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1542
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:301
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:272
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:912
@@ -6705,7 +6761,7 @@ msgstr ""
 #: cache/91/91982ff1ff9899125ec30731f264a8f4.php:73
 #: cache/e5/e5310108493cd13aa490732e70fdb013.php:60
 #: cache/9e/9e2a80ecdd8879e59308a644c1f6721f.php:73
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:365
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:369
 #: cache/73/73ac35c5bb699e096000941498cdfdc9.php:66
 #: cache/4e/4ecfb080a1b970aaf8c60b2a16c13a4f.php:67
 #: cache/67/671e1a0d15cf6622a031b0a7a49f5956.php:73
@@ -6722,7 +6778,7 @@ msgstr ""
 #: cache/66/661d79c5da6d14a0db85cd0980868ff7.php:280
 #: cache/9e/9e2a80ecdd8879e59308a644c1f6721f.php:99
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:143
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:817
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:797
 #: cache/0b/0bf1ec6ab33ef0ba5938df774146f8dc.php:105
 #: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:264
 #: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1307
@@ -6858,7 +6914,7 @@ msgstr ""
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:353
 #: cache/7d/7d93daaf181fe08e96e60d7e241a1d1c.php:99
 #: cache/88/880da8bf57750f4e35ce30624c0c6d79.php:633
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2346
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2227
 #: cache/38/38e5186bcfa9917c4ec02d8c626e2552.php:258
 #: cache/51/5183626e7e19083fdf9708e7d778f66f.php:150
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:274
@@ -6873,7 +6929,7 @@ msgstr ""
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:368
 #: cache/7d/7d93daaf181fe08e96e60d7e241a1d1c.php:114
 #: cache/88/880da8bf57750f4e35ce30624c0c6d79.php:648
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2350
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2231
 #: cache/38/38e5186bcfa9917c4ec02d8c626e2552.php:273
 #: cache/51/5183626e7e19083fdf9708e7d778f66f.php:165
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:289
@@ -6956,7 +7012,7 @@ msgstr ""
 
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:395
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:475
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2541
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2422
 msgid "Action Type"
 msgstr ""
 
@@ -6968,8 +7024,8 @@ msgstr ""
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:405
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:485
 #: cache/77/774dde73b0eb7965a680b8a52776fa6b.php:234
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1293
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1941
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1250
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1818
 msgid "Navigate to Layout"
 msgstr ""
 
@@ -6991,8 +7047,8 @@ msgstr ""
 
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:425
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:505
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1317
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2537
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1274
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2418
 #: cache/fa/fa66e594804204b7397616a42725bee8.php:87
 #: cache/cb/cb1c15ce617fd7e7648d38bb0b2b48f5.php:1217
 msgid "Trigger Code"
@@ -7006,8 +7062,8 @@ msgstr ""
 #: cache/c8/c81aa074ed0c595eefef0776b8c89639.php:440
 #: cache/80/8016dad6634116cf39ffaf1bbf646931.php:520
 #: cache/77/774dde73b0eb7965a680b8a52776fa6b.php:242
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1333
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2557
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1290
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2438
 msgid "Layout Code"
 msgstr ""
 
@@ -7187,7 +7243,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:455
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:564
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2009
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2014
 msgid "Monday"
 msgstr ""
 
@@ -7201,7 +7257,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:460
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:568
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2013
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2018
 msgid "Tuesday"
 msgstr ""
 
@@ -7215,7 +7271,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:465
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:572
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2017
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2022
 msgid "Wednesday"
 msgstr ""
 
@@ -7229,7 +7285,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:470
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:576
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2021
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2026
 msgid "Thursday"
 msgstr ""
 
@@ -7243,7 +7299,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:475
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:580
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2025
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2030
 msgid "Friday"
 msgstr ""
 
@@ -7257,7 +7313,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:480
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:584
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2029
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2034
 msgid "Saturday"
 msgstr ""
 
@@ -7271,7 +7327,7 @@ msgstr ""
 #: cache/0e/0e02100c0f3615b819bb09d3e2a17b8a.php:485
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:588
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:640
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2033
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:2038
 msgid "Sunday"
 msgstr ""
 
@@ -7381,8 +7437,8 @@ msgstr ""
 #: cache/c8/c82ad061a984295661821ddeb6ffb8c0.php:87
 #: cache/9f/9f9a142004ca4a1c914a4395fe586017.php:239
 #: cache/a4/a4b5f52b1992bb349e8a30b19ff24645.php:154
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:829
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2470
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:809
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2351
 msgid "Playlists"
 msgstr ""
 
@@ -7401,7 +7457,7 @@ msgstr ""
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:108
 #: cache/a4/a4b5f52b1992bb349e8a30b19ff24645.php:517
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:71
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1086
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1047
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:71
 #: cache/8d/8de7dd9661211f3ba39933b564d76990.php:96
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:117
@@ -7502,11 +7558,11 @@ msgstr ""
 #: cache/eb/eb0b05526f681e297aa747d8a42bfc36.php:76
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:410
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:274
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1553
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1643
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1738
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2072
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2148
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1518
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1592
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1671
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1949
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2029
 #: cache/23/2360e54d15ebe919cd8f4305d3819359.php:423
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:148
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:388
@@ -7528,7 +7584,7 @@ msgstr ""
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:660
 #: cache/64/6468accf3a0fea12fced661d430c769f.php:97
 #: cache/df/dfa8c9877043c738d127ce9a84cd99fa.php:141
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:469
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:473
 #: cache/23/238f0b98d7f96aca9a850e8b230fe1fb.php:267
 #: cache/8d/8de7dd9661211f3ba39933b564d76990.php:100
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:431
@@ -7611,7 +7667,7 @@ msgstr ""
 #: cache/12/128a25d2a51c15a82cded4869488f710.php:194
 #: cache/66/661d79c5da6d14a0db85cd0980868ff7.php:296
 #: cache/66/661d79c5da6d14a0db85cd0980868ff7.php:384
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2024
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1901
 #: cache/35/35be00044edc69c7e0405b74ef1b4562.php:211
 #: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:155
 #: cache/cb/cb0f801b3d2ddd3d1f61f47414d32047.php:150
@@ -7742,7 +7798,7 @@ msgstr ""
 #: cache/09/09fa06e4cbb20e5f65e2075bff1da423.php:590
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:656
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:96
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1778
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1711
 #: cache/70/70af2bbd82243291558c9b83caec5b48.php:124
 msgid "Remote"
 msgstr ""
@@ -8110,8 +8166,8 @@ msgstr ""
 #: cache/86/86d9a0599e765017f2e6f2e4a7025625.php:696
 #: cache/41/413dbe6a803c413d6ff11377888e1e0d.php:666
 #: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1438
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1894
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1909
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1899
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1914
 msgid "Always"
 msgstr ""
 
@@ -8409,6 +8465,7 @@ msgid ""
 msgstr ""
 
 #: cache/e7/e7012f849ea8937cd0edbed2b7de4de8.php:978
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2017
 msgid "Group"
 msgstr ""
 
@@ -8665,7 +8722,7 @@ msgstr ""
 #: cache/65/651e2483d1426d8b1b7ce3fef030fb15.php:88
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:89
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:134
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1425
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1390
 #: cache/63/63a123f42a16165e90cd9f604b2de4bd.php:210
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:182
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:336
@@ -10170,7 +10227,7 @@ msgstr ""
 #: cache/17/17a063cd6b023f6b3259fc5bb6f3383f.php:74
 #: cache/9c/9cd9c506c8127381b3a38d63834ca951.php:68
 #: cache/8c/8c08891d370939702e3d45696c9e38d6.php:112
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:732
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:724
 #: cache/0b/0be3ce8babaac9062233441fb19b6502.php:68
 #: cache/4c/4cf917c586e727b0fb8bbf89dacfd02d.php:68
 #: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:394
@@ -10351,12 +10408,12 @@ msgid "Active"
 msgstr ""
 
 #: cache/e5/e5e5434fb79a5ac6a7fd60b41343e917.php:202
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:901
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:885
 msgid "Start time"
 msgstr ""
 
 #: cache/e5/e5e5434fb79a5ac6a7fd60b41343e917.php:206
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:905
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:889
 msgid "End time"
 msgstr ""
 
@@ -10522,7 +10579,7 @@ msgstr ""
 
 #: cache/f5/f5c7640aa7fbb9ab7e2caec1a409d7c2.php:274
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:289
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2545
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2426
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:186
 msgid "Target Type"
 msgstr ""
@@ -10557,8 +10614,8 @@ msgstr ""
 #: cache/f5/f5c7640aa7fbb9ab7e2caec1a409d7c2.php:292
 #: cache/77/774dde73b0eb7965a680b8a52776fa6b.php:246
 #: cache/89/8945ceeea3df1eea58421905bdc6dd5e.php:293
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1245
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2549
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1202
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2430
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:204
 msgid "Target"
 msgstr ""
@@ -10604,7 +10661,7 @@ msgid ""
 msgstr ""
 
 #: cache/eb/eb722a59dac7c3fddd70255e2c4c5f1d.php:56
-#: lib/Controller/DataSet.php:267 lib/Controller/Module.php:117
+#: lib/Controller/DataSet.php:267 lib/Controller/Module.php:130
 msgid "Clear Cache"
 msgstr ""
 
@@ -11182,8 +11239,8 @@ msgstr ""
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:557
 #: cache/7d/7d8878cf40b2a074d7a7dd990858a580.php:90
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:187
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1704
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1726
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1637
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1659
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:270
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:288
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:243
@@ -11246,7 +11303,6 @@ msgstr ""
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:632
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:365
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:371
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1808
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:423
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:580
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:316
@@ -11280,7 +11336,7 @@ msgstr ""
 #: cache/09/09fa06e4cbb20e5f65e2075bff1da423.php:598
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:712
 #: cache/d2/d2fa8bed4d1e30769527c78081442bfc.php:182
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1750
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1683
 #: cache/23/238f0b98d7f96aca9a850e8b230fe1fb.php:295
 #: cache/f3/f3286f195f132c53823b9bb1068e5cc9.php:204
 msgid "Modified Date"
@@ -11455,7 +11511,7 @@ msgstr ""
 
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:415
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:193
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1760
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1693
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:276
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:297
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:250
@@ -11465,7 +11521,7 @@ msgstr ""
 
 #: cache/24/24c5ae3175cea2904ae6bd208e699f50.php:420
 #: cache/49/49b3c02c876e8a464a75e1682c064115.php:193
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1764
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1697
 #: cache/74/74cac03bd6d6bdd54edcfd79c1c2a2fb.php:276
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:300
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:253
@@ -11629,7 +11685,7 @@ msgid ""
 msgstr ""
 
 #: cache/7d/7d8878cf40b2a074d7a7dd990858a580.php:97
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1742
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1675
 msgid "File Size"
 msgstr ""
 
@@ -11966,7 +12022,7 @@ msgid "Edit DMA"
 msgstr ""
 
 #: cache/88/880da8bf57750f4e35ce30624c0c6d79.php:238
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:744
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:732
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:124
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:82
 #: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:585
@@ -12077,7 +12133,7 @@ msgid ""
 msgstr ""
 
 #: cache/d5/d548e4848346b34fa2915d684010817b.php:56
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:401
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:405
 #: cache/fe/fe92f223f863fb1896ced5bd33b8c256.php:551
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:57
 msgid "Edit Layout"
@@ -12569,18 +12625,18 @@ msgid "Connectors"
 msgstr ""
 
 #: cache/41/411fdd8ac98835cf7ed952b29cda0628.php:170
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:780
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:760
 #: cache/8d/8de7dd9661211f3ba39933b564d76990.php:137
 msgid "Copy to Clipboard"
 msgstr ""
 
 #: cache/41/411fdd8ac98835cf7ed952b29cda0628.php:174
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:800
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:780
 msgid "Could not copy"
 msgstr ""
 
 #: cache/41/411fdd8ac98835cf7ed952b29cda0628.php:178
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:804
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:784
 msgid "Copied!"
 msgstr ""
 
@@ -12589,8 +12645,8 @@ msgid "Installed"
 msgstr ""
 
 #: cache/41/411fdd8ac98835cf7ed952b29cda0628.php:410
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1078
-#: lib/Controller/Module.php:109
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1039
+#: lib/Controller/Module.php:122
 msgid "Configure"
 msgstr ""
 
@@ -12647,7 +12703,7 @@ msgid "Navigate to layout with code [layoutTag]?"
 msgstr ""
 
 #: cache/77/774dde73b0eb7965a680b8a52776fa6b.php:218
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2152
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2033
 msgid "Empty layout"
 msgstr ""
 
@@ -12660,8 +12716,8 @@ msgid "Previous Item"
 msgstr ""
 
 #: cache/77/774dde73b0eb7965a680b8a52776fa6b.php:230
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1297
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1945
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1254
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1822
 msgid "Navigate to Widget"
 msgstr ""
 
@@ -12727,7 +12783,7 @@ msgid "Delete %layout%"
 msgstr ""
 
 #: cache/17/1730b41c1b94639a7bb894f0f6bbe405.php:68
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:768
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:748
 #: lib/Controller/Layout.php:1793 lib/Controller/Layout.php:1799
 msgid "Retire"
 msgstr ""
@@ -12793,62 +12849,62 @@ msgid "Add RSS"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:211
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2357
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2238
 msgid "Ascending"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:215
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2361
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2242
 msgid "Descending"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:260
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2368
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2249
 msgid "starts with"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:266
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2374
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2255
 msgid "ends with"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:272
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2380
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2261
 msgid "contains"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:278
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2386
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2267
 msgid "equals"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:284
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2392
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2273
 msgid "does not start with"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:290
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2398
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2279
 msgid "does not end with"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:296
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2404
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2285
 msgid "does not contain"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:302
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2410
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2291
 msgid "does not equal"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:308
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2416
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2297
 msgid "greater than"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:314
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2422
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2303
 msgid "less than"
 msgstr ""
 
@@ -12861,12 +12917,12 @@ msgid "is not empty"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:335
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2431
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2312
 msgid "Or"
 msgstr ""
 
 #: cache/ae/ae039a69e1615431d4752f5fb2b147d3.php:341
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2437
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2318
 msgid "And"
 msgstr ""
 
@@ -13300,9 +13356,9 @@ msgid "Released"
 msgstr ""
 
 #: cache/66/661d79c5da6d14a0db85cd0980868ff7.php:479
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:825
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1840
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1951
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:805
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1717
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1828
 msgid "Widgets"
 msgstr ""
 
@@ -13392,7 +13448,7 @@ msgid ""
 msgstr ""
 
 #: cache/25/257d7652c0b04ca6e480ad5c9beaa3c2.php:79
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2478
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2359
 msgid "Spots"
 msgstr ""
 
@@ -13402,12 +13458,12 @@ msgid "Locked"
 msgstr ""
 
 #: cache/25/257d7652c0b04ca6e480ad5c9beaa3c2.php:325
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:345
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:349
 msgid "Add"
 msgstr ""
 
 #: cache/25/257d7652c0b04ca6e480ad5c9beaa3c2.php:331
-#: lib/Controller/StatusDashboard.php:301 lib/Report/LibraryUsage.php:207
+#: lib/Controller/StatusDashboard.php:302 lib/Report/LibraryUsage.php:207
 #: lib/Report/LibraryUsage.php:555
 msgid "Empty"
 msgstr ""
@@ -13418,7 +13474,7 @@ msgid "Discard %layout%"
 msgstr ""
 
 #: cache/40/4029f5db3a11dd01464e9160f8b6cf6f.php:72
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:776
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:756
 #: lib/Controller/Template.php:183 lib/Controller/Layout.php:1656
 msgid "Discard"
 msgstr ""
@@ -13492,8 +13548,8 @@ msgid ""
 msgstr ""
 
 #: cache/8a/8acc5a2af63338673a6de3f58764bb95.php:58
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1003
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:247
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:964
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:251
 msgid "Edit Playlist"
 msgstr ""
 
@@ -14029,121 +14085,103 @@ msgid "Delete %obj%"
 msgstr ""
 
 #: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:716
-msgid "Delete selected items"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:720
-msgid "Are you sure? All changes related to this object will be erased"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:724
 msgid "Changes that you have made may not be saved!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:736
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:728
 #: cache/37/37f12704cf17017038d73d9ee1907d04.php:312
 msgid "Select All"
 msgstr ""
 
 #: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:740
-msgid "All changes saved!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:752
 msgid "Load %prop% for %obj%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:756
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:744
 msgid "Loading"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:760
-msgid "Tooltips disabled!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:764
-msgid "Tooltips enabled!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:772
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:752
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:156
 #: cache/8d/8d27a7617bf5bf7e7c28a56a7b503514.php:74
 #: lib/Controller/Template.php:177 lib/Controller/Layout.php:1650
 msgid "Publish"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:784
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:764
 msgid "Detach Editor"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:788
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:768
 msgid "Attach Editor"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:792
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:266
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:772
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:270
 msgid "Zoom in"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:796
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:270
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:776
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:274
 msgid "Zoom out"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:808
-msgid "Module not enabled!"
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:788
+msgid ""
+"This widget isn't enabled and can't be configured, please contact your "
+"administrator for help."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:812
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:792
 #: lib/Controller/Playlist.php:382
 msgid "Timeline"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:821
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:801
 msgid "Zones"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:834
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1273
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:818
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1230
 msgid "Delete Action"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:838
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:822
 msgid "Are you sure you want to delete this action?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:855
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:839
 msgid "Replace Layout"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:859
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:843
 msgid "Are you sure you want to replace your Layout with a template?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:868
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2159
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:852
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2040
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:691
 msgid "Replace"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:874
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:858
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:128
 msgid "Exit"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:881
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:865
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:704
 msgid "Upload media"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:885
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:869
 #: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:257
 #: cache/cb/cb0f801b3d2ddd3d1f61f47414d32047.php:278
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:615
 msgid "Add files"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:889
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:873
 #: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:261
 #: cache/cb/cb0f801b3d2ddd3d1f61f47414d32047.php:282
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:619
@@ -14151,7 +14189,7 @@ msgstr ""
 msgid "Start upload"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:893
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:877
 #: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:265
 #: cache/cb/cb0f801b3d2ddd3d1f61f47414d32047.php:286
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:623
@@ -14159,630 +14197,574 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:897
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2183
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:881
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2064
 #: cache/37/37f12704cf17017038d73d9ee1907d04.php:606
 #: cache/cb/cb0f801b3d2ddd3d1f61f47414d32047.php:290
 #: cache/b2/b21687508ff5b0bb637fdbd3f8c0d3c6.php:337
 msgid "Processing..."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:909
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2207
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:893
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2088
 msgid "Set Expiry Dates"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:913
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2211
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:897
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2092
 msgid "Use the check box to set Start and End dates and times for Widgets"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:917
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2215
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:901
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2096
 #: cache/72/72bfb52fd80e06544d4442d19663906a.php:97
 msgid "Select the start time for this widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:921
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2219
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:905
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2100
 #: cache/72/72bfb52fd80e06544d4442d19663906a.php:112
 msgid "Select the end time for this widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:925
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2223
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:909
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2104
 msgid "Delete on Expiry"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:929
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2227
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:913
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2108
 #: cache/72/72bfb52fd80e06544d4442d19663906a.php:127
 msgid ""
 "When the End Time for this Widget passes should the Widget be removed from "
 "the Playlist?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:933
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:917
 msgid "Delete from Library"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:937
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:921
 msgid "Remove file from the Media Library"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:945
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2179
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:929
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2060
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:805
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:631
 msgid "Change Current Folder location"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:953
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:937
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:813
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:639
 msgid "Upload files to this Folder"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:960
-msgid ""
-"Are you sure you want to remove this %obj%? This action cannot be undone."
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:964
-msgid ""
-"This widget is linked to Media in the Library which is also in use "
-"elsewhere. If this should be deleted then please do so from the Library page."
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:968
-#: cache/8d/8d762416eec05c4841be70e1b937f167.php:109
-#: cache/8d/8d762416eec05c4841be70e1b937f167.php:114
-msgid "Also delete from the Library?"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:972
-#: cache/8d/8d762416eec05c4841be70e1b937f167.php:120
-msgid ""
-"This widget is linked to Media in the Library. Check this option to also "
-"delete that Media."
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:976
-msgid ""
-"Are you sure you want to remove these items? This action cannot be undone."
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:983
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:944
 msgid "Edit Attached Audio"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:987
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:948
 msgid "Edit Expiry Dates"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:991
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:952
 msgid "Edit Transition In"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:995
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:956
 msgid "Edit Transition Out"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:999
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:960
 msgid "Edit Sharing"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1007
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:968
 msgid "Move one step left"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1011
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:972
 msgid "Move one step right"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1015
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:976
 msgid "Move to the top left"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1019
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:980
 msgid "Move to the top right"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1023
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:984
 msgid "Bring to front"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1027
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:988
 msgid "Bring forward"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1031
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:992
 msgid "Send backwards"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1035
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:996
 msgid "Send to back"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1043
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1004
 #: cache/37/37f12704cf17017038d73d9ee1907d04.php:368
 msgid "Duplicate"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1047
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1008
 msgid "Group elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1051
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1012
 msgid "Ungroup elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1055
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1016
 msgid "Delete all"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1066
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1224
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2033
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2049
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1027
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1181
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1910
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1926
 msgid "Zone"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1082
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1043
 msgid "Appearance"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1118
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1079
 msgid "Scale"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1126
-msgid "This widget needs to be configured before it will be shown"
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1087
+msgid "This widget needs to be configured before it will be shown."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1130
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1091
 msgid ""
 "This widget needs to have at least one of the following elements: %elements%."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1134
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1095
 msgid "Data Slot"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1138
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1099
 msgid ""
 "When there are more than one of the same element for a widget you can set "
 "the slot for each element. For example with two of the same element you'd "
 "have data slot 1 and data slot 2. If 10 items were returned slot 1 would "
-"receive items 1,3,5,7,9 and slot 2 would receive items 2,4,6,8,19."
+"receive items 1,3,5,7,9 and slot 2 would receive items 2,4,6,8,10."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1142
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1103
 msgid "Pin this slot?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1146
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1107
 msgid ""
 "The first item that appears in a slot will be pinned and will not cycle with "
 "the rest of the items."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1150
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1111
 msgid "Scale with group"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1154
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1115
 msgid "Scale element when scaling containing group."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1158
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1119
 msgid "Align"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1162
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1123
 msgid "Alignment when scaling the containing group."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1167
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1128
 msgid "Top/Left"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1171
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1132
 msgid "Top/Right"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1175
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1136
 msgid "Bottom/Left"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1179
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1140
 msgid "Bottom/Right"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1184
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1145
 msgid "Something went wrong!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1188
-msgid "Select a target zone!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1193
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1150
 msgid "No actions to show"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1197
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1154
 msgid "Other Actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1201
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1158
 msgid "* Not Defined"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1206
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1163
 msgid "Layout Actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1210
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1167
 msgid "Zone Actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1214
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1171
 msgid "Widget Actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1241
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1325
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1198
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1282
 msgid "Trigger"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1249
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1206
 msgid ""
 "If your Widget is a Shell Command you can select to target 'Screen' to run "
 "the command without affecting any Zones. For all other Widgets select 'Zone' "
 "as target."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1253
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1210
 msgid "Touch/Click"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1257
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1214
 msgid "Web hook"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1269
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1226
 msgid "Edit Action"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1277
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1925
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1234
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1802
 msgid "Next Layout"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1281
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1929
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1238
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1806
 msgid "Previous Layout"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1285
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1933
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:255
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1242
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1810
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:259
 msgid "Next Widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1289
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1937
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:251
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1246
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1814
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:255
 msgid "Previous Widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1301
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1258
 msgid "Widget to Load"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1305
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1262
 msgid "Select of create a Widget to be loaded"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1309
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2533
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1266
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2414
 msgid "Trigger Type"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1313
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1270
 msgid "How should the Player listen for this Action to be triggered?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1321
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1278
 msgid ""
 "If this Action is triggered by a Web Hook then this Trigger Code must be "
 "present in the URL `trigger=` parameter."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1329
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1286
 msgid "Select the target for the Trigger"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1337
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1294
 msgid ""
 "Please enter the Code identifier for the Layout as assigned in the Add / "
 "Edit Layout form."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1341
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1298
 msgid "-- Create New --"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1351
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1308
 msgid "Layer related to all layout objects"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1355
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1312
 msgid "Element Layer"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1359
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1316
 msgid "Layer for the element related to other elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1363
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1320
+msgid "Element Group Layer"
+msgstr ""
+
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1324
+msgid ""
+"Layer for the element group related to other groups or elements without group"
+msgstr ""
+
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1328
 msgid "Canvas Layer"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1367
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1332
 msgid "Layer for the canvas containing all elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1387
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1352
 msgid "Rotation"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1391
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1356
 msgid ""
 "Make this full screen, dimensions will be set to %layout.width% by %layout."
 "height%."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1409
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1374
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:131
 msgid "No Image set, add from Toolbar or Upload!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1413
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1378
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:143
 msgid "Add background image"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1417
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1382
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:156
 msgid "Upload"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1421
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1386
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:164
 #: cache/37/37f12704cf17017038d73d9ee1907d04.php:412
 msgid "Remove"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1429
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1394
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:187
 msgid "Change the resolution"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1437
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1402
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:202
 msgid ""
 "The layering order of the background image (z-index). Advanced use only."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1441
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1406
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:212
 msgid "Automatically apply Transitions?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1445
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1410
 #: cache/0c/0cc104a3d7987780eed7a70657ece580.php:217
 msgid ""
 "When enabled, the default Transition type and duration will be applied to "
 "all widgets on this Layout."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1455
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1541
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1420
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1506
 msgid "An optional name for this widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1459
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1424
 msgid "Content Synchronisation Key"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1463
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1428
 msgid ""
 "If this layout is scheduled using a synchronised event, this key will be "
 "used to match with other layouts in the same event."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1471
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1436
 msgid "If there is only one item in this %region.type% should it loop?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1475
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1440
 msgid "When should the %regionType% Loop be enabled?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1479
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1444
 msgid ""
 "* If your %regionType% contains more than one Widget, Loop should not be "
 "enabled."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1483
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1448
 msgid ""
 "* If your %regionType% contains one Widget, and that Widget is a 'fixed' "
 "item (eg Text), Loop should not be enabled."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1487
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1452
 msgid ""
 "* If your %regionType% contains one Widget, and that Widget needs to update "
 "periodically (eg RSS Ticker Widget), Loop can be enabled ONLY if the Widget "
 "needs to update MORE frequently than the duration of the overall Layout."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1495
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1460
 msgid "The layering order of this %regionType% (z-index). Advanced use only."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1503
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1468
 msgid "The top position of the %regionType%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1511
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1476
 msgid "The left position of the %regionType%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1519
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1484
 msgid "The width of the %regionType%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1527
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1492
 msgid "The height of the %regionType%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1531
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1496
 msgid ""
 "Make this %regionType% full screen, dimensions will be set to %layout.width% "
 "by %layout.height%."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1545
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1510
 msgid "Set a duration?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1549
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1514
 msgid "Select to provide a specific duration for this Widget"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1557
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1522
 msgid "The duration of the widget in seconds"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1565
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1530
 msgid ""
 "Enable the collection of Proof of Play statistics for this Widget. Ensure "
 "that ‘Enable Stats Collection’ is set to ‘On’ in the Display Settings."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1581
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1546
 msgid "Repeat items to fill all data slots?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1585
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1550
 msgid ""
 "Once all items have been placed in a slot, any empty slots will be filled "
 "with items from the start."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1595
-msgid "%tagCount% tags"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1599
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1560
 msgid "Delete selected %object%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1603
-msgid "Select multiple widgets"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1607
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1564
 msgid "Change Layout"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1615
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1572
 msgid "Tooltips?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1619
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1576
 msgid ""
 "Show/Hide tooltips which provide help; informational tooltips will remain."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1623
-msgid "Library Media Search"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1627
-msgid "Close all tabs"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1631
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1684
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1580
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1617
 msgid "Search"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1635
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1584
 msgid "Select"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1639
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1588
 msgid "Deselect"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1647
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1596
 msgid "Preview media"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1651
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1600
 #: lib/Controller/SavedReport.php:142
 msgid "Open"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1655
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1604
 msgid "Mark as favourite"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1659
-msgid "Scroll to the start!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1663
-msgid "Scroll to the end!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1667
-msgid "Scroll left!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1671
-msgid "Scroll right!"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1675
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1608
 msgid "Upload new"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1679
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1612
 msgid "Upload %obj%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1692
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1625
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:311
 msgid "Tag"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1708
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1641
 msgid "Provider"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1718
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1651
 msgid "Media Id"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1756
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1770
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2582
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1689
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1703
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2463
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:247
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:295
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:317
@@ -14790,558 +14772,529 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1774
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1707
 msgid "Local"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1783
-msgid "Library Search %tagId%"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1788
-msgid "Tools"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1792
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2525
-msgid "Id"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1814
-msgid "Media Add Queue"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1818
-msgid "Clear Queue"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1822
-msgid "Add to Selected Zone"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1826
-msgid "Add to Playlist"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1830
-msgid "Click in Zone to Add"
-msgstr ""
-
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1844
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1721
 msgid "Add widgets"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1848
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1725
 msgid "Global"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1852
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1729
 msgid "Global Elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1860
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1737
 msgid "Library image search"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1868
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1745
 msgid "Library audio search"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1876
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1753
 msgid "Library video search"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1880
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1757
 msgid "Other"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1884
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1761
 msgid "Library other media search"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1888
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1959
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2521
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1765
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1836
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2402
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:216
 msgid "Actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1892
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1769
 msgid "Interactive actions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1896
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1773
 msgid "Layout Templates"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1900
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1777
 msgid "Search for Layout Templates"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1906
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1783
 msgid "Move Window"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1910
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1787
 msgid "Close Window"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1914
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1791
 msgid "Minimise Window"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1918
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1795
 msgid "New Tab"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1955
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1832
 msgid "Data Widgets"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1963
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1840
 msgid "Favourites"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1967
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1844
 msgid "Elements"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1971
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1848
 msgid "Stencils"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1975
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1852
 msgid "Static Templates"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1979
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1856
 msgid "Close content"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1983
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1860
 msgid "No widgets to display"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1987
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1864
 msgid "No actions to display"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1991
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1868
 msgid "No templates to display"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1995
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1872
 msgid "No media to display!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1999
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1876
 msgid "Show more"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2003
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1880
 msgid "No more results for this filter!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2008
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1885
 #: cache/cb/cb1c15ce617fd7e7648d38bb0b2b48f5.php:934
 msgid "Close Preview"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2012
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1889
 #: cache/cb/cb1c15ce617fd7e7648d38bb0b2b48f5.php:938
 msgid "Change window size"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2016
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1893
 msgid "Select media to add"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2020
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2080
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1897
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1957
 msgid "Dimensions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2037
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1914
 msgid "Element"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2041
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1918
 msgid "Element Group"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2053
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1930
 msgid "Replace your Layout with a template?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2057
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1934
 msgid "Required"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2068
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:302
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1945
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:306
 msgid "Layout name"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2076
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:306
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1953
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:310
 msgid "Layout duration"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2084
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:310
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1961
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:314
 msgid "Layout dimensions"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2088
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1965
 msgid "Layout Actions:"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2092
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1969
 msgid "My Layouts?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2100
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1977
 msgid "Revert %target% form save"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2104
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1981
 msgid "Revert %target% order"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2108
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1985
 msgid "Revert %target% transformation"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2112
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2120
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1989
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1997
 msgid "Revert %target% creation"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2116
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:1993
 msgid "Revert %target% assignment"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2128
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2005
 msgid "Layers"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2140
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2021
 msgid "In %groupId%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2163
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2044
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:742
 msgid "Add Replacement"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2167
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2048
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:746
 msgid "Start Replace"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2171
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2052
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:750
 msgid "Cancel Replace"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2188
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2069
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:312
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:755
 msgid "Update this media in all layouts it is assigned to?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2192
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2073
 #: cache/c5/c52b8109558dd3acc604e183177113c8.php:317
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:759
 msgid "Note: It will only be updated in layouts you have permission to edit."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2198
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2079
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:765
 msgid "Delete the old version?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2202
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2083
 #: cache/10/10b7f3b85c460e6ccc00e28eed2bf591.php:769
 msgid ""
 "Completely remove the old version of this media item if a new file is being "
 "uploaded."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2235
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2116
 msgid "ERROR"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2239
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2120
 msgid "There was a problem loading the Layout!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2243
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2124
 msgid "There was a problem loading the Playlist!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2247
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2128
 msgid "User save preferences failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2251
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2132
 msgid "User load preferences failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2255
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2136
 msgid "Library load failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2259
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2140
 msgid "Form load failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2263
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2144
 msgid "Revert failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2267
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2148
 msgid "Save order failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2271
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2152
 msgid "Delete failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2275
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2156
 msgid "Save all changes failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2279
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2160
 msgid "Remove all changes failed!!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2283
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2164
 msgid "Importing media failed!!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2287
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2168
 msgid "Add media failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2291
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2172
 msgid "Add module failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2295
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2176
 msgid "Create region failed: %error%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2299
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2180
 msgid "List order not Changed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2303
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2184
 msgid "Playlist save order failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2307
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2188
 msgid "Get form failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2311
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2192
 msgid "Transform zone failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2315
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2196
 msgid "Preview failed!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2319
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2200
 msgid "No widgets need saving!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2323
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2204
 msgid "Missing required property %property%"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2327
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2208
 #: cache/cb/cbed339b261aade59b9d7cdbdfb46dcc.php:712
 #: lib/Connector/XiboAudienceReportingConnector.php:899
 #: lib/Connector/XiboAudienceReportingConnector.php:974
 msgid "Unknown Error"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2334
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2215
 msgid "Set to start"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2338
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2219
 msgid "Set to expire"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2342
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2223
 #: cache/05/05600263dc8230138bb0f89338bbef69.php:104 web/xmds.php:136
 msgid "Expired"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2450
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2331
 msgid "Fill - use the first Playlist to fill any remaining Spots"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2454
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2335
 msgid "Pad"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2458
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2339
 msgid "Pad - use the first Playlist to pad any remaining Spots"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2462
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2343
 msgid "Repeat"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2466
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2347
 msgid ""
 "Repeat - repeat the Widgets in this Playlist until the number of Spots have "
 "been filled"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2474
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2355
 msgid ""
 "How many spots would you like on this Sub-Playlist? This is used before "
 "ordering to expand or shrink the list to the specified size. Leave empty to "
 "use the count of Widgets."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2482
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2363
 msgid ""
 "Set the duration of all Widgets in the Playlist to a specific value in "
 "seconds. Leave empty to use each Widget duration."
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2486
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2367
 msgid "Spot Length"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2490
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2371
 msgid ""
 "If there are not enough Widgets fill all spots, how should the remaining "
 "spots be filled?"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2494
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2375
 msgid "Spot Fill"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2498
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2379
 msgid "You do not have access to this playlist"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2502
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2383
 msgid "Playlist Id"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2509
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2390
 msgid "Columns Available"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2513
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2394
 msgid "Columns Selected"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2529
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2406
+msgid "Id"
+msgstr ""
+
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2410
 msgid "Owner Id"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2563
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2444
 msgid "Add Action"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2567
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2448
 msgid "Click to Add a new Action"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2575
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2456
 msgid "There can only be one category per zone!"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2586
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2467
 msgid "Show All"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2590
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2471
 msgid "Show Paged"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2598
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2479
 msgid "No Transition"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2602
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2483
 msgid "Marquee Left"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2606
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2487
 msgid "Marquee Right"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2610
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2491
 msgid "Marquee Up"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2614
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2495
 msgid "Marquee Down"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2618
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2499
 msgid "Fade"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2626
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2507
 msgid "Scroll Horizontal"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2630
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2511
 msgid "Scroll Vertical"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2634
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2515
 msgid "Flip Horizontal"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2638
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2519
 msgid "Flip Vertical"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2642
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2523
 msgid "Shuffle"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2646
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2527
 msgid "Tile Slide"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2650
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2531
 msgid "Tile Blind"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2658
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2539
 msgid "Edit Playlist - %playlistName% - "
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2662
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2543
 msgid "Widgets count"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2667
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2548
 msgid "Zoom In"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2671
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2552
 msgid "Zoom Out"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2675
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2556
 msgid "Default zoom"
 msgstr ""
 
-#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2679
+#: cache/74/744308e2456d1f83f205ef9ab9fe3022.php:2560
 msgid "Change scale mode"
 msgstr ""
 
@@ -15677,184 +15630,188 @@ msgid ""
 "or continue to view it in a read only mode."
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:227
-msgid "Inline Editor"
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:224
+msgid "Showing sample data"
 msgstr ""
 
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:231
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:409
-msgid "Next widget"
+msgid "Inline Editor"
 msgstr ""
 
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:235
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:413
-msgid "Previous widget"
+msgid "Next widget"
 msgstr ""
 
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:239
-msgid "Add Widget"
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:417
+msgid "Previous widget"
 msgstr ""
 
 #: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:243
+msgid "Add Widget"
+msgstr ""
+
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:247
 msgid "Edit Group"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:259
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:263
 #: lib/Controller/Region.php:672
 msgid "Empty Playlist"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:274
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:278
 msgid "Reset zoom"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:278
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:282
 msgid "Visible area time span"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:282
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:286
 msgid "Zoom out to see timeruler!"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:286
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:290
 msgid ""
 "No Regions: Add a Region to start creating content by clicking here or the "
 "Edit Layout icon below!"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:290
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:294
 msgid "Scroll to selected widget"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:294
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:298
 msgid "Visible area start time"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:298
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:302
 msgid "Visible area end time"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:314
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:318
 msgid "Add to this position"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:318
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:322
 msgid "Zoom in to see more details!"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:322
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:326
 msgid "Edit region"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:326
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:330
 msgid "Open as playlist"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:330
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:334
 msgid "Widget Actions:"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:334
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:338
 msgid "Region Actions:"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:341
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:345
 msgid "Edit layout regions"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:349
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:353
 msgid "Add a new region"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:353
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:357
 msgid "Delete region"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:357
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:361
 msgid "Undo"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:361
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:365
 msgid "Revert last change"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:369
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:373
 msgid "Return to Layout View"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:377
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:381
 msgid "Save changes"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:381
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:385
 msgid "Go back to Layout view"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:385
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:389
 msgid "Save editor changes"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:389
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:393
 msgid "Play Layout preview"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:393
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:397
 msgid "Preview stopped!"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:397
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:401
 msgid "Click to Play again"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:405
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:409
 msgid "Stop Layout preview"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:419
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:423
 msgid "Region"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:423
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:427
 msgid "Add a Region"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:433
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:437
 msgid "Upload Audio files to assign to Widgets"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:439
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:443
 msgid "Expiry Dates"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:443
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:447
 msgid "Enter start and end times for Widgets"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:449
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:453
 msgid "Transition In"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:453
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:457
 msgid "Apply a Transition type for the start of a media item"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:459
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:463
 msgid "Transition Out"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:463
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:467
 msgid "Apply a Transition type for the end of a media item"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:473
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:477
 msgid "Set View, Edit and Delete Sharing for Widgets and Playlists"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:643
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:647
 msgid "Add Background Image"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:650
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:654
 #: cache/c5/c5ca1344d07a74a91c5de3a21d4c2de4.php:305
 #: cache/08/08aee2625ba2279e6a2c6465471b11e8.php:243
 #: cache/37/37f12704cf17017038d73d9ee1907d04.php:380
@@ -15870,16 +15827,16 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:663
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:667
 msgid "Browse/Add Image"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:667
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:671
 #: cache/c5/c5ca1344d07a74a91c5de3a21d4c2de4.php:322
 msgid "Start Upload"
 msgstr ""
 
-#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:671
+#: cache/1b/1b4d10b8bb67ce8b30ada153b15daf6e.php:675
 #: cache/c5/c5ca1344d07a74a91c5de3a21d4c2de4.php:326
 msgid "Cancel Upload"
 msgstr ""
@@ -17548,11 +17505,11 @@ msgstr ""
 msgid "Lead"
 msgstr ""
 
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1634
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1639
 msgid "Set The same Layout on all displays?"
 msgstr ""
 
-#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1638
+#: cache/a7/a7a26926ec2b52230c8037d640a807ea.php:1643
 msgid "Mirror"
 msgstr ""
 
@@ -18078,6 +18035,17 @@ msgstr ""
 msgid "Select the date and time to publish the layout"
 msgstr ""
 
+#: cache/8d/8d762416eec05c4841be70e1b937f167.php:109
+#: cache/8d/8d762416eec05c4841be70e1b937f167.php:114
+msgid "Also delete from the Library?"
+msgstr ""
+
+#: cache/8d/8d762416eec05c4841be70e1b937f167.php:120
+msgid ""
+"This widget is linked to Media in the Library. Check this option to also "
+"delete that Media."
+msgstr ""
+
 #: cache/8d/8de7dd9661211f3ba39933b564d76990.php:57
 msgid "Edit Application"
 msgstr ""
@@ -20010,7 +19978,7 @@ msgid "Please provide LayoutId"
 msgstr ""
 
 #: lib/Controller/Action.php:348 lib/Controller/Action.php:498
-#: lib/Controller/Action.php:562 lib/Controller/Layout.php:2931
+#: lib/Controller/Action.php:562 lib/Controller/Layout.php:2938
 msgid "Layout is not checked out"
 msgstr ""
 
@@ -20034,20 +20002,20 @@ msgstr ""
 msgid "Provided source is invalid. "
 msgstr ""
 
-#: lib/Controller/Module.php:251
+#: lib/Controller/Module.php:265
 #, php-format
 msgid "Configured %s"
 msgstr ""
 
-#: lib/Controller/Module.php:300
+#: lib/Controller/Module.php:314
 msgid "Cleared the Cache"
 msgstr ""
 
-#: lib/Controller/Module.php:317
+#: lib/Controller/Module.php:349
 msgid "Please provide a datatype"
 msgstr ""
 
-#: lib/Controller/Module.php:397
+#: lib/Controller/Module.php:430
 msgid "Please provide an assetId"
 msgstr ""
 
@@ -20172,7 +20140,7 @@ msgid ""
 msgstr ""
 
 #: lib/Controller/Playlist.php:1200 lib/Controller/Library.php:2246
-#: lib/Controller/Layout.php:2158
+#: lib/Controller/Layout.php:2165
 #, php-format
 msgid "Copied as %s"
 msgstr ""
@@ -20297,20 +20265,20 @@ msgstr ""
 msgid "Route is available through the API"
 msgstr ""
 
-#: lib/Controller/Library.php:1796 lib/Controller/Layout.php:2223
+#: lib/Controller/Library.php:1796 lib/Controller/Layout.php:2230
 msgid "No tags to assign"
 msgstr ""
 
-#: lib/Controller/Library.php:1807 lib/Controller/Layout.php:2234
+#: lib/Controller/Library.php:1807 lib/Controller/Layout.php:2241
 #, php-format
 msgid "Tagged %s"
 msgstr ""
 
-#: lib/Controller/Library.php:1870 lib/Controller/Layout.php:2299
+#: lib/Controller/Library.php:1870 lib/Controller/Layout.php:2306
 msgid "No tags to unassign"
 msgstr ""
 
-#: lib/Controller/Library.php:1881 lib/Controller/Layout.php:2309
+#: lib/Controller/Library.php:1881 lib/Controller/Layout.php:2316
 #, php-format
 msgid "Untagged %s"
 msgstr ""
@@ -20369,24 +20337,24 @@ msgstr ""
 msgid "Imported"
 msgstr ""
 
-#: lib/Controller/StatusDashboard.php:222
+#: lib/Controller/StatusDashboard.php:223
 msgid "Used"
 msgstr ""
 
-#: lib/Controller/StatusDashboard.php:230
+#: lib/Controller/StatusDashboard.php:231
 msgid "Available"
 msgstr ""
 
-#: lib/Controller/StatusDashboard.php:295 lib/Report/LibraryUsage.php:201
+#: lib/Controller/StatusDashboard.php:296 lib/Report/LibraryUsage.php:201
 #: lib/Report/LibraryUsage.php:549
 msgid "Free"
 msgstr ""
 
-#: lib/Controller/StatusDashboard.php:415
+#: lib/Controller/StatusDashboard.php:417
 msgid "Latest news not available."
 msgstr ""
 
-#: lib/Controller/StatusDashboard.php:418
+#: lib/Controller/StatusDashboard.php:420
 msgid "Latest news not enabled."
 msgstr ""
 
@@ -20437,9 +20405,9 @@ msgstr ""
 #: lib/Controller/Layout.php:956 lib/Controller/Layout.php:1058
 #: lib/Controller/Layout.php:1106 lib/Controller/Layout.php:1155
 #: lib/Controller/Layout.php:1224 lib/Controller/Layout.php:1263
-#: lib/Controller/Layout.php:2657 lib/Controller/Layout.php:2708
-#: lib/Controller/Layout.php:2747 lib/Controller/Layout.php:2816
-#: lib/Controller/Layout.php:2876 lib/Controller/Layout.php:2926
+#: lib/Controller/Layout.php:2664 lib/Controller/Layout.php:2715
+#: lib/Controller/Layout.php:2754 lib/Controller/Layout.php:2823
+#: lib/Controller/Layout.php:2883 lib/Controller/Layout.php:2933
 msgid "You do not have permissions to edit this layout"
 msgstr ""
 
@@ -20475,19 +20443,19 @@ msgstr ""
 msgid "Invalid Module"
 msgstr ""
 
-#: lib/Controller/Layout.php:1613 lib/Controller/Layout.php:2361
+#: lib/Controller/Layout.php:1613 lib/Controller/Layout.php:2368
 msgid "This Layout is ready to play"
 msgstr ""
 
-#: lib/Controller/Layout.php:1614 lib/Controller/Layout.php:2365
+#: lib/Controller/Layout.php:1614 lib/Controller/Layout.php:2372
 msgid "There are items on this Layout that can only be assessed by the Display"
 msgstr ""
 
-#: lib/Controller/Layout.php:1615 lib/Controller/Layout.php:2369
+#: lib/Controller/Layout.php:1615 lib/Controller/Layout.php:2376
 msgid "This Layout has not been built yet"
 msgstr ""
 
-#: lib/Controller/Layout.php:1616 lib/Controller/Layout.php:2373
+#: lib/Controller/Layout.php:1616 lib/Controller/Layout.php:2380
 msgid "This Layout is invalid and should not be scheduled"
 msgstr ""
 
@@ -20523,74 +20491,74 @@ msgstr ""
 msgid "Unretire"
 msgstr ""
 
-#: lib/Controller/Layout.php:2072
+#: lib/Controller/Layout.php:2079
 msgid "Cannot copy a Draft Layout"
 msgstr ""
 
-#: lib/Controller/Layout.php:2218 lib/Controller/Layout.php:2294
+#: lib/Controller/Layout.php:2225 lib/Controller/Layout.php:2301
 msgid "Cannot manage tags on a Draft Layout"
 msgstr ""
 
-#: lib/Controller/Layout.php:2423 lib/Controller/Layout.php:2461
+#: lib/Controller/Layout.php:2430 lib/Controller/Layout.php:2468
 msgid "Cannot export Draft Layout"
 msgstr ""
 
-#: lib/Controller/Layout.php:2591
+#: lib/Controller/Layout.php:2598
 msgid "Layout background must be an image"
 msgstr ""
 
-#: lib/Controller/Layout.php:2713
+#: lib/Controller/Layout.php:2720
 msgid "Layout is already checked out"
 msgstr ""
 
-#: lib/Controller/Layout.php:2722
+#: lib/Controller/Layout.php:2729
 #, php-format
 msgid "Checked out %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:2838
+#: lib/Controller/Layout.php:2845
 #, php-format
 msgid "Published %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:2845
+#: lib/Controller/Layout.php:2852
 #, php-format
 msgid "Layout will be published on %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:2943
+#: lib/Controller/Layout.php:2950
 #, php-format
 msgid "Discarded %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:2994
+#: lib/Controller/Layout.php:3001
 msgid ""
 "This function is available only to User who originally locked this Layout."
 msgstr ""
 
-#: lib/Controller/Layout.php:3076 lib/Entity/Layout.php:2266
+#: lib/Controller/Layout.php:3083 lib/Entity/Layout.php:2266
 msgid "Empty Region"
 msgstr ""
 
-#: lib/Controller/Layout.php:3180
+#: lib/Controller/Layout.php:3187
 msgid "Incorrect image data"
 msgstr ""
 
-#: lib/Controller/Layout.php:3205
+#: lib/Controller/Layout.php:3212
 msgid "Thumbnail not found for Layout"
 msgstr ""
 
-#: lib/Controller/Layout.php:3297
+#: lib/Controller/Layout.php:3304
 #, php-format
 msgid "Please select %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:3315
+#: lib/Controller/Layout.php:3322
 #, php-format
 msgid "Fetched %s"
 msgstr ""
 
-#: lib/Controller/Layout.php:3435
+#: lib/Controller/Layout.php:3442
 #, php-format
 msgid "Created %s"
 msgstr ""
@@ -20621,17 +20589,17 @@ msgid ""
 "empty"
 msgstr ""
 
-#: lib/Controller/CypressTest.php:160 lib/Controller/Schedule.php:1135
-#: lib/Controller/Schedule.php:1758
+#: lib/Controller/CypressTest.php:160 lib/Controller/Schedule.php:1137
+#: lib/Controller/Schedule.php:1757
 msgid "Direct scheduling of an Ad Campaign is not allowed"
 msgstr ""
 
-#: lib/Controller/CypressTest.php:171 lib/Controller/Schedule.php:1146
-#: lib/Controller/Schedule.php:1769 lib/Entity/Schedule.php:622
+#: lib/Controller/CypressTest.php:171 lib/Controller/Schedule.php:1148
+#: lib/Controller/Schedule.php:1768 lib/Entity/Schedule.php:622
 msgid "Share of Voice must be a whole number between 0 and 3600"
 msgstr ""
 
-#: lib/Controller/CypressTest.php:197 lib/Controller/Schedule.php:1323
+#: lib/Controller/CypressTest.php:197 lib/Controller/Schedule.php:1322
 msgid "Added Event"
 msgstr ""
 
@@ -21178,7 +21146,7 @@ msgid "%s scheduled on %s"
 msgstr ""
 
 #: lib/Controller/Schedule.php:373 lib/Controller/Schedule.php:631
-#: lib/Controller/Schedule.php:2284 lib/Entity/Schedule.php:1851
+#: lib/Controller/Schedule.php:2283 lib/Entity/Schedule.php:1851
 msgid "Private Item"
 msgstr ""
 
@@ -21192,19 +21160,19 @@ msgstr ""
 msgid ", Repeats every %s %s"
 msgstr ""
 
-#: lib/Controller/Schedule.php:1198 lib/Controller/Schedule.php:1812
+#: lib/Controller/Schedule.php:1200 lib/Controller/Schedule.php:1811
 msgid "Please enter a from date"
 msgstr ""
 
-#: lib/Controller/Schedule.php:1511 lib/Controller/Schedule.php:2060
+#: lib/Controller/Schedule.php:1510 lib/Controller/Schedule.php:2059
 msgid "Deleted Event"
 msgstr ""
 
-#: lib/Controller/Schedule.php:1979
+#: lib/Controller/Schedule.php:1978
 msgid "Edited Event"
 msgstr ""
 
-#: lib/Controller/Schedule.php:2427 lib/Factory/RequiredFileFactory.php:419
+#: lib/Controller/Schedule.php:2426 lib/Factory/RequiredFileFactory.php:419
 msgid "Unknown type"
 msgstr ""
 
@@ -21440,7 +21408,7 @@ msgid "Invalid type"
 msgstr ""
 
 #: lib/Entity/Campaign.php:476 lib/Entity/MenuBoard.php:249
-#: lib/Entity/SyncGroup.php:278 lib/Entity/MenuBoardCategory.php:167
+#: lib/Entity/SyncGroup.php:279 lib/Entity/MenuBoardCategory.php:167
 #: lib/Entity/MenuBoardProduct.php:151 lib/Entity/DayPart.php:160
 msgid "Name cannot be empty"
 msgstr ""
@@ -21513,7 +21481,7 @@ msgstr ""
 msgid "Please select a Widget"
 msgstr ""
 
-#: lib/Entity/Module.php:536
+#: lib/Entity/Module.php:540
 msgid "Default Duration is a required field."
 msgstr ""
 
@@ -21556,15 +21524,20 @@ msgstr ""
 msgid "Missing name"
 msgstr ""
 
-#: lib/Entity/SyncGroup.php:282
+#: lib/Entity/SyncGroup.php:283
 msgid "Sync Publisher Port cannot be empty"
 msgstr ""
 
-#: lib/Entity/SyncGroup.php:286
+#: lib/Entity/SyncGroup.php:287
 msgid "Please select lead Display for this sync group"
 msgstr ""
 
-#: lib/Entity/SyncGroup.php:383
+#: lib/Entity/SyncGroup.php:297
+msgid ""
+"Please make sure to select a Layout for all Displays in this Sync Group."
+msgstr ""
+
+#: lib/Entity/SyncGroup.php:396
 #, php-format
 msgid "Display %s already belongs to a different sync group ID %d"
 msgstr ""
@@ -21663,11 +21636,11 @@ msgid ""
 "data"
 msgstr ""
 
-#: lib/Entity/DataSetColumn.php:307
+#: lib/Entity/DataSetColumn.php:309
 msgid "Provided formula is invalid"
 msgstr ""
 
-#: lib/Entity/DataSetColumn.php:434
+#: lib/Entity/DataSetColumn.php:436
 msgid "Existing data is incompatible with your new configuration"
 msgstr ""
 
@@ -23116,7 +23089,7 @@ msgid "Entity not found"
 msgstr ""
 
 #: lib/Widget/RssProvider.php:54
-msgid "Please enter a the URI to a valid RSS feed."
+msgid "Please enter the URI to a valid RSS feed."
 msgstr ""
 
 #: lib/Widget/RssProvider.php:213 lib/Widget/IcsProvider.php:206
@@ -23135,6 +23108,10 @@ msgstr ""
 msgid "Unknown issue getting posts"
 msgstr ""
 
+#: lib/Widget/IcsProvider.php:54
+msgid "Please enter the URI to a valid ICS feed."
+msgstr ""
+
 #: lib/Widget/IcsProvider.php:163
 msgid "The iCal provided is not valid, please choose a valid feed"
 msgstr ""
@@ -23152,68 +23129,68 @@ msgstr ""
 msgid "Asset file does not exist"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:189
+#: lib/Widget/Definition/Property.php:213
 #, php-format
 msgid "Value too large for %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:229
+#: lib/Widget/Definition/Property.php:253
 #, php-format
 msgid "Missing required property %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:240
+#: lib/Widget/Definition/Property.php:264
 #, php-format
 msgid "%s must be a valid URI"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:253
-#: lib/Widget/Definition/Property.php:265
+#: lib/Widget/Definition/Property.php:277
+#: lib/Widget/Definition/Property.php:289
 msgid ""
 "That is not a valid date interval, please use natural language such as 1 week"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:275
+#: lib/Widget/Definition/Property.php:299
 #, php-format
 msgid "%s must equal %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:284
+#: lib/Widget/Definition/Property.php:308
 #, php-format
 msgid "%s must not equal %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:293
+#: lib/Widget/Definition/Property.php:317
 #, php-format
 msgid "%s must contain %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:303
+#: lib/Widget/Definition/Property.php:327
 #, php-format
 msgid "%s must not contain %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:314
+#: lib/Widget/Definition/Property.php:338
 #, php-format
 msgid "%s must be less than %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:325
+#: lib/Widget/Definition/Property.php:349
 #, php-format
 msgid "%s must be less than or equal to %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:336
+#: lib/Widget/Definition/Property.php:360
 #, php-format
 msgid "%s must be greater than or equal to %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:347
+#: lib/Widget/Definition/Property.php:371
 #, php-format
 msgid "%s must be greater than %s"
 msgstr ""
 
-#: lib/Widget/Definition/Property.php:419
+#: lib/Widget/Definition/Property.php:443
 #, php-format
 msgid "%s is not a valid option"
 msgstr ""
@@ -23484,14 +23461,22 @@ msgid ""
 "empty folder"
 msgstr ""
 
-#: lib/Helper/Install.php:438
+#: lib/Helper/Install.php:419
+msgid ""
+"Could not create the fonts sub-folder under Library Location directory for "
+"you. Please ensure the webserver has permission to create a folder in this "
+"location, or create the folder manually and grant permission for the "
+"webserver to write to the folder."
+msgstr ""
+
+#: lib/Helper/Install.php:443
 #, php-format
 msgid ""
 "An error occurred updating these settings. This is an unexpected error, "
 "please contact support. Error Message = [%s]"
 msgstr ""
 
-#: lib/Helper/Install.php:443
+#: lib/Helper/Install.php:448
 msgid ""
 "Unable to delete install/index.php. Please ensure the web server has "
 "permission to unlink this file and retry"
@@ -23664,17 +23649,17 @@ msgstr ""
 msgid "Stocks data invalid"
 msgstr ""
 
-#: lib/Connector/AlphaVantageConnector.php:393
+#: lib/Connector/AlphaVantageConnector.php:394
 msgid ""
 "Missing Items for Currencies Module. Please provide items in order to "
 "proceed."
 msgstr ""
 
-#: lib/Connector/AlphaVantageConnector.php:533
-#: lib/Connector/AlphaVantageConnector.php:540
-#: lib/Connector/AlphaVantageConnector.php:545
-#: lib/Connector/AlphaVantageConnector.php:610
-#: lib/Connector/AlphaVantageConnector.php:615
+#: lib/Connector/AlphaVantageConnector.php:536
+#: lib/Connector/AlphaVantageConnector.php:543
+#: lib/Connector/AlphaVantageConnector.php:548
+#: lib/Connector/AlphaVantageConnector.php:613
+#: lib/Connector/AlphaVantageConnector.php:618
 msgid "Currency data invalid"
 msgstr ""
 
diff --git a/locale/el.mo b/locale/el.mo
index c33488808d..bceac33ccd 100644
Binary files a/locale/el.mo and b/locale/el.mo differ
diff --git a/locale/en_GB.mo b/locale/en_GB.mo
index b221faea67..e632beaaf5 100644
Binary files a/locale/en_GB.mo and b/locale/en_GB.mo differ
diff --git a/locale/es.mo b/locale/es.mo
index 0fb23a2c0d..4a199f8797 100644
Binary files a/locale/es.mo and b/locale/es.mo differ
diff --git a/locale/et.mo b/locale/et.mo
index ad7b41a7e8..09d1551ddd 100644
Binary files a/locale/et.mo and b/locale/et.mo differ
diff --git a/locale/eu.mo b/locale/eu.mo
index 3691ffa66c..5def98f409 100644
Binary files a/locale/eu.mo and b/locale/eu.mo differ
diff --git a/locale/fa.mo b/locale/fa.mo
index 87308735af..fca1d60b59 100644
Binary files a/locale/fa.mo and b/locale/fa.mo differ
diff --git a/locale/fi.mo b/locale/fi.mo
index db675a9b56..0c5e1f0ef5 100644
Binary files a/locale/fi.mo and b/locale/fi.mo differ
diff --git a/locale/fr.mo b/locale/fr.mo
index 3bba506e9e..4ed6f9ee64 100644
Binary files a/locale/fr.mo and b/locale/fr.mo differ
diff --git a/locale/he.mo b/locale/he.mo
index 658e614b87..361ca82d93 100644
Binary files a/locale/he.mo and b/locale/he.mo differ
diff --git a/locale/hi.mo b/locale/hi.mo
index a011aba7c8..30c12a5d85 100644
Binary files a/locale/hi.mo and b/locale/hi.mo differ
diff --git a/locale/hr.mo b/locale/hr.mo
index 8ec70fdfc0..bcb87ac1bc 100644
Binary files a/locale/hr.mo and b/locale/hr.mo differ
diff --git a/locale/hu.mo b/locale/hu.mo
index aaf8694ce8..43b4683d49 100644
Binary files a/locale/hu.mo and b/locale/hu.mo differ
diff --git a/locale/id.mo b/locale/id.mo
index d28469820e..7872f343db 100644
Binary files a/locale/id.mo and b/locale/id.mo differ
diff --git a/locale/it.mo b/locale/it.mo
index 657e570da7..b37310e215 100644
Binary files a/locale/it.mo and b/locale/it.mo differ
diff --git a/locale/ja.mo b/locale/ja.mo
index 958c742e3f..396e2805c5 100644
Binary files a/locale/ja.mo and b/locale/ja.mo differ
diff --git a/locale/ko.mo b/locale/ko.mo
index 2b50ca4f54..06bfd06970 100644
Binary files a/locale/ko.mo and b/locale/ko.mo differ
diff --git a/locale/ku.mo b/locale/ku.mo
index 28d330775c..7a22b924f8 100644
Binary files a/locale/ku.mo and b/locale/ku.mo differ
diff --git a/locale/lb.mo b/locale/lb.mo
index 201671f99d..40a0e669ae 100644
Binary files a/locale/lb.mo and b/locale/lb.mo differ
diff --git a/locale/lo.mo b/locale/lo.mo
index f8b4596dcd..5cea4ac080 100644
Binary files a/locale/lo.mo and b/locale/lo.mo differ
diff --git a/locale/lt.mo b/locale/lt.mo
index 23364b99af..fb366ff77b 100644
Binary files a/locale/lt.mo and b/locale/lt.mo differ
diff --git a/locale/nb.mo b/locale/nb.mo
index 76e1e114fa..e6b00359ea 100644
Binary files a/locale/nb.mo and b/locale/nb.mo differ
diff --git a/locale/nl.mo b/locale/nl.mo
index 60c3ce9b79..7a207beb8d 100644
Binary files a/locale/nl.mo and b/locale/nl.mo differ
diff --git a/locale/nl_NL.mo b/locale/nl_NL.mo
index f6ae024fb7..7371a69f34 100644
Binary files a/locale/nl_NL.mo and b/locale/nl_NL.mo differ
diff --git a/locale/pl.mo b/locale/pl.mo
index 36254db8d1..ea6b651f87 100644
Binary files a/locale/pl.mo and b/locale/pl.mo differ
diff --git a/locale/pt.mo b/locale/pt.mo
index 09d265b9ff..47cae5c9c5 100644
Binary files a/locale/pt.mo and b/locale/pt.mo differ
diff --git a/locale/pt_BR.mo b/locale/pt_BR.mo
index 72bdf97459..da4cc6fc59 100644
Binary files a/locale/pt_BR.mo and b/locale/pt_BR.mo differ
diff --git a/locale/ro.mo b/locale/ro.mo
index fad9206b8a..8941865fc0 100644
Binary files a/locale/ro.mo and b/locale/ro.mo differ
diff --git a/locale/ru.mo b/locale/ru.mo
index 16912207ee..bd1e3ee320 100644
Binary files a/locale/ru.mo and b/locale/ru.mo differ
diff --git a/locale/sk.mo b/locale/sk.mo
index 948d5d8a95..e6f0320133 100644
Binary files a/locale/sk.mo and b/locale/sk.mo differ
diff --git a/locale/sl.mo b/locale/sl.mo
index 7995d121dc..6fe737170f 100644
Binary files a/locale/sl.mo and b/locale/sl.mo differ
diff --git a/locale/sr@latin.mo b/locale/sr@latin.mo
index 03dfca005f..1088ad57fb 100644
Binary files a/locale/sr@latin.mo and b/locale/sr@latin.mo differ
diff --git a/locale/sv.mo b/locale/sv.mo
index d10c49c480..c718fd7eb8 100644
Binary files a/locale/sv.mo and b/locale/sv.mo differ
diff --git a/locale/th.mo b/locale/th.mo
index 39399bb77f..b7954cec42 100644
Binary files a/locale/th.mo and b/locale/th.mo differ
diff --git a/locale/tr.mo b/locale/tr.mo
index de6df2518a..b324a67bac 100644
Binary files a/locale/tr.mo and b/locale/tr.mo differ
diff --git a/locale/vi.mo b/locale/vi.mo
index 5074527d70..f73f871af3 100644
Binary files a/locale/vi.mo and b/locale/vi.mo differ
diff --git a/locale/zh_CN.mo b/locale/zh_CN.mo
index 94ef221c0c..44c1717751 100644
Binary files a/locale/zh_CN.mo and b/locale/zh_CN.mo differ
diff --git a/locale/zh_TW.mo b/locale/zh_TW.mo
index f672f2e918..00dac5bd23 100644
Binary files a/locale/zh_TW.mo and b/locale/zh_TW.mo differ
diff --git a/modules/assets/template-thumbnails/dataset/dataset-slideshow.png b/modules/assets/template-thumbnails/dataset/dataset-slideshow.png
deleted file mode 100644
index 8054be5c0c..0000000000
Binary files a/modules/assets/template-thumbnails/dataset/dataset-slideshow.png and /dev/null differ
diff --git a/modules/dataset.xml b/modules/dataset.xml
index f454095b86..9b5e1f5e96 100755
--- a/modules/dataset.xml
+++ b/modules/dataset.xml
@@ -20,13 +20,13 @@
   -->
 <module>
     <id>core-dataset</id>
-    <name>Dataset</name>
+    <name>DataSet</name>
     <author>Core</author>
     <description>Display DataSet content</description>
     <icon>fa fa-table</icon>
     <class>\Xibo\Widget\DataSetProvider</class>
     <compatibilityClass>\Xibo\Widget\Compatibility\DatasetWidgetCompatibility</compatibilityClass>
-    <dataCacheKey>%dataSetId%_%lowerLimit%_%lowerLimit%_%numItems%_%orderClauses%_%useOrderingClause%_%ordering%_%filterClauses%_%useFilteringClause%_%filter%</dataCacheKey>
+    <dataCacheKey>%dataSetId%_%lowerLimit%_%upperLimit%_%numItems%_%orderClauses%_%useOrderingClause%_%ordering%_%filterClauses%_%useFilteringClause%_%filter%_%displayId%</dataCacheKey>
     <type>dataset</type>
     <dataType>dataset</dataType>
     <legacyType>datasetticker</legacyType>
diff --git a/modules/embedded.xml b/modules/embedded.xml
index 40769a582b..6e75e2dc27 100644
--- a/modules/embedded.xml
+++ b/modules/embedded.xml
@@ -39,18 +39,18 @@
         <property id="transparency" type="checkbox">
             <title>Background transparent?</title>
             <helpText>Should the Widget be shown with a transparent background? Also requires the embedded content to have a transparent background.</helpText>
-            <default>1</default>
+            <default>0</default>
         </property>
         <property id="scaleContent" type="checkbox">
             <title>Scale Content?</title>
             <helpText>Should the embedded content be scaled along with the layout?</helpText>
-            <default>1</default>
+            <default>0</default>
             <playerCompatibility windows="v2 R253+"></playerCompatibility>
         </property>
         <property id="isPreNavigate" type="checkbox">
             <title>Preload?</title>
             <helpText>Should this Widget be loaded entirely off-screen so that it is ready when shown? Dynamic content will start running off screen.</helpText>
-            <default>1</default>
+            <default>0</default>
         </property>
         <property id="embedHtml" type="code" allowLibraryRefs="true" variant="html">
             <title>HTML to embed</title>
@@ -59,21 +59,28 @@
         <property id="embedStyle" type="code" allowLibraryRefs="true" variant="css">
             <title>Custom Style Sheets</title>
         </property>
-        <property id="embedScript" type="code" variant="javascript">
+        <property id="embedJavaScript" type="code" allowLibraryRefs="true" variant="javascript">
+            <title>JavaScript</title>
+            <helpText>Add JavaScript to be included in the HTML. Do not use [] array notation as this is reserved for library references. Do not include script tags.</helpText>
+        </property>
+        <property id="embedScript" type="code" variant="html">
             <title>HEAD content to embed</title>
-            <helpText>Please include script tags.</helpText>
+            <helpText>Add content to appear within the HEAD tags on this embedded HTML. Please include script tags.</helpText>
         </property>
     </properties>
     <preview></preview>
     <stencil>
+        <head><![CDATA[
+{{embedScript|raw}}
+        ]]></head>
         <twig><![CDATA[
-            {{embedHtml|raw}}
-            <script type="text/javascript">
-                {{embedScript|raw}}
-            </script>
-            <style>
-                {{embedStyle}}
-            </style>
+{{embedHtml|raw}}
+<script type="text/javascript">
+    {{embedJavaScript|raw}}
+</script>
+<style>
+    {{embedStyle|raw}}
+</style>
         ]]></twig>
     </stencil>
     <onInitialize><![CDATA[
@@ -90,4 +97,4 @@ if(properties.scaleContent) {
     $('body').xiboLayoutScaler(globalOptions);
 }
     ]]></onInitialize>
-</module>
\ No newline at end of file
+</module>
diff --git a/modules/forecastio-css-generator.twig b/modules/forecastio-css-generator.twig
index 3b6305fdf6..54ae08e8ab 100644
--- a/modules/forecastio-css-generator.twig
+++ b/modules/forecastio-css-generator.twig
@@ -88,13 +88,13 @@
 
 {% macro colors(backgroundColor, textColor, iconsColor, footerColor, footerTextColor, footerIconsColor, shadowColor) %}
     {% if backgroundColor != '' %}
-    #content .container {
+    #content > div {
         background-color: {{ backgroundColor }} !important;
     }
     {% endif %}
 
     {% if textColor != '' %}
-    #content .container {
+    #content > div {
         color: {{ textColor }} !important;
     }
     {% endif %}
diff --git a/modules/src/player.js b/modules/src/player.js
index 4c267532a4..b8e9f582aa 100644
--- a/modules/src/player.js
+++ b/modules/src/player.js
@@ -152,7 +152,7 @@ $(function() {
         xiboIC.reportFault({
           code: '5001',
           reason: 'No Data',
-        });
+        }, {targetId: widget.widgetId});
       }
 
       onDataError(httpStatus, response);
@@ -160,7 +160,7 @@ $(function() {
       xiboIC.reportFault({
         code: '5001',
         reason: 'No Data',
-      });
+      }, {targetId: widget.widgetId});
     }
   }
 
@@ -191,10 +191,18 @@ $(function() {
             onDataErrorCallback(widget, data.error, data);
           }
 
+          if (Array.isArray(data) && data.length === 0) {
+            xiboIC.expireNow({targetId: xiboICTargetId});
+          }
+
           resolve(data);
         }).fail(function(jqXHR, textStatus, errorThrown) {
           onDataErrorCallback(widget, jqXHR.status, jqXHR.responseJSON);
           console.log(jqXHR, textStatus, errorThrown);
+
+          if (jqXHR.status === 404) {
+            xiboIC.expireNow({targetId: xiboICTargetId});
+          }
         });
       } else {
         resolve(null);
@@ -284,10 +292,6 @@ $(function() {
     widget.items = [];
     const $target = $('body');
 
-    if (dataItems.length === 0 && showError) {
-      xiboIC.expireNow({targetId: widget.widgetId});
-    }
-
     if (showError && data?.message) {
       $target.append(
         '<div class="error-message" role="alert">' +
@@ -335,7 +339,7 @@ $(function() {
 
         // IF we added item template
         templateAlreadyAdded = true;
-      };
+      }
 
       // Add item to the widget object
       (item) && widget.items.push(item);
@@ -486,10 +490,6 @@ $(function() {
     dataItems,
     showError,
   ) {
-    if (dataItems.length === 0 && showError) {
-      xiboIC.expireNow({targetId: widget.widgetId});
-    }
-
     // Parse out the template with elements.
     if (elements?.length > 0) {
       const $content = $('#content');
@@ -575,6 +575,8 @@ $(function() {
         elementCopy.hbs = null;
         elementCopy.dataOverride = null;
         elementCopy.dataOverrideWith = null;
+        elementCopy.escapeHtml = null;
+        elementCopy.isExtended = false;
 
         // Compile the template if it exists
         if ($template && $template.length > 0) {
@@ -582,6 +584,13 @@ $(function() {
               $template?.data('extends-override');
           elementCopy.dataOverrideWith =
               $template?.data('extends-with');
+          elementCopy.escapeHtml =
+              $template?.data('escape-html');
+
+          if (String(elementCopy.dataOverride).length > 0 &&
+            String(elementCopy.dataOverrideWith).length > 0) {
+            elementCopy.isExtended = true;
+          }
 
           elementCopy.hbs = Handlebars.compile($template.html());
         }
@@ -837,12 +846,15 @@ $(function() {
                 )),
             );
 
+            const onTemplateRenderId = item.isExtended ?
+              item.dataOverride : item.templateData.id;
+
             // Handle the rendering of the template
             if (typeof window[
-              `onTemplateRender_${item.templateData.id}`
+              `onTemplateRender_${onTemplateRenderId}`
             ] === 'function') {
               const onTemplateRender = window[
-                `onTemplateRender_${item.templateData.id}`];
+                `onTemplateRender_${onTemplateRenderId}`];
               const itemID =
                   item.uniqueID || item.templateData?.uniqueID;
 
diff --git a/modules/src/xibo-elements-render.js b/modules/src/xibo-elements-render.js
index f2579a0f03..78e72a8cc3 100644
--- a/modules/src/xibo-elements-render.js
+++ b/modules/src/xibo-elements-render.js
@@ -107,24 +107,44 @@ jQuery.fn.extend({
       options.speed = (options.speed <= 200) ? 1000 : options.speed;
 
       const numberOfSlides = items?.length || 1;
-
       const duration = (options.durationIsPerItem) ?
         options.duration :
         options.duration / numberOfSlides;
       const timeout = duration * 1000;
       const noTransitionSpeed = 200;
-
-      $(cycleElement).addClass('cycle-slideshow').cycle({
-        fx: (options.effect === 'noTransition' || options.effect === 'none') ?
-          'none' : options.effect,
-        speed: (
+      let cycle2Config = {
+        'data-cycle-fx': (options.effect === 'noTransition' ||
+          options.effect === 'none') ? 'none' : options.effect,
+        'data-cycle-speed': (
           options.effect === 'noTransition' || options.effect === 'none'
         ) ? noTransitionSpeed : options.speed,
-        timeout: timeout,
-        slides: `> .${options.parentId}--item`,
-        autoHeight: false,
-        sync: false,
-      });
+        'data-cycle-timeout': timeout,
+        'data-cycle-slides': `> .${options.parentId}--item`,
+        'data-cycle-auto-height': false,
+      };
+
+      if (options.effect === 'scrollHorz') {
+        $(cycleElement).find(`> .${options.parentId}--item`)
+          .each(function(idx, elem) {
+            $(elem).css({width: '-webkit-fill-available'});
+          });
+      } else {
+        cycle2Config = {
+          ...cycle2Config,
+          'data-cycle-sync': false,
+        };
+      }
+
+      $(cycleElement).addClass('cycle-slideshow').attr(cycle2Config).cycle();
+
+      // Add some margin for each slide when options.effect === scrollHorz
+      if (options.effect === 'scrollHorz') {
+        $(cycleElement).css({width: options.width + (options.gap / 2)});
+        $(cycleElement).find('.cycle-slide').css({
+          marginLeft: options.gap / 4,
+          marginRight: options.gap / 4,
+        });
+      }
     } else if (
       options.effect === 'marqueeLeft' ||
       options.effect === 'marqueeRight'
diff --git a/modules/src/xibo-legacy-template-render.js b/modules/src/xibo-legacy-template-render.js
index bffcb0f873..6a3d4b6536 100644
--- a/modules/src/xibo-legacy-template-render.js
+++ b/modules/src/xibo-legacy-template-render.js
@@ -38,17 +38,19 @@ jQuery.fn.extend({
         const elementHTML = $(element).html();
         const match = elementHTML.match(/\[dailyForecast.*?\]/g);
 
-        // Get the number of days
-        const numDays = match[0].split('|')[1];
-        const offset = match[0].split('|')[2].replace(']', '');
-
-        // Replace HTML on the element
-        $(element).html(elementHTML.replace(
-          match[0],
-          '<div class="forecast-container" ' +
-          'data-days-num="' + numDays + '" ' +
-          'data-days-offset="' + offset + '"></div>',
-        ));
+        if (match) {
+          // Get the number of days
+          const numDays = match[0].split('|')[1];
+          const offset = match[0].split('|')[2].replace(']', '');
+
+          // Replace HTML on the element
+          $(element).html(elementHTML.replace(
+            match[0],
+            '<div class="forecast-container" ' +
+            'data-days-num="' + numDays + '" ' +
+            'data-days-offset="' + offset + '"></div>',
+          ));
+        }
       }
 
       // Social Media
diff --git a/modules/templates/article-elements.xml b/modules/templates/article-elements.xml
index b2582544e8..a43f717d47 100644
--- a/modules/templates/article-elements.xml
+++ b/modules/templates/article-elements.xml
@@ -43,7 +43,7 @@
     </template>
     <template>
         <id>article_content</id>
-        <extends override="text" with="data.content" escape="false">text</extends>
+        <extends override="text" with="data.content" escapeHtml="false">text</extends>
         <title>Content</title>
         <type>element</type>
         <dataType>article</dataType>
diff --git a/modules/templates/dashboard-static.xml b/modules/templates/dashboard-static.xml
new file mode 100644
index 0000000000..b09cc12a99
--- /dev/null
+++ b/modules/templates/dashboard-static.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ Copyright (C) 2023 Xibo Signage Ltd
+  ~
+  ~ Xibo - Digital Signage - https://xibosignage.com
+  ~
+  ~ This file is part of Xibo.
+  ~
+  ~ Xibo is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ any later version.
+  ~
+  ~ Xibo is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<templates>
+    <template>
+        <id>dashboard_image</id>
+        <type>static</type>
+        <dataType>xibo-dashboard-service</dataType>
+        <title>Dashboard Image</title>
+        <icon>fa fa-file-image</icon>
+    </template>
+</templates>
\ No newline at end of file
diff --git a/modules/templates/dataset-static.xml b/modules/templates/dataset-static.xml
index d3a79764f8..b5b0afaef0 100644
--- a/modules/templates/dataset-static.xml
+++ b/modules/templates/dataset-static.xml
@@ -151,6 +151,11 @@
             ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -265,7 +270,7 @@ $datasetTableContainer.dataSetRender(properties);
                     </test>
                 </visibility>
             </property>
-            <property id="template" type="richText" allowLibraryRefs="true" variant="html">
+            <property id="template" type="code" allowLibraryRefs="true" variant="html">
                 <title>Item Template</title>
                 <helpText>Enter text in the box below, used to display each article.</helpText>
                 <visibility>
@@ -640,6 +645,11 @@ table.DataSetTable {visibility:hidden;}
             ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -908,6 +918,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -1167,6 +1182,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -1424,6 +1444,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -1679,6 +1704,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -1932,6 +1962,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -2180,6 +2215,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -2469,6 +2509,11 @@ table.DataSetTable {visibility:hidden;}
         ]]></twig>
         </stencil>
         <onTemplateRender><![CDATA[
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
 // Columns to be shown in the table
 var columnIndex = JSON.parse(properties.columns);
 var columns = (meta && meta.mapping) ? meta.mapping.filter(function (column) {
@@ -2572,8 +2617,9 @@ $datasetTableContainer.dataSetRender(properties);
         <id>dataset_slideshow</id>
         <type>static</type>
         <dataType>dataset</dataType>
-        <title>Dataset Image Slideshow</title>
-        <thumbnail>dataset-slideshow</thumbnail>
+        <showIn>playlist</showIn>
+        <icon>fas fa-film</icon>
+        <title>Image Slideshow</title>
         <properties>
             <property id="dataTypeId" type="hidden">
                 <default>4,5</default>
@@ -2678,8 +2724,189 @@ $('body').xiboLayoutScaler(properties);
 
 $(target).xiboTextRender(Object.assign(properties, globalOptions), $(target).find('#content > *'));
         ]]></onTemplateRender>
-        <assets>
-            <asset id="dataset-slideshow" type="path" mimeType="image/png" cmsOnly="true" path="/modules/assets/template-thumbnails/dataset/dataset-slideshow.png" />
-        </assets>
+    </template>
+    <template>
+        <id>dataset_string_template</id>
+        <type>static</type>
+        <dataType>dataset</dataType>
+        <showIn>playlist</showIn>
+        <icon>fa fa-font</icon>
+        <title>String template with placeholders</title>
+        <properties>
+            <property type="message">
+                <title>Select a dataset to display appearance options.</title>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="eq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="template" type="richText" allowLibraryRefs="true" variant="html">
+                <title>Item Template</title>
+                <helpText>Enter text in the box below, used to display each article.</helpText>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="dataTypeSnippets" type="snippet" mode="dataType" target="template">
+                <title>Snippets</title>
+                <helpText>Choose data type snippet</helpText>
+                <dependsOn>dataSetId</dependsOn>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="itemsSideBySide" type="checkbox">
+                <title>Show items side by side?</title>
+                <helpText>Should items be shown side by side?</helpText>
+                <default>0</default>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="backgroundColor" type="color">
+                <title>Background Colour</title>
+                <helpText>The selected effect works best with a background colour. Optionally add one here.</helpText>
+                <default></default>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="effect" type="effectSelector" variant="all">
+                <title>Effect</title>
+                <helpText>Please select the effect that will be used to transition between items.</helpText>
+                <default>noTransition</default>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="speed" type="number">
+                <title>Speed</title>
+                <helpText>The transition speed of the selected effect in milliseconds (normal = 1000) or the Marquee Speed in a low to high scale (normal = 1)</helpText>
+                <default>1000</default>
+                <visibility>
+                    <test type="and">
+                        <condition field="effect" type="neq">none</condition>
+                        <condition field="effect" type="neq">noTransition</condition>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="itemsPerPage" type="number">
+                <title>Items per page</title>
+                <helpText>If an effect has been selected, how many pages should we split the items across? If you don't enter anything here 1 item will be put on each page.</helpText>
+                <default>1</default>
+                <visibility>
+                    <test type="and">
+                        <condition field="effect" type="neq">none</condition>
+                        <condition field="effect" type="neq">marqueeLeft</condition>
+                        <condition field="effect" type="neq">marqueeRight</condition>
+                        <condition field="effect" type="neq">marqueeUp</condition>
+                        <condition field="effect" type="neq">marqueeDown</condition>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="noDataMessage" type="richText" allowLibraryRefs="true" variant="html">
+                <title>No data message</title>
+                <helpText>A message to display when no data is returned from the source</helpText>
+                <visibility>
+                    <test>
+                        <condition field="dataSetId" type="neq"></condition>
+                    </test>
+                </visibility>
+            </property>
+        </properties>
+        <preview></preview>
+        <stencil>
+            <twig><![CDATA[
+<style>
+{% if itemsSideBySide %}
+.item, .page {
+    float: left;
+}
+{% endif %}
+
+{% if backgroundColor != '' %}
+body {
+    background-color: {{ backgroundColor }};
+}
+{% endif %}
+</style>
+        ]]></twig>
+        </stencil>
+        <onTemplateRender><![CDATA[
+// Module renderer options
+// id: The id of the widget
+// target: The target element to render
+// items: The items to render
+// properties: The properties for the widget
+
+// No data message
+if (items.length <= 0 && properties.noDataMessage && properties.noDataMessage !== '') {
+    items.push(properties.noDataMessage);
+}
+
+// Clear the content container
+$(target).find('#content').empty();
+
+// If we don't have metadata, we can't render anything
+if (!meta || !meta.mapping) {
+    return;
+}
+
+// Get dataset columns from meta.mapping
+var columnTypes = {};
+for (var i = 0; i < meta.mapping.length; i++) {
+    var column = meta.mapping[i];
+    columnTypes[column.dataSetColumnId] = {
+        type: column.dataTypeId
+    };
+}
+
+// Add content for each item
+// make replacements
+// and wrap it in a div with the item class
+for (var i = 0; i < items.length; i++) {
+    var item = items[i];
+
+    // Replace the template with the item content
+    var content = properties.template.replace(/\[(.*?)\]/g, function (match, column) {
+        var itemId = column.split('|')[0];
+        var itemCol = column.split('|')[1];
+        var itemType = columnTypes[itemCol].type;
+        var itemValue = item[itemId];
+
+        // If this is an image column, wrap it in an image tag
+        if (itemType === 4 || itemType === 5) {
+            itemValue = itemValue ? '<img src="' + itemValue + '" />' : '';
+        }
+
+        return itemValue ? itemValue : '';
+    });
+
+    // Add the content to the target
+    $(target).find('#content').append(
+        $('<div>')
+            .addClass('item')
+            .append(content)
+    );
+}
+
+// Scale the layout
+$('body').xiboLayoutScaler(properties);
+
+$(target).xiboTextRender(Object.assign(properties, globalOptions), $(target).find('#content > *'));
+        ]]></onTemplateRender>
     </template>
 </templates>
diff --git a/modules/templates/forecast-elements.xml b/modules/templates/forecast-elements.xml
index f18446feea..9033db5130 100644
--- a/modules/templates/forecast-elements.xml
+++ b/modules/templates/forecast-elements.xml
@@ -125,9 +125,6 @@ if (String(value).includes('°C')) {
 
 return value + '%';
         ]]></onElementParseData>
-        <assets>
-            <asset id="weather-humidity-percent" type="path" cmsOnly="true" mimeType="image/png" path="/modules/assets/template-thumbnails/forecast/elements/weather-humidity-percent.png" />
-        </assets>
     </template>
     <template>
         <id>weather_icon</id>
@@ -240,6 +237,66 @@ if (meta && meta.hasOwnProperty('Attribution')) {
         <startWidth>480</startWidth>
         <startHeight>600</startHeight>
         <properties>
+            <property id="bgFromLibrary" type="checkbox">
+                <title>Select from Library</title>
+                <default>0</default>
+                <helpText>Should the background image be coming from library?</helpText>
+            </property>
+            <property id="weatherBg" type="mediaSelector">
+                <title>Background from Library</title>
+                <visibility>
+                    <test type="and">
+                        <condition field="bgFromLibrary" type="eq">1</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="objectFit" type="dropdown" mode="single">
+                <title>Scale type</title>
+                <helpText>How should this image be scaled?</helpText>
+                <default>contain</default>
+                <options>
+                    <option name="fill">Fill</option>
+                    <option name="contain">Contain</option>
+                    <option name="cover">Cover</option>
+                </options>
+                <visibility>
+                    <test type="and">
+                        <condition field="bgFromLibrary" type="eq">1</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="alignId" type="dropdown" mode="single">
+                <title>Horizontal Align</title>
+                <helpText>How should this image be aligned?</helpText>
+                <default>center</default>
+                <options>
+                    <option name="left">Left</option>
+                    <option name="center">Centre</option>
+                    <option name="right">Right</option>
+                </options>
+                <visibility>
+                    <test>
+                        <condition field="bgFromLibrary" type="eq">1</condition>
+                        <condition field="objectFit" type="neq">fill</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="valignId" type="dropdown" mode="single">
+                <title>Vertical Align</title>
+                <helpText>How should this image be vertically aligned?</helpText>
+                <default>middle</default>
+                <options>
+                    <option name="top">Top</option>
+                    <option name="middle">Middle</option>
+                    <option name="bottom">Bottom</option>
+                </options>
+                <visibility>
+                    <test>
+                        <condition field="bgFromLibrary" type="eq">1</condition>
+                        <condition field="objectFit" type="neq">fill</condition>
+                    </test>
+                </visibility>
+            </property>
             <property id="roundBorder" type="checkbox">
                 <title>Round Border</title>
                 <default>0</default>
@@ -257,8 +314,22 @@ if (meta && meta.hasOwnProperty('Attribution')) {
         </properties>
         <stencil>
             <hbs><![CDATA[
+{{#if bgFromLibrary}}
+    {{#if weatherBg}}
+        <div class="global-elements-image img-container" style="width:100%; height: 100%; overflow: hidden; position: relative;
+            {{#if roundBorder}}border-radius: {{borderRadius}}px;{{/if}}">
+            <img src="/library/download/{{weatherBg}}" style="
+                width:100%; height: 100%;
+                object-fit: {{objectFit}};
+                object-position: {{alignId}} {{valignId}};
+                position: absolute; top: 0; left: 0;"
+            />
+        </div>
+    {{/if}}
+{{else}}
 <div class="forecast-elements-background-image {{#if data.icon}}has-bg{{/if}}"
     style="background-image: url('[[assetId=bg-{{data.icon}}]]')"></div>
+{{/if}}
             ]]></hbs>
             <style><![CDATA[
 .forecast-elements-background-image:not(.has-bg) {
diff --git a/modules/templates/forecast-static.xml b/modules/templates/forecast-static.xml
index 9e829c30ae..fd560a2430 100644
--- a/modules/templates/forecast-static.xml
+++ b/modules/templates/forecast-static.xml
@@ -51,6 +51,114 @@
             <property id="javaScript" type="code" allowLibraryRefs="true" variant="javascript">
                 <title>Optional JavaScript</title>
             </property>
+
+            <property id="background-image" type="dropdown" mode="single">
+                <title>Background Image</title>
+                <helpText>The background image to use</helpText>
+                <default>none</default>
+                <options>
+                    <option name="none">None</option>
+                    <option name="fit">Fit</option>
+                    <option name="stretch">Stretch</option>
+                    <option name="center">Center</option>
+                </options>
+            </property>
+            <property type="header" variant="main">
+                <title>Backgrounds</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property type="message">
+                <title>Select images from the media library to replace the default weather backgrounds.</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="cloudy-image" type="mediaSelector">
+                <title>Cloudy</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="day-cloudy-image" type="mediaSelector">
+                <title>Cloudy day</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="day-sunny-image" type="mediaSelector">
+                <title>Clear</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="fog-image" type="mediaSelector">
+                <title>Fog</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="hail-image" type="mediaSelector">
+                <title>Hail</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="night-clear-image" type="mediaSelector">
+                <title>Clear night</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="night-partly-cloudy-image" type="mediaSelector">
+                <title>Cloudy night</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="rain-image" type="mediaSelector">
+                <title>Raining</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="snow-image" type="mediaSelector">
+                <title>Snowing</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
+            <property id="windy-image" type="mediaSelector">
+                <title>Windy</title>
+                <visibility>
+                    <test>
+                        <condition field="background-image" type="neq">none</condition>
+                    </test>
+                </visibility>
+            </property>
         </properties>
         <stencil>
             <hbs></hbs>
diff --git a/modules/templates/global-elements.xml b/modules/templates/global-elements.xml
index dafc43ae93..d76ea403f4 100644
--- a/modules/templates/global-elements.xml
+++ b/modules/templates/global-elements.xml
@@ -176,7 +176,11 @@
     {{#if textShadow}}text-shadow: {{shadowX}}px {{shadowY}}px {{shadowBlur}}px {{textShadowColor}};{{/if}}
     width: 100%; height: 100%;"
 >
-<div>{{{text}}}</div>
+{{#if escapeHtml}}
+    <div>{{text}}</div>
+{{else}}
+    <div>{{{text}}}</div>
+{{/if}}
 </div>
             ]]></hbs>
         </stencil>
diff --git a/modules/text.xml b/modules/text.xml
index df4bd70025..85726b27e9 100755
--- a/modules/text.xml
+++ b/modules/text.xml
@@ -55,7 +55,7 @@
         <property id="effect" type="effectSelector" variant="all">
             <title>Effect</title>
             <helpText>Please select the effect that will be used to transition between items.</helpText>
-            <default>noTransition</default>
+            <default>none</default>
         </property>
         <property id="speed" type="number">
             <title>Speed</title>
diff --git a/modules/widget-html-render.twig b/modules/widget-html-render.twig
index 2946b11d8d..a65cade566 100644
--- a/modules/widget-html-render.twig
+++ b/modules/widget-html-render.twig
@@ -30,6 +30,9 @@
         <!-- Copyright 2006-2022 Xibo Signage Ltd. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
         <script type="text/javascript" src="[[PlayerBundle]]"></script>
         <link href="[[FontBundle]]" rel="stylesheet">
+        {% for item in head %}
+            {{ item|raw }}
+        {% endfor %}
         <style type="text/css">
             body {
                 margin: 0;
@@ -46,6 +49,13 @@
                 margin-bottom:0;
             }
         </style>
+        {% if style|length > 0 %}
+        <style type="text/css">
+            {% for item in style %}
+            {{ item|raw }}
+            {% endfor %}
+        </style>
+        {% endif %}
     </head>
     <body>
         <div id="content"></div>
@@ -59,13 +69,6 @@
         <script id="{{ asset.id }}" type="text/javascript" src="[[assetId={{ asset.id }}]]"></script>
         {% endif %}
     {% endfor %}
-    {% if style|length > 0 %}
-        <style type="text/css">
-        {% for item in style %}
-            {{ item|raw }}
-        {% endfor %}
-        </style>
-    {% endif %}
     </body>
     <script type="text/javascript">
         var xiboICTargetId = {{ widgetId }};
@@ -93,6 +96,7 @@
             data-gap="{{ item.gapBetweenHbs }}"
             data-extends-override="{{ item.extends.override }}"
             data-extends-with="{{ item.extends.with }}"
+            data-escape-html="{{ item.extends.escapeHtml }}"
     >{{ item.content|raw }}</script>
 {% endfor %}
 {% for widgetId, parser in onInitialize %}
diff --git a/ui/src/core/file-upload.js b/ui/src/core/file-upload.js
index 35b3279a2c..a12b640a54 100644
--- a/ui/src/core/file-upload.js
+++ b/ui/src/core/file-upload.js
@@ -45,6 +45,10 @@ function openUploadForm(options) {
     uploadTemplate = Handlebars.compile($('#' + options.templateId).html());
   }
 
+  if (typeof maxImagePixelSize === undefined || maxImagePixelSize === '') {
+    maxImagePixelSize = 0;
+  }
+
   // Handle bars and open a dialog
   const dialog = bootbox.dialog({
     message: uploadTemplate(options.templateOptions),
@@ -275,9 +279,11 @@ function handleVideoCoverImage(e, data) {
           video.name = file.name;
           video.setAttribute('id', file.name);
           video.preload = 'metadata';
-
-          getVideoImage(video, 2);
-          video.addEventListener('seeked, pause', seekImage);
+          video.onseeked = createImage;
+          video.onpause = createImage;
+          // set current time to trigger event
+          // and create the cover image
+          video.currentTime = 2;
         }
       });
 
@@ -294,23 +300,9 @@ function handleVideoCoverImage(e, data) {
   }, 100);
 }
 
-function getVideoImage(video, secs) {
-  // both onseeked and onpause call the same function
-  // onseeked will be called with secs = 2 at the start
-  video.onloadedmetadata = function() {
-    this.currentTime = secs;
-  };
-  video.onseeked = createImage;
-  video.onpause = createImage;
-}
-
-function seekImage() {
-  // if we paused the video and seeked specific point in the video, generate new image
-  getVideoImage(this, this.currentTime);
-}
-
 function createImage() {
-  // this will actually create the image and save it to an object with file name as a key
+  // this will actually create the image
+  // and save it to an object with file name as a key
   const canvas = document.createElement('canvas');
   canvas.height = this.videoHeight;
   canvas.width = this.videoWidth;
diff --git a/ui/src/core/forms.js b/ui/src/core/forms.js
index 4d1c296b94..5617a50a4d 100644
--- a/ui/src/core/forms.js
+++ b/ui/src/core/forms.js
@@ -1858,7 +1858,7 @@ window.forms = {
     ).each(function(_k, el) {
       // Populate the effect list with options
       const $el = $(el).find('select');
-      const effectsType = $el.data('effects-type');
+      const effectsType = $el.data('effects-type').split(' ');
 
       // Effects
       const effects = [
@@ -1881,10 +1881,23 @@ window.forms = {
 
       // Add the options
       $.each(effects, function(_index, element) {
-        if ((effectsType !== 'all' && element.group !== effectsType) ||
-          element.effect === 'none') {
+        // Don't add effect if it's none and
+        // the target is a element or element-group
+        if (
+          effectsType.indexOf('noNone') != -1 &&
+          element.effect === 'none'
+        ) {
           return;
         }
+
+        // Don't add effect if the target effect type isn't all or a valid type
+        if (
+          effectsType.indexOf('all') === -1 &&
+          effectsType.indexOf(element.group) === -1
+        ) {
+          return;
+        }
+
         $el.append(
           $('<option value="' +
             element.effect +
@@ -1936,6 +1949,23 @@ window.forms = {
       }
     });
 
+    // Select2 dropdown
+    findElements(
+      '.select2-hidden-accessible',
+      target,
+    ).each(function(_k, el) {
+      const $el = $(el);
+
+      $el.on('select2:open', function(event) {
+        const $search = $(event.target).data('select2').dropdown?.$search;
+        setTimeout(function() {
+          if ($search) {
+            $search.get(0).focus();
+          }
+        }, 10);
+      });
+    });
+
     // Handle field dependencies for the container
     // only if we don't have a target
     if (!target) {
diff --git a/ui/src/core/xibo-calendar.js b/ui/src/core/xibo-calendar.js
index 03b860f783..80d5647447 100644
--- a/ui/src/core/xibo-calendar.js
+++ b/ui/src/core/xibo-calendar.js
@@ -75,7 +75,7 @@ $(document).ready(function() {
         // Callback function to navigate to calendar date with the date picker
         const navigateToCalendarDate = function() {
             if(calendar != undefined) {
-                let selectedDate = moment(moment($('#fromDt').val()).format(jsDateOnlyFormat));
+                let selectedDate = moment(moment($('#fromDt').val()).format(systemDateFormat));
                 // Add event to the picker to update the calendar
                 calendar.navigate('date', selectedDate);
             }
@@ -96,12 +96,12 @@ $(document).ready(function() {
                         let from =  moment(
                           moment($('#fromDt').val())
                             .startOf('day')
-                            .format(jsDateOnlyFormat)
+                            .format(systemDateFormat)
                         )
                         let to =  moment(
                           moment($('#toDt').val())
                             .startOf('day')
-                            .format(jsDateOnlyFormat)
+                            .format(systemDateFormat)
                         )
 
                         let diff = to.diff(from, 'days');
@@ -576,7 +576,7 @@ $(document).ready(function() {
                 // Sync the date of the date picker to the current calendar date
                 if (this.options.position.start != undefined && this.options.position.start != "") {
                     // Update timepicker
-                    updateDatePicker($('#dateInput'), moment.unix(this.options.position.start.getTime() / 1000).format(jsDateOnlyFormat), jsDateOnlyFormat);
+                    updateDatePicker($('#dateInput'), moment.unix(this.options.position.start.getTime() / 1000).format(systemDateFormat), systemDateFormat);
                 }
 
                 if (typeof this.getTitle === "function")
diff --git a/ui/src/core/xibo-cms.js b/ui/src/core/xibo-cms.js
index 321b9d69df..6e9b6c303d 100644
--- a/ui/src/core/xibo-cms.js
+++ b/ui/src/core/xibo-cms.js
@@ -3292,6 +3292,12 @@ function makePagedSelect(element, parent) {
         }
     });
 
+    element.on('select2:open', function(event) {
+        setTimeout(function() {
+            $(event.target).data('select2').dropdown?.$search.get(0).focus();
+        }, 10);
+    });
+
     // Set initial value if exists
     if(
         [undefined, ''].indexOf(element.data("initialValue")) == -1 &&
@@ -3419,6 +3425,12 @@ function makeLocalSelect(element, parent) {
             return state.text;
         }
     });
+
+    element.on('select2:open', function(event) {
+        setTimeout(function() {
+            $(event.target).data('select2').dropdown?.$search.get(0).focus();
+        }, 10);
+    });
 }
 
 // Custom submit for user preferences
diff --git a/ui/src/editor-core/layer-manager.js b/ui/src/editor-core/layer-manager.js
index c51dd80edf..2d1845e288 100644
--- a/ui/src/editor-core/layer-manager.js
+++ b/ui/src/editor-core/layer-manager.js
@@ -39,6 +39,9 @@ const LayerManager = function(parent, container, viewerContainer) {
 
   // Show/Hide ( false by default )
   this.visible = false;
+
+  // Save scroll position
+  this.scrollPosition = 0;
 };
 
 /**
@@ -60,7 +63,10 @@ LayerManager.prototype.createStructure = function() {
       arrayToAdd[layer] = [];
     }
 
-    arrayToAdd[layer].push(object);
+    const newIdx = arrayToAdd[layer].push(object);
+
+    // Return newly added object
+    return arrayToAdd[layer][newIdx-1];
   };
 
   const parseDuration = function(duration) {
@@ -82,6 +88,35 @@ LayerManager.prototype.createStructure = function() {
     canvasObject.duration = parseDuration(canvas.duration);
     canvasObject.subLayers = [];
 
+    const getGroupInCanvasStructure = function(group, widget) {
+      let groupInCanvas = null;
+      canvasObject.subLayers.forEach((layer) => {
+        layer.forEach((obj) => {
+          if (obj.type == 'elementGroup' && obj.id == group.id) {
+            groupInCanvas = obj;
+          }
+        });
+      });
+
+      // If there's no group, create it
+      if (!groupInCanvas) {
+        groupInCanvas = addToLayerStructure(
+          group.layer,
+          {
+            type: 'elementGroup',
+            name: group.id,
+            id: group.id,
+            moduleIcon: lD.common.getModuleByType(widget.subType).icon,
+            selected: group.selected,
+            layers: [],
+          },
+          canvasObject.subLayers,
+        );
+      }
+
+      return groupInCanvas;
+    };
+
     // Get elements
     if (canvas.widgets) {
       Object.values(canvas.widgets).forEach((widget) => {
@@ -93,21 +128,34 @@ LayerManager.prototype.createStructure = function() {
           ($.isEmptyObject(element.template)) &&
             promiseArray.push(element.getTemplate());
 
-          addToLayerStructure(element.layer, {
-            type: 'element',
-            name: (element.template.title) ?
-              element.template.title : element.id,
-            // Element has parent widget duration
-            duration: parseDuration(widget.getDuration()),
-            id: element.elementId,
-            icon: element.template.icon,
-            moduleIcon: moduleIcon,
-            hasGroup: (element.groupId != undefined),
-            groupId: layerManagerTrans.inGroup
-              .replace('%groupId%', element.groupId),
-            selected: element.selected,
-          },
-          canvasObject.subLayers,
+          // Element has group
+          const hasGroup = (element.groupId != undefined);
+
+          // Add to canvas or to group
+          if (hasGroup) {
+            const group = widget.elementGroups[element.groupId];
+            arrayToAddTo = getGroupInCanvasStructure(group, widget).layers;
+          } else {
+            arrayToAddTo = canvasObject.subLayers;
+          }
+
+          addToLayerStructure(
+            element.layer,
+            {
+              type: 'element',
+              name: (element.template.title) ?
+                element.template.title : element.id,
+              // Element has parent widget duration
+              duration: parseDuration(widget.getDuration()),
+              id: element.elementId,
+              icon: element.template.icon,
+              moduleIcon: moduleIcon,
+              hasGroup: hasGroup,
+              groupId: layerManagerTrans.inGroup
+                .replace('%groupId%', element.groupId),
+              selected: element.selected,
+            },
+            arrayToAddTo,
           );
         });
       });
@@ -211,7 +259,8 @@ LayerManager.prototype.render = function(reset) {
         });
 
         // Select items
-        this.DOMObject.find('.layer-manager-layer-item.selectable')
+        this.DOMObject
+          .find('.layer-manager-layer-item.selectable:not(.selected)')
           .off('click').on('click', function(ev) {
             const elementId = $(ev.currentTarget).data('item-id');
             const $viewerObject = self.viewerContainer.find('#' + elementId);
@@ -234,9 +283,27 @@ LayerManager.prototype.render = function(reset) {
 
               // Mark object with selected from manager class
               $auxTarget.addClass('selected-from-layer-manager');
+
+              // If it's an element, we need to set canvas zIndex
+              // to auto for it to show over all other static widgets
+              lD.viewer.DOMObject.find('.designer-region-canvas')
+                .addClass('canvas-element-selected-from-layer-manager');
             }
           });
 
+        // Handle scroll
+        this.DOMObject.find('.layer-manager-body')
+          .on('scrollend', function(ev) {
+            // Save scroll value
+            self.scrollPosition = $(ev.currentTarget).scrollTop();
+          });
+
+        // If we have a scroll value, restore it
+        if (self.scrollPosition != 0) {
+          this.DOMObject.find('.layer-manager-body')
+            .scrollTop(self.scrollPosition);
+        }
+
         // Handle close button
         this.DOMObject.find('.close-layer-manager')
           .off('click').on('click', function(ev) {
diff --git a/ui/src/editor-core/properties-panel.js b/ui/src/editor-core/properties-panel.js
index fa735e6e68..dab5e524f4 100644
--- a/ui/src/editor-core/properties-panel.js
+++ b/ui/src/editor-core/properties-panel.js
@@ -528,21 +528,12 @@ PropertiesPanel.prototype.render = function(
       // Check if we can use is repeat data
       dataToRender.repeatDataActive = hasData;
 
-      // Check if we need to show the required elements error message
-      if (target.requiredElements && target.requiredElements.valid == false) {
-        const dataType = lD.common.getModuleByType(target.subType).dataType;
-
-        // Get element names for the missing elements
-        const requiredMissingElements =
-          target.requiredElements.missing.map((el) => {
-            const elTitle = lD.templateManager.templates[dataType][el].title;
-            return (elTitle != undefined) ? elTitle : el;
-          });
+      // Check required elements
+      const errorMessage = target.checkRequiredElements();
 
+      if (errorMessage != '') {
         dataToRender.showErrorMessage = true;
-        dataToRender.errorMessage =
-          propertiesPanelTrans.requiredElementsMessage
-            .replace('%elements%', requiredMissingElements.join(', '));
+        dataToRender.errorMessage = errorMessage;
       }
     }
 
@@ -670,7 +661,7 @@ PropertiesPanel.prototype.render = function(
             helpText: propertiesPanelTrans.effectHelpText,
             value: targetAux.effect,
             type: 'effectSelector',
-            variant: 'all',
+            variant: 'all noNone',
             visibility: [],
           });
         }
@@ -720,25 +711,28 @@ PropertiesPanel.prototype.render = function(
         // if we created a new effect for element group input
         // handle when changed
         if (targetAux.effect !== undefined) {
-          self.DOMObject.find('[name="effect"]').on('change', function(ev) {
-            let effectValue = $(ev.currentTarget).val();
+          self.DOMObject.find('[name="effect"]')
+            .on('change', function(ev, options) {
+              if (!options?.skipSave) {
+                let effectValue = $(ev.currentTarget).val();
 
-            // If value is lower than minSlotValue
-            // set it to minSlotValue
-            if (String(effectValue).length === 0) {
-              effectValue = 'noTransition';
-              $(ev.currentTarget).val(effectValue);
-            }
+                // If value is lower than minSlotValue
+                // set it to minSlotValue
+                if (String(effectValue).length === 0) {
+                  effectValue = 'noTransition';
+                  $(ev.currentTarget).val(effectValue);
+                }
 
-            // update slot for the group
-            targetAux.updateEffect(effectValue, true);
+                // update slot for the group
+                targetAux.updateEffect(effectValue, true);
 
-            // save elements
-            target.saveElements();
+                // save elements
+                target.saveElements();
 
-            // Render canvas again
-            app.viewer.renderCanvas(app.layout.canvas);
-          });
+                // Render canvas again
+                app.viewer.renderCanvas(app.layout.canvas);
+              }
+            });
         }
 
         showAppearanceTab();
@@ -870,7 +864,7 @@ PropertiesPanel.prototype.render = function(
               helpText: propertiesPanelTrans.effectHelpText,
               value: targetAux.effect,
               type: 'effectSelector',
-              variant: 'all',
+              variant: 'all noNone',
               visibility: [],
             });
           }
@@ -1010,6 +1004,7 @@ PropertiesPanel.prototype.render = function(
           left: targetAux.left,
           width: targetAux.width,
           height: targetAux.height,
+          zIndex: targetAux.layer,
         };
       } else if (targetAux?.type === 'element') {
         positionProperties = {
@@ -1079,7 +1074,11 @@ PropertiesPanel.prototype.render = function(
       ) {
         positionProperties.zIndexCanvas = app.layout.canvas.zIndex;
 
-        positionProperties.showElementLayer = true;
+        (targetAux?.type == 'element') &&
+          (positionProperties.showElementLayer = true);
+
+        (targetAux?.type == 'element-group') &&
+            (positionProperties.showElementGroupLayer = true);
       }
 
       self.DOMObject.find('#advancedTab').after(
@@ -1208,8 +1207,12 @@ PropertiesPanel.prototype.render = function(
               height: form.find('[name="height"]').val() * viewerScale,
               top: form.find('[name="top"]').val() * viewerScale,
               left: form.find('[name="left"]').val() * viewerScale,
+              zIndex: zIndexVal,
             });
 
+            // Save layer
+            targetAux.layer = zIndexVal;
+
             // Scale group
             // Update element dimension properties
             targetAux.transform({
@@ -1412,23 +1415,6 @@ PropertiesPanel.prototype.initFields = function(
         }
       });
 
-    // Create delete button
-    if (actionEditMode) {
-      const deleteButton =
-        $('<button type="button" class="delete btn btn-danger">')
-          .html(editorsTrans.delete);
-
-      deleteButton.on('click', function(e) {
-        e.preventDefault();
-        app.deleteSelectedObject();
-      });
-
-      // Add to button container
-      self.DOMObject.find('.button-container').prepend(deleteButton);
-    } else {
-      self.DOMObject.find('.button-container button#delete').remove();
-    }
-
     // Render action tab
     if (
       app.mainObjectType === 'layout' &&
diff --git a/ui/src/editor-core/toolbar.js b/ui/src/editor-core/toolbar.js
index 038dbbf026..3d6df9b2be 100644
--- a/ui/src/editor-core/toolbar.js
+++ b/ui/src/editor-core/toolbar.js
@@ -1481,7 +1481,14 @@ Toolbar.prototype.mediaContentPopulate = function(menu) {
             module.trans.upload =
               module.trans.uploadType.replace('%obj%', module.name);
 
-            const $uploadCard = $(ToolbarCardMediaUploadTemplate(module));
+            const $uploadCard = $(ToolbarCardMediaUploadTemplate(
+              Object.assign(
+                {},
+                module,
+                {
+                  editingPlaylist: self.isPlaylist,
+                })),
+            );
             $mediaContent.append($uploadCard).masonry('appended', $uploadCard);
           }
         };
@@ -2609,8 +2616,8 @@ Toolbar.prototype.loadTemplates = function(
           // don't show items based on showIn property
           // or elements and stencils if we are in playlist editor
           if (
-            el.showIn == 'playlist' && !isPlaylist ||
-            el.showIn == 'layout' && isPlaylist ||
+            el.showIn == 'playlist' && !self.isPlaylist ||
+            el.showIn == 'layout' && self.isPlaylist ||
             el.showIn == 'none' ||
             el.type === 'element' && self.isPlaylist ||
             el.type === 'element-group' && self.isPlaylist
diff --git a/ui/src/editor-core/topbar.js b/ui/src/editor-core/topbar.js
index 92eb2790d9..827df136c9 100644
--- a/ui/src/editor-core/topbar.js
+++ b/ui/src/editor-core/topbar.js
@@ -300,6 +300,11 @@ Topbar.prototype.setupJumpList = function(jumpListContainer) {
         $search.trigger('input');
       }, 100);
     });
+
+    // Force search field focus
+    setTimeout(function() {
+      $search.get(0).focus();
+    }, 10);
   });
 };
 
diff --git a/ui/src/editor-core/widget.js b/ui/src/editor-core/widget.js
index 8097f92e84..682e03a864 100644
--- a/ui/src/editor-core/widget.js
+++ b/ui/src/editor-core/widget.js
@@ -151,6 +151,8 @@ const Widget = function(id, data, regionId = null, layoutObject = null) {
   this.cachedData = {};
   this.forceRecalculateData = false;
 
+  this.validateData = {};
+
   this.validateRequiredElements = function() {
     const moduleType = this.subType;
     // Check if element is required
@@ -688,6 +690,7 @@ Widget.prototype.saveElements = function(
         width: element.group.width,
         height: element.group.height,
         effect: element.group.effect,
+        layer: element.group.layer,
         pinSlot: element.group.pinSlot,
       };
 
@@ -992,6 +995,9 @@ Widget.prototype.removeElement = function(
       app.layout.deleteObject('widget', this.widgetId).then(reloadLayout);
     }
   } else {
+    // Last element will be the one being saved
+    const lastElement = save;
+
     // Recalculate required elements
     this.validateRequiredElements();
 
@@ -1005,16 +1011,16 @@ Widget.prototype.removeElement = function(
         reloadViewer: false,
       });
       lD.viewer.selectElement(null, false, false);
-    } else if (lD.selectedObject.type != 'layout') {
+    } else if (lD.selectedObject.type != 'layout' && lastElement) {
       // If we have a selected object other than layout, reload properties panel
       lD.propertiesPanel.render(lD.selectedObject);
     }
 
     // Reload viewer to update widget valid status
-    lD.viewer.render();
+    (lastElement) && lD.viewer.render();
 
     // If we're not removing widget, we need ot update element map
-    this.updateElementMap();
+    (lastElement) && this.updateElementMap();
   }
 };
 
@@ -1135,10 +1141,24 @@ Widget.prototype.getData = function() {
               data: sampleData,
               meta: data?.meta || {},
             };
+
+            // Save error to widget
+            self.validateData = {
+              sampleDataMessage: layoutEditorTrans.showingSampleData,
+            };
+
+            // If we have an error, add it to the validate data
+            if (data.success === false) {
+              self.validateData.errorMessage = data.message;
+            }
+
             resolve(self.cachedData);
           }
         }
       } else {
+        // Valid, so reset messages
+        self.validateData = {};
+
         // Run onDataLoad/onParseData
         Object.keys(modulesList).forEach(function(item) {
           if (modulesList[item].type === self.subType
@@ -1194,6 +1214,33 @@ Widget.prototype.getData = function() {
   return self.cachedDataPromise;
 };
 
+/**
+ * Update element map for this widget
+ * @return {string} error message
+ */
+Widget.prototype.checkRequiredElements = function() {
+  let errorMessage = '';
+  const self = this;
+
+  // Check if we need to show the required elements error message
+  if (self.requiredElements && self.requiredElements.valid == false) {
+    const dataType = lD.common.getModuleByType(self.subType).dataType;
+
+    // Get element names for the missing elements
+    const requiredMissingElements =
+      self.requiredElements.missing.map((el) => {
+        const elTitle = lD.templateManager.templates[dataType][el].title;
+        return (elTitle != undefined) ? elTitle : el;
+      });
+
+    errorMessage =
+      propertiesPanelTrans.requiredElementsMessage
+        .replace('%elements%', requiredMissingElements.join(', '));
+  }
+
+  return errorMessage;
+};
+
 /**
  * Update element map for this widget
  * @param {object} [element]
diff --git a/ui/src/layout-editor/layout.js b/ui/src/layout-editor/layout.js
index 6d3fffe643..8f8cde84eb 100644
--- a/ui/src/layout-editor/layout.js
+++ b/ui/src/layout-editor/layout.js
@@ -132,10 +132,6 @@ Layout.prototype.createDataStructure = function(data) {
       // Save index
       newRegion.index = parseInt(region) + 1;
 
-      // Check if new region has top layer and set it
-      (newRegion.zIndex > lD.topLayer) &&
-        (lD.topLayer = newRegion.zIndex);
-
       // Widgets
       const widgets = newRegion.playlists.widgets;
 
@@ -193,10 +189,6 @@ Layout.prototype.createDataStructure = function(data) {
                   newWidget,
                 );
 
-              // Check if new element has top layer and set it
-              (newElement.layer > lD.topLayer) &&
-                (lD.topLayer = newElement.layer);
-
               // Update elements map for the widget
               newWidget.updateElementMap(newElement);
 
@@ -217,6 +209,15 @@ Layout.prototype.createDataStructure = function(data) {
                     );
                 }
 
+                // If group has no layer, give the element layer to it
+                if (
+                  newWidget.elementGroups[newElement.groupId].layer == null ||
+                  newWidget.elementGroups[newElement.groupId].layer == undefined
+                ) {
+                  newWidget.elementGroups[newElement.groupId].layer =
+                    newElement.layer;
+                }
+
                 // Add group reference to element
                 newElement.group = newWidget.elementGroups[newElement.groupId];
 
@@ -891,10 +892,10 @@ Layout.prototype.createDrawer = function(drawerData) {
 
 /**
  * Create or get canvas region
- * @param {object} canvasData - Canvas data
+ * @param {number=} canvasLayer - Canvas layer
  * @return {Promise} Promise with the canvas region
  */
-Layout.prototype.getCanvas = function() {
+Layout.prototype.getCanvas = function(canvasLayer) {
   const self = this;
   // If we have a canvas already, return it
   if (!$.isEmptyObject(this.canvas)) {
@@ -904,6 +905,13 @@ Layout.prototype.getCanvas = function() {
   // Create canvas as a region
   // return promise
   return new Promise(function(resolve, reject) {
+    // If we have a layer, set it to the dimensions
+    const dimensions = {
+      width: self.width,
+      height: self.height,
+    };
+    (canvasLayer) && (dimensions.zIndex = canvasLayer);
+
     // Create canvas as a region
     // always add to the top left
     // and with the same dimensions as the layout
@@ -915,10 +923,7 @@ Layout.prototype.getCanvas = function() {
           top: 0,
           left: 0,
         },
-        dimensions: {
-          width: self.width,
-          height: self.height,
-        },
+        dimensions,
       }).then((res) => {
       // Push Region to the Layout region array
       self.canvas = new Canvas(
diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
index 171c4b2d44..a48253bd4a 100644
--- a/ui/src/layout-editor/main.js
+++ b/ui/src/layout-editor/main.js
@@ -112,6 +112,9 @@ window.lD = {
 
 // Load Layout and build app structure
 $(() => {
+  // Add class to body so we can use CSS specifically on it
+  $('body').addClass('editor-opened');
+
   // Get layout id
   const layoutId = lD.editorContainer.attr('data-layout-id');
 
@@ -284,7 +287,7 @@ $(() => {
             inactiveCheck: function() {
               return lD.templateEditMode ||
                 (lD.layout.editable ||
-                 !lD.layout.scheduleNowPermission);
+                  !lD.layout.scheduleNowPermission);
             },
             inactiveCheckClass: 'd-none',
           },
@@ -405,7 +408,11 @@ lD.selectObject =
       if (
         target &&
         (
-          ['drawer', 'zone', 'playlist'].includes(target.data('subType')) ||
+          (
+            target.data('subType') == 'playlist' &&
+            lD.common.hasTarget(card, 'playlist')
+          ) ||
+          ['drawer', 'zone'].includes(target.data('subType')) ||
           (
             target.hasClass('designer-widget') &&
             activeDroppable
@@ -551,8 +558,8 @@ lD.selectObject =
               .selected = true;
 
             this.selectedObject =
-                this.layout.regions[target.data('widgetRegion')]
-                  .widgets[newSelectedId];
+              this.layout.regions[target.data('widgetRegion')]
+                .widgets[newSelectedId];
           }
         } else if (newSelectedType === 'element') {
           const parentRegion = target.data('regionId');
@@ -1271,7 +1278,7 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
   const draggableData = $(draggable).data();
   const droppableIsDrawer = ($(droppable).data('subType') === 'drawer');
   const droppableIsZone = ($(droppable).data('subType') === 'zone');
-  const droppableIsPlaylist =($(droppable).data('subType') === 'playlist');
+  const droppableIsPlaylist = ($(droppable).data('subType') === 'playlist');
   const droppableIsWidget = $(droppable).hasClass('designer-widget');
   const droppableIsElement = $(droppable).hasClass('designer-element');
   const droppableIsElementGroup =
@@ -1439,10 +1446,10 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
     // if draggable is type global or if both are the same type
     const canBeAddedToGroup = function() {
       return $(droppable).hasClass('editing') &&
-      (
-        draggableData.dataType == 'global' ||
-        draggableData.dataType == $(droppable).data('elementType')
-      );
+        (
+          draggableData.dataType == 'global' ||
+          draggableData.dataType == $(droppable).data('elementType')
+        );
     };
 
     // Create group if group is type global
@@ -1465,8 +1472,11 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
       }
     }
 
+    // Calculate next available top layer
+    const topLayer = lD.calculateLayers().availableTop;
+
     // Get canvas
-    this.layout.getCanvas().then((canvas) => {
+    this.layout.getCanvas(topLayer).then((canvas) => {
       // Create element
       const createElement = function({
         id,
@@ -1659,7 +1669,7 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
           const targetWidget = lD.getObjectByTypeAndId(
             'widget',
             'widget_' + $(droppable).data('regionId') + '_' +
-              $(droppable).data('widgetId'),
+            $(droppable).data('widgetId'),
             'canvas',
           );
 
@@ -1687,7 +1697,7 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
           const targetWidget = lD.getObjectByTypeAndId(
             'widget',
             'widget_' + $(droppable).data('regionId') + '_' +
-              $(droppable).data('widgetId'),
+            $(droppable).data('widgetId'),
             'canvas',
           );
 
@@ -1932,10 +1942,10 @@ lD.dropItemAdd = function(droppable, draggable, dropPosition) {
     } else if (droppableIsZone || droppableIsPlaylist) {
       // Get zone region
       const region =
-      lD.getObjectByTypeAndId(
-        'region',
-        'region_' + $(droppable).data('regionId'),
-      );
+        lD.getObjectByTypeAndId(
+          'region',
+          'region_' + $(droppable).data('regionId'),
+        );
 
       // Add module to zone
       lD.addModuleToPlaylist(
@@ -2292,8 +2302,8 @@ lD.addMediaToPlaylist = function(
       // Save the new widget as temporary
       lD.viewer.saveTemporaryObject(
         'widget_' +
-          res.data.regionId + '_' +
-          res.data.newWidgets[0].widgetId,
+        res.data.regionId + '_' +
+        res.data.newWidgets[0].widgetId,
         'widget',
         {
           type: 'widget',
@@ -2666,8 +2676,7 @@ lD.openContextMenu = function(obj, position = {x: 0, y: 0}) {
 
   // Check if we can change the object layer
   const canChangeLayer = (
-    layoutObject.isEditable &&
-    layoutObject.type != 'element-group'
+    layoutObject.isEditable
   );
 
   // If it's an editable group show ungroup option
@@ -2763,6 +2772,10 @@ lD.openContextMenu = function(obj, position = {x: 0, y: 0}) {
       // Calculate Layers
       const calculatedLayers = lD.calculateLayers(
         originalLayer,
+        (
+          layoutObject.type === 'element' ||
+          layoutObject.type === 'element-group'
+        ),
         groupElements,
       );
 
@@ -2807,15 +2820,22 @@ lD.openContextMenu = function(obj, position = {x: 0, y: 0}) {
 
           // Update on viewer
           lD.viewer.updateRegion(layoutObject);
-        } else if (layoutObject.type === 'element') {
+        } else if (
+          layoutObject.type === 'element' ||
+          layoutObject.type === 'element-group'
+        ) {
           layoutObject.layer = newLayer;
 
           // Get widget
           const elementWidget =
             lD.getObjectByTypeAndId('widget', objAuxId, 'canvas');
 
-          // Update element in the viewer
-          lD.viewer.updateElement(layoutObject, true);
+          // Update element or element group in the viewer
+          if (layoutObject.type === 'element') {
+            lD.viewer.updateElement(layoutObject, true);
+          } else {
+            lD.viewer.updateElementGroupLayer(layoutObject);
+          }
 
           // Save elements to the widget
           elementWidget.saveElements();
@@ -4080,7 +4100,8 @@ lD.populateDropdownWithLayoutElements = function(
     // Update widgetId
     if (
       $widgetIDInput.length > 0 &&
-      $widgetIDInput.val() != ''
+      $widgetIDInput.val() != '' &&
+      getDrawerWidgets
     ) {
       // Call update widget drawer edit element
       handleEditWidget($widgetIDInput.val());
@@ -4107,18 +4128,60 @@ lD.populateDropdownWithLayoutElements = function(
 
   // Open or edit drawer widget
   const handleEditWidget = function(dropdownValue) {
+    const $dropdownParent = $dropdown.parent();
+
+    const removeDeleteButton = function() {
+      // Remove delete widget button
+      $dropdown.siblings('.delete-widget-btn').remove();
+
+      // Remove class from container
+      $dropdownParent.removeClass('delete-active');
+    };
+
     if (dropdownValue === 'create') {
       // Create new
       lD.viewer.addActionEditArea(actionData, 'create');
-    } else if (dropdownValue != '') {
+
+      removeDeleteButton();
+    } else if (dropdownValue != '' && dropdownValue != null) {
       // Update action widget data
       actionData.widgetId = dropdownValue;
 
       // Edit existing
       lD.viewer.addActionEditArea(actionData, 'edit');
+
+      // Show delete button on dropdown
+      if ($dropdown.siblings('.delete-widget-btn').length === 0) {
+        const $deleteBtn = $(
+          '<div class="btn btn-danger delete-widget-btn" title="' +
+          editorsTrans.actions.deleteWidget + '">' +
+          editorsTrans.actions.deleteWidget +
+          '</div>',
+        ).on('click', function() {
+          const widgetId = $dropdown.val();
+          const drawerId = lD.getObjectByTypeAndId('drawer').regionId;
+
+          removeDeleteButton();
+
+          lD.deleteObject(
+            'widget',
+            widgetId,
+            drawerId,
+            true,
+          );
+        });
+
+        // Append to dropdown parent
+        $dropdownParent.append($deleteBtn);
+
+        // Add class to container
+        $dropdownParent.addClass('delete-active');
+      }
     } else {
       // Remove edit area
       lD.viewer.removeActionEditArea();
+
+      removeDeleteButton();
     }
   };
 
@@ -4322,7 +4385,7 @@ lD.addElementsToWidget = function(
   addingToExistingGroup = false,
 ) {
   // Calculate next available global top layer
-  let topLayer = lD.calculateLayers().availableTop;
+  let topLayer = lD.calculateLayers(null, true).availableTop;
 
   // Add element promise array
   const addElementPromise = [];
@@ -4342,6 +4405,7 @@ lD.addElementsToWidget = function(
       // Calculate next available global top layer
       topLayer = lD.calculateLayers(
         null,
+        true,
         (widgetGroup) ? widgetGroup.elements : null,
       ).availableTop;
     }
@@ -4356,10 +4420,13 @@ lD.addElementsToWidget = function(
         'element_' + element.id + '_' +
         Math.floor(Math.random() * 1000000);
 
-      // Add layer to the next top layer
-      element.layer = (element.layer) ?
-        (element.layer + topLayer) :
-        topLayer;
+      // Add top layer to the group properties
+      if (element.groupId) {
+        element.groupProperties.layer = topLayer;
+      } else {
+        // Add element to the top layer
+        element.layer = topLayer;
+      }
 
       // Add element to the widget and push to array
       addElementPromise.push(widget.addElement(element, false));
@@ -4422,10 +4489,16 @@ lD.addElementsToWidget = function(
 /**
  * Calculate top layer
  * @param {number} baseLayer - Base layer to be compared
+ * @param {boolean=} calculateInCanvas
+ *  - Calculate layers only for canvas
  * @param {object=} groupElements - Calculate only for group elements
  * @return {object} Calculated layers
  */
-lD.calculateLayers = function(baseLayer, groupElements) {
+lD.calculateLayers = function(
+  baseLayer,
+  calculateInCanvas = false,
+  groupElements,
+) {
   const self = this;
 
   const limits = {
@@ -4450,7 +4523,7 @@ lD.calculateLayers = function(baseLayer, groupElements) {
     },
   };
 
-  const addElementToLayerMap = function(layer, elementType, elementId) {
+  const addObjToLayerMap = function(layer, objType, objId) {
     if (
       layerMap[layer] == undefined
     ) {
@@ -4458,105 +4531,103 @@ lD.calculateLayers = function(baseLayer, groupElements) {
     }
 
     layerMap[layer].push({
-      id: elementId,
-      type: elementType,
+      id: objId,
+      type: objType,
     });
   };
 
+  const checkAndSaveLayer = function(layer, objType, objId) {
+    if (
+      calculatedLayers.top === null ||
+      layer > calculatedLayers.top) {
+      calculatedLayers.top = layer;
+    }
+
+    if (
+      calculatedLayers.bottom === null ||
+      layer < calculatedLayers.bottom
+    ) {
+      calculatedLayers.bottom = layer;
+    }
+
+    // Save to layer map
+    addObjToLayerMap(layer, objType, objId);
+  };
+
   // Calculate only for elements in a group
   if (groupElements) {
     Object.values(groupElements).forEach((element) => {
       const elementLayer = Number(element.layer);
 
-      if (
-        calculatedLayers.top === null ||
-        elementLayer > calculatedLayers.top) {
-        calculatedLayers.top = elementLayer;
-      }
-
-      if (
-        calculatedLayers.bottom === null ||
-        elementLayer < calculatedLayers.bottom
-      ) {
-        calculatedLayers.bottom = elementLayer;
-      }
-
-      // Save to layer map
-      addElementToLayerMap(elementLayer, 'element', element.elementId);
-    });
-  } else {
-    // Check regions layers
-    Object.values(lD.layout.regions).forEach((region) => {
-      const regionLayer = Number(region.zIndex);
-
-      if (
-        calculatedLayers.top === null ||
-        regionLayer > calculatedLayers.top
-      ) {
-        calculatedLayers.top = regionLayer;
-      }
-
-      if (
-        calculatedLayers.bottom === null ||
-        regionLayer < calculatedLayers.bottom
-      ) {
-        calculatedLayers.bottom = regionLayer;
-      }
-
-      // Save to layer map
-      addElementToLayerMap(regionLayer, 'region', region.id);
+      checkAndSaveLayer(elementLayer, 'element', element.elementId);
     });
-
-    // Check elements
+  } else if (calculateInCanvas) {
+    // Calculate only for canvas elements
     if (lD.layout.canvas.widgets) {
       Object.values(lD.layout.canvas.widgets).forEach((widget) => {
+        // Elements
         Object.values(widget.elements).forEach((element) => {
-          const elementLayer = Number(element.layer);
-
-          if (
-            calculatedLayers.top === null ||
-            elementLayer > calculatedLayers.top) {
-            calculatedLayers.top = elementLayer;
-          }
-
+          // Only calculate if it's a group-less element
           if (
-            calculatedLayers.bottom === null ||
-            elementLayer < calculatedLayers.bottom
+            element.groupId === '' ||
+            element.groupId === undefined
           ) {
-            calculatedLayers.bottom = elementLayer;
+            const elementLayer = Number(element.layer);
+            checkAndSaveLayer(elementLayer, 'element', element.elementId);
           }
+        });
 
-          // Save to layer map
-          addElementToLayerMap(elementLayer, 'element', element.elementId);
+        // Element groups
+        Object.values(widget.elementGroups).forEach((elementGroup) => {
+          const elementGroupLayer = Number(elementGroup.layer);
+          checkAndSaveLayer(elementGroupLayer, 'elementGroup', elementGroup.id);
         });
       });
     }
+  } else {
+    // Add canvas layer
+    if (!$.isEmptyObject(lD.layout.canvas)) {
+      checkAndSaveLayer(lD.layout.canvas.zIndex, 'region', lD.layout.canvas.id);
+    }
+
+    // Check regions layers
+    Object.values(lD.layout.regions).forEach((region) => {
+      const regionLayer = Number(region.zIndex);
+      checkAndSaveLayer(regionLayer, 'region', region.id);
+    });
 
     // Save layerMap to the global var
     self.layerMap = layerMap;
   }
 
   // Find if the element is already the only one on top and bottom layers
-  const isSingleOnTopLayer = (baseLayer === undefined) ? false : (
-    layerMap[calculatedLayers.top].length === 1 &&
-    calculatedLayers.top === baseLayer
-  );
+  const isSingleOnTopLayer =
+    (baseLayer === undefined || baseLayer === null) ? false : (
+      layerMap[calculatedLayers.top].length === 1 &&
+      calculatedLayers.top === baseLayer
+    );
 
-  const isSingleOnBottomLayer = (baseLayer === undefined) ? false : (
-    layerMap[calculatedLayers.bottom].length === 1 &&
-    calculatedLayers.bottom === baseLayer
-  );
+  const isSingleOnBottomLayer =
+    (baseLayer === undefined || baseLayer === null) ? false : (
+      layerMap[calculatedLayers.bottom].length === 1 &&
+      calculatedLayers.bottom === baseLayer
+    );
 
   // Find the next available layer at top
   if (
     layerMap[calculatedLayers.top + 1] === undefined &&
     !isSingleOnTopLayer
   ) {
-    // Set top value, but not over the limit
-    calculatedLayers.availableTop = Math.min(
-      (calculatedLayers.top + 1),
-      limits.top,
-    );
+    // If we don't have any layers yet, set to 0
+    if (layerMap.length === 0) {
+      calculatedLayers.availableTop = 0;
+    } else {
+      // Set top value, but not over the limit
+      calculatedLayers.availableTop = Math.min(
+        (calculatedLayers.top + 1),
+        limits.top,
+      );
+    }
   }
 
   // Find the next available layer at bottom
diff --git a/ui/src/layout-editor/viewer.js b/ui/src/layout-editor/viewer.js
index ee08af1591..e8358b1ff1 100644
--- a/ui/src/layout-editor/viewer.js
+++ b/ui/src/layout-editor/viewer.js
@@ -1197,6 +1197,22 @@ Viewer.prototype.updateElementGroup = _.throttle(function(
   });
 }, drawThrottle);
 
+/**
+ * Update element group
+ * @param {object} elementGroup
+ */
+Viewer.prototype.updateElementGroupLayer = _.throttle(function(
+  elementGroup,
+  layer,
+) {
+  const $container = lD.viewer.DOMObject.find(`#${elementGroup.elementId}`);
+
+  // Update element index
+  $container.css({
+    'z-index': (layer) ? layer : elementGroup.layer,
+  });
+}, drawThrottle);
+
 /**
  * Update Region
  * @param {object} region - region object
@@ -1393,6 +1409,13 @@ Viewer.prototype.renderElement = function(
       top: element.group.top * viewerScale,
       width: element.group.width * viewerScale,
     });
+
+    // Update element group index
+    if (element.group.layer) {
+      $groupContainer.css({
+        'z-index': element.group.layer,
+      });
+    }
   }
 
   // Render element content and handle interactions after
@@ -1600,6 +1623,67 @@ Viewer.prototype.renderElementContent = function(
         const elData = elementData?.data;
         const meta = elementData?.meta;
 
+        // If parent widget isn't valid, replace error message
+        if (!$.isEmptyObject(parentWidget.validateData)) {
+          const $messageContainer = $elementContainer.find('.invalid-parent');
+          const errorArray = [$messageContainer.prop('title')];
+          const hasGroup = Boolean(element.groupId);
+          const $groupContainer = (hasGroup) ?
+            $elementContainer.parents('.designer-element-group') : null;
+
+          // Add if elemens has no group or
+          // if has group but the group doesn't have message yet
+          if (
+            !hasGroup ||
+            (
+              hasGroup &&
+              $groupContainer.find('> .invalid-parent').length == 0
+            )
+          ) {
+            // Required elements message
+            const requiredElementsErrorMessage =
+              parentWidget.checkRequiredElements();
+
+            (requiredElementsErrorMessage) &&
+              errorArray.push(
+                '<p>' +
+                requiredElementsErrorMessage +
+                '</p>');
+
+            // Default error message
+            (parentWidget.validateData.errorMessage) &&
+              errorArray.push(
+                '<p>' +
+                parentWidget.validateData.errorMessage +
+                '</p>');
+
+            (parentWidget.validateData.sampleDataMessage) &&
+              errorArray.push(
+                '<p class="sample-data">( ' +
+                parentWidget.validateData.sampleDataMessage +
+                ' )</p>');
+
+            // If element has group, move error to group
+            (hasGroup) && $messageContainer.appendTo(
+              $elementContainer.parents('.designer-element-group'),
+            );
+
+            // Set title/tooltip
+            $messageContainer.tooltip('dispose')
+              .prop('title', '<div class="custom-tooltip">' +
+              errorArray.join('') + '</div>');
+            $messageContainer.tooltip();
+
+            // Show tooltip
+            $messageContainer.removeClass('d-none');
+          }
+
+          // Remove message from element if it's in a group
+          if (hasGroup) {
+            $elementContainer.find('.invalid-parent').remove();
+          }
+        }
+
         // Check all data elements and make replacements
         for (const key in elData) {
           if (elData.hasOwnProperty(key)) {
@@ -1667,6 +1751,9 @@ Viewer.prototype.renderElementContent = function(
           }
         }
 
+        // Escape HTML
+        convertedProperties.escapeHtml = template?.extends?.escapeHtml;
+
         // Compile hbs template with data
         let hbsHtml = hbsTemplate(convertedProperties);
 
@@ -2376,6 +2463,10 @@ Viewer.prototype.selectElement = function(
   if (!multiSelect) {
     this.DOMObject.find('.selected, .selected-from-layer-manager')
       .removeClass('selected selected-from-layer-manager');
+
+    // Also remove select from layer manager from canvas
+    self.DOMObject.find('.designer-region-canvas')
+      .removeClass('canvas-element-selected-from-layer-manager');
   }
 
   // Remove all editing from groups
@@ -3113,6 +3204,8 @@ Viewer.prototype.editGroup = function(
     const viewerOverlayIndex =
       self.DOMObject.find('.viewer-overlay').css('z-index');
 
+    // Save original layer to data
+    $(groupDOMObject).data('layer', $(groupDOMObject).css('z-index'));
     $(groupDOMObject).css('z-index', Number(viewerOverlayIndex) + 1);
 
     // Give group the same background as the layout's
@@ -3126,8 +3219,12 @@ Viewer.prototype.editGroup = function(
     self.DOMObject.find('.designer-region-canvas')
       .css('zIndex', lD.layout.canvas.zIndex);
 
-    // Unset group z-index
-    $(groupDOMObject).css('z-index', '');
+    // Unset or reset group z-index
+    const originalLayer = $(groupDOMObject).data('layer');
+    $(groupDOMObject).css(
+      'z-index',
+      originalLayer ? originalLayer : '',
+    );
 
     // Remove background color
     $(groupDOMObject).css('background-color', '');
diff --git a/ui/src/playlist-editor/main.js b/ui/src/playlist-editor/main.js
index 9db5d0a602..9dcd76f847 100644
--- a/ui/src/playlist-editor/main.js
+++ b/ui/src/playlist-editor/main.js
@@ -100,6 +100,9 @@ window.pE = {
  * @param {string} inline - Is this an inline playlist editor?
  */
 pE.loadEditor = function(inline = false) {
+  // Add class to body so we can use CSS specifically on it
+  (!inline) && $('body').addClass('editor-opened');
+
   pE.common.showLoadingScreen();
 
   // Save and change toastr positioning
@@ -738,6 +741,9 @@ pE.close = function() {
   toastr.options.positionClass = this.toastrPosition;
 
   $('#editor-container').empty();
+
+  // Remove editing class from body
+  (!this.inline) && $('body').removeClass('editor-opened');
 };
 
 /**
diff --git a/ui/src/style/layout-editor.scss b/ui/src/style/layout-editor.scss
index bacbe4053a..199e449dbd 100644
--- a/ui/src/style/layout-editor.scss
+++ b/ui/src/style/layout-editor.scss
@@ -24,7 +24,7 @@
 @import "mixins";
 
 // CSS
-body {
+body.editor-opened {
     overflow: hidden;
 }
 
@@ -560,6 +560,10 @@ body {
         .designer-region-canvas {
             width: 0;
             height: 0;
+
+            &.canvas-element-selected-from-layer-manager {
+                z-index: auto !important;
+            }
         }
 
         .designer-region-drawer {
@@ -1094,7 +1098,7 @@ body {
             }
         }
 
-        .slot, .invalid-parent {
+        .slot {
             position: absolute;
             left: 2px;
             top: 2px;
@@ -1107,17 +1111,7 @@ body {
             opacity: 0.3;
         }
 
-        .invalid-parent {
-            left: auto;
-            top: auto;
-            right: 2px;
-            bottom: 2px;
-            background-color: $xibo-color-semantic-error;
-            color: $xibo-color-neutral-0;
-            opacity: 0.6;
-        }
-
-        &:hover .slot, &:hover .invalid-parent {
+        &:hover .slot {
             opacity: 0.8;
         }
 
@@ -1232,6 +1226,10 @@ body {
             opacity: 0.3;
         }
 
+        & > .invalid-parent {
+            z-index: $viewer-object-group-bts-z-index !important;
+        }
+
         &:hover > .slot, &:hover > .group-edit-btn {
             opacity: 0.8;
         }
@@ -1255,6 +1253,27 @@ body {
         }
     }
 
+    .designer-element, .designer-element-group {
+        .invalid-parent {
+            position: absolute;
+            padding: 2px 5px;
+            border-radius: 4px;
+            font-weight: bold;
+            z-index: 100;
+            left: auto;
+            top: auto;
+            right: 2px;
+            bottom: 2px;
+            background-color: $xibo-color-semantic-error;
+            color: $xibo-color-neutral-0;
+            opacity: 0.6;
+        }
+
+        &:hover .invalid-parent {
+            opacity: 0.8;
+        }
+    }
+
     .designer-region:not(.selected):hover::before {
         outline-color: $xibo-color-neutral-0;
     }
@@ -1632,7 +1651,7 @@ div#bg_media_name {
             flex-basis: 30px;
             font-weight: bold;
             text-align: center;
-            background-color: $xibo-color-primary-l20;
+            background-color: $xibo-color-primary-l10;
             height: 32px;
             display: flex;
             align-items: center;
@@ -1651,13 +1670,6 @@ div#bg_media_name {
             text-align: center;
         }
 
-        &.has-group {
-            .module-icon {
-                padding: 2px;
-                border: 2px solid $xibo-color-neutral-0;
-            }
-        }
-
         &.selected {
             color: $xibo-color-neutral-0;
             background-color: $xibo-color-accent !important;
@@ -1665,17 +1677,21 @@ div#bg_media_name {
             .layer {
                 background-color: darken($xibo-color-accent, 5%) !important;
             }
+
+            .layer-item-in-group-helper {
+                background-color: darken($xibo-color-accent, 10%) !important;
+            }
         }
 
-        &.selectable {
+        &.selectable:not(.selected) {
             cursor: pointer;
 
             &:hover {
                 color: $xibo-color-secondary;
-                background-color: lighten($xibo-color-accent, 15%);
+                background-color: lighten($xibo-color-accent, 20%) !important;
 
                 .layer {
-                    background-color: lighten($xibo-color-accent, 12%);
+                    background-color: lighten($xibo-color-accent, 15%) !important;
                 }
             }
         }
@@ -1684,11 +1700,45 @@ div#bg_media_name {
     .layer-manager-canvas-layers {
         .layer-manager-layer-item {
             padding-left: 16px;
-            background-color: darken($xibo-color-primary-l60, 10%);
-            color: $xibo-color-neutral-0;
+            background-color: $xibo-color-primary-l5;
 
             .layer {
-                background-color: $xibo-color-primary-l60;
+                background-color: darken($xibo-color-primary-l5, 5%);
+            }
+
+            .layer-item-in-group {
+                display: flex;
+                width: 4px;
+                height: 100%;
+                background-color: unset;
+                flex-direction: column;
+
+                .layer-item-in-group-helper {
+                    background-color: darken($xibo-color-primary-l5, 5%);
+                    width: 100%;
+                    height: 100%;
+                }
+            }
+
+            &.element-group {
+                .name {
+                    font-size: 0.9rem;
+                }
+            }
+
+            &.has-group {
+                padding-left: 22px;
+                background-color: $xibo-color-primary-l10;
+
+                .layer {
+                    margin-left: -2px;
+                    background-color: darken($xibo-color-primary-l10, 5%);
+                }
+    
+                .module-icon {
+                    padding: 2px;
+                    border: 2px solid $xibo-color-neutral-0;
+                }
             }
         }
     }
@@ -1867,6 +1917,33 @@ div#bg_media_name {
             background-color: $xibo-color-action-target-light;
         }
 
+        .action-element-form-target.delete-active {
+            font-size: 0;
+
+            & > * {
+                font-size: 1rem;
+            }
+
+            .select2-container {
+                display: inline-block;
+                width: calc(100% - 80px) !important;
+
+                .select2-selection {
+                    border-radius: 4px 0 0 4px;
+                }
+            }
+
+            .delete-widget-btn {
+                display: inline-block;
+                height: 34px;
+                width: 80px;
+                border-radius: 0 4px 4px 0;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
+
         .error-message {
             display: none;
         }
@@ -1894,7 +1971,6 @@ body[layout-editor-fs] .moveable-control-box {
     background: $xibo-color-semantic-error !important;
 }
 
-
 .moveable-control.moveable-origin, .moveable-normal.red {
     background: $xibo-color-accent !important;
 }
@@ -1903,3 +1979,18 @@ body[layout-editor-fs] .moveable-control-box {
     color: $xibo-color-accent !important;
     font-size: 1rem !important;
 }
+
+/* Custom tooltip */
+.custom-tooltip {
+    text-align: left;
+    color: $xibo-color-neutral-0;
+    line-height: 1.2;
+
+    p {
+       margin: 0.3rem 0; 
+    }
+
+    .sample-data {
+        color: $xibo-color-tertiary;
+    }
+}
\ No newline at end of file
diff --git a/ui/src/templates/forms/position.hbs b/ui/src/templates/forms/position.hbs
index f9c4fd0ecf..157f3436b6 100644
--- a/ui/src/templates/forms/position.hbs
+++ b/ui/src/templates/forms/position.hbs
@@ -7,6 +7,9 @@
     {{#if showElementLayer}}
         {{set "layerTitle" trans.positionTab.elementLayer}}
         {{set "layerHelp" trans.positionTab.elementLayerHelp}}
+    {{else if showElementGroupLayer}}
+        {{set "layerTitle" trans.positionTab.elementGroupLayer}}
+        {{set "layerHelp" trans.positionTab.elementGroupLayerHelp}}
     {{else}}
         {{set "layerTitle" trans.positionTab.layer}}
         {{set "layerHelp" trans.positionTab.layerHelp}}
diff --git a/ui/src/templates/layer-manager.hbs b/ui/src/templates/layer-manager.hbs
index 9a7e15bd6d..a8b715d1c2 100644
--- a/ui/src/templates/layer-manager.hbs
+++ b/ui/src/templates/layer-manager.hbs
@@ -21,19 +21,46 @@
                         </div>
                         {{#each layers as |canvasLayer canvasLayerIdx|}}
                             {{#each this}}
-                                <div class="layer-manager-layer-item selectable {{#if hasGroup}}has-group{{/if}} {{#if selected}}selected{{/if}}" data-item-id="{{id}}">
-                                    <div class="layer">{{canvasLayerIdx}}</div>
-                                    {{#eq type 'element'}}
+                                {{#eq type 'elementGroup'}}
+                                     <div class="layer-manager-layer-item selectable element-group {{#if selected}}selected{{/if}}" data-item-id="{{id}}">
+                                        <div class="layer">{{canvasLayerIdx}}</div>
                                         {{#if moduleIcon}}
-                                            <i class="module-icon {{#if moduleIcon}}{{moduleIcon}}{{else}}fas fa-object-group{{/if}}" {{#if hasGroup}}title="{{groupId}}"{{/if}}></i>
+                                            <i class="module-icon {{#if moduleIcon}}{{moduleIcon}}{{else}}fas fa-object-group{{/if}}"></i>
                                         {{/if}}
-                                        <i class="element-icon {{#if icon}}{{icon}}{{else}}fas fa-atom{{/if}}"></i>
-                                    {{/eq}}
-                                    <span class="name" title="{{../../../../trans.name}}">{{name}}</span>
-                                    {{#if duration}}
-                                        <span class="duration" title="{{../../../../trans.duration}}">{{duration}}</span>
-                                    {{/if}}
-                                </div>
+                                        <span class="label">{{../../../../trans.group}}</span><span class="name" title="{{../../../../trans.id}}">({{id}})</span>
+                                    </div>
+                                    {{#each layers as |groupLayer groupLayerIdx|}}
+                                        {{#each this}}
+                                            <div class="layer-manager-layer-item selectable has-group {{#if selected}}selected{{/if}}" data-item-id="{{id}}">
+                                                <div class="layer-item-in-group">
+                                                    <div class="layer-item-in-group-helper"></div>
+                                                </div>
+                                                <div class="layer">{{groupLayerIdx}}</div>
+                                                {{#eq type 'element'}}
+                                                    <i class="element-icon {{#if icon}}{{icon}}{{else}}fas fa-atom{{/if}}"></i>
+                                                {{/eq}}
+                                                <span class="name" title="{{../../../../../../trans.name}}">{{name}}</span>
+                                                {{#if duration}}
+                                                    <span class="duration" title="{{../../../../../../trans.duration}}">{{duration}}</span>
+                                                {{/if}}
+                                            </div>
+                                        {{/each}}
+                                    {{/each}}
+                                {{else}}
+                                    <div class="layer-manager-layer-item selectable  {{#if selected}}selected{{/if}}" data-item-id="{{id}}">
+                                        <div class="layer">{{canvasLayerIdx}}</div>
+                                        {{#eq type 'element'}}
+                                            {{#if moduleIcon}}
+                                                <i class="module-icon {{#if moduleIcon}}{{moduleIcon}}{{else}}fas fa-object-group{{/if}}" {{#if hasGroup}}title="{{groupId}}"{{/if}}></i>
+                                            {{/if}}
+                                            <i class="element-icon {{#if icon}}{{icon}}{{else}}fas fa-atom{{/if}}"></i>
+                                        {{/eq}}
+                                        <span class="name" title="{{../../../../trans.name}}">{{name}}</span>
+                                        {{#if duration}}
+                                            <span class="duration" title="{{../../../../trans.duration}}">{{duration}}</span>
+                                        {{/if}}
+                                    </div>
+                                {{/eq}}
                             {{/each}}
                         {{/each}}
                     </div>
diff --git a/ui/src/templates/toolbar-card-media-upload.hbs b/ui/src/templates/toolbar-card-media-upload.hbs
index 25f6fa1cfe..accf16552f 100644
--- a/ui/src/templates/toolbar-card-media-upload.hbs
+++ b/ui/src/templates/toolbar-card-media-upload.hbs
@@ -2,7 +2,7 @@
     data-toggle="tooltip" 
     data-type="widget" 
     data-sub-type="{{type}}"
-    data-target="{{#if target}}{{target}}{{else}}layout playlist{{/if}}"
+    data-target="{{#if target}}{{target}}{{else}}layout {{#if editingPlaylist}}playlist{{/if}}{{/if}}"
     data-region-specific="{{regionSpecific}}"
     data-valid-ext="{{ validExtensions }}"
     data-max-size="{{ maxSize }}" 
diff --git a/ui/src/templates/toolbar-card-template.hbs b/ui/src/templates/toolbar-card-template.hbs
index 747d41b680..5f9e3482b6 100644
--- a/ui/src/templates/toolbar-card-template.hbs
+++ b/ui/src/templates/toolbar-card-template.hbs
@@ -10,8 +10,12 @@
 
 {{#if thumbnail}}
     <div class="toolbar-card-thumb">
-        <img src="{{thumbnail}}" />
+        <img src="{{thumbnail}}"  alt="{{title}}"/>
     </div>
+{{else}}
+    {{#if icon}}
+        <i class="element-icon {{icon}} card-icon"></i>
+    {{/if}}
 {{/if}}
 
     <div class="toolbar-content tooltip-always-on" data-toggle="tooltip" data-title="{{title}}">
diff --git a/ui/src/templates/viewer-element-content.hbs b/ui/src/templates/viewer-element-content.hbs
index 0c51363304..7295df6cef 100644
--- a/ui/src/templates/viewer-element-content.hbs
+++ b/ui/src/templates/viewer-element-content.hbs
@@ -16,7 +16,7 @@
 {{/neq}}
 
 {{#if invalidParent}}
-<div class="invalid-parent" title="{{trans.invalidWidget}}">
+<div class="invalid-parent d-none" data-html="true" title="{{trans.invalidWidget}}">
     <i class="fa fa-warning"></i>
 </div>
 {{/if}}
diff --git a/views/common.twig b/views/common.twig
index aae9ade39c..a14c54ea01 100644
--- a/views/common.twig
+++ b/views/common.twig
@@ -371,19 +371,14 @@
             // TRANSLATIONS
             var editorsTrans = {
                 deleteTitle: "{{ "Delete %obj%" |trans }}",
-                deleteMultipleTitle: "{{ "Delete selected items" |trans }}",
-                deleteConfirm: "{{ "Are you sure? All changes related to this object will be erased" |trans }}",
                 onbeforeunload: "{{ "Changes that you have made may not be saved!" |trans }}",
                 yes: "{{ "Yes" |trans }}",
                 no: "{{ "No" |trans }}",
                 selectAll: "{{ "Select All" |trans }}",
-                allChangesSaved: "{{ "All changes saved!" |trans }}",
                 back: "{{ "Back" |trans }}",
                 delete: "{{ "Delete" |trans }}",
                 loadPropertyForObject: "{{ "Load %prop% for %obj%" |trans }}",
                 loading: "{{ "Loading" |trans }}",
-                tooltipsDisabled: "{{ "Tooltips disabled!" |trans }}",
-                tooltipsEnabled: "{{ "Tooltips enabled!" |trans }}",
                 retire: "{{ "Retire" |trans }}",
                 publish: "{{ "Publish" |trans }}",
                 discard: "{{ "Discard"|trans }}",
@@ -394,13 +389,14 @@
                 zoomOutEditor: "{{ "Zoom out"|trans }}",
                 couldNotCopy: "{{ "Could not copy"|trans }}",
                 copied: "{{ "Copied!"|trans }}",
-                invalidModule:  "{{ "Module not enabled!"|trans }}",
+                invalidModule:  "{{ "This widget isn't enabled and can't be configured, please contact your administrator for help."|trans }}",
                 timeline: "{{ "Timeline"|trans }}",
                 actions: {
                     layouts:  "{{ "Layouts"|trans }}",
                     regions: "{{ "Zones"|trans }}",
                     widgets: "{{ "Widgets"|trans }}",
                     playlists: "{{ "Playlists"|trans }}",
+                    deleteWidget: "{{ "Delete"|trans }}",
                     deleteModal: {
                         title: "{{ "Delete Action"|trans }}",
                         message: "{{ "Are you sure you want to delete this action?"|trans }}",
@@ -443,14 +439,6 @@
                 selectedFolderTitle: "{{ "Upload files to this Folder"|trans }}:"
             };
 
-            var deleteMenuTrans = {
-                mainMessage: "{{ "Are you sure you want to remove this %obj%? This action cannot be undone." |trans }}",
-                infoDeleteMessage: "{{ "This widget is linked to Media in the Library which is also in use elsewhere. If this should be deleted then please do so from the Library page." |trans }}",
-                deleteMediaFromLibraryTitle: "{{ "Also delete from the Library?" |trans }}",
-                deleteMediaFromLibraryMessage: "{{ "This widget is linked to Media in the Library. Check this option to also delete that Media." |trans }}",
-                deleteMultipleObjects: "{{ "Are you sure you want to remove these items? This action cannot be undone."|trans }}"
-            };
-
             var contextMenuTrans = {
                 editAudio: "{{ "Edit Attached Audio" |trans }}",
                 editExpiry: "{{ "Edit Expiry Dates" |trans }}",
@@ -490,10 +478,10 @@
                 left: "{{ "Left" |trans }}",
                 scale: "{{ "Scale"|trans }}",
                 layer: "{{ "Layer"|trans }}",
-                invalidWidget:  "{{ "This widget needs to be configured before it will be shown"|trans }}",
+                invalidWidget:  "{{ "This widget needs to be configured before it will be shown."|trans }}",
                 requiredElementsMessage: "{{ "This widget needs to have at least one of the following elements: %elements%." |trans }}",
                 dataSlot: "{{ "Data Slot"|trans }}",
-                dataSlotHelpText: "{{ "When there are more than one of the same element for a widget you can set the slot for each element. For example with two of the same element you'd have data slot 1 and data slot 2. If 10 items were returned slot 1 would receive items 1,3,5,7,9 and slot 2 would receive items 2,4,6,8,19."|trans }}",
+                dataSlotHelpText: "{{ "When there are more than one of the same element for a widget you can set the slot for each element. For example with two of the same element you'd have data slot 1 and data slot 2. If 10 items were returned slot 1 would receive items 1,3,5,7,9 and slot 2 would receive items 2,4,6,8,10."|trans }}",
                 pinSlot: "{{ "Pin this slot?"|trans }}",
                 pinSlotHelpText: "{{ "The first item that appears in a slot will be pinned and will not cycle with the rest of the items."|trans }}",
                 groupScale: "{{ "Scale with group"|trans }}",
@@ -507,7 +495,6 @@
                     bottomRight: "{{ "Bottom/Right" |trans }}",
                 },
                 somethingWentWrong: "{{ "Something went wrong!"|trans }}",
-                selectATarget: "{{ "Select a target zone!"|trans }}",
                 actions: {
                     noActionsToShow: "{{ "No actions to show"|trans }}",
                     otherActions: "{{ "Other Actions" |trans }}",
@@ -556,6 +543,8 @@
                     layerHelp: "{{ "Layer related to all layout objects" |trans }}",
                     elementLayer: "{{ "Element Layer" |trans }}",
                     elementLayerHelp: "{{ "Layer for the element related to other elements" |trans }}",
+                    elementGroupLayer: "{{ "Element Group Layer" |trans }}",
+                    elementGroupLayerHelp: "{{ "Layer for the element group related to other groups or elements without group" |trans }}",
                     canvasLayer: "{{ "Canvas Layer" |trans }}",
                     canvasLayerHelp: "{{ "Layer for the canvas containing all elements" |trans }}",
                     top: "{{ "Top" |trans }}",
@@ -623,15 +612,11 @@
             };
 
             var toolbarTrans = {
-                toolbarTagsMessage: "{{ "%tagCount% tags" |trans }}",
                 deleteObject: "{{ "Delete selected %object%" |trans }}",
-                selectMultipleWidgets: "{{ "Select multiple widgets" |trans }}",
                 changeLayout: "{{ "Change Layout" |trans }}",
                 options: "{{ "Options" |trans }}",
                 displayTooltipsName: "{{ "Tooltips?" |trans }}",
                 displayTooltipsTitle: "{{ "Show/Hide tooltips which provide help; informational tooltips will remain." |trans }}",
-                createNewTab: "{{ "Library Media Search" |trans }}",
-                closeAllTabs: "{{ "Close all tabs" |trans }}",
                 search: "{{ "Search" |trans }}",
                 select: "{{ "Select" |trans }}",
                 deselect: "{{ "Deselect" |trans }}",
@@ -639,10 +624,6 @@
                 preview: "{{ "Preview media" |trans }}",
                 open: "{{ "Open" |trans }}",
                 addAsFavourite: "{{ "Mark as favourite" |trans }}",
-                moduleNavStart: "{{ "Scroll to the start!" |trans }}",
-                moduleNavEnd: "{{ "Scroll to the end!" |trans }}",
-                moduleNavLeft: "{{ "Scroll left!" |trans }}",
-                moduleNavRight: "{{ "Scroll right!" |trans }}",
                 upload: "{{ "Upload new" |trans }}",
                 uploadType: "{{ "Upload %obj%" |trans }}",
                 searchFilters: {
@@ -676,23 +657,6 @@
                   local: "{{ "Local"|trans }}",
                   remote: "{{ "Remote"|trans }}"
                 },
-                tabName: "{{ "Library Search %tagId%" |trans }}",
-                tableHeader: {
-                    toolsName: "{{ "Tools" |trans }}",
-                    id: "{{ "Id"|trans }}",
-                    name: "{{ "Name"|trans }}",
-                    type: "{{ "Type"|trans }}",
-                    tags: "{{ "Tags"|trans }}",
-                    thumbnail: "{{ "Thumbnail"|trans }}"
-                },
-                queue: {
-                    title: "{{ "Media Add Queue"|trans }}",
-                    clear: "{{ "Clear Queue"|trans }}",
-                    addToRegion: "{{ "Add to Selected Zone"|trans }}",
-                    addToPlaylist: "{{ "Add to Playlist"|trans }}",
-                    selectRegion: "{{ "Click in Zone to Add"|trans }}",
-                    cancel: "{{ "Cancel"|trans }}"
-                },
                 menuItems: {
                     widgetsName: "{{ "Widgets" |trans }}",
                     widgetsTitle: "{{ "Add widgets" |trans }}",
@@ -784,6 +748,7 @@
                 title: "{{ "Layers" |trans }}",
                 layer: "{{ "Layer" |trans }}",
                 canvas: "{{ "Canvas" |trans }}",
+                group: "{{ "Group" |trans }}",
                 inGroup: "{{ "In %groupId%" |trans }}",
                 name: "{{ "Name" |trans }}",
                 duration: "{{ "Duration" |trans }}",
diff --git a/views/dashboard-status-page.twig b/views/dashboard-status-page.twig
index 54224e5403..f54949c02e 100644
--- a/views/dashboard-status-page.twig
+++ b/views/dashboard-status-page.twig
@@ -381,11 +381,12 @@
             }
         });
 
-        $(".article_date").each(function(index, element) {
-            if($(".article_date").length > 1){
-                // Replace the ISO date with a nice formatted date "for humans"
-                $(this).html(moment($(this).html(), systemDateFormat).fromNow());
-            }
+        $('.article_date').each(function(index, element) {
+          // Replace the ISO date with a nice formatted date "for humans"
+          const date = $(element).html();
+          if (date) {
+            $(element).html(moment(date, systemDateFormat).fromNow());
+          }
         });
 
         var table = $("#displays").DataTable({
@@ -672,8 +673,7 @@
                             data.start = dataToSend.start;
                             data.order = dataToSend.order;
                             data.columns = [];
-                            // remove buttons column
-                            dataToSend.columns.pop();
+
                             $.each(dataToSend.columns, function (index, e) {
                                 var col = {};
                                 col.data = e.data;
diff --git a/views/include-file-upload.twig b/views/include-file-upload.twig
index b947fe7c8b..8363b410e8 100644
--- a/views/include-file-upload.twig
+++ b/views/include-file-upload.twig
@@ -17,7 +17,7 @@
 
 {# Max image resize size from settings #}
 <script type="text/javascript">
-  const maxImagePixelSize = {{ settings.DEFAULT_RESIZE_LIMIT }};
+  let maxImagePixelSize = "{{ settings.DEFAULT_RESIZE_LIMIT }}";
 </script>
 
 {# Handlebars Templates #}
diff --git a/views/layout-designer-page.twig b/views/layout-designer-page.twig
index 679a2945dd..77f380864a 100644
--- a/views/layout-designer-page.twig
+++ b/views/layout-designer-page.twig
@@ -76,7 +76,8 @@
                     unlockMessage: "{% trans "The current layout will be unlocked to other users. You will also be redirected to the Layouts page" %}",
                     viewModeTitle: "{% trans "View" %}",
                     actions: "{% trans "Actions" %}",
-                    welcomeModalMessage: "{% trans "This is published and cannot be edited. You can checkout for editing below, or continue to view it in a read only mode." %}"
+                    welcomeModalMessage: "{% trans "This is published and cannot be edited. You can checkout for editing below, or continue to view it in a read only mode." %}",
+                    showingSampleData:  "{% trans "Showing sample data" %}",
                 };
 
                 var viewerTrans = {
diff --git a/views/module-icon-preview.twig b/views/module-icon-preview.twig
index ccd4dbad57..2cecd00771 100644
--- a/views/module-icon-preview.twig
+++ b/views/module-icon-preview.twig
@@ -1,4 +1,4 @@
 <div style="text-align:center;">
     <i alt="{{ moduleName}} thumbnail" 
-       class="module-preview-icon fa fa-{{ moduleIcon }}"></i>
+       class="module-preview-icon {{ moduleIcon }}"></i>
 </div>
\ No newline at end of file
diff --git a/views/schedule-page.twig b/views/schedule-page.twig
index de397e1008..cdc2aa93f4 100644
--- a/views/schedule-page.twig
+++ b/views/schedule-page.twig
@@ -1094,7 +1094,7 @@
                 <td>{{display}}</td>
                 <td>
                    <div class="form-group pagedSelect">
-                       <select class="form-control syncContentSelect single-select" name="layoutId_{{displayId}}" id="layoutId_{{displayId}}" data-search-url="/layout"
+                       <select class="form-control syncContentSelect single-select" name="layoutId_{{displayId}}" id="layoutId_{{displayId}}"{% endverbatim %} data-search-url="{{ url_for('layout.search') }}"{% verbatim %}
                        data-search-term="layout" data-width="100%" data-id-property="layoutId" data-text-property="layout" data-anchor-element="#contentSelectorTable"
                        data-initial-key="layoutId" data-initial-value="{{layoutId}}" data-display-id="{{displayId}}" data-lead-display-id="{{leadDisplayId}}">
                        <option></option>
diff --git a/web/swagger.json b/web/swagger.json
index 3ba19833ad..ad9229933b 100644
--- a/web/swagger.json
+++ b/web/swagger.json
@@ -6912,6 +6912,119 @@
                 }
             }
         },
+        "/module": {
+            "get": {
+                "tags": [
+                    "module"
+                ],
+                "summary": "Module Search",
+                "description": "Get a list of all modules available to this CMS",
+                "operationId": "moduleSearch",
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/Module"
+                        }
+                    }
+                }
+            }
+        },
+        "/module/properties/{id}": {
+            "get": {
+                "tags": [
+                    "module"
+                ],
+                "summary": "Get Module Properties",
+                "description": "Get a module properties which are needed to for the editWidget call",
+                "operationId": "getModuleProperties",
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "The ModuleId",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "$ref": "#/definitions/Property"
+                        }
+                    }
+                }
+            }
+        },
+        "/module/templates/{dataType}": {
+            "get": {
+                "tags": [
+                    "module"
+                ],
+                "summary": "Module Template Search",
+                "description": "Get a list of templates available for a particular data type",
+                "operationId": "moduleTemplateSearch",
+                "parameters": [
+                    {
+                        "name": "dataType",
+                        "in": "path",
+                        "description": "DataType to return templates for",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "An array of module templates for the provided datatype",
+                        "schema": {
+                            "$ref": "#/definitions/ModuleTemplate"
+                        }
+                    }
+                }
+            }
+        },
+        "/module/template/{dataType}/properties/{id}": {
+            "get": {
+                "tags": [
+                    "module"
+                ],
+                "summary": "Get Module Template Properties",
+                "description": "Get a module template properties which are needed to for the editWidget call",
+                "operationId": "getModuleProperties",
+                "parameters": [
+                    {
+                        "name": "dataType",
+                        "in": "path",
+                        "description": "The Template DataType",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "The Template Id",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "successful operation",
+                        "schema": {
+                            "type": "object",
+                            "additionalProperties": {
+                                "id": "string",
+                                "type": "string",
+                                "title": "string",
+                                "helpText": "string",
+                                "options": "array"
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "/notification": {
             "get": {
                 "tags": [
@@ -12882,7 +12995,9 @@
                 "legacyTypes": {
                     "description": "Legacy type codes for this module",
                     "type": "array",
-                    "items": {}
+                    "items": {
+                        "$ref": "#/definitions/LegacyType"
+                    }
                 },
                 "dataType": {
                     "description": "The data type of the data expected to be returned by this modules data provider",
@@ -12942,6 +13057,13 @@
                         "type": "string"
                     }
                 },
+                "properties": {
+                    "description": "Properties to display in the property panel and supply to stencils",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/Property"
+                    }
+                },
                 "onInitialize": {
                     "description": "JavaScript function run when a module is initialised, before data is returned",
                     "type": "string"
@@ -12986,14 +13108,14 @@
                     "description": "An array of additional module specific settings",
                     "type": "array",
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/Property"
                     }
                 },
                 "propertyGroups": {
                     "description": "An array of additional module specific group properties",
                     "type": "array",
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/PropertyGroup"
                     }
                 },
                 "requiredElements": {
@@ -13002,21 +13124,84 @@
                     "items": {
                         "type": "string"
                     }
+                },
+                "isInstalled": {
+                    "description": "$isInstalled Is this module installed?",
+                    "type": "boolean"
+                },
+                "isError": {
+                    "description": "$isError Does this module have any errors?",
+                    "type": "boolean"
+                },
+                "errors": {
+                    "description": "$errors An array of errors this module has.",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             }
         },
         "ModuleTemplate": {
             "properties": {
+                "templateId": {
+                    "description": "The templateId",
+                    "type": "string"
+                },
+                "type": {
+                    "description": "Type of template (static|element|stencil)",
+                    "type": "string"
+                },
+                "extends": {
+                    "description": "If this template extends another",
+                    "$ref": "#/definitions/Extend"
+                },
+                "dataType": {
+                    "description": "The datatype of this template",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "The title",
+                    "type": "string"
+                },
+                "icon": {
+                    "description": "Icon",
+                    "type": "string"
+                },
+                "thumbnail": {
+                    "description": "",
+                    "type": "string"
+                },
                 "showIn": {
                     "description": "A flag indicating whether the template should be excluded from the Layout Editor",
                     "type": "string"
                 },
+                "properties": {
+                    "description": "Properties",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/Property"
+                    }
+                },
+                "isVisible": {
+                    "description": "Is Visible?",
+                    "type": "boolean"
+                },
                 "propertyGroups": {
                     "description": "An array of additional module specific group properties",
                     "type": "array",
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/PropertyGroup"
                     }
+                },
+                "stencil": {
+                    "description": "A stencil, if needed",
+                    "$ref": "#/definitions/Stencil"
+                },
+                "assets": {
+                    "description": "",
+                    "type": "array",
+                    "items": {}
                 }
             }
         },
@@ -14315,7 +14500,61 @@
                     "type": "string"
                 }
             }
-        }
+        },
+        "Element": {},
+        "Extend": {},
+        "LegacyType": {},
+        "Option": {
+            "properties": {
+                "name": {
+                    "description": "Name",
+                    "type": "string"
+                },
+                "image": {
+                    "description": "Image: optional image asset",
+                    "type": "string"
+                },
+                "set": {
+                    "description": "Set",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "title": {
+                    "description": "Title: shown in the dropdown/select",
+                    "type": "string"
+                }
+            }
+        },
+        "Property": {
+            "properties": {
+                "id": {
+                    "description": "ID, saved as a widget option",
+                    "type": "string"
+                },
+                "type": {
+                    "description": "Type, determines the field type",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Title: shown in the property panel",
+                    "type": "string"
+                },
+                "helpText": {
+                    "description": "Help Text: shown in the property panel",
+                    "type": "string"
+                },
+                "default": {
+                    "description": "An optional default value",
+                    "type": "string"
+                }
+            }
+        },
+        "PropertyGroup": {},
+        "Rule": {},
+        "Stencil": {},
+        "Test": {}
     },
     "parameters": {
         "actionId": {
@@ -14498,10 +14737,6 @@
             "name": "statistics",
             "description": "Statistics"
         },
-        {
-            "name": "log",
-            "description": "Logs"
-        },
         {
             "name": "user",
             "description": "Users"
@@ -14522,14 +14757,6 @@
             "name": "dayPart",
             "description": "Dayparting"
         },
-        {
-            "name": "task",
-            "description": "Tasks"
-        },
-        {
-            "name": "report",
-            "description": "Report schedule"
-        },
         {
             "name": "Player Software"
         },
@@ -14537,10 +14764,6 @@
             "name": "tags",
             "description": "Tags"
         },
-        {
-            "name": "actions",
-            "description": "Actions"
-        },
         {
             "name": "menuBoard",
             "description": "Menu Boards - feature preview, please do not use in production."