diff --git a/.prettierrc b/.prettierrc
index f32423c1b..a00e51884 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,9 +1,16 @@
 {
-  "parser": "babel",
-  "plugins": ["prettier-plugin-jsdoc"],
   "singleQuote": true,
   "tabWidth": 2,
   "semi": true,
   "arrowParens": "always",
-  "printWidth": 120
+  "printWidth": 120,
+  "overrides": [
+    {
+      "files": "*.js",
+      "options": {
+        "parser": "babel",
+        "plugins": ["prettier-plugin-jsdoc"]
+      }
+    }
+  ]
 }
diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index ffcf656d9..5307ee1f6 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -20,6 +20,18 @@ module.exports = {
     'color-function-notation': null,
     'order/properties-order': null,
     'rule-empty-line-before': null,
+    'at-rule-no-unknown': [
+      true,
+      {
+        ignoreAtRules: ['container'],
+      },
+    ],
+    'property-no-unknown': [
+      true,
+      {
+        ignoreProperties: ['container-type', 'container-name'],
+      },
+    ],
   },
   overrides: [
     {
diff --git a/abstract/ActivityBlock.js b/abstract/ActivityBlock.js
index fa7fa9827..f9abbe01b 100644
--- a/abstract/ActivityBlock.js
+++ b/abstract/ActivityBlock.js
@@ -1,3 +1,4 @@
+import { Modal } from '../blocks/Modal/Modal.js';
 import { debounce } from '../blocks/utils/debounce.js';
 import { Block } from './Block.js';
 import { activityBlockCtx } from './CTX.js';
@@ -6,7 +7,8 @@ const ACTIVE_ATTR = 'active';
 const ACTIVE_PROP = '___ACTIVITY_IS_ACTIVE___';
 
 export class ActivityBlock extends Block {
-  ctxInit = activityBlockCtx();
+  historyTracked = false;
+  ctxInit = activityBlockCtx(this);
 
   _debouncedHistoryFlush = debounce(this._historyFlush.bind(this), 10);
 
@@ -33,10 +35,10 @@ export class ActivityBlock extends Block {
           actDesc?.deactivateCallback?.();
           // console.log(`Activity "${this.activityType}" deactivated`);
         } else if (this.activityType === val && !this[ACTIVE_PROP]) {
+          this.$['*historyBack'] = this.historyBack.bind(this);
           /** @private */
           this[ACTIVE_PROP] = true;
           this.setAttribute(ACTIVE_ATTR, '');
-          this.setForCtxTarget('lr-modal', '*modalCloseCallback', actDesc?.modalCloseCallback);
           actDesc?.activateCallback?.();
           // console.log(`Activity "${this.activityType}" activated`);
 
@@ -56,7 +58,9 @@ export class ActivityBlock extends Block {
       if (history.length > 10) {
         history = history.slice(history.length - 11, history.length - 1);
       }
-      history.push(this.activityType);
+      if (this.historyTracked) {
+        history.push(this.activityType);
+      }
       this.$['*history'] = history;
     }
   }
@@ -76,10 +80,9 @@ export class ActivityBlock extends Block {
    * @param {Object} [options]
    * @param {() => void} [options.onActivate]
    * @param {() => void} [options.onDeactivate]
-   * @param {() => void} [options.onClose]
    */
-  registerActivity(name, options) {
-    const { onActivate, onDeactivate, onClose } = options;
+  registerActivity(name, options = {}) {
+    const { onActivate, onDeactivate } = options;
     if (!ActivityBlock._activityRegistry) {
       ActivityBlock._activityRegistry = Object.create(null);
     }
@@ -87,7 +90,6 @@ export class ActivityBlock extends Block {
     ActivityBlock._activityRegistry[actKey] = {
       activateCallback: onActivate,
       deactivateCallback: onDeactivate,
-      modalCloseCallback: onClose,
     };
   }
 
@@ -109,12 +111,14 @@ export class ActivityBlock extends Block {
     /** @type {String[]} */
     let history = this.$['*history'];
     if (history) {
-      history.pop();
-      let prevActivity = history.pop();
-      this.$['*currentActivity'] = prevActivity;
+      let nextActivity = history.pop();
+      while (nextActivity === this.activityType) {
+        nextActivity = history.pop();
+      }
+      this.$['*currentActivity'] = nextActivity;
       this.$['*history'] = history;
-      if (!prevActivity) {
-        this.setForCtxTarget('lr-modal', '*modalActive', false);
+      if (!nextActivity) {
+        this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
       }
     }
   }
diff --git a/abstract/Block.js b/abstract/Block.js
index b65fdb801..0902389c0 100644
--- a/abstract/Block.js
+++ b/abstract/Block.js
@@ -1,5 +1,5 @@
 import { BaseComponent, Data } from '@symbiotejs/symbiote';
-import { applyTemplateData } from '../utils/applyTemplateData.js';
+import { applyTemplateData, getPluralObjects } from '../utils/template-utils.js';
 import { l10nProcessor } from './l10nProcessor.js';
 import { blockCtx } from './CTX.js';
 import { createWindowHeightTracker, getIsWindowHeightTracked } from '../utils/createWindowHeightTracker.js';
@@ -7,6 +7,7 @@ import { createWindowHeightTracker, getIsWindowHeightTracked } from '../utils/cr
 const TAG_PREFIX = 'lr-';
 
 export class Block extends BaseComponent {
+  static StateConsumerScope = null;
   allowCustomTemplate = true;
 
   ctxInit = blockCtx();
@@ -18,11 +19,32 @@ export class Block extends BaseComponent {
    * @returns {String}
    */
   l10n(str, variables = {}) {
+    if (!str) {
+      return '';
+    }
     let template = this.getCssData('--l10n-' + str, true) || str;
+    let pluralObjects = getPluralObjects(template);
+    for (let pluralObject of pluralObjects) {
+      variables[pluralObject.variable] = this.pluralize(
+        pluralObject.pluralKey,
+        Number(variables[pluralObject.countVariable])
+      );
+    }
     let result = applyTemplateData(template, variables);
     return result;
   }
 
+  /**
+   * @param {string} key
+   * @param {number} count
+   * @returns {string}
+   */
+  pluralize(key, count) {
+    const locale = this.l10n('locale-name') || 'en-US';
+    const pluralForm = new Intl.PluralRules(locale).select(count);
+    return this.l10n(`${key}__${pluralForm}`);
+  }
+
   constructor() {
     super();
     /** @type {String} */
@@ -55,26 +77,40 @@ export class Block extends BaseComponent {
   }
 
   /**
-   * @param {String} targetTagName
+   * @param {(block: Block) => boolean} callback
    * @returns {Boolean}
    */
-  checkCtxTarget(targetTagName) {
+  findBlockInCtx(callback) {
     /** @type {Set} */
-    let registry = this.$['*ctxTargetsRegistry'];
-    return registry?.has(targetTagName);
+    let blocksRegistry = this.$['*blocksRegistry'];
+    for (let block of blocksRegistry) {
+      if (callback(block)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   /**
-   * @param {String} targetTagName
+   * @param {String} consumerScope
    * @param {String} prop
    * @param {any} newVal
    */
-  setForCtxTarget(targetTagName, prop, newVal) {
-    if (this.checkCtxTarget(targetTagName)) {
+  setForCtxTarget(consumerScope, prop, newVal) {
+    if (this.findBlockInCtx((b) => /** @type {typeof Block} */ (b.constructor).StateConsumerScope === consumerScope)) {
       this.$[prop] = newVal;
     }
   }
 
+  /** @param {String} activityType */
+  setActivity(activityType) {
+    if (this.findBlockInCtx((b) => b.activityType === activityType)) {
+      this.$['*currentActivity'] = activityType;
+      return;
+    }
+    console.warn(`Activity type "${activityType}" not found in the context`);
+  }
+
   connectedCallback() {
     if (!getIsWindowHeightTracked()) {
       this._destroyInnerHeightTracker = createWindowHeightTracker();
@@ -98,23 +134,13 @@ export class Block extends BaseComponent {
   }
 
   initCallback() {
-    let tagName = this.constructor['is'];
-    let registry = this.$['*ctxTargetsRegistry'];
-    let counter = registry.has(tagName) ? registry.get(tagName) + 1 : 1;
-    registry.set(tagName, counter);
-    this.$['*ctxTargetsRegistry'] = registry;
+    let blocksRegistry = this.$['*blocksRegistry'];
+    blocksRegistry.add(this);
   }
 
   destroyCallback() {
-    let tagName = this.constructor['is'];
-    let registry = this.$['*ctxTargetsRegistry'];
-    let newCount = registry.has(registry) ? registry.get(tagName) - 1 : 0;
-    if (newCount === 0) {
-      registry.delete(tagName);
-    } else {
-      registry.set(tagName, newCount);
-    }
-    this.$['*ctxTargetsRegistry'] = registry;
+    let blocksRegistry = this.$['*blocksRegistry'];
+    blocksRegistry.delete(this);
   }
 
   /**
diff --git a/abstract/CTX.js b/abstract/CTX.js
index 035d837ac..0dfd515ff 100644
--- a/abstract/CTX.js
+++ b/abstract/CTX.js
@@ -1,18 +1,24 @@
 export const blockCtx = () => ({
-  '*ctxTargetsRegistry': new Map(),
+  /** @type {Set<import('./Block').Block>} */
+  '*blocksRegistry': new Set(),
 });
 
-export const activityBlockCtx = () => ({
+export const activityBlockCtx = (fnCtx) => ({
   ...blockCtx(),
   '*currentActivity': '',
   '*currentActivityParams': {},
   '*history': [],
-  '*activityCaption': '',
-  '*activityIcon': '',
+  '*historyBack': null,
+  '*closeModal': () => {
+    fnCtx.set$({
+      '*modalActive': false,
+      '*currentActivity': '',
+    });
+  },
 });
 
-export const uploaderBlockCtx = () => ({
-  ...activityBlockCtx(),
+export const uploaderBlockCtx = (fnCtx) => ({
+  ...activityBlockCtx(fnCtx),
   '*commonProgress': 0,
   '*uploadList': [],
   '*outputData': null,
diff --git a/abstract/SolutionBlock.js b/abstract/SolutionBlock.js
index 167787917..574817259 100644
--- a/abstract/SolutionBlock.js
+++ b/abstract/SolutionBlock.js
@@ -2,6 +2,15 @@ import { ShadowWrapper } from '../blocks/ShadowWrapper/ShadowWrapper.js';
 import { uploaderBlockCtx } from './CTX.js';
 
 export class SolutionBlock extends ShadowWrapper {
-  ctxInit = uploaderBlockCtx();
+  ctxInit = uploaderBlockCtx(this);
   ctxOwner = true;
+  _template = null;
+
+  static set template(value) {
+    this._template = value + /** HTML */ `<slot></slot>`;
+  }
+
+  static get template() {
+    return this._template;
+  }
 }
diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js
index 168584841..8f6e72d21 100644
--- a/abstract/UploaderBlock.js
+++ b/abstract/UploaderBlock.js
@@ -7,9 +7,10 @@ import { customUserAgent } from '../blocks/utils/userAgent.js';
 import { TypedCollection } from './TypedCollection.js';
 import { uploaderBlockCtx } from './CTX.js';
 import { EVENT_TYPES, EventData, EventManager } from './EventManager.js';
+import { Modal } from '../blocks/Modal/Modal.js';
 
 export class UploaderBlock extends ActivityBlock {
-  ctxInit = uploaderBlockCtx();
+  ctxInit = uploaderBlockCtx(this);
 
   /** @private */
   __initialUploadMetadata = null;
@@ -42,9 +43,10 @@ export class UploaderBlock extends ActivityBlock {
   destroyCallback() {
     super.destroyCallback();
 
-    let registry = this.$['*ctxTargetsRegistry'];
-    if (registry?.size === 0) {
+    let blocksRegistry = this.$['*blocksRegistry'];
+    if (blocksRegistry.has(this)) {
       this.uploadCollection.unobserve(this._handleCollectionUpdate);
+      blocksRegistry.delete(this);
     }
   }
 
@@ -61,11 +63,13 @@ export class UploaderBlock extends ActivityBlock {
     });
   }
 
-  openSystemDialog() {
+  /** @param {{ captureCamera?: boolean }} options */
+  openSystemDialog(options = {}) {
     let accept = mergeFileTypes([
       this.getCssData('--cfg-accept'),
       ...(this.getCssData('--cfg-img-only') ? IMAGE_ACCEPT_LIST : []),
     ]).join(',');
+
     if (this.getCssData('--cfg-accept') && !!this.getCssData('--cfg-img-only')) {
       console.warn(
         'There could be a mistake.\n' +
@@ -76,12 +80,18 @@ export class UploaderBlock extends ActivityBlock {
     this.fileInput = document.createElement('input');
     this.fileInput.type = 'file';
     this.fileInput.multiple = !!this.getCssData('--cfg-multiple');
-    this.fileInput.accept = accept;
+    if (options.captureCamera) {
+      this.fileInput.capture = '';
+      this.fileInput.accept = IMAGE_ACCEPT_LIST.join(',');
+    } else {
+      this.fileInput.accept = accept;
+    }
     this.fileInput.dispatchEvent(new MouseEvent('click'));
     this.fileInput.onchange = () => {
       this.addFiles([...this.fileInput['files']]);
       // To call uploadTrigger UploadList should draw file items first:
       this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
+      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
       this.fileInput['value'] = '';
       this.fileInput = null;
     };
@@ -106,7 +116,7 @@ export class UploaderBlock extends ActivityBlock {
       this.set$({
         '*currentActivity': ActivityBlock.activities.UPLOAD_LIST,
       });
-      this.setForCtxTarget('lr-modal', '*modalActive', true);
+      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
     } else {
       if (this.sourceList?.length === 1) {
         let srcKey = this.sourceList[0];
@@ -125,14 +135,14 @@ export class UploaderBlock extends ActivityBlock {
           } else {
             this.$['*currentActivity'] = srcKey;
           }
-          this.setForCtxTarget('lr-modal', '*modalActive', true);
+          this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
         }
       } else {
         // Multiple sources case:
         this.set$({
           '*currentActivity': ActivityBlock.activities.START_FROM,
         });
-        this.setForCtxTarget('lr-modal', '*modalActive', true);
+        this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
       }
     }
   }
@@ -143,7 +153,7 @@ export class UploaderBlock extends ActivityBlock {
       '*history': this.doneActivity ? [this.doneActivity] : [],
     });
     if (!this.$['*currentActivity']) {
-      this.setForCtxTarget('lr-modal', '*modalActive', false);
+      this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
     }
   }
 
diff --git a/assets/htm/blocks-demo.htm b/assets/htm/blocks-demo.htm
index 2e037f563..446a717e2 100644
--- a/assets/htm/blocks-demo.htm
+++ b/assets/htm/blocks-demo.htm
@@ -14,6 +14,7 @@ <h2>🎬 Live Demo (regular case)</h2>
       --cfg-pubkey: 'demopublickey';
       --cfg-use-local-image-editor: 0;
       --cfg-use-cloud-image-editor: 1;
+      --darkmode: 1;
     }
   </style>
 
@@ -21,8 +22,6 @@ <h2>🎬 Live Demo (regular case)</h2>
     <lr-simple-btn></lr-simple-btn>
 
     <lr-modal>
-      <lr-activity-icon slot="heading"></lr-activity-icon>
-      <lr-activity-caption slot="heading"></lr-activity-caption>
       <lr-start-from>
         <lr-source-list></lr-source-list>
         <lr-drop-area clickable></lr-drop-area>
@@ -31,7 +30,6 @@ <h2>🎬 Live Demo (regular case)</h2>
       <lr-camera-source></lr-camera-source>
       <lr-url-source></lr-url-source>
       <lr-external-source></lr-external-source>
-      <lr-upload-details></lr-upload-details>
       <lr-confirmation-dialog></lr-confirmation-dialog>
       <lr-cloud-image-editor></lr-cloud-image-editor>
     </lr-modal>
diff --git a/blocks/ActivityCaption/ActivityCaption.js b/blocks/ActivityCaption/ActivityCaption.js
deleted file mode 100644
index c9e651ff0..000000000
--- a/blocks/ActivityCaption/ActivityCaption.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ActivityBlock } from '../../abstract/ActivityBlock.js';
-
-export class ActivityCaption extends ActivityBlock {}
-
-ActivityCaption.template = /* HTML */ ` <div class="caption">{{*activityCaption}}</div> `;
diff --git a/blocks/ActivityCaption/activity-caption.css b/blocks/ActivityCaption/activity-caption.css
deleted file mode 100644
index ec58214bb..000000000
--- a/blocks/ActivityCaption/activity-caption.css
+++ /dev/null
@@ -1,4 +0,0 @@
-lr-activity-caption {
-  color: var(--clr-txt);
-  font-size: 1em;
-}
diff --git a/blocks/ActivityCaption/ref.htm b/blocks/ActivityCaption/ref.htm
deleted file mode 100644
index 61c37f631..000000000
--- a/blocks/ActivityCaption/ref.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>ActivityCaption</h1>
-<lr-live-html>
-  <script src="./test.js" type="module"></script>
-
-  <lr-activity-caption></lr-activity-caption>
-</lr-live-html>
\ No newline at end of file
diff --git a/blocks/ActivityCaption/test.js b/blocks/ActivityCaption/test.js
deleted file mode 100644
index 55684f948..000000000
--- a/blocks/ActivityCaption/test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ifRef } from '../../utils/ifRef.js';
-import { ActivityCaption } from './ActivityCaption.js';
-import { registerBlocks } from '../../abstract/registerBlocks.js';
-
-ifRef(() => {
-  registerBlocks({ ActivityCaption });
-  /** @type {ActivityCaption} */
-  let actCap = document.querySelector(ActivityCaption.is);
-  actCap.$['*activityCaption'] = 'TEST CAPTION';
-});
diff --git a/blocks/ActivityHeader/ActivityHeader.js b/blocks/ActivityHeader/ActivityHeader.js
new file mode 100644
index 000000000..528e88818
--- /dev/null
+++ b/blocks/ActivityHeader/ActivityHeader.js
@@ -0,0 +1,3 @@
+import { ActivityBlock } from '../../abstract/ActivityBlock.js';
+
+export class ActivityHeader extends ActivityBlock {}
diff --git a/blocks/ActivityHeader/activity-header.css b/blocks/ActivityHeader/activity-header.css
new file mode 100644
index 000000000..1003d50fd
--- /dev/null
+++ b/blocks/ActivityHeader/activity-header.css
@@ -0,0 +1,23 @@
+lr-activity-header {
+  display: flex;
+  gap: var(--gap-mid);
+  justify-content: space-between;
+  padding: var(--gap-mid);
+  color: var(--clr-txt);
+  font-weight: 500;
+  font-size: 1em;
+  line-height: var(--ui-size);
+}
+
+lr-activity-header lr-icon {
+  height: var(--ui-size);
+}
+
+lr-activity-header button {
+  color: var(--clr-txt);
+}
+
+lr-activity-header > * {
+  display: flex;
+  align-items: center;
+}
diff --git a/blocks/ActivityIcon/ActivityIcon.js b/blocks/ActivityIcon/ActivityIcon.js
deleted file mode 100644
index de32f2954..000000000
--- a/blocks/ActivityIcon/ActivityIcon.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ActivityBlock } from '../../abstract/ActivityBlock.js';
-
-export class ActivityIcon extends ActivityBlock {}
-
-ActivityIcon.template = /* HTML */ ` <lr-icon set="@name: *activityIcon"></lr-icon> `;
diff --git a/blocks/ActivityIcon/activity-icon.css b/blocks/ActivityIcon/activity-icon.css
deleted file mode 100644
index b1e1383e7..000000000
--- a/blocks/ActivityIcon/activity-icon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-lr-activity-icon {
-  height: var(--ui-size);
-}
diff --git a/blocks/ActivityIcon/ref.htm b/blocks/ActivityIcon/ref.htm
deleted file mode 100644
index 0a2785b0d..000000000
--- a/blocks/ActivityIcon/ref.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>ActivityIcon</h1>
-
-<lr-live-html>
-  <link rel="stylesheet" href="../themes/lr-basic/index.css" />
-  <script src="./test.js" type="module"></script>
-
-  <lr-activity-icon class="lr-wgt-common"></lr-activity-icon>
-</lr-live-html>
diff --git a/blocks/ActivityIcon/test.js b/blocks/ActivityIcon/test.js
deleted file mode 100644
index d97353fdc..000000000
--- a/blocks/ActivityIcon/test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ifRef } from '../../utils/ifRef.js';
-import { Icon } from '../Icon/Icon.js';
-import { ActivityIcon } from './ActivityIcon.js';
-import { registerBlocks } from '../../abstract/registerBlocks.js';
-
-ifRef(() => {
-  registerBlocks({ Icon, ActivityIcon });
-  /** @type {ActivityIcon} */
-  let actIcon = document.querySelector(ActivityIcon.is);
-  actIcon.$['*activityIcon'] = 'file';
-});
diff --git a/blocks/CameraSource/CameraSource.js b/blocks/CameraSource/CameraSource.js
index f9c839d9e..1aae83c9a 100644
--- a/blocks/CameraSource/CameraSource.js
+++ b/blocks/CameraSource/CameraSource.js
@@ -13,8 +13,8 @@ export class CameraSource extends UploaderBlock {
     ...this.ctxInit,
     video: null,
     videoTransformCss: null,
-    shotBtnDisabled: false,
-    videoHidden: false,
+    shotBtnDisabled: true,
+    videoHidden: true,
     messageHidden: true,
     requestBtnHidden: canUsePermissionsApi(),
     l10nMessage: null,
@@ -44,11 +44,6 @@ export class CameraSource extends UploaderBlock {
 
   /** @private */
   _onActivate = () => {
-    this.set$({
-      '*activityCaption': this.l10n('caption-camera'),
-      '*activityIcon': 'camera',
-    });
-
     if (canUsePermissionsApi()) {
       this._subscribePermissions();
     }
@@ -64,11 +59,6 @@ export class CameraSource extends UploaderBlock {
     this._stopCapture();
   };
 
-  /** @private */
-  _onClose = () => {
-    this.historyBack();
-  };
-
   /** @private */
   _handlePermissionsChange = () => {
     this._capture();
@@ -80,6 +70,7 @@ export class CameraSource extends UploaderBlock {
    */
   _setPermissionsState = debounce((state) => {
     this.$.originalErrorMessage = null;
+    this.classList.toggle('initialized', state === 'granted');
 
     if (state === 'granted') {
       this.set$({
@@ -201,32 +192,53 @@ export class CameraSource extends UploaderBlock {
     this.registerActivity(this.activityType, {
       onActivate: this._onActivate,
       onDeactivate: this._onDeactivate,
-      onClose: this._onClose,
     });
 
     this.sub('--cfg-camera-mirror', (val) => {
       this.$.videoTransformCss = val ? 'scaleX(-1)' : null;
     });
 
-    let deviceList = await navigator.mediaDevices.enumerateDevices();
-    let cameraSelectOptions = deviceList
-      .filter((info) => {
-        return info.kind === 'videoinput';
-      })
-      .map((info, idx) => {
-        return {
-          text: info.label.trim() || `${this.l10n('caption-camera')} ${idx + 1}`,
-          value: info.deviceId,
-        };
-      });
-    if (cameraSelectOptions.length > 1) {
-      this.$.cameraSelectOptions = cameraSelectOptions;
-      this.$.cameraSelectHidden = false;
+    try {
+      let deviceList = await navigator.mediaDevices.enumerateDevices();
+      let cameraSelectOptions = deviceList
+        .filter((info) => {
+          return info.kind === 'videoinput';
+        })
+        .map((info, idx) => {
+          return {
+            text: info.label.trim() || `${this.l10n('caption-camera')} ${idx + 1}`,
+            value: info.deviceId,
+          };
+        });
+      if (cameraSelectOptions.length > 1) {
+        this.$.cameraSelectOptions = cameraSelectOptions;
+        this.$.cameraSelectHidden = false;
+      }
+    } catch (err) {
+      // mediaDevices isn't available for HTTP
+      // TODO: handle this case
     }
   }
 }
 
 CameraSource.template = /* HTML */ `
+  <lr-activity-header>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="back"></lr-icon>
+    </button>
+    <div set="@hidden: !cameraSelectHidden">
+      <lr-icon name="camera"></lr-icon>
+      <span l10n="caption-camera"></span>
+    </div>
+    <lr-select
+      class="camera-select"
+      set="$.options: cameraSelectOptions; @hidden: cameraSelectHidden; onchange: onCameraSelectChange"
+    >
+    </lr-select>
+    <button type="button" class="mini-btn close-btn" set="onclick: *closeModal">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
   <div class="content">
     <video
       autoplay
@@ -243,17 +255,8 @@ CameraSource.template = /* HTML */ `
         l10n="camera-permissions-request"
       ></button>
     </div>
-  </div>
-
-  <div class="toolbar">
-    <button type="button" class="cancel-btn secondary-btn" set="onclick: onCancel" l10n="cancel"></button>
-    <lr-select set="$.options: cameraSelectOptions; @hidden: cameraSelectHidden; onchange: onCameraSelectChange">
-    </lr-select>
-    <button
-      type="button"
-      class="shot-btn primary-btn"
-      set="onclick: onShot; @disabled: shotBtnDisabled"
-      l10n="camera-shot"
-    ></button>
+    <button type="button" class="shot-btn" set="onclick: onShot; @disabled: shotBtnDisabled">
+      <lr-icon name="camera"></lr-icon>
+    </button>
   </div>
 `;
diff --git a/blocks/CameraSource/camera-source.css b/blocks/CameraSource/camera-source.css
index 960c8ef9c..15353cd75 100644
--- a/blocks/CameraSource/camera-source.css
+++ b/blocks/CameraSource/camera-source.css
@@ -1,20 +1,40 @@
 lr-camera-source {
   position: relative;
   display: flex;
-  align-items: center;
-  justify-content: center;
-  height: var(--modal-content-height-fill, 100%);
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  max-height: 100%;
+  overflow: hidden;
+  background-color: var(--clr-background-light);
+  border-radius: var(--border-radius-element);
+}
+
+lr-modal lr-camera-source {
+  width: min(calc(var(--modal-max-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
+  height: 100vh;
   max-height: var(--modal-max-content-height);
-  padding-bottom: calc(2 * var(--gap-mid) + var(--ui-size));
+}
+
+lr-camera-source.initialized {
+  height: max-content;
+}
+
+@media only screen and (max-width: 430px) {
+  lr-camera-source {
+    width: calc(100vw - var(--gap-mid) * 2);
+    height: var(--modal-content-height-fill, 100%);
+  }
 }
 
 lr-camera-source video {
   display: block;
-  max-width: 100%;
+  width: 100%;
   max-height: 100%;
   object-fit: contain;
   object-position: center center;
-  background-color: var(--clr-background);
+  background-color: var(--clr-background-dark);
+  border-radius: var(--border-radius-element);
 }
 
 lr-camera-source .toolbar {
@@ -24,13 +44,17 @@ lr-camera-source .toolbar {
   justify-content: space-between;
   width: 100%;
   padding: var(--gap-mid);
-  background-color: var(--clr-background);
+  background-color: var(--clr-background-light);
 }
 
 lr-camera-source .content {
   display: flex;
+  flex: 1;
   justify-content: center;
-  height: 100%;
+  width: 100%;
+  padding: var(--gap-mid);
+  padding-top: 0;
+  overflow: hidden;
 }
 
 lr-camera-source .message-box {
@@ -42,9 +66,41 @@ lr-camera-source .message-box {
   align-items: center;
   justify-content: center;
   padding: var(--padding) var(--padding) 0 var(--padding);
+  color: var(--clr-txt);
 }
 
 lr-camera-source .message-box button {
   color: var(--clr-btn-txt-primary);
   background-color: var(--clr-btn-bgr-primary);
 }
+
+lr-camera-source .shot-btn {
+  position: absolute;
+  bottom: var(--gap-max);
+  width: calc(var(--ui-size) * 1.8);
+  height: calc(var(--ui-size) * 1.8);
+  color: var(--clr-background-light);
+  background-color: var(--clr-txt);
+  border-radius: 50%;
+  opacity: 0.85;
+  transition: var(--transition-duration) ease;
+}
+
+lr-camera-source .shot-btn:hover {
+  transform: scale(1.05);
+  opacity: 1;
+}
+
+lr-camera-source .shot-btn:active {
+  background-color: var(--clr-txt-mid);
+  opacity: 1;
+}
+
+lr-camera-source .shot-btn[disabled] {
+  bottom: calc(var(--gap-max) * -1 - var(--gap-mid) - var(--ui-size) * 2);
+}
+
+lr-camera-source .shot-btn lr-icon svg {
+  width: calc(var(--ui-size) / 1.5);
+  height: calc(var(--ui-size) / 1.5);
+}
diff --git a/blocks/CloudImageEditor/CloudImageEditor.js b/blocks/CloudImageEditor/CloudImageEditor.js
index 99a625dc2..2c490725d 100644
--- a/blocks/CloudImageEditor/CloudImageEditor.js
+++ b/blocks/CloudImageEditor/CloudImageEditor.js
@@ -7,7 +7,7 @@ export class CloudImageEditor extends UploaderBlock {
 
   init$ = {
     ...this.ctxInit,
-    uuid: null,
+    cdnUrl: null,
   };
 
   initCallback() {
@@ -17,7 +17,6 @@ export class CloudImageEditor extends UploaderBlock {
     this.registerActivity(this.activityType, {
       onActivate: () => this.mountEditor(),
       onDeactivate: () => this.unmountEditor(),
-      onClose: () => this.historyBack(),
     });
 
     this.sub('*focusedEntry', (/** @type {import('../../abstract/TypedData.js').TypedData} */ entry) => {
@@ -26,9 +25,9 @@ export class CloudImageEditor extends UploaderBlock {
       }
       this.entry = entry;
 
-      this.entry.subscribe('uuid', (uuid) => {
-        if (uuid) {
-          this.$.uuid = uuid;
+      this.entry.subscribe('cdnUrl', (cdnUrl) => {
+        if (cdnUrl) {
+          this.$.cdnUrl = cdnUrl;
         }
       });
     });
@@ -51,8 +50,8 @@ export class CloudImageEditor extends UploaderBlock {
   mountEditor() {
     let instance = new CloudEditor();
     instance.classList.add('lr-cldtr-common');
-    let uuid = this.$.uuid;
-    instance.setAttribute('uuid', uuid);
+    let cdnUrl = this.$.cdnUrl;
+    instance.setAttribute('cdn-url', cdnUrl);
 
     instance.addEventListener('apply', (result) => this.handleApply(result));
     instance.addEventListener('cancel', () => this.handleCancel());
diff --git a/blocks/CloudImageEditor/index.css b/blocks/CloudImageEditor/index.css
index 6a865a58e..bb5acf536 100644
--- a/blocks/CloudImageEditor/index.css
+++ b/blocks/CloudImageEditor/index.css
@@ -4,6 +4,12 @@ lr-cloud-image-editor {
   position: relative;
   display: flex;
   width: 100%;
-  height: var(--modal-content-height-fill, 100%);
+  height: 100%;
   overflow: hidden;
+  background-color: var(--clr-background-light);
+}
+
+lr-modal lr-cloud-image-editor {
+  width: min(calc(var(--modal-max-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
+  height: var(--modal-content-height-fill, 100%);
 }
diff --git a/blocks/CloudImageEditor/ref.htm b/blocks/CloudImageEditor/ref.htm
index 2e37d29f6..768f11b34 100644
--- a/blocks/CloudImageEditor/ref.htm
+++ b/blocks/CloudImageEditor/ref.htm
@@ -1,9 +1,21 @@
 <h1>Cloud image editor</h1>
 
+<h2>Load image by UUID</h2>
+
 <lr-live-html>
   <link rel="stylesheet" href="./src/css/index.css" />
 
   <script src="./test.js" type="module"></script>
 
   <lr-cloud-editor class="lr-cldtr-common" uuid="7c167b79-9f27-4489-8032-3f3be1840605"></lr-cloud-editor>
-</lr-live-html>
\ No newline at end of file
+</lr-live-html>
+
+<h2>Load image by CDN URL</h2>
+
+<lr-live-html>
+  <link rel="stylesheet" href="./src/css/index.css" />
+
+  <script src="./test.js" type="module"></script>
+
+  <lr-cloud-editor class="lr-cldtr-common" cdn-url="https://ucarecdn.com/7c167b79-9f27-4489-8032-3f3be1840605/-/crop/100x100/0,0/"></lr-cloud-editor>
+</lr-live-html>
diff --git a/blocks/CloudImageEditor/src/CloudEditor.js b/blocks/CloudImageEditor/src/CloudEditor.js
index 7a6d68c83..600336e94 100644
--- a/blocks/CloudImageEditor/src/CloudEditor.js
+++ b/blocks/CloudImageEditor/src/CloudEditor.js
@@ -1,13 +1,18 @@
 import { Block } from '../../../abstract/Block.js';
-import { createCdnUrl, createCdnUrlModifiers, createOriginalUrl } from '../../../utils/cdn-utils.js';
+import {
+  createCdnUrl,
+  createCdnUrlModifiers,
+  createOriginalUrl,
+  extractOperations,
+  extractUuid,
+} from '../../../utils/cdn-utils.js';
+import { TRANSPARENT_PIXEL_SRC } from '../../../utils/transparentPixelSrc.js';
 import { classNames } from './lib/classNames.js';
 import { debounce } from './lib/debounce.js';
-import { preloadImage } from './lib/preloadImage.js';
-import { TRANSPARENT_PIXEL_SRC } from '../../../utils/transparentPixelSrc.js';
+import { operationsToTransformations } from './lib/transformationUtils.js';
 import { initState } from './state.js';
 import { TEMPLATE } from './template.js';
 import { TabId } from './toolbar-constants.js';
-import { viewerImageSrc } from './util.js';
 
 export class CloudEditor extends Block {
   get ctxName() {
@@ -26,69 +31,22 @@ export class CloudEditor extends Block {
     this.$.showLoader = show;
   }
 
-  _loadImageFromCdn() {
-    this._debouncedShowLoader(true);
-    let src = this._imageSrc();
-    let { promise, cancel } = preloadImage(src);
-    promise
-      .then(() => {
-        this.$.src = src;
-      })
-      .catch((err) => {
-        this.$['*networkProblems'] = true;
-        this._debouncedShowLoader(false);
-        this.$.src = src;
-      });
-    this._cancelPreload && this._cancelPreload();
-    this._cancelPreload = cancel;
-  }
-
-  _imageSrc() {
-    let { width } = this.ref['img-container-el'].getBoundingClientRect();
-    return this.proxyUrl(viewerImageSrc(this.$['*originalUrl'], width, {}));
-  }
-
-  /**
-   * To proper work, we need non-zero size the element. So, we'll wait for it.
-   *
-   * @private
-   * @returns {Promise<void>}
-   */
-  _waitForSize() {
-    return new Promise((resolve, reject) => {
-      let timeout = 300;
-      let start = Date.now();
-
-      let callback = () => {
-        // there could be problem when element disconnected and connected again between ticks
-        if (!this.isConnected) {
-          clearInterval(interval);
-          reject();
-          return;
-        }
-        if (Date.now() - start > timeout) {
-          clearInterval(interval);
-          reject(new Error('[cloud-image-editor] timout waiting for non-zero container size'));
-          return;
-        }
-        let { width, height } = this.getBoundingClientRect();
-
-        if (width > 0 && height > 0) {
-          clearInterval(interval);
-          resolve();
-        }
-      };
-      let interval = setInterval(callback, 50);
-      callback();
-    });
-  }
-
   cssInit$ = {
     '--cfg-cdn-cname': 'https://ucarecdn.com',
   };
 
   async initCallback() {
-    this.$['*originalUrl'] = createOriginalUrl(this.localCtx.read('--cfg-cdn-cname'), this.$.uuid);
+    if (this.$.cdnUrl) {
+      let uuid = extractUuid(this.$.cdnUrl);
+      this.$['*originalUrl'] = createOriginalUrl(this.$.cdnUrl, uuid);
+      let operations = extractOperations(this.$.cdnUrl);
+      let transformations = operationsToTransformations(operations);
+      this.$['*editorTransformations'] = transformations;
+    } else if (this.$.uuid) {
+      this.$['*originalUrl'] = createOriginalUrl(this.localCtx.read('--cfg-cdn-cname'), this.$.uuid);
+    } else {
+      throw new Error('No UUID nor CDN URL provided');
+    }
 
     this.$['*faderEl'] = this.ref['fader-el'];
     this.$['*cropperEl'] = this.ref['cropper-el'];
@@ -139,8 +97,6 @@ export class CloudEditor extends Block {
         .then(({ width, height }) => {
           this.$['*imageSize'] = { width, height };
         });
-      await this._waitForSize();
-      this._loadImageFromCdn();
     } catch (err) {
       if (err) {
         console.error('Failed to load image info', err);
@@ -152,4 +108,5 @@ export class CloudEditor extends Block {
 CloudEditor.template = TEMPLATE;
 CloudEditor.bindAttributes({
   uuid: 'uuid',
+  'cdn-url': 'cdnUrl',
 });
diff --git a/blocks/CloudImageEditor/src/EditorFilterControl.js b/blocks/CloudImageEditor/src/EditorFilterControl.js
index 2657cd258..7c3c0fed1 100644
--- a/blocks/CloudImageEditor/src/EditorFilterControl.js
+++ b/blocks/CloudImageEditor/src/EditorFilterControl.js
@@ -61,9 +61,7 @@ export class EditorFilterControl extends EditorButtonControl {
         })
         .finally(() => {
           previewEl.style.backgroundImage = `url(${src})`;
-          setTimeout(() => {
-            previewEl.style.opacity = '1';
-          });
+          previewEl.setAttribute('loaded', '');
 
           observer.unobserve(this);
         });
diff --git a/blocks/CloudImageEditor/src/EditorToolbar.js b/blocks/CloudImageEditor/src/EditorToolbar.js
index 6193e0ab2..e2fae02a3 100644
--- a/blocks/CloudImageEditor/src/EditorToolbar.js
+++ b/blocks/CloudImageEditor/src/EditorToolbar.js
@@ -6,7 +6,14 @@ import { FAKE_ORIGINAL_FILTER } from './EditorSlider.js';
 import { classNames } from './lib/classNames.js';
 import { debounce } from './lib/debounce.js';
 import { batchPreloadImages } from './lib/preloadImage.js';
-import { ALL_COLOR_OPERATIONS, ALL_CROP_OPERATIONS, ALL_FILTERS, TabId, TABS } from './toolbar-constants.js';
+import {
+  ALL_COLOR_OPERATIONS,
+  ALL_CROP_OPERATIONS,
+  ALL_FILTERS,
+  COLOR_OPERATIONS_CONFIG,
+  TabId,
+  TABS,
+} from './toolbar-constants.js';
 import { viewerImageSrc } from './util.js';
 
 /** @param {String} id */
@@ -47,12 +54,10 @@ export class EditorToolbar extends Block {
       /** @type {import('./types.js').LoadingOperations} */
       '*loadingOperations': new Map(),
       '*showSlider': false,
-      /** @type {import('./types.js').Transformations} */
-      '*editorTransformations': {},
       '*currentFilter': FAKE_ORIGINAL_FILTER,
       '*currentOperation': null,
+      '*tabId': TabId.CROP,
       showLoader: false,
-      tabId: TabId.CROP,
       filters: ALL_FILTERS,
       colorOperations: ALL_COLOR_OPERATIONS,
       cropOperations: ALL_CROP_OPERATIONS,
@@ -104,18 +109,11 @@ export class EditorToolbar extends Block {
     this._debouncedShowLoader = debounce(this._showLoader.bind(this), 500);
   }
 
-  get tabId() {
-    return this.$.tabId;
-  }
-
   /** @private */
   _onSliderClose() {
     this.$['*showSlider'] = false;
-    if (this.$.tabId === TabId.SLIDERS) {
-      this.ref['tooltip-el'].className = classNames('filter-tooltip', {
-        'filter-tooltip_visible': false,
-        'filter-tooltip_hidden': true,
-      });
+    if (this.$['*tabId'] === TabId.SLIDERS) {
+      this.ref['tooltip-el'].classList.toggle('info-tooltip_visible', false);
     }
   }
 
@@ -193,7 +191,7 @@ export class EditorToolbar extends Block {
    * @param {{ fromViewer?: Boolean }} options
    */
   _activateTab(id, { fromViewer }) {
-    this.$.tabId = id;
+    this.$['*tabId'] = id;
 
     if (id === TabId.CROP) {
       this.$['*faderEl'].deactivate();
@@ -232,7 +230,7 @@ export class EditorToolbar extends Block {
 
   /** @private */
   _syncTabIndicator() {
-    let tabToggleEl = this.ref[`tab-toggle-${this.$.tabId}`];
+    let tabToggleEl = this.ref[`tab-toggle-${this.$['*tabId']}`];
     let indicatorEl = this.ref['tabs-indicator'];
     indicatorEl.style.transform = `translateX(${tabToggleEl.offsetLeft}px)`;
   }
@@ -256,6 +254,31 @@ export class EditorToolbar extends Block {
     this.$.showLoader = show;
   }
 
+  _updateInfoTooltip = debounce(() => {
+    let transformations = this.$['*editorTransformations'];
+    let text = '';
+    let visible = false;
+
+    if (this.$['*tabId'] === TabId.FILTERS) {
+      visible = true;
+      if (this.$['*currentFilter'] && transformations?.filter?.name === this.$['*currentFilter']) {
+        let value = transformations?.filter?.amount || 100;
+        text = this.l10n(this.$['*currentFilter']) + ' ' + value;
+      } else {
+        text = this.l10n(FAKE_ORIGINAL_FILTER);
+      }
+    } else if (this.$['*tabId'] === TabId.SLIDERS && this.$['*currentOperation']) {
+      visible = true;
+      let value =
+        transformations?.[this.$['*currentOperation']] || COLOR_OPERATIONS_CONFIG[this.$['*currentOperation']].zero;
+      text = this.$['*currentOperation'] + ' ' + value;
+    }
+    if (visible) {
+      this.$['*operationTooltip'] = text;
+    }
+    this.ref['tooltip-el'].classList.toggle('info-tooltip_visible', visible);
+  }, 0);
+
   initCallback() {
     super.initCallback();
 
@@ -264,38 +287,28 @@ export class EditorToolbar extends Block {
     this.sub('*imageSize', (imageSize) => {
       if (imageSize) {
         setTimeout(() => {
-          this._activateTab(this.$.tabId, { fromViewer: true });
+          this._activateTab(this.$['*tabId'], { fromViewer: true });
         }, 0);
       }
     });
 
-    this.sub('*currentFilter', (currentFilter) => {
-      this.$['*operationTooltip'] = this.l10n(currentFilter || FAKE_ORIGINAL_FILTER);
-      this.ref['tooltip-el'].className = classNames('filter-tooltip', {
-        'filter-tooltip_visible': currentFilter,
-        'filter-tooltip_hidden': !currentFilter,
-      });
+    this.sub('*editorTransformations', (editorTransformations) => {
+      let appliedFilter = editorTransformations?.filter?.name;
+      if (this.$['*currentFilter'] !== appliedFilter) {
+        this.$['*currentFilter'] = appliedFilter;
+      }
     });
 
-    this.sub('*currentOperation', (currentOperation) => {
-      if (this.$.tabId !== TabId.SLIDERS) {
-        return;
-      }
-      this.$['*operationTooltip'] = currentOperation;
-      this.ref['tooltip-el'].className = classNames('filter-tooltip', {
-        'filter-tooltip_visible': currentOperation,
-        'filter-tooltip_hidden': !currentOperation,
-      });
+    this.sub('*currentFilter', () => {
+      this._updateInfoTooltip();
     });
 
-    this.sub('*tabId', (tabId) => {
-      if (tabId === TabId.FILTERS) {
-        this.$['*operationTooltip'] = this.$['*currentFilter'];
-      }
-      this.ref['tooltip-el'].className = classNames('filter-tooltip', {
-        'filter-tooltip_visible': tabId === TabId.FILTERS,
-        'filter-tooltip_hidden': tabId !== TabId.FILTERS,
-      });
+    this.sub('*currentOperation', () => {
+      this._updateInfoTooltip();
+    });
+
+    this.sub('*tabId', () => {
+      this._updateInfoTooltip();
     });
 
     this.sub('*originalUrl', (originalUrl) => {
@@ -329,14 +342,16 @@ export class EditorToolbar extends Block {
       this.$['presence.subToolbar'] = showSlider;
       this.$['presence.mainToolbar'] = !showSlider;
     });
+
+    this._updateInfoTooltip();
   }
 }
 
 EditorToolbar.template = /* HTML */ `
   <lr-line-loader-ui set="active: showLoader"></lr-line-loader-ui>
-  <div class="filter-tooltip_container">
-    <div class="filter-tooltip_wrapper">
-      <div ref="tooltip-el" class="filter-tooltip filter-tooltip_visible">{{*operationTooltip}}</div>
+  <div class="info-tooltip_container">
+    <div class="info-tooltip_wrapper">
+      <div ref="tooltip-el" class="info-tooltip info-tooltip_hidden">{{*operationTooltip}}</div>
     </div>
   </div>
   <div class="toolbar-container">
diff --git a/blocks/CloudImageEditor/src/css/common.css b/blocks/CloudImageEditor/src/css/common.css
index 239a2dbb9..331cb23da 100644
--- a/blocks/CloudImageEditor/src/css/common.css
+++ b/blocks/CloudImageEditor/src/css/common.css
@@ -1,3 +1,5 @@
+/* TODO: we shuoud use basic theme there  */
+
 :where(.lr-cldtr-common),
 :host {
   /* Theme settings >>> */
@@ -44,10 +46,10 @@
   --border-radius-ui: 5px;
   --border-radius-base: 6px;
 
-  --gap-min: 5px;
-  --gap-mid-1: 10px;
-  --gap-mid-2: 15px;
-  --gap-max: 20px;
+  --cldtr-gap-min: 5px;
+  --cldtr-gap-mid-1: 10px;
+  --cldtr-gap-mid-2: 15px;
+  --cldtr-gap-max: 20px;
 
   --opacity-min: var(--opacity-shade-mid);
   --opacity-mid: 0.1;
@@ -136,13 +138,13 @@ lr-cloud-editor > .wrapper {
   --l-min-img-height: var(--modal-toolbar-height);
   --l-max-img-height: 100%;
   --l-edit-button-width: 120px;
-  --l-toolbar-horizontal-padding: var(--gap-mid-1);
+  --l-toolbar-horizontal-padding: var(--cldtr-gap-mid-1);
 }
 
 @media only screen and (max-width: 800px) {
   lr-cloud-editor > .wrapper {
     --l-edit-button-width: 70px;
-    --l-toolbar-horizontal-padding: var(--gap-min);
+    --l-toolbar-horizontal-padding: var(--cldtr-gap-min);
   }
 }
 
@@ -277,7 +279,7 @@ lr-cloud-editor > .wrapper > .network_problems_splash > .network_problems_conten
 }
 
 lr-cloud-editor > .wrapper > .network_problems_splash > .network_problems_content > .network_problems_text {
-  margin-top: var(--gap-max);
+  margin-top: var(--cldtr-gap-max);
   font-size: var(--font-size-ui);
 }
 
@@ -368,17 +370,25 @@ lr-editor-operation-control {
   transition: var(--l-width-transition);
 }
 
-lr-editor-button-control > .active,
-lr-editor-operation-control > .active,
-lr-editor-crop-button-control > .active,
-lr-editor-filter-control > .active {
+lr-editor-button-control.active,
+lr-editor-operation-control.active,
+lr-editor-crop-button-control.active,
+lr-editor-filter-control.active {
   --idle-color-rgb: var(--rgb-primary-accent);
 }
 
-lr-editor-button-control > .not_active,
-lr-editor-operation-control > .not_active,
-lr-editor-crop-button-control > .not_active,
-lr-editor-filter-control > .not_active {
+lr-editor-filter-control.not_active .preview[loaded] {
+  opacity: 1;
+}
+
+lr-editor-filter-control.active .preview {
+  opacity: 0;
+}
+
+lr-editor-button-control.not_active,
+lr-editor-operation-control.not_active,
+lr-editor-crop-button-control.not_active,
+lr-editor-filter-control.not_active {
   --idle-color-rgb: var(--rgb-text-base);
 }
 
@@ -401,7 +411,7 @@ lr-editor-button-control > .title,
 lr-editor-operation-control > .title,
 lr-editor-crop-button-control > .title,
 lr-editor-filter-control > .title {
-  padding-right: var(--gap-mid-1);
+  padding-right: var(--cldtr-gap-mid-1);
   font-size: 0.7em;
   letter-spacing: 1.004px;
   text-transform: uppercase;
@@ -552,17 +562,17 @@ lr-editor-toolbar {
 
 @media only screen and (max-width: 600px) {
   lr-editor-toolbar {
-    --l-tab-gap: var(--gap-mid-1);
-    --l-slider-padding: var(--gap-min);
-    --l-controls-padding: var(--gap-min);
+    --l-tab-gap: var(--cldtr-gap-mid-1);
+    --l-slider-padding: var(--cldtr-gap-min);
+    --l-controls-padding: var(--cldtr-gap-min);
   }
 }
 
 @media only screen and (min-width: 601px) {
   lr-editor-toolbar {
-    --l-tab-gap: calc(var(--gap-mid-1) + var(--gap-max));
-    --l-slider-padding: var(--gap-mid-1);
-    --l-controls-padding: var(--gap-mid-1);
+    --l-tab-gap: calc(var(--cldtr-gap-mid-1) + var(--cldtr-gap-max));
+    --l-slider-padding: var(--cldtr-gap-mid-1);
+    --l-controls-padding: var(--cldtr-gap-mid-1);
   }
 }
 
@@ -662,14 +672,14 @@ lr-editor-toolbar > .toolbar-container > .sub-toolbar > .tab-content-row > .tab-
   grid-template-columns: 1fr auto 1fr;
   box-sizing: border-box;
   min-width: 100%;
-  padding-left: var(--gap-max);
+  padding-left: var(--cldtr-gap-max);
 }
 
 lr-editor-toolbar > .toolbar-container > .sub-toolbar > .tab-content-row > .tab-content .controls-list_inner {
   display: grid;
   grid-area: inner;
   grid-auto-flow: column;
-  grid-gap: calc((var(--gap-min) - 1px) * 3);
+  grid-gap: calc((var(--cldtr-gap-min) - 1px) * 3);
 }
 
 lr-editor-toolbar
@@ -678,14 +688,14 @@ lr-editor-toolbar
   > .tab-content-row
   > .tab-content
   .controls-list_inner:last-child {
-  padding-right: var(--gap-max);
+  padding-right: var(--cldtr-gap-max);
 }
 
 lr-editor-toolbar .controls-list_last-item {
-  margin-right: var(--gap-max);
+  margin-right: var(--cldtr-gap-max);
 }
 
-lr-editor-toolbar .filter-tooltip_container {
+lr-editor-toolbar .info-tooltip_container {
   position: absolute;
   display: flex;
   align-items: flex-start;
@@ -694,9 +704,9 @@ lr-editor-toolbar .filter-tooltip_container {
   height: 100%;
 }
 
-lr-editor-toolbar .filter-tooltip_wrapper {
+lr-editor-toolbar .info-tooltip_wrapper {
   position: absolute;
-  top: calc(-100% - var(--gap-mid-2));
+  top: calc(-100% - var(--cldtr-gap-mid-2));
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
@@ -704,32 +714,28 @@ lr-editor-toolbar .filter-tooltip_wrapper {
   pointer-events: none;
 }
 
-lr-editor-toolbar .filter-tooltip {
+lr-editor-toolbar .info-tooltip {
   z-index: 3;
-  padding-top: calc(var(--gap-min) / 2);
-  padding-right: var(--gap-min);
-  padding-bottom: calc(var(--gap-min) / 2);
-  padding-left: var(--gap-min);
+  padding-top: calc(var(--cldtr-gap-min) / 2);
+  padding-right: var(--cldtr-gap-min);
+  padding-bottom: calc(var(--cldtr-gap-min) / 2);
+  padding-left: var(--cldtr-gap-min);
   color: var(--color-text-base);
   font-size: 0.7em;
   letter-spacing: 1px;
   text-transform: uppercase;
   background-color: var(--color-text-accent-contrast);
   border-radius: var(--border-radius-editor);
+  transform: translateY(100%);
   opacity: 0;
   transition: var(--transition-duration-3);
 }
 
-lr-editor-toolbar .filter-tooltip_visible {
+lr-editor-toolbar .info-tooltip_visible {
   transform: translateY(0px);
   opacity: 1;
 }
 
-lr-editor-toolbar .filter-tooltip_hidden {
-  transform: translateY(100%);
-  opacity: 0;
-}
-
 lr-editor-toolbar .slider {
   padding-right: var(--l-slider-padding);
   padding-left: var(--l-slider-padding);
@@ -745,8 +751,8 @@ lr-btn-ui {
   align-items: center;
   box-sizing: var(--css-box-sizing, border-box);
   height: var(--css-height, var(--size-touch-area));
-  padding-right: var(--css-padding-right, var(--gap-mid-1));
-  padding-left: var(--css-padding-left, var(--gap-mid-1));
+  padding-right: var(--css-padding-right, var(--cldtr-gap-mid-1));
+  padding-left: var(--css-padding-left, var(--cldtr-gap-mid-1));
   color: rgba(var(--color-effect), var(--opacity-effect));
   outline: none;
   cursor: pointer;
@@ -769,13 +775,13 @@ lr-btn-ui .icon {
 }
 
 lr-btn-ui .icon_left {
-  margin-right: var(--gap-mid-1);
+  margin-right: var(--cldtr-gap-mid-1);
   margin-left: 0px;
 }
 
 lr-btn-ui .icon_right {
   margin-right: 0px;
-  margin-left: var(--gap-mid-1);
+  margin-left: var(--cldtr-gap-mid-1);
 }
 
 lr-btn-ui .icon_single {
diff --git a/blocks/CloudImageEditor/src/lib/transformationUtils.js b/blocks/CloudImageEditor/src/lib/transformationUtils.js
index 44ea60b73..862498ea1 100644
--- a/blocks/CloudImageEditor/src/lib/transformationUtils.js
+++ b/blocks/CloudImageEditor/src/lib/transformationUtils.js
@@ -46,7 +46,8 @@ function transformationToStr(operation, options) {
   return '';
 }
 
-const ORDER = [
+// TODO: refactor all the operations constants
+const SUPPORTED_OPERATIONS_ORDERED = [
   'enhance',
   'brightness',
   'exposure',
@@ -68,7 +69,7 @@ const ORDER = [
  */
 export function transformationsToOperations(transformations) {
   return joinCdnOperations(
-    ...ORDER.filter(
+    ...SUPPORTED_OPERATIONS_ORDERED.filter(
       (operation) => typeof transformations[operation] !== 'undefined' && transformations[operation] !== null
     )
       .map((operation) => {
@@ -80,3 +81,53 @@ export function transformationsToOperations(transformations) {
 }
 
 export const COMMON_OPERATIONS = joinCdnOperations('format/auto', 'progressive/yes');
+
+const asNumber = ([value]) => (typeof value !== 'undefined' ? Number(value) : undefined);
+const asBoolean = () => true;
+const asFilter = ([name, amount]) => ({
+  name,
+  amount: Number(amount),
+});
+
+// Docs: https://uploadcare.com/docs/transformations/image/resize-crop/#operation-crop
+// We don't support percentages and aligment presets,
+// Because it's unclear how to handle them in the Editor UI
+// TODO: add support for percentages and aligment presets
+const asCrop = ([dimensions, coords]) => {
+  return { dimensions: dimensions.split('x').map(Number), coords: coords.split(',').map(Number) };
+};
+
+const OPERATION_PROCESSORS = {
+  enhance: asNumber,
+  brightness: asNumber,
+  exposure: asNumber,
+  gamma: asNumber,
+  contrast: asNumber,
+  saturation: asNumber,
+  vibrance: asNumber,
+  warmth: asNumber,
+  filter: asFilter,
+  mirror: asBoolean,
+  flip: asBoolean,
+  rotate: asNumber,
+  crop: asCrop,
+};
+
+/**
+ * @param {string[]} operations
+ * @returns {import('../types.js').Transformations}
+ */
+export function operationsToTransformations(operations) {
+  /** @type {import('../types.js').Transformations} */
+  let transformations = {};
+  for (let operation of operations) {
+    let [name, ...args] = operation.split('/');
+    if (!SUPPORTED_OPERATIONS_ORDERED.includes(name)) {
+      continue;
+    }
+    const processor = OPERATION_PROCESSORS[name];
+    const value = processor(args);
+    transformations[name] = value;
+  }
+  return transformations;
+}
diff --git a/blocks/CloudImageEditor/src/state.js b/blocks/CloudImageEditor/src/state.js
index 4a4bd85ca..c1a61c4c1 100644
--- a/blocks/CloudImageEditor/src/state.js
+++ b/blocks/CloudImageEditor/src/state.js
@@ -6,13 +6,14 @@ import { TRANSPARENT_PIXEL_SRC } from '../../../utils/transparentPixelSrc.js';
 export function initState(fnCtx) {
   return {
     '*originalUrl': null,
-    '*tabId': null,
     '*faderEl': null,
     '*cropperEl': null,
     '*imgEl': null,
     '*imgContainerEl': null,
     '*networkProblems': false,
     '*imageSize': null,
+    /** @type {import('./types.js').Transformations} */
+    '*editorTransformations': {},
 
     entry: null,
     extension: null,
@@ -24,6 +25,7 @@ export function initState(fnCtx) {
     fileType: '',
     showLoader: false,
     uuid: null,
+    cdnUrl: null,
 
     'presence.networkProblems': false,
     'presence.modalCaption': true,
diff --git a/blocks/ConfirmationDialog/ConfirmationDialog.js b/blocks/ConfirmationDialog/ConfirmationDialog.js
index b84cded47..dd2c6199c 100644
--- a/blocks/ConfirmationDialog/ConfirmationDialog.js
+++ b/blocks/ConfirmationDialog/ConfirmationDialog.js
@@ -21,6 +21,7 @@ export class ConfirmationDialog extends ActivityBlock {
 
   init$ = {
     ...this.ctxInit,
+    activityCaption: '',
     messageTxt: '',
     confirmBtnTxt: '',
     denyBtnTxt: '',
@@ -41,18 +42,15 @@ export class ConfirmationDialog extends ActivityBlock {
         return;
       }
       this.set$({
-        '*modalHeaderHidden': true,
         '*currentActivity': ActivityBlock.activities.CONFIRMATION,
-        '*activityCaption': this.l10n(cfn.captionL10nStr),
+        activityCaption: this.l10n(cfn.captionL10nStr),
         messageTxt: this.l10n(cfn.messageL10Str),
         confirmBtnTxt: this.l10n(cfn.confirmL10nStr),
         denyBtnTxt: this.l10n(cfn.denyL10nStr),
         onDeny: () => {
-          this.$['*modalHeaderHidden'] = false;
           cfn.denyAction();
         },
         onConfirm: () => {
-          this.$['*modalHeaderHidden'] = false;
           cfn.confirmAction();
         },
       });
@@ -61,6 +59,16 @@ export class ConfirmationDialog extends ActivityBlock {
 }
 
 ConfirmationDialog.template = /* HTML */ `
+  <lr-activity-header>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="back"></lr-icon>
+    </button>
+    <span>{{activityCaption}}</span>
+    <button type="button" class="mini-btn close-btn" set="onclick: *closeModal">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
+
   <div class="message">{{messageTxt}}</div>
   <div class="toolbar">
     <button type="button" class="deny-btn secondary-btn" set="onclick: onDeny">{{denyBtnTxt}}</button>
diff --git a/blocks/Copyright/Copyright.js b/blocks/Copyright/Copyright.js
new file mode 100644
index 000000000..d3b6322a4
--- /dev/null
+++ b/blocks/Copyright/Copyright.js
@@ -0,0 +1,12 @@
+import { Block } from '../../abstract/Block.js';
+
+export class Copyright extends Block {
+  static template = /* HTML */ `
+    <a
+      href="https://uploadcare.com/?utm_source=copyright&utm_medium=referral&utm_campaign=v4"
+      target="_blank noopener"
+      class="credits"
+      >Powered by Uploadcare</a
+    >
+  `;
+}
diff --git a/blocks/Copyright/copyright.css b/blocks/Copyright/copyright.css
new file mode 100644
index 000000000..b9f24d591
--- /dev/null
+++ b/blocks/Copyright/copyright.css
@@ -0,0 +1,12 @@
+lr-copyright .credits {
+  padding: 0 var(--gap-mid) var(--gap-mid) calc(var(--gap-mid) * 1.5);
+  color: var(--clr-txt-lightest);
+  font-weight: normal;
+  font-size: 0.85em;
+  opacity: 0.7;
+  transition: var(--transition-duration) ease;
+}
+
+lr-copyright .credits:hover {
+  opacity: 1;
+}
diff --git a/blocks/DropArea/DropArea.js b/blocks/DropArea/DropArea.js
index abc34f431..f418afc96 100644
--- a/blocks/DropArea/DropArea.js
+++ b/blocks/DropArea/DropArea.js
@@ -2,26 +2,76 @@ import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 import { ActivityBlock } from '../../abstract/ActivityBlock.js';
 import { DropzoneState, addDropzone } from './addDropzone.js';
 import { fileIsImage } from '../../utils/fileTypes.js';
+import { Modal } from '../Modal/Modal.js';
 
 export class DropArea extends UploaderBlock {
   init$ = {
     ...this.ctxInit,
     state: DropzoneState.INACTIVE,
+    withIcon: false,
+    isClickable: false,
+    isFullscreen: false,
+    text: this.l10n('drop-files-here'),
+    'lr-drop-area/targets': null,
   };
+  isActive() {
+    const bounds = this.getBoundingClientRect();
+    const hasSize = bounds.width > 0 && bounds.height > 0;
+    const isInViewport =
+      bounds.top >= 0 &&
+      bounds.left >= 0 &&
+      bounds.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      bounds.right <= (window.innerWidth || document.documentElement.clientWidth);
+
+    const style = window.getComputedStyle(this);
+    const visible = style.visibility !== 'hidden' && style.display !== 'none';
+
+    return hasSize && visible && isInViewport;
+  }
   initCallback() {
     super.initCallback();
+    if (!this.$['lr-drop-area/targets']) {
+      this.$['lr-drop-area/targets'] = new Set();
+    }
+    this.$['lr-drop-area/targets'].add(this);
+
+    this.defineAccessor('clickable', (value) => {
+      this.set$({ isClickable: typeof value === 'string' });
+    });
+    this.defineAccessor('with-icon', (value) => {
+      this.set$({ withIcon: typeof value === 'string' });
+    });
+    this.defineAccessor('fullscreen', (value) => {
+      this.set$({ isFullscreen: typeof value === 'string' });
+    });
+
+    this.defineAccessor('text', (value) => {
+      if (value) {
+        this.set$({ text: this.l10n(value) || value });
+      } else {
+        this.set$({ text: this.l10n('drop-files-here') });
+      }
+    });
+
     /** @private */
     this._destroyDropzone = addDropzone({
       element: this,
+      shouldIgnore: () => this._isDisabled(),
       onChange: (state) => {
         this.$.state = state;
       },
+      /** @param {(File | String)[]} items */
       onItems: (items) => {
         if (!items.length) {
           return;
         }
-        if (!this.getCssData('--cfg-multiple')) {
-          items = [items[0]];
+        let isMultiple = this.getCssData('--cfg-multiple');
+        let multipleMax = this.getCssData('--cfg-multiple-max');
+        let currentFilesCount = this.uploadCollection.size;
+        if (isMultiple && multipleMax) {
+          items = items.slice(0, multipleMax - currentFilesCount - 1);
+        } else if (!isMultiple) {
+          items = items.slice(0, currentFilesCount > 0 ? 0 : 1);
         }
         items.forEach((/** @type {File | String} */ item) => {
           if (typeof item === 'string') {
@@ -43,12 +93,26 @@ export class DropArea extends UploaderBlock {
           this.set$({
             '*currentActivity': ActivityBlock.activities.UPLOAD_LIST,
           });
-          // @ts-ignore
-          this.setForCtxTarget('lr-modal', '*modalActive', true);
+          this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', true);
         }
       },
     });
 
+    let contentWrapperEl = this.ref['content-wrapper'];
+    if (contentWrapperEl) {
+      this._destroyContentWrapperDropzone = addDropzone({
+        element: contentWrapperEl,
+        onChange: (state) => {
+          const stateText = Object.entries(DropzoneState)
+            .find(([, value]) => value === state)?.[0]
+            .toLowerCase();
+          stateText && contentWrapperEl.setAttribute('drag-state', stateText);
+        },
+        onItems: () => {},
+        shouldIgnore: () => this._isDisabled(),
+      });
+    }
+
     this.sub('state', (state) => {
       const stateText = Object.entries(DropzoneState)
         .find(([, value]) => value === state)?.[0]
@@ -58,23 +122,78 @@ export class DropArea extends UploaderBlock {
       }
     });
 
-    if (this.hasAttribute('clickable')) {
-      let clickable = this.getAttribute('clickable');
-      if (clickable === '' || clickable === 'true') {
-        // @private
-        this._onAreaClicked = () => {
-          this.openSystemDialog();
-        };
-        this.addEventListener('click', this._onAreaClicked);
-      }
+    if (this.$.isClickable) {
+      // @private
+      this._onAreaClicked = () => {
+        this.openSystemDialog();
+      };
+      this.addEventListener('click', this._onAreaClicked);
     }
   }
 
+  /**
+   * Ignore drop events if there are other visible drop areas on the page
+   *
+   * @returns {Boolean}
+   */
+  _isDisabled() {
+    if (!this._couldHandleFiles()) {
+      return true;
+    }
+    if (!this.$.isFullscreen) {
+      return false;
+    }
+    const otherTargets = [...this.$['lr-drop-area/targets']].filter((el) => el !== this);
+    const activeTargets = otherTargets.filter((/** @type {typeof this} */ el) => {
+      return el.isActive();
+    });
+    return activeTargets.length > 0;
+  }
+
+  _couldHandleFiles() {
+    let isMultiple = this.getCssData('--cfg-multiple');
+    let multipleMax = this.getCssData('--cfg-multiple-max');
+    let currentFilesCount = this.uploadCollection.size;
+
+    if (isMultiple && multipleMax && currentFilesCount >= multipleMax) {
+      return false;
+    }
+
+    if (!isMultiple && currentFilesCount > 0) {
+      return false;
+    }
+
+    return true;
+  }
+
   destroyCallback() {
     super.destroyCallback();
+
+    this.$['lr-drop-area/targets']?.remove?.(this);
+
     this._destroyDropzone?.();
+    this._destroyContentWrapperDropzone?.();
     if (this._onAreaClicked) {
       this.removeEventListener('click', this._onAreaClicked);
     }
   }
 }
+
+DropArea.template = /* HTML */ `
+  <slot>
+    <div ref="content-wrapper" class="content-wrapper">
+      <div class="icon-container" set="@hidden: !withIcon">
+        <lr-icon name="default"></lr-icon>
+        <lr-icon name="arrow-down"></lr-icon>
+      </div>
+      <span class="text">{{text}}</span>
+    </div>
+  </slot>
+`;
+
+DropArea.bindAttributes({
+  'with-icon': null,
+  clickable: null,
+  text: null,
+  fullscreen: null,
+});
diff --git a/blocks/DropArea/addDropzone.js b/blocks/DropArea/addDropzone.js
index b045cea0c..9fa6ff16f 100644
--- a/blocks/DropArea/addDropzone.js
+++ b/blocks/DropArea/addDropzone.js
@@ -8,7 +8,7 @@ export const DropzoneState = {
   OVER: 3,
 };
 
-let FINAL_EVENTS = ['dragleave', 'dragexit', 'dragend', 'drop', 'mouseleave', 'mouseout'];
+let RESET_EVENTS = ['focus'];
 let NEAR_OFFSET = 100;
 let nearnessRegistry = new Map();
 
@@ -29,56 +29,53 @@ function distance(p, r) {
  * @param {HTMLElement} desc.element
  * @param {Function} desc.onChange
  * @param {Function} desc.onItems
+ * @param {() => Boolean} desc.shouldIgnore
  */
 export function addDropzone(desc) {
+  let eventCounter = 0;
+
+  let body = document.body;
   let switchHandlers = new Set();
   let handleSwitch = (fn) => switchHandlers.add(fn);
   let state = DropzoneState.INACTIVE;
 
   let setState = (newState) => {
+    if (desc.shouldIgnore() && newState !== DropzoneState.INACTIVE) {
+      return;
+    }
     if (state !== newState) {
       switchHandlers.forEach((fn) => fn(newState));
     }
     state = newState;
   };
 
-  let onFinalEvent = (e) => {
-    let { clientX, clientY } = e;
-    let bodyBounds = document.body.getBoundingClientRect();
-    let isDrop = e.type === 'drop';
-    let isOuterDrag = ['dragleave', 'dragexit', 'dragend'].includes(e.type) && clientX === 0 && clientY === 0;
-    let isOuterMouse =
-      ['mouseleave', 'mouseout'].includes(e.type) &&
-      (clientX < 0 || clientX > bodyBounds.width || clientY < 0 || clientY > bodyBounds.height);
-    if (isDrop || isOuterDrag || isOuterMouse) {
+  handleSwitch((newState) => desc.onChange(newState));
+
+  let onResetEvent = () => {
+    eventCounter = 0;
+    setState(DropzoneState.INACTIVE);
+  };
+  let onDragEnter = () => {
+    eventCounter += 1;
+    if (state === DropzoneState.INACTIVE) {
+      setState(DropzoneState.ACTIVE);
+    }
+  };
+  let onDragLeave = () => {
+    eventCounter -= 1;
+    let draggingInPage = eventCounter > 0;
+    if (!draggingInPage) {
       setState(DropzoneState.INACTIVE);
     }
+  };
+  let onDrop = (e) => {
     e.preventDefault();
+    eventCounter = 0;
+    setState(DropzoneState.INACTIVE);
   };
 
-  handleSwitch((newState) => desc.onChange(newState));
-  handleSwitch((newState) => {
-    if (newState === DropzoneState.ACTIVE) {
-      FINAL_EVENTS.forEach((eventName) => {
-        window.addEventListener(eventName, onFinalEvent, false);
-      });
-    }
-  });
-  handleSwitch((newState) => {
-    if (newState === DropzoneState.INACTIVE) {
-      FINAL_EVENTS.forEach((eventName) => {
-        window.removeEventListener(eventName, onFinalEvent, false);
-      });
-    }
-  });
-
   let onDragOver = (e) => {
-    // console.log(e)
-    // Not sure that it won't conflict with other dnd elements on the page
     e.preventDefault();
-    if (state === DropzoneState.INACTIVE) {
-      setState(DropzoneState.ACTIVE);
-    }
 
     /** @type {[Number, Number]} */
     let dragPoint = [e.x, e.y];
@@ -98,22 +95,32 @@ export function addDropzone(desc) {
       setState(DropzoneState.ACTIVE);
     }
   };
-  window.addEventListener('dragover', onDragOver, false);
 
-  let onDrop = async (e) => {
+  let onElementDrop = async (e) => {
     e.preventDefault();
     let items = await getDropItems(e.dataTransfer);
     desc.onItems(items);
     setState(DropzoneState.INACTIVE);
   };
-  desc.element.addEventListener('drop', onDrop);
+
+  body.addEventListener('drop', onDrop);
+  body.addEventListener('dragleave', onDragLeave);
+  body.addEventListener('dragenter', onDragEnter);
+  body.addEventListener('dragover', onDragOver);
+  desc.element.addEventListener('drop', onElementDrop);
+  RESET_EVENTS.forEach((eventName) => {
+    window.addEventListener(eventName, onResetEvent);
+  });
 
   return () => {
     nearnessRegistry.delete(desc.element);
-    window.removeEventListener('dragover', onDragOver, false);
-    desc.element.removeEventListener('drop', onDrop);
-    FINAL_EVENTS.forEach((eventName) => {
-      window.removeEventListener(eventName, onFinalEvent, false);
+    body.removeEventListener('drop', onDrop);
+    body.removeEventListener('dragleave', onDragLeave);
+    body.removeEventListener('dragenter', onDragEnter);
+    body.removeEventListener('dragover', onDragOver);
+    desc.element.removeEventListener('drop', onElementDrop);
+    RESET_EVENTS.forEach((eventName) => {
+      window.removeEventListener(eventName, onResetEvent);
     });
   };
 }
diff --git a/blocks/DropArea/drop-area.css b/blocks/DropArea/drop-area.css
index 974ea2568..4cecb3cfd 100644
--- a/blocks/DropArea/drop-area.css
+++ b/blocks/DropArea/drop-area.css
@@ -1,44 +1,172 @@
 lr-drop-area {
-  display: flex;
-  align-items: center;
-  justify-content: center;
   padding: var(--gap-min);
+  overflow: hidden;
   border: var(--border-dashed);
   border-radius: var(--border-radius-frame);
-  transition: border-color var(--transition-duration) ease, background-color var(--transition-duration) ease,
-    opacity var(--transition-duration) ease;
+  transition: var(--transition-duration) ease;
+}
+
+lr-drop-area,
+lr-drop-area .content-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
 }
 
-lr-drop-area::after {
+lr-drop-area .text {
+  position: relative;
+  margin: var(--gap-mid);
   color: var(--clr-txt-light);
-  content: var(--l10n-drop-files-here);
+  transition: var(--transition-duration) ease;
 }
 
 lr-drop-area[ghost][drag-state='inactive'] {
+  display: none;
   opacity: 0;
 }
 
-lr-drop-area[drag-state='inactive'] {
-  background-color: var(--clr-shade-lv1);
+lr-drop-area[ghost]:not([fullscreen]):is([drag-state='active'], [drag-state='near'], [drag-state='over']) {
+  background: var(--clr-background);
 }
 
-lr-drop-area[drag-state='active'] {
-  background-color: var(--clr-accent-lightest);
+lr-drop-area[with-icon]
+  > .content-wrapper:is([drag-state='active'], [drag-state='near'], [drag-state='over'])
+  :is(.text, .icon-container) {
+  color: var(--clr-accent);
+}
+
+lr-drop-area:is([drag-state='active'], [drag-state='near'], [drag-state='over'], :hover) {
+  color: var(--clr-accent);
+  background: var(--clr-accent-lightest);
+  border-color: var(--clr-accent-light);
+}
+
+lr-drop-area:is([drag-state='active'], [drag-state='near']) {
   opacity: 1;
 }
 
-lr-drop-area[drag-state='near'] {
+lr-drop-area[drag-state='over'] {
+  border-color: var(--clr-accent);
   opacity: 1;
 }
 
-lr-drop-area[drag-state='near'],
-lr-drop-area:hover {
-  background-color: var(--clr-accent-lightest);
-  border-color: var(--clr-accent-light);
+lr-drop-area[with-icon] {
+  min-height: calc(var(--ui-size) * 6);
 }
 
-lr-drop-area[drag-state='over'] {
+lr-drop-area[with-icon] .content-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+
+lr-drop-area[with-icon] .text {
+  color: var(--clr-txt);
+  font-weight: 500;
+  font-size: 1.1em;
+}
+
+lr-drop-area[with-icon] .icon-container {
+  position: relative;
+  width: calc(var(--ui-size) * 2);
+  height: calc(var(--ui-size) * 2);
+  margin: var(--gap-mid);
+  overflow: hidden;
+  color: var(--clr-txt);
+  background-color: var(--clr-background);
+  border-radius: 50%;
+  transition: var(--transition-duration) ease;
+}
+
+lr-drop-area[with-icon] lr-icon {
+  position: absolute;
+  top: calc(50% - var(--ui-size) / 2);
+  left: calc(50% - var(--ui-size) / 2);
+  transition: var(--transition-duration) ease;
+}
+
+lr-drop-area[with-icon] lr-icon:last-child {
+  transform: translateY(calc(var(--ui-size) * 1.5));
+}
+
+lr-drop-area[with-icon]:hover .icon-container,
+lr-drop-area[with-icon]:hover .text {
+  color: var(--clr-accent);
+}
+
+lr-drop-area[with-icon]:hover .icon-container {
   background-color: var(--clr-accent-lightest);
-  border-color: var(--clr-accent);
+}
+
+lr-drop-area[with-icon]
+  > .content-wrapper:is([drag-state='active'], [drag-state='near'], [drag-state='over'])
+  .icon-container {
+  color: white;
+  background-color: var(--clr-accent);
+}
+
+lr-drop-area[with-icon] > .content-wrapper:is([drag-state='active'], [drag-state='near'], [drag-state='over']) .text {
+  color: var(--clr-accent);
+}
+
+lr-drop-area[with-icon]
+  > .content-wrapper:is([drag-state='active'], [drag-state='near'], [drag-state='over'])
+  lr-icon:first-child {
+  transform: translateY(calc(var(--ui-size) * -1.5));
+}
+
+lr-drop-area[with-icon]
+  > .content-wrapper:is([drag-state='active'], [drag-state='near'], [drag-state='over'])
+  lr-icon:last-child {
+  transform: translateY(0);
+}
+
+lr-drop-area[with-icon] > .content-wrapper[drag-state='near'] lr-icon:last-child {
+  transform: scale(1.3);
+}
+
+lr-drop-area[with-icon] > .content-wrapper[drag-state='over'] lr-icon:last-child {
+  transform: scale(1.5);
+}
+
+lr-drop-area[fullscreen] {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 2147483647;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: calc(100vw - var(--gap-mid) * 2);
+  height: calc(100vh - var(--gap-mid) * 2);
+  margin: var(--gap-mid);
+}
+
+lr-drop-area[fullscreen] .content-wrapper {
+  width: 100%;
+  max-width: calc(var(--modal-normal-w) * 0.8);
+  height: calc(var(--ui-size) * 6);
+  color: var(--clr-txt);
+  background-color: var(--clr-background-light);
+  border-radius: var(--border-radius-frame);
+  box-shadow: var(--modal-shadow);
+  transition: var(--transition-duration) ease;
+}
+
+lr-drop-area[with-icon][fullscreen][drag-state='active'] > .content-wrapper,
+lr-drop-area[with-icon][fullscreen][drag-state='near'] > .content-wrapper {
+  transform: translateY(var(--gap-mid));
+  opacity: 0;
+}
+
+lr-drop-area[with-icon][fullscreen][drag-state='over'] > .content-wrapper {
+  transform: translateY(0px);
   opacity: 1;
 }
+
+:is(lr-drop-area[with-icon][fullscreen]) > .content-wrapper lr-icon:first-child {
+  transform: translateY(calc(var(--ui-size) * -1.5));
+}
diff --git a/blocks/ExternalSource/ExternalSource.js b/blocks/ExternalSource/ExternalSource.js
index f610966dc..8b70442e7 100644
--- a/blocks/ExternalSource/ExternalSource.js
+++ b/blocks/ExternalSource/ExternalSource.js
@@ -15,6 +15,8 @@ export class ExternalSource extends UploaderBlock {
 
   init$ = {
     ...this.ctxInit,
+    activityIcon: '',
+    activityCaption: '',
     counter: 0,
     onDone: () => {
       this.$['*currentActivity'] = ActivityBlock.activities.UPLOAD_LIST;
@@ -34,14 +36,13 @@ export class ExternalSource extends UploaderBlock {
         let { externalSourceType } = /** @type {ActivityParams} */ (this.activityParams);
 
         this.set$({
-          '*activityCaption': `${externalSourceType?.[0].toUpperCase()}${externalSourceType?.slice(1)}`,
-          '*activityIcon': externalSourceType,
+          activityCaption: `${externalSourceType?.[0].toUpperCase()}${externalSourceType?.slice(1)}`,
+          activityIcon: externalSourceType,
         });
 
         this.$.counter = 0;
         this.mountIframe();
       },
-      onClose: () => this.historyBack(),
     });
     this.sub('*currentActivity', (val) => {
       if (val !== this.activityType) {
@@ -137,13 +138,27 @@ export class ExternalSource extends UploaderBlock {
 }
 
 ExternalSource.template = /* HTML */ `
-  <div ref="iframeWrapper" class="iframe-wrapper"></div>
-  <div class="toolbar">
-    <button type="button" class="cancel-btn secondary-btn" set="onclick: onCancel" l10n="cancel"></button>
-    <div></div>
-    <div class="selected-counter"><span l10n="selected-count"></span>{{counter}}</div>
-    <button type="button" class="done-btn primary-btn" set="onclick: onDone; @disabled: !counter">
-      <lr-icon name="check"></lr-icon>
+  <lr-activity-header>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="back"></lr-icon>
     </button>
+    <div>
+      <lr-icon set="@name: activityIcon"></lr-icon>
+      <span>{{activityCaption}}</span>
+    </div>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
+  <div class="content">
+    <div ref="iframeWrapper" class="iframe-wrapper"></div>
+    <div class="toolbar">
+      <button type="button" class="cancel-btn secondary-btn" set="onclick: onCancel" l10n="cancel"></button>
+      <div></div>
+      <div class="selected-counter"><span l10n="selected-count"></span>{{counter}}</div>
+      <button type="button" class="done-btn primary-btn" set="onclick: onDone; @disabled: !counter">
+        <lr-icon name="check"></lr-icon>
+      </button>
+    </div>
   </div>
 `;
diff --git a/blocks/ExternalSource/external-source.css b/blocks/ExternalSource/external-source.css
index 079845376..487ce12bc 100644
--- a/blocks/ExternalSource/external-source.css
+++ b/blocks/ExternalSource/external-source.css
@@ -1,9 +1,29 @@
 lr-external-source {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  background-color: var(--clr-background-light);
+}
+
+lr-modal lr-external-source {
+  width: min(calc(var(--modal-max-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
+  height: var(--modal-content-height-fill, 100%);
+  max-height: var(--modal-max-content-height);
+}
+
+lr-external-source > .content {
   position: relative;
   display: grid;
+  flex: 1;
   grid-template-rows: 1fr min-content;
-  height: var(--modal-content-height-fill, 100%);
-  max-height: var(--modal-max-content-height);
+}
+
+@media only screen and (max-width: 430px) {
+  lr-external-source {
+    width: calc(100vw - var(--gap-mid) * 2);
+    height: var(--modal-content-height-fill, 100%);
+  }
 }
 
 lr-external-source iframe {
@@ -41,4 +61,5 @@ lr-external-source .selected-counter {
   align-items: center;
   justify-content: space-between;
   padding: var(--gap-mid);
+  color: var(--clr-txt-light);
 }
diff --git a/blocks/FileItem/FileItem.js b/blocks/FileItem/FileItem.js
index 4a09197e3..9b7814a3f 100644
--- a/blocks/FileItem/FileItem.js
+++ b/blocks/FileItem/FileItem.js
@@ -36,24 +36,29 @@ export class FileItem extends UploaderBlock {
     ...this.ctxInit,
     uid: '',
     itemName: '',
+    errorText: '',
     thumbUrl: '',
     progressValue: 0,
     progressVisible: false,
     progressUnknown: false,
-    notImage: true,
     badgeIcon: '',
     isFinished: false,
     isFailed: false,
     isUploading: false,
     isFocused: false,
+    isEditable: false,
     state: FileItemState.IDLE,
     '*uploadTrigger': null,
 
     onEdit: () => {
       this.set$({
         '*focusedEntry': this._entry,
-        '*currentActivity': ActivityBlock.activities.DETAILS,
       });
+      if (this.findBlockInCtx((b) => b.activityType === ActivityBlock.activities.DETAILS)) {
+        this.$['*currentActivity'] = ActivityBlock.activities.DETAILS;
+      } else {
+        this.$['*currentActivity'] = ActivityBlock.activities.CLOUD_IMG_EDIT;
+      }
     },
     onRemove: () => {
       let entryUuid = this._entry.getValue('uuid');
@@ -193,21 +198,12 @@ export class FileItem extends UploaderBlock {
 
     this._subEntry('validationErrorMsg', (validationErrorMsg) => {
       this._debouncedCalculateState();
-      if (!validationErrorMsg) {
-        return;
-      }
-      let caption =
-        this.l10n('validation-error') + ': ' + (entry.getValue('file')?.name || entry.getValue('externalUrl'));
-      this._showMessage('error', caption, validationErrorMsg);
+      this.$.errorText = validationErrorMsg;
     });
 
     this._subEntry('uploadError', (uploadError) => {
       this._debouncedCalculateState();
-      if (!uploadError) {
-        return;
-      }
-      let caption = this.l10n('upload-error') + ': ' + (entry.getValue('file')?.name || entry.getValue('externalUrl'));
-      this._showMessage('error', caption, uploadError.message);
+      this.$.errorText = uploadError?.message;
     });
 
     this._subEntry('isUploading', () => {
@@ -293,6 +289,7 @@ export class FileItem extends UploaderBlock {
         isUploading: state === FileItemState.UPLOADING,
         isFinished: state === FileItemState.FINISHED,
         progressVisible: state === FileItemState.UPLOADING,
+        isEditable: state === FileItemState.FINISHED && this._entry?.getValue('isImage'),
       });
 
       if (state === FileItemState.FAILED) {
@@ -396,9 +393,6 @@ export class FileItem extends UploaderBlock {
         },
         signal: abortController.signal,
       });
-      if (entry === this._entry) {
-        this._debouncedCalculateState();
-      }
       entry.setMultipleValues({
         fileInfo,
         isUploading: false,
@@ -409,10 +403,16 @@ export class FileItem extends UploaderBlock {
         uuid: fileInfo.uuid,
         cdnUrl: fileInfo.cdnUrl,
       });
+
+      if (entry === this._entry) {
+        this._debouncedCalculateState();
+      }
     } catch (error) {
-      entry.setValue('abortController', null);
-      entry.setValue('isUploading', false);
-      entry.setValue('uploadProgress', 0);
+      entry.setMultipleValues({
+        abortController: null,
+        isUploading: false,
+        uploadProgress: 0,
+      });
 
       if (entry === this._entry) {
         this._debouncedCalculateState();
@@ -434,14 +434,15 @@ FileItem.template = /* HTML */ `
     </div>
     <div class="file-name-wrapper">
       <span class="file-name" set="@title: itemName">{{itemName}}</span>
+      <span class="file-error" set="@hidden: !errorText">{{errorText}}</span>
     </div>
-    <button type="button" class="edit-btn" set="onclick: onEdit;">
+    <button type="button" class="edit-btn mini-btn" set="onclick: onEdit; @hidden: !isEditable">
       <lr-icon name="edit-file"></lr-icon>
     </button>
-    <button type="button" class="remove-btn" set="onclick: onRemove;">
+    <button type="button" class="remove-btn mini-btn" set="onclick: onRemove;">
       <lr-icon name="remove-file"></lr-icon>
     </button>
-    <button type="button" class="upload-btn" set="onclick: onUpload;">
+    <button type="button" class="upload-btn mini-btn" set="onclick: onUpload;">
       <lr-icon name="upload"></lr-icon>
     </button>
     <lr-progress-bar
diff --git a/blocks/FileItem/file-item.css b/blocks/FileItem/file-item.css
index ce94c3397..e8beba01f 100644
--- a/blocks/FileItem/file-item.css
+++ b/blocks/FileItem/file-item.css
@@ -1,19 +1,23 @@
+lr-file-item {
+  display: block;
+}
 lr-file-item > .inner {
   position: relative;
   display: grid;
   grid-template-columns: min-content auto min-content min-content;
+  gap: var(--gap-min);
+  align-items: center;
+  margin-bottom: var(--gap-small);
   padding: var(--gap-mid);
-  background-color: transparent;
-  border-bottom: var(--border-light);
+  overflow: hidden;
+  font-size: 0.95em;
+  background-color: var(--clr-background);
+  border-radius: var(--border-radius-element);
   transition: var(--transition-duration);
 }
 
 lr-file-item:last-of-type > .inner {
-  border-bottom: none;
-}
-
-lr-file-item:hover > .inner {
-  background-color: var(--clr-background);
+  margin-bottom: 0;
 }
 
 lr-file-item > .inner[focused] {
@@ -48,7 +52,8 @@ lr-file-item .file-name-wrapper {
   padding-right: var(--gap-mid);
   padding-left: var(--gap-mid);
   overflow: hidden;
-  color: var(--clr-txt);
+  color: var(--clr-txt-light);
+  transition: color var(--transition-duration);
 }
 
 lr-file-item .file-name {
@@ -58,40 +63,44 @@ lr-file-item .file-name {
   text-overflow: ellipsis;
 }
 
-lr-file-item button {
-  width: var(--ui-size);
-  height: var(--ui-size);
-  padding: 0;
+lr-file-item .file-error {
+  display: none;
+  color: var(--clr-error);
+  font-size: 0.85em;
+  line-height: 130%;
+}
+
+lr-file-item button.remove-btn,
+lr-file-item button.edit-btn {
   color: var(--clr-txt-lightest);
-  background-color: transparent;
-  cursor: pointer;
-  opacity: var(--opacity-normal);
-  transition: opacity var(--transition-duration);
 }
 
-lr-file-item .upload-btn {
+lr-file-item button.upload-btn {
   display: none;
 }
 
 lr-file-item button:hover {
-  opacity: var(--opacity-hover);
+  color: var(--clr-txt-light);
 }
 
 lr-file-item .badge {
   position: absolute;
-  top: calc(var(--ui-size) * -0.15);
-  right: calc(var(--ui-size) * -0.15);
-  display: none;
-  width: calc(var(--ui-size) * 0.42);
-  height: calc(var(--ui-size) * 0.42);
+  top: calc(var(--ui-size) * -0.13);
+  right: calc(var(--ui-size) * -0.13);
+  width: calc(var(--ui-size) * 0.44);
+  height: calc(var(--ui-size) * 0.44);
   color: var(--clr-background-light);
   background-color: var(--clr-txt);
   border-radius: 50%;
+  transform: scale(0.3);
+  opacity: 0;
+  transition: var(--transition-duration) ease;
 }
 
 lr-file-item > .inner[failed] .badge,
 lr-file-item > .inner[finished] .badge {
-  display: block;
+  transform: scale(1);
+  opacity: 1;
 }
 
 lr-file-item > .inner[finished] .badge {
@@ -102,6 +111,10 @@ lr-file-item > .inner[failed] .badge {
   background-color: var(--clr-error);
 }
 
+lr-file-item > .inner[failed] .file-error {
+  display: block;
+}
+
 lr-file-item .badge lr-icon,
 lr-file-item .badge lr-icon svg {
   width: 100%;
diff --git a/blocks/Icon/Icon.js b/blocks/Icon/Icon.js
index 4fc82f6e8..d164215e8 100644
--- a/blocks/Icon/Icon.js
+++ b/blocks/Icon/Icon.js
@@ -31,7 +31,7 @@ export class Icon extends Block {
         this.ref.svg.innerHTML = path;
       } else {
         this.removeAttribute('raw');
-        this.ref.svg.innerHTML = `<path d="${path}"></path>`;
+        this.ref.svg.innerHTML = `<path fill-rule="evenodd" d="${path}"></path>`;
       }
     });
 
diff --git a/blocks/Icon/icon.css b/blocks/Icon/icon.css
index 7ffe6fd1d..9d7a72567 100644
--- a/blocks/Icon/icon.css
+++ b/blocks/Icon/icon.css
@@ -7,8 +7,8 @@ lr-icon {
 }
 
 lr-icon svg {
-  width: 1.2em;
-  height: 1.2em;
+  width: calc(var(--ui-size) / 2);
+  height: calc(var(--ui-size) / 2);
 }
 
 lr-icon:not([raw]) path {
diff --git a/blocks/Img/ImgBase.js b/blocks/Img/ImgBase.js
index b91924fe2..eddf7689d 100644
--- a/blocks/Img/ImgBase.js
+++ b/blocks/Img/ImgBase.js
@@ -1,5 +1,5 @@
 import { BaseComponent } from '@symbiotejs/symbiote';
-import { applyTemplateData } from '../../utils/applyTemplateData.js';
+import { applyTemplateData } from '../../utils/template-utils.js';
 import { createCdnUrl, createCdnUrlModifiers, createOriginalUrl } from '../../utils/cdn-utils.js';
 import { PROPS_MAP } from './props-map.js';
 
diff --git a/blocks/LiveHtml/LiveHtml.js b/blocks/LiveHtml/LiveHtml.js
index b123550ad..a38fa9e3f 100644
--- a/blocks/LiveHtml/LiveHtml.js
+++ b/blocks/LiveHtml/LiveHtml.js
@@ -105,6 +105,15 @@ class Caret {
 const headerHtml = /* HTML */ `
   <script>
     window.__IS_REF__ = true;
+    window.addEventListener('DOMContentLoaded', () => {
+      const pageHtml = document.head.innerHTML + document.body.innerHTML;
+      //
+      if (['--darkmode:' + ' 1', '--darkmode:' + '1'].some((substr) => pageHtml.includes(substr))) {
+        document.body.style.background = 'white';
+        document.body.style.transition = 'background .3s ease-in-out';
+        document.body.style.background = 'black';
+      }
+    });
   </script>
 `;
 
diff --git a/blocks/Modal/Modal.js b/blocks/Modal/Modal.js
index 814228615..65c8bcc9a 100644
--- a/blocks/Modal/Modal.js
+++ b/blocks/Modal/Modal.js
@@ -1,29 +1,31 @@
 import { Block } from '../../abstract/Block.js';
 
 export class Modal extends Block {
-  _handleClose = () => {
-    if (this.$['*modalCloseCallback']) {
-      this.$['*modalCloseCallback']();
-      return;
-    }
-    this.set$({
-      '*modalActive': false,
-      '*currentActivity': '',
-    });
+  static StateConsumerScope = 'modal';
+
+  _handleBackdropClick = () => {
+    this._closeDialog();
+  };
+
+  _closeDialog = () => {
+    this.setForCtxTarget(Modal.StateConsumerScope, '*modalActive', false);
   };
 
-  _handleClick = (e) => {
+  _handleDialogClose = () => {
+    this._closeDialog();
+  };
+
+  _handleDialogClick = (e) => {
     if (e.target === this.ref.dialog) {
-      this._handleClose();
+      this._closeDialog();
     }
   };
+
   init$ = {
     ...this.ctxInit,
     '*modalActive': false,
-    '*modalHeaderHidden': false,
-    '*modalCloseCallback': null,
     isOpen: false,
-    closeClicked: this._handleClose,
+    closeClicked: this._handleDialogClose,
   };
 
   cssInit$ = {
@@ -31,25 +33,26 @@ export class Modal extends Block {
   };
 
   show() {
-    if (this.ref.dialog.showModal) {
-      this.ref.dialog.showModal();
-    } else {
-      this.setAttribute('dialog-fallback', '');
-    }
+    this.ref.dialog.showModal?.();
   }
 
   hide() {
-    if (this.ref.dialog.close) {
-      this.ref.dialog.close();
-    } else {
-      this.removeAttribute('dialog-fallback');
-    }
+    this.ref.dialog.close?.();
   }
 
   initCallback() {
     super.initCallback();
-    this.ref.dialog.addEventListener('close', this._handleClose);
-    this.ref.dialog.addEventListener('click', this._handleClick);
+    if (typeof HTMLDialogElement === 'function') {
+      this.ref.dialog.addEventListener('close', this._handleDialogClose);
+      this.ref.dialog.addEventListener('click', this._handleDialogClick);
+    } else {
+      this.setAttribute('dialog-fallback', '');
+      let backdrop = document.createElement('div');
+      backdrop.className = 'backdrop';
+      this.appendChild(backdrop);
+      backdrop.addEventListener('click', this._handleBackdropClick);
+    }
+
     this.sub('*modalActive', (modalActive) => {
       if (this.$.isOpen !== modalActive) {
         this.$.isOpen = modalActive;
@@ -83,21 +86,13 @@ export class Modal extends Block {
 
   destroyCallback() {
     super.destroyCallback();
-    this.ref.dialog.removeEventListener('close', this._handleClose);
-    this.ref.dialog.removeEventListener('click', this._handleClick);
+    this.ref.dialog.removeEventListener('close', this._handleDialogClose);
+    this.ref.dialog.removeEventListener('click', this._handleDialogClick);
   }
 }
 
 Modal.template = /* HTML */ `
-  <dialog ref="dialog" class="dialog">
-    <div class="heading" set="@hidden: *modalHeaderHidden">
-      <slot name="heading"></slot>
-      <button type="button" class="close-btn" set="onclick: closeClicked">
-        <lr-icon name="close"></lr-icon>
-      </button>
-    </div>
-    <div class="content">
-      <slot></slot>
-    </div>
+  <dialog ref="dialog">
+    <slot></slot>
   </dialog>
 `;
diff --git a/blocks/Modal/modal.css b/blocks/Modal/modal.css
index 1adda386a..3bdf54870 100644
--- a/blocks/Modal/modal.css
+++ b/blocks/Modal/modal.css
@@ -2,28 +2,62 @@ lr-modal {
   --modal-max-content-height: calc(var(--uploadcare-blocks-window-height, 100vh) - 4 * var(--gap-mid) - var(--ui-size));
   --modal-content-height-fill: var(--uploadcare-blocks-window-height, 100vh);
 }
+
 lr-modal[dialog-fallback] {
+  --lr-z-max: 2147483647;
+
   position: fixed;
-  top: 0px;
-  left: 0px;
+  z-index: var(--lr-z-max);
   display: flex;
   align-items: center;
   justify-content: center;
   width: 100vw;
   height: 100vh;
+  pointer-events: none;
+  inset: 0;
 }
 
-lr-modal > :is(.dialog::backdrop),
-lr-modal[dialog-fallback] {
+lr-modal[dialog-fallback] dialog[open] {
+  z-index: var(--lr-z-max);
+  pointer-events: auto;
+}
+
+lr-modal[dialog-fallback] dialog[open] + .backdrop {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  z-index: calc(var(--lr-z-max) - 1);
+  align-items: center;
+  justify-content: center;
+  width: 100vw;
+  height: 100vh;
   background-color: var(--clr-curtain);
+  pointer-events: auto;
 }
 
-lr-modal[strokes] > :is(.dialog::backdrop),
-lr-modal[dialog-fallback][strokes] {
+lr-modal[strokes][dialog-fallback] dialog[open] + .backdrop {
   background-image: var(--modal-backdrop-background-image);
 }
 
-lr-modal > .dialog:not([open]) {
+@supports selector(dialog::backdrop) {
+  lr-modal > dialog::backdrop {
+    /* backdrop don't inherit theme properties */
+    background-color: rgba(247 247 248 60%);
+  }
+  lr-modal[strokes] > dialog::backdrop {
+    /* TODO: it's not working, fix it */
+    background-image: var(--modal-backdrop-background-image);
+  }
+}
+
+lr-modal > dialog[open] {
+  transform: translateY(0px);
+  visibility: visible;
+  opacity: 1;
+}
+
+lr-modal > dialog:not([open]) {
+  transform: translateY(20px);
   visibility: hidden;
   opacity: 0;
 }
@@ -32,64 +66,38 @@ lr-modal button.close-btn {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  width: var(--ui-size);
-  height: var(--ui-size);
-  padding: 0;
-  color: var(--clr-txt-light);
-  background-color: transparent;
-  border: none;
-  cursor: pointer;
-  opacity: var(--opacity-normal);
-  transition: opacity var(--transition-duration) ease;
+  color: var(--clr-txt-mid);
 }
 
 lr-modal button.close-btn:hover {
-  opacity: var(--opacity-hover);
+  background-color: var(--clr-background);
 }
 
 lr-modal button.close-btn:active {
-  opacity: var(--opacity-active);
+  background-color: var(--clr-background-dark);
 }
 
-lr-modal > .dialog {
+lr-modal > dialog {
   display: flex;
   flex-direction: column;
-  width: 100%;
-  max-width: calc(var(--modal-max-w) - var(--gap-mid) * 2);
+
+  /* there was `fit-content` but it doesn't reduce width after activity change */
+  width: max-content;
+  max-width: min(calc(100% - var(--gap-mid) * 2), calc(var(--modal-max-w) - var(--gap-mid) * 2));
   min-height: var(--ui-size);
   max-height: calc(var(--modal-max-h) - var(--gap-mid) * 2);
   margin: auto;
   padding: 0;
   overflow: hidden;
-  background-color: var(--clr-background);
+  background-color: var(--clr-background-light);
   border: 0;
   border-radius: var(--border-radius-frame);
   box-shadow: var(--modal-shadow);
-  transition: transform 0.4s;
+  transition: transform calc(var(--transition-duration) * 2);
 }
 
-@media only screen and (max-width: 600px), only screen and (max-height: 800px) {
-  lr-modal > .dialog > .content {
+@media only screen and (max-width: 430px), only screen and (max-height: 600px) {
+  lr-modal > dialog > .content {
     height: var(--modal-max-content-height);
   }
 }
-
-lr-modal .dialog:not([open]) {
-  transform: translateY(20px);
-}
-
-lr-modal > .dialog > .content {
-  display: contents;
-}
-
-lr-modal .heading {
-  display: grid;
-  grid-template-columns: min-content 1fr min-content;
-  padding: var(--gap-mid);
-  color: var(--clr-txt-light);
-  font-weight: 500;
-  font-size: 1.1em;
-  line-height: var(--ui-size);
-  background-color: var(--clr-background-light);
-  border-bottom: var(--border-light);
-}
diff --git a/blocks/README.md b/blocks/README.md
index 0a28c1f4c..8a974a054 100644
--- a/blocks/README.md
+++ b/blocks/README.md
@@ -4,8 +4,6 @@ If our pre-built [uploader solution](/solutions/file-uploader/) isn't enough for
 
 ## Blocks list
 
-- [ActivityCaption](/blocks/ActivityCaption/) — shows heading text for the current activity
-- [ActivityIcon](/blocks/ActivityIcon/) — shows actual icon for the current activity
 - [CameraSource](/blocks/CameraSource/) — getting image for upload from the device camera
 - [CloudImageEditor](/blocks/CloudImageEditor/) — image editing via Uploadcare cloud functions
 - [Color](/blocks/Color/) — simple wrapper for the native color selector in browser
@@ -126,8 +124,6 @@ Block components can be used separately or in combinations. You can combine them
 <lr-simple-btn></lr-simple-btn>
 
 <lr-modal strokes>
-  <lr-activity-icon slot="heading"></lr-activity-icon>
-  <lr-activity-caption slot="heading"></lr-activity-caption>
   <lr-start-from>
     <lr-source-list wrap></lr-source-list>
     <lr-drop-area></lr-drop-area>
@@ -136,7 +132,6 @@ Block components can be used separately or in combinations. You can combine them
   <lr-camera-source></lr-camera-source>
   <lr-url-source></lr-url-source>
   <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
   <lr-confirmation-dialog></lr-confirmation-dialog>
   <lr-cloud-image-editor></lr-cloud-image-editor>
 </lr-modal>
diff --git a/blocks/ShadowWrapper/ShadowWrapper.js b/blocks/ShadowWrapper/ShadowWrapper.js
index db8f24dc1..1f64ad25c 100644
--- a/blocks/ShadowWrapper/ShadowWrapper.js
+++ b/blocks/ShadowWrapper/ShadowWrapper.js
@@ -9,6 +9,7 @@ export class ShadowWrapper extends Block {
 
   initCallback() {
     super.initCallback();
+    this.setAttribute('hidden', '');
     let href = this.getAttribute(CSS_ATTRIBUTE);
     if (href) {
       this.renderShadow = true;
@@ -25,6 +26,7 @@ export class ShadowWrapper extends Block {
         window.requestAnimationFrame(() => {
           this.render();
           window.setTimeout(() => {
+            this.removeAttribute('hidden');
             this.shadowReadyCallback();
           });
         });
@@ -32,6 +34,7 @@ export class ShadowWrapper extends Block {
       this.shadowRoot.appendChild(link);
     } else {
       this.render();
+      this.removeAttribute('hidden');
       this.shadowReadyCallback();
     }
   }
diff --git a/blocks/SimpleBtn/simple-btn.css b/blocks/SimpleBtn/simple-btn.css
index 02800a9d7..99607f6b6 100644
--- a/blocks/SimpleBtn/simple-btn.css
+++ b/blocks/SimpleBtn/simple-btn.css
@@ -10,6 +10,11 @@ lr-simple-btn button {
   box-shadow: var(--shadow-btn-secondary);
 }
 
+lr-simple-btn button lr-icon svg {
+  width: calc(var(--ui-size) * 0.4);
+  height: calc(var(--ui-size) * 0.4);
+}
+
 lr-simple-btn button:hover {
   background-color: var(--clr-btn-bgr-secondary-hover);
 }
diff --git a/blocks/SourceBtn/SourceBtn.js b/blocks/SourceBtn/SourceBtn.js
index 1cab3c615..135a419cd 100644
--- a/blocks/SourceBtn/SourceBtn.js
+++ b/blocks/SourceBtn/SourceBtn.js
@@ -15,7 +15,6 @@ export class SourceBtn extends UploaderBlock {
   initTypes() {
     this.registerType({
       type: UploaderBlock.sourceTypes.LOCAL,
-      // activity: '',
       onClick: () => {
         this.openSystemDialog();
       },
@@ -28,6 +27,14 @@ export class SourceBtn extends UploaderBlock {
     this.registerType({
       type: UploaderBlock.sourceTypes.CAMERA,
       activity: ActivityBlock.activities.CAMERA,
+      onClick: () => {
+        let el = document.createElement('input');
+        var supportsCapture = el.capture !== undefined;
+        if (supportsCapture) {
+          this.openSystemDialog({ captureCamera: true });
+        }
+        return !supportsCapture;
+      },
     });
     this.registerType({
       type: 'draw',
@@ -78,12 +85,12 @@ export class SourceBtn extends UploaderBlock {
     this.applyL10nKey('src-type', `${L10N_PREFIX}${textKey}`);
     this.$.iconName = icon;
     this.onclick = (e) => {
-      activity &&
+      const showActivity = onClick ? onClick(e) : !!activity;
+      showActivity &&
         this.set$({
           '*currentActivityParams': activityParams,
           '*currentActivity': activity,
         });
-      onClick && onClick(e);
     };
   }
 }
diff --git a/blocks/SourceBtn/source-btn.css b/blocks/SourceBtn/source-btn.css
index e467489a2..6a36de0dc 100644
--- a/blocks/SourceBtn/source-btn.css
+++ b/blocks/SourceBtn/source-btn.css
@@ -1,7 +1,8 @@
 lr-source-btn {
   display: flex;
   align-items: center;
-  padding-right: 1em;
+  margin-bottom: var(--gap-min);
+  padding: var(--gap-min) var(--gap-mid);
   color: var(--clr-txt-mid);
   border-radius: var(--border-radius-element);
   cursor: pointer;
@@ -11,13 +12,13 @@ lr-source-btn {
 }
 
 lr-source-btn:hover {
-  color: var(--clr-txt);
-  background-color: var(--clr-shade-lv1);
+  color: var(--clr-accent);
+  background-color: var(--clr-accent-lightest);
 }
 
 lr-source-btn:active {
-  color: var(--clr-txt);
-  background-color: var(--clr-shade-lv2);
+  color: var(--clr-accent);
+  background-color: var(--clr-accent-light);
 }
 
 lr-source-btn lr-icon {
@@ -25,6 +26,8 @@ lr-source-btn lr-icon {
   flex-grow: 1;
   justify-content: center;
   min-width: var(--ui-size);
+  margin-right: var(--gap-mid);
+  opacity: 0.8;
 }
 
 lr-source-btn[type='local'] > .txt::after {
diff --git a/blocks/StartFrom/StartFrom.js b/blocks/StartFrom/StartFrom.js
index 25cbea356..f7f6926da 100644
--- a/blocks/StartFrom/StartFrom.js
+++ b/blocks/StartFrom/StartFrom.js
@@ -1,21 +1,11 @@
 import { ActivityBlock } from '../../abstract/ActivityBlock.js';
 
 export class StartFrom extends ActivityBlock {
+  historyTracked = true;
   activityType = 'start-from';
 
   initCallback() {
     super.initCallback();
-    this.registerActivity(this.activityType, {
-      onActivate: () => {
-        this.add$(
-          {
-            '*activityCaption': this.l10n('select-file-source'),
-            '*activityIcon': 'default',
-          },
-          true
-        );
-      },
-      onClose: () => this.historyBack(),
-    });
+    this.registerActivity(this.activityType);
   }
 }
diff --git a/blocks/StartFrom/start-from.css b/blocks/StartFrom/start-from.css
index 483610036..9cafa3b6c 100644
--- a/blocks/StartFrom/start-from.css
+++ b/blocks/StartFrom/start-from.css
@@ -1,9 +1,14 @@
 lr-start-from {
   display: grid;
-  grid-template-columns: min-content auto;
-  gap: var(--gap-mid);
-
-  /* height: 100%; - this breaks inner modal layout height in Safari */
-  padding: var(--gap-mid);
+  grid-template-rows: 1fr max-content max-content;
+  gap: var(--gap-max);
+  width: 100%;
+  height: max-content;
+  padding: var(--gap-max);
   overflow-y: auto;
+  background-color: var(--clr-background-light);
+}
+
+lr-modal lr-start-from {
+  width: min(calc(var(--modal-normal-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
 }
diff --git a/blocks/UploadDetails/UploadDetails.js b/blocks/UploadDetails/UploadDetails.js
index f132b3ed7..6646ae185 100644
--- a/blocks/UploadDetails/UploadDetails.js
+++ b/blocks/UploadDetails/UploadDetails.js
@@ -53,15 +53,9 @@ export class UploadDetails extends UploaderBlock {
     this.render();
     this.$.fileSize = this.l10n('file-size-unknown');
     this.registerActivity(this.activityType, {
-      onActivate: () => {
-        this.set$({
-          '*activityCaption': this.l10n('caption-edit-file'),
-        });
-      },
       onDeactivate: () => {
         this.ref.filePreview.clear();
       },
-      onClose: () => this.historyBack(),
     });
     /** @type {import('../FilePreview/FilePreview.js').FilePreview} */
     this.sub('*focusedEntry', (/** @type {import('../../abstract/TypedData.js').TypedData} */ entry) => {
@@ -144,46 +138,57 @@ export class UploadDetails extends UploaderBlock {
 }
 
 UploadDetails.template = /* HTML */ `
-  <lr-tabs tab-list="tab-view, tab-details">
-    <div tab-ctx="tab-details" class="details">
-      <div class="info-block">
-        <div class="info-block_name" l10n="file-name"></div>
-        <input
-          name="name-input"
-          ref="file_name_input"
-          set="value: fileName; oninput: onNameInput; @disabled: !!cdnUrl"
-          type="text"
-        />
-      </div>
+  <lr-activity-header>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="back"></lr-icon>
+    </button>
+    <span l10n="caption-edit-file"></span>
+    <button type="button" class="mini-btn close-btn" set="onclick: *closeModal">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
+  <div class="content">
+    <lr-tabs tab-list="tab-view, tab-details">
+      <div tab-ctx="tab-details" class="details">
+        <div class="info-block">
+          <div class="info-block_name" l10n="file-name"></div>
+          <input
+            name="name-input"
+            ref="file_name_input"
+            set="value: fileName; oninput: onNameInput; @disabled: !!cdnUrl"
+            type="text"
+          />
+        </div>
 
-      <div class="info-block">
-        <div class="info-block_name" l10n="file-size"></div>
-        <div>{{fileSize}}</div>
-      </div>
+        <div class="info-block">
+          <div class="info-block_name" l10n="file-size"></div>
+          <div>{{fileSize}}</div>
+        </div>
 
-      <div class="info-block">
-        <div class="info-block_name" l10n="cdn-url"></div>
-        <a class="cdn-link" target="_blank" set="@href: cdnUrl; @disabled: !cdnUrl">{{cdnUrl}}</a>
-      </div>
+        <div class="info-block">
+          <div class="info-block_name" l10n="cdn-url"></div>
+          <a class="cdn-link" target="_blank" set="@href: cdnUrl; @disabled: !cdnUrl">{{cdnUrl}}</a>
+        </div>
 
-      <div>{{errorTxt}}</div>
-    </div>
+        <div>{{errorTxt}}</div>
+      </div>
 
-    <lr-file-preview tab-ctx="tab-view" set="@checkerboard: checkerboard;" ref="filePreview"> </lr-file-preview>
-  </lr-tabs>
+      <lr-file-preview tab-ctx="tab-view" set="@checkerboard: checkerboard;" ref="filePreview"> </lr-file-preview>
+    </lr-tabs>
 
-  <div class="toolbar" set="@edit-disabled: cloudEditBtnHidden">
-    <button type="button" class="edit-btn secondary-btn" set="onclick: onCloudEdit; @hidden: cloudEditBtnHidden;">
-      <lr-icon name="edit"></lr-icon>
-      <span l10n="edit-image"></span>
-    </button>
-    <button type="button" class="remove-btn secondary-btn" set="onclick: onRemove">
-      <lr-icon name="remove"></lr-icon>
-      <span l10n="remove-from-list"></span>
-    </button>
-    <div></div>
-    <button type="button" class="back-btn primary-btn" set="onclick: onBack">
-      <span l10n="ok"></span>
-    </button>
+    <div class="toolbar" set="@edit-disabled: cloudEditBtnHidden">
+      <button type="button" class="edit-btn secondary-btn" set="onclick: onCloudEdit; @hidden: cloudEditBtnHidden;">
+        <lr-icon name="edit"></lr-icon>
+        <span l10n="edit-image"></span>
+      </button>
+      <button type="button" class="remove-btn secondary-btn" set="onclick: onRemove">
+        <lr-icon name="remove"></lr-icon>
+        <span l10n="remove-from-list"></span>
+      </button>
+      <div></div>
+      <button type="button" class="back-btn primary-btn" set="onclick: onBack">
+        <span l10n="ok"></span>
+      </button>
+    </div>
   </div>
 `;
diff --git a/blocks/UploadDetails/upload-details.css b/blocks/UploadDetails/upload-details.css
index 6074c882e..17f419762 100644
--- a/blocks/UploadDetails/upload-details.css
+++ b/blocks/UploadDetails/upload-details.css
@@ -1,10 +1,18 @@
 lr-upload-details {
-  position: relative;
-  display: grid;
-  grid-template-rows: auto min-content;
+  display: flex;
+  flex-direction: column;
+  width: min(calc(var(--modal-max-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
   height: var(--modal-content-height-fill, 100%);
   max-height: var(--modal-max-content-height);
   overflow: hidden;
+  background-color: var(--clr-background-light);
+}
+
+lr-upload-details > .content {
+  position: relative;
+  display: grid;
+  flex: 1;
+  grid-template-rows: auto min-content;
 }
 
 lr-upload-details lr-tabs .tabs-context {
diff --git a/blocks/UploadList/UploadList.js b/blocks/UploadList/UploadList.js
index 755e77037..babc16122 100644
--- a/blocks/UploadList/UploadList.js
+++ b/blocks/UploadList/UploadList.js
@@ -1,11 +1,11 @@
 import { UploaderBlock } from '../../abstract/UploaderBlock.js';
 import { ActivityBlock } from '../../abstract/ActivityBlock.js';
-import { UiConfirmation } from '../ConfirmationDialog/ConfirmationDialog.js';
 import { UiMessage } from '../MessageBox/MessageBox.js';
 import { EVENT_TYPES, EventData, EventManager } from '../../abstract/EventManager.js';
 import { debounce } from '../utils/debounce.js';
 
 export class UploadList extends UploaderBlock {
+  historyTracked = true;
   activityType = ActivityBlock.activities.UPLOAD_LIST;
 
   init$ = {
@@ -13,9 +13,9 @@ export class UploadList extends UploaderBlock {
     doneBtnVisible: false,
     doneBtnEnabled: false,
     uploadBtnVisible: false,
-    uploadBtnEnabled: false,
     addMoreBtnVisible: false,
     addMoreBtnEnabled: false,
+    headerText: '',
 
     hasFiles: false,
     onAdd: () => {
@@ -29,25 +29,17 @@ export class UploadList extends UploaderBlock {
       this.cancelFlow();
     },
     onCancel: () => {
-      let cfn = new UiConfirmation();
-      cfn.confirmAction = () => {
-        let data = this.getOutputData((dataItem) => {
-          return !!dataItem.getValue('uuid');
-        });
-        EventManager.emit(
-          new EventData({
-            type: EVENT_TYPES.REMOVE,
-            ctx: this.ctxName,
-            data,
-          })
-        );
-        this.uploadCollection.clearAll();
-        this.historyBack();
-      };
-      cfn.denyAction = () => {
-        this.historyBack();
-      };
-      this.$['*confirmation'] = cfn;
+      let data = this.getOutputData((dataItem) => {
+        return !!dataItem.getValue('uuid');
+      });
+      EventManager.emit(
+        new EventData({
+          type: EVENT_TYPES.REMOVE,
+          ctx: this.ctxName,
+          data,
+        })
+      );
+      this.uploadCollection.clearAll();
     },
   };
 
@@ -139,32 +131,47 @@ export class UploadList extends UploaderBlock {
     let fitValidation = summary.failed === 0;
 
     let doneBtnEnabled = summary.total > 0 && fitCountRestrictions && fitValidation;
-    let uploadBtnEnabled =
-      summary.total - summary.succeed - summary.uploading - summary.failed > 0 && fitCountRestrictions;
+    let uploadBtnVisible =
+      !allDone && summary.total - summary.succeed - summary.uploading - summary.failed > 0 && fitCountRestrictions;
 
     this.set$({
       doneBtnVisible: allDone,
       doneBtnEnabled: doneBtnEnabled,
 
-      uploadBtnVisible: !allDone,
-      uploadBtnEnabled,
+      uploadBtnVisible,
 
       addMoreBtnEnabled: summary.total === 0 || (!tooMany && !exact),
       addMoreBtnVisible: !exact || this.getCssData('--cfg-multiple'),
+
+      headerText: this._getHeaderText(summary),
     });
   }
 
+  /** @private */
+  _getHeaderText(summary) {
+    const localizedText = (status) => {
+      const count = summary[status];
+      return this.l10n(`header-${status}`, {
+        count: count,
+      });
+    };
+    if (summary.uploading > 0) {
+      return localizedText('uploading');
+    }
+    if (summary.failed > 0) {
+      return localizedText('failed');
+    }
+    if (summary.succeed > 0) {
+      return localizedText('succeed');
+    }
+
+    return localizedText('selected');
+  }
+
   initCallback() {
     super.initCallback();
 
-    this.registerActivity(this.activityType, {
-      onActivate: () => {
-        this.set$({
-          '*activityCaption': this.l10n('selected'),
-          '*activityIcon': 'local',
-        });
-      },
-    });
+    this.registerActivity(this.activityType);
 
     this.sub('--cfg-multiple', this._debouncedHandleCollectionUpdate);
     this.sub('--cfg-multiple-min', this._debouncedHandleCollectionUpdate);
@@ -192,7 +199,7 @@ export class UploadList extends UploaderBlock {
       });
 
       if (list?.length === 0 && !this.getCssData('--cfg-show-empty-list')) {
-        this.cancelFlow();
+        this.historyBack();
       }
     });
   }
@@ -204,6 +211,13 @@ export class UploadList extends UploaderBlock {
 }
 
 UploadList.template = /* HTML */ `
+  <lr-activity-header>
+    <span class="header-text">{{headerText}}</span>
+    <button type="button" class="mini-btn close-btn" set="onclick: *closeModal">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
+
   <div class="no-files" set="@hidden: hasFiles">
     <slot name="empty"><span l10n="no-files"></span></slot>
   </div>
@@ -217,12 +231,13 @@ UploadList.template = /* HTML */ `
       type="button"
       class="add-more-btn secondary-btn"
       set="onclick: onAdd; @disabled: !addMoreBtnEnabled; @hidden: !addMoreBtnVisible"
-      l10n="add-more"
-    ></button>
+    >
+      <lr-icon name="add"></lr-icon><span l10n="add-more"></span>
+    </button>
     <button
       type="button"
       class="upload-btn primary-btn"
-      set="@hidden: !uploadBtnVisible; onclick: onUpload; @disabled: !uploadBtnEnabled"
+      set="@hidden: !uploadBtnVisible; onclick: onUpload;"
       l10n="upload"
     ></button>
     <button
@@ -232,4 +247,6 @@ UploadList.template = /* HTML */ `
       l10n="done"
     ></button>
   </div>
+
+  <lr-drop-area ghost></lr-drop-area>
 `;
diff --git a/blocks/UploadList/upload-list.css b/blocks/UploadList/upload-list.css
index 34832b1fd..778d2d036 100644
--- a/blocks/UploadList/upload-list.css
+++ b/blocks/UploadList/upload-list.css
@@ -1,31 +1,58 @@
 lr-upload-list {
   display: flex;
   flex-direction: column;
-  max-height: var(--modal-max-content-height);
+  width: 100%;
+  height: 100%;
   overflow: hidden;
   background-color: var(--clr-background-light);
   transition: opacity var(--transition-duration);
 }
 
+lr-modal lr-upload-list {
+  width: min(calc(var(--modal-normal-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
+  height: max-content;
+  max-height: var(--modal-max-content-height);
+}
+
 lr-upload-list .no-files {
-  height: var(--file-item-height);
+  height: var(--ui-size);
   padding: var(--gap-max);
 }
 
 lr-upload-list .files {
   display: block;
+  flex: 1;
+  min-height: var(--ui-size);
+  padding: 0 var(--gap-mid);
   overflow: auto;
 }
 
 lr-upload-list .toolbar {
   display: flex;
-  gap: var(--gap-mid);
+  gap: var(--gap-small);
   justify-content: space-between;
   padding: var(--gap-mid);
-  background-color: var(--clr-background);
-  border-top: var(--border-light);
+  background-color: var(--clr-background-light);
+}
+
+lr-upload-list .toolbar .add-more-btn {
+  padding-left: 0.2em;
 }
 
 lr-upload-list .toolbar-spacer {
   flex: 1;
 }
+
+lr-upload-list lr-drop-area {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: calc(100% - var(--gap-mid) * 2);
+  height: calc(100% - var(--gap-mid) * 2);
+  margin: var(--gap-mid);
+  border-radius: var(--border-radius-element);
+}
+
+lr-upload-list lr-activity-header > .header-text {
+  padding: 0 var(--gap-mid);
+}
diff --git a/blocks/UrlSource/UrlSource.js b/blocks/UrlSource/UrlSource.js
index 1c51a14b1..afad083ae 100644
--- a/blocks/UrlSource/UrlSource.js
+++ b/blocks/UrlSource/UrlSource.js
@@ -25,20 +25,29 @@ export class UrlSource extends UploaderBlock {
 
   initCallback() {
     super.initCallback();
-    this.registerActivity(this.activityType, {
-      onActivate: () => {
-        this.set$({
-          '*activityCaption': this.l10n('caption-from-url'),
-          '*activityIcon': 'url',
-        });
-      },
-      onClose: () => this.historyBack(),
-    });
+    this.registerActivity(this.activityType);
   }
 }
 
 UrlSource.template = /* HTML */ `
-  <input placeholder="https://..." .url-input type="text" ref="input" set="oninput: onInput" />
-  <button type="button" class="url-upload-btn primary-btn" set="onclick: onUpload; @disabled: importDisabled"></button>
-  <button type="button" class="cancel-btn secondary-btn" set="onclick: onCancel" l10n="cancel"></button>
+  <lr-activity-header>
+    <button type="button" class="mini-btn close-btn" set="onclick: *historyBack">
+      <lr-icon name="back"></lr-icon>
+    </button>
+    <div>
+      <lr-icon name="url"></lr-icon>
+      <span l10n="caption-from-url"></span>
+    </div>
+    <button type="button" class="mini-btn close-btn" set="onclick: *closeModal">
+      <lr-icon name="close"></lr-icon>
+    </button>
+  </lr-activity-header>
+  <div class="content">
+    <input placeholder="https://" class="url-input" type="text" ref="input" set="oninput: onInput" />
+    <button
+      type="button"
+      class="url-upload-btn primary-btn"
+      set="onclick: onUpload; @disabled: importDisabled"
+    ></button>
+  </div>
 `;
diff --git a/blocks/UrlSource/url-source.css b/blocks/UrlSource/url-source.css
index af562b6c8..4de8c8705 100644
--- a/blocks/UrlSource/url-source.css
+++ b/blocks/UrlSource/url-source.css
@@ -1,8 +1,18 @@
 lr-url-source {
+  display: block;
+  background-color: var(--clr-background-light);
+}
+
+lr-modal lr-url-source {
+  width: min(calc(var(--modal-normal-w) - var(--gap-mid) * 2), calc(100vw - var(--gap-mid) * 2));
+}
+
+lr-url-source > .content {
   display: grid;
-  grid-gap: var(--gap-mid);
-  grid-template-columns: 1fr min-content min-content;
+  grid-gap: var(--gap-small);
+  grid-template-columns: 1fr min-content;
   padding: var(--gap-mid);
+  padding-top: 0;
 }
 
 lr-url-source .url-input {
diff --git a/blocks/Video/video.css b/blocks/Video/video.css
index 0a91fc827..85499ee3c 100644
--- a/blocks/Video/video.css
+++ b/blocks/Video/video.css
@@ -1,4 +1,4 @@
-@import '../Range/range.css';
+@import url('../Range/range.css');
 
 lr-video {
   --color-accent: rgb(196, 243, 255);
diff --git a/blocks/svg-backgrounds/svg-backgrounds.js b/blocks/svg-backgrounds/svg-backgrounds.js
index f0e28ed2c..042fc17c9 100644
--- a/blocks/svg-backgrounds/svg-backgrounds.js
+++ b/blocks/svg-backgrounds/svg-backgrounds.js
@@ -36,42 +36,10 @@ export function strokesCssBg(color = 'rgba(0, 0, 0, .1)') {
  * @param {String} [color]
  * @returns {String}
  */
-export function fileCssBg(color = 'hsl(0, 0%, 100%)', width = 36, height = 36) {
+export function fileCssBg(color = 'hsl(209, 21%, 65%)', width = 32, height = 32) {
   return createSvgBlobUrl(/*svg*/ `
-  <svg width="${width}" height="${height}" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M10.5 28L25.5 27.9997V29.0024L10.5 29.0027V28Z" fill="black" fill-opacity="0.06"/>
-    <path d="M9.5 7.50029L21.25 7.5L26.5 12.75V28.4998L9.5 28.5001V7.50029Z" fill="black" fill-opacity="0.06"/>
-    <path d="M10 8.00298L21 8.00269L26 12.9998V28.0025L10 28.0027V8.00298Z" fill="${color}"/>
-    <path d="M10 8.00298L21 8.00269L26 12.9998V28.0025L10 28.0027V8.00298Z" fill="url(#paint0_linear_2735_2136)"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M20.793 8.50269L10.5 8.50296V27.5027L25.5 27.5025V13.2069L20.793 8.50269ZM21 8.00269L10 8.00298V28.0027L26 28.0025V12.9998L21 8.00269Z" fill="url(#paint1_radial_2735_2136)"/>
-    <path d="M21 8L26 13V14H20V8H21Z" fill="black" fill-opacity="0.03"/>
-    <path d="M21 8L26 13V13.5H20.5V8H21Z" fill="black" fill-opacity="0.08"/>
-    <path d="M21 8L26 13H21V8Z" fill="${color}"/>
-    <path d="M21 8L26 13H21V8Z" fill="url(#paint2_linear_2735_2136)"/>
-    <path d="M21 8L26 13H21V8Z" fill="url(#paint3_linear_2735_2136)"/>
-    <path d="M21.5 8.5L21 8V13H26L25.5 12.5H21.5V8.5Z" fill="url(#paint4_linear_2735_2136)"/>
-    <defs>
-      <linearGradient id="paint0_linear_2735_2136" x1="18" y1="8" x2="18" y2="28.0027" gradientUnits="userSpaceOnUse">
-        <stop stop-color="white" stop-opacity="0.06"/>
-        <stop offset="1" stop-color="white" stop-opacity="0"/>
-      </linearGradient>
-      <radialGradient id="paint1_radial_2735_2136" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 11) rotate(53.7462) scale(18.6011 18.0323)">
-        <stop stop-color="white" stop-opacity="0.12"/>
-        <stop offset="1" stop-color="white" stop-opacity="0"/>
-      </radialGradient>
-      <linearGradient id="paint2_linear_2735_2136" x1="21" y1="13" x2="23.5" y2="10.5" gradientUnits="userSpaceOnUse">
-        <stop offset="0.40625" stop-opacity="0"/>
-        <stop offset="1" stop-opacity="0.04"/>
-      </linearGradient>
-      <linearGradient id="paint3_linear_2735_2136" x1="21" y1="13" x2="23.5" y2="10.5" gradientUnits="userSpaceOnUse">
-        <stop stop-color="white" stop-opacity="0.16"/>
-        <stop offset="1" stop-color="white" stop-opacity="0.06"/>
-      </linearGradient>
-      <linearGradient id="paint4_linear_2735_2136" x1="21" y1="13" x2="23.5" y2="10.5" gradientUnits="userSpaceOnUse">
-        <stop stop-color="white" stop-opacity="0.15"/>
-        <stop offset="1" stop-color="white" stop-opacity="0"/>
-      </linearGradient>
-    </defs>
-</svg>
+  <svg width="${width}" height="${height}" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" fill="${color}" d="M9.68848 8.70068C9.68848 8.42454 9.91233 8.20068 10.1885 8.20068H15.0885C15.2211 8.20068 15.3483 8.25336 15.442 8.34713L20.342 13.2471C20.4358 13.3409 20.4885 13.4681 20.4885 13.6007V21.3007C20.4885 21.5768 20.2646 21.8007 19.9885 21.8007H10.1885C9.91233 21.8007 9.68848 21.5768 9.68848 21.3007V8.70068ZM10.6885 9.20068V20.8007H19.4885V14.1007L15.0885 14.1007C14.8123 14.1007 14.5885 13.8768 14.5885 13.6007L14.5885 9.20068H10.6885ZM15.5885 9.90779L18.7814 13.1007L15.5885 13.1007L15.5885 9.90779Z"/>
+  </svg>
   `);
 }
diff --git a/blocks/test/custom-source-btn/index.htm b/blocks/test/custom-source-btn/index.htm
index dca8929a3..d5330b8ba 100644
--- a/blocks/test/custom-source-btn/index.htm
+++ b/blocks/test/custom-source-btn/index.htm
@@ -18,7 +18,6 @@
   <lr-camera-source></lr-camera-source>
   <lr-url-source></lr-url-source>
   <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
   <lr-confirmation-dialog></lr-confirmation-dialog>
   <lr-cloud-image-editor></lr-cloud-image-editor>
 </lr-modal>
diff --git a/blocks/test/inline-mode.htm b/blocks/test/inline-mode.htm
index 91c310acb..841083f37 100644
--- a/blocks/test/inline-mode.htm
+++ b/blocks/test/inline-mode.htm
@@ -6,6 +6,7 @@
   .lr-wgt-common {
     --ctx-name: 'my-uploader';
     --cfg-pubkey: 'demopublickey';
+    --darkmode: 0;
   }
 </style>
 <script src="./blocks/index.js" type="module"></script>
@@ -37,10 +38,6 @@
 </style>
 
 <div class="uploader lr-wgt-common">
-  <div class="header">
-    <lr-activity-icon></lr-activity-icon>
-    <lr-activity-caption></lr-activity-caption>
-  </div>
   <lr-inline class="lr-wgt-common">
     <lr-source-select>
       <lr-source-list wrap></lr-source-list>
@@ -50,7 +47,6 @@
     <lr-camera-source></lr-camera-source>
     <lr-url-source></lr-url-source>
     <lr-external-source></lr-external-source>
-    <lr-upload-details></lr-upload-details>
     <lr-confirmation-dialog></lr-confirmation-dialog>
     <lr-cloud-image-editor></lr-cloud-image-editor>
   </lr-inline>
diff --git a/blocks/test/raw-build.htm b/blocks/test/raw-build.htm
index 7965ee816..fb0fc2703 100644
--- a/blocks/test/raw-build.htm
+++ b/blocks/test/raw-build.htm
@@ -2,37 +2,13 @@
 
 <style>
   @import url(./blocks/themes/lr-basic/index.css);
-  .lr-wgt-common {
+  .config {
     --ctx-name: 'my-uploader';
     --cfg-pubkey: 'demopublickey';
+    --darkmode: 0;
   }
 </style>
 
-<script src="./blocks/build/blocks.js" type="module"></script>
+<script src="./web/blocks-browser.min.js" type="module"></script>
 
-<lr-simple-btn class="lr-wgt-common"></lr-simple-btn>
-
-<lr-modal strokes class="lr-wgt-common">
-  <lr-activity-icon slot="heading"></lr-activity-icon>
-  <lr-activity-caption slot="heading"></lr-activity-caption>
-  <lr-start-from>
-    <lr-source-list wrap></lr-source-list>
-    <lr-drop-area></lr-drop-area>
-  </lr-start-from>
-  <lr-upload-list></lr-upload-list>
-  <lr-camera-source></lr-camera-source>
-  <lr-url-source></lr-url-source>
-  <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
-  <lr-confirmation-dialog></lr-confirmation-dialog>
-  <lr-cloud-image-editor></lr-cloud-image-editor>
-</lr-modal>
-
-<lr-message-box class="lr-wgt-common"></lr-message-box>
-<lr-progress-bar-common class="lr-wgt-common"></lr-progress-bar-common>
-
-<lr-data-output
-  fire-event
-  item-template="<img height='200' src='https://ucarecdn.com/{{uuid}}/-/preview/s' />"
-  class="lr-wgt-common"
-></lr-data-output>
+<lr-file-uploader-regular class="config" css-src="./blocks/themes/lr-basic/index.css"></lr-file-uploader-regular>
diff --git a/blocks/test/raw-minimal.htm b/blocks/test/raw-minimal.htm
new file mode 100644
index 000000000..c7b0889dc
--- /dev/null
+++ b/blocks/test/raw-minimal.htm
@@ -0,0 +1,34 @@
+<base href="../../" />
+
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    .config {
+      --ctx-name: 'my-uploader';
+      --cfg-pubkey: 'demopublickey';
+      --cfg-multiple: 0;
+      --cfg-multiple-min: 0;
+      --cfg-multiple-max: 3;
+      --darkmode: 0;
+    }
+  </style>
+  <script
+    async=""
+    src="https://cdn.skypack.dev/-/es-module-shims@v1.5.8-O0uWfhbenfjMbv6D3d8E/dist=es2020,mode=raw,min/dist/es-module-shims.js"
+  ></script>
+  <script type="importmap">
+    {
+      "imports": {
+        "@symbiotejs/symbiote": "./node_modules/@symbiotejs/symbiote/build/symbiote.js",
+        "@uploadcare/upload-client": "./node_modules/@uploadcare/upload-client/dist/index.browser.js"
+      }
+    }
+  </script>
+  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import * as LR from './index.js';
+    LR.registerBlocks(LR);
+  </script>
+</head>
+
+<lr-file-uploader-minimal class="config" css-src="./solutions/file-uploader/minimal/index.css"></lr-file-uploader-minimal>
diff --git a/blocks/test/raw-regular.htm b/blocks/test/raw-regular.htm
new file mode 100644
index 000000000..d03758395
--- /dev/null
+++ b/blocks/test/raw-regular.htm
@@ -0,0 +1,33 @@
+<base href="../../" />
+
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    .config {
+      --ctx-name: 'my-uploader';
+      --cfg-pubkey: 'demopublickey';
+      --cfg-multiple-min: 0;
+      --cfg-multiple-max: 3;
+      --darkmode: 0;
+    }
+  </style>
+  <script
+    async=""
+    src="https://cdn.skypack.dev/-/es-module-shims@v1.5.8-O0uWfhbenfjMbv6D3d8E/dist=es2020,mode=raw,min/dist/es-module-shims.js"
+  ></script>
+  <script type="importmap">
+    {
+      "imports": {
+        "@symbiotejs/symbiote": "./node_modules/@symbiotejs/symbiote/build/symbiote.js",
+        "@uploadcare/upload-client": "./node_modules/@uploadcare/upload-client/dist/index.browser.js"
+      }
+    }
+  </script>
+  <script src="./index.js" type="module"></script>
+  <script type="module">
+    import * as LR from './index.js';
+    LR.registerBlocks(LR);
+  </script>
+</head>
+
+<lr-file-uploader-regular class="config" css-src="./blocks/themes/lr-basic/index.css"></lr-file-uploader-regular>
diff --git a/blocks/test/raw.htm b/blocks/test/raw.htm
deleted file mode 100644
index 878b79269..000000000
--- a/blocks/test/raw.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<base href="../../" />
-
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<style>
-  @import url(./blocks/themes/lr-basic/index.css);
-
-  .lr-wgt-common {
-    --ctx-name: 'my-uploader';
-    --cfg-pubkey: 'demopublickey';
-    --cfg-multiple-min: 0;
-    --cfg-multiple-max: 3;
-  }
-
-</style>
-<script async=""
-  src="https://cdn.skypack.dev/-/es-module-shims@v1.5.8-O0uWfhbenfjMbv6D3d8E/dist=es2020,mode=raw,min/dist/es-module-shims.js"></script>
-<script type="importmap">
-          {
-    "imports": {
-      "@symbiotejs/symbiote": "https://cdn.skypack.dev/pin/@symbiotejs/symbiote@v1.11.1-nb4uuMnoyFEHQ78uWIov/mode=imports,min/optimized/@symbiotejs/symbiote.js",
-      "@uploadcare/upload-client": "https://cdn.skypack.dev/-/@uploadcare/upload-client@v5.1.0-ikuQtxJ0wUDrZwcMWBtL/dist=es2020,mode=raw,min/dist/index.browser.js"
-    }
-  }
-</script>
-<script src="./index.js" type="module"></script>
-<script type="module">
-  import * as LR from './index.js';
-  LR.registerBlocks(LR);
-</script>
-
-<lr-simple-btn class="lr-wgt-common"></lr-simple-btn>
-
-<lr-modal strokes class="lr-wgt-common">
-  <lr-activity-icon slot="heading"></lr-activity-icon>
-  <lr-activity-caption slot="heading"></lr-activity-caption>
-  <lr-start-from>
-    <lr-source-list wrap></lr-source-list>
-    <lr-drop-area></lr-drop-area>
-  </lr-start-from>
-  <lr-upload-list></lr-upload-list>
-  <lr-camera-source></lr-camera-source>
-  <lr-url-source></lr-url-source>
-  <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
-  <lr-confirmation-dialog></lr-confirmation-dialog>
-  <lr-cloud-image-editor></lr-cloud-image-editor>
-</lr-modal>
-
-<lr-message-box class="lr-wgt-common"></lr-message-box>
-<lr-progress-bar-common class="lr-wgt-common"></lr-progress-bar-common>
-
-<form action="/post" method="post">
-  <lr-data-output use-input class="lr-wgt-common"></lr-data-output>
-  <button>SUBMIT</button>
-</form>
diff --git a/blocks/test/split-mode.htm b/blocks/test/split-mode.htm
index 154f2af5a..381eceed2 100644
--- a/blocks/test/split-mode.htm
+++ b/blocks/test/split-mode.htm
@@ -6,6 +6,7 @@
   .lr-wgt-common {
     --ctx-name: 'my-uploader';
     --cfg-pubkey: 'demopublickey';
+    --darkmode: 0;
   }
 </style>
 <script src="./blocks/index.js" type="module"></script>
@@ -47,10 +48,6 @@
 </style>
 
 <div class="uploader lr-wgt-common">
-  <div class="header">
-    <lr-activity-icon></lr-activity-icon>
-    <lr-activity-caption></lr-activity-caption>
-  </div>
   <!-- want to show confirmation in the modal -->
   <!-- <lr-modal class="lr-wgt-common">
     <lr-confirmation-dialog></lr-confirmation-dialog>
@@ -64,7 +61,6 @@
     <lr-camera-source></lr-camera-source>
     <lr-url-source></lr-url-source>
     <lr-external-source></lr-external-source>
-    <lr-upload-details></lr-upload-details>
     <lr-cloud-image-editor></lr-cloud-image-editor>
     <lr-confirmation-dialog></lr-confirmation-dialog>
   </div>
diff --git a/blocks/test/wrapped.htm b/blocks/test/wrapped.htm
index 6045139bd..2de5b5366 100644
--- a/blocks/test/wrapped.htm
+++ b/blocks/test/wrapped.htm
@@ -8,8 +8,6 @@
 <lr-simple-btn></lr-simple-btn>
 
 <lr-modal strokes>
-  <lr-activity-icon slot="heading"></lr-activity-icon>
-  <lr-activity-caption slot="heading"></lr-activity-caption>
   <lr-start-from>
     <lr-source-list wrap></lr-source-list>
     <lr-drop-area></lr-drop-area>
@@ -18,7 +16,6 @@
   <lr-camera-source></lr-camera-source>
   <lr-url-source></lr-url-source>
   <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
   <lr-confirmation-dialog></lr-confirmation-dialog>
   <lr-cloud-image-editor></lr-cloud-image-editor>
 </lr-modal>
diff --git a/blocks/themes/lr-basic/common.css b/blocks/themes/lr-basic/common.css
index 46fb78ac2..f6ac2db61 100644
--- a/blocks/themes/lr-basic/common.css
+++ b/blocks/themes/lr-basic/common.css
@@ -3,7 +3,7 @@
   color: var(--clr-txt);
 
   /* font-size and family for testing purposes, to be removed */
-  font-size: 15px;
+  font-size: 14px;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
     'Helvetica Neue', sans-serif;
 }
@@ -23,6 +23,11 @@
   display: none;
 }
 
+:where(.lr-wgt-theme, .lr-wgt-common) dialog:not([open]) [activity],
+:host dialog:not([open]) [activity] {
+  display: none;
+}
+
 :where(.lr-wgt-theme, .lr-wgt-common) button,
 :host button {
   display: flex;
@@ -84,6 +89,27 @@
   background-color: var(--clr-btn-bgr-secondary-active);
 }
 
+:where(.lr-wgt-theme, .lr-wgt-common) button.mini-btn,
+:host button.mini-btn {
+  width: var(--ui-size);
+  height: var(--ui-size);
+  padding: 0;
+  background-color: transparent;
+  border: none;
+  cursor: pointer;
+  transition: var(--transition-duration) ease;
+}
+
+:where(.lr-wgt-theme, .lr-wgt-common) button.mini-btn:hover,
+:host button.mini-btn:hover {
+  background-color: var(--clr-shade-lv1);
+}
+
+:where(.lr-wgt-theme, .lr-wgt-common) button.mini-btn:active,
+:host button.mini-btn:active {
+  background-color: var(--clr-shade-lv2);
+}
+
 :where(.lr-wgt-theme, .lr-wgt-common)
   :is(button[disabled], button.primary-btn[disabled], button.secondary-btn[disabled]),
 :host :is(button[disabled], button.primary-btn[disabled], button.secondary-btn[disabled]) {
@@ -112,15 +138,19 @@
   padding-right: 0.6em;
   padding-left: 0.6em;
   color: var(--clr-txt);
-  font-size: var(--font-size-ui);
+  font-size: 1em;
   font-family: inherit;
   background-color: var(--clr-background-light);
-  border: var(--border-mid);
+  border: var(--border-light);
   border-radius: var(--border-radius-element);
-  box-shadow: var(--inset-shadow);
   transition: var(--transition-duration);
 }
 
+:where(.lr-wgt-theme, .lr-wgt-common) input[type='text'],
+:host input[type='text']::placeholder {
+  color: var(--clr-txt-lightest);
+}
+
 :where(.lr-wgt-theme, .lr-wgt-common) input[type='text']:hover,
 :host input[type='text']:hover {
   border-color: var(--clr-accent-light);
diff --git a/blocks/themes/lr-basic/config.css b/blocks/themes/lr-basic/config.css
index 1533496cf..780cb1b2f 100644
--- a/blocks/themes/lr-basic/config.css
+++ b/blocks/themes/lr-basic/config.css
@@ -5,12 +5,12 @@
   --cfg-multiple-min: 0;
   --cfg-multiple-max: 0;
 
-  --cfg-confirm-upload: 1;
+  --cfg-confirm-upload: 0;
   --cfg-img-only: 0;
   --cfg-accept: '';
   --cfg-store: unset;
   --cfg-camera-mirror: 1;
-  --cfg-source-list: 'local, url, camera, dropbox, gdrive, facebook';
+  --cfg-source-list: 'local, url, camera, dropbox, gdrive';
   --cfg-max-local-file-size-bytes: 0;
   --cfg-thumb-size: 76;
   --cfg-show-empty-list: 0;
diff --git a/blocks/themes/lr-basic/icons.css b/blocks/themes/lr-basic/icons.css
index 08674a8d4..50bd82c0f 100644
--- a/blocks/themes/lr-basic/icons.css
+++ b/blocks/themes/lr-basic/icons.css
@@ -1,30 +1,36 @@
 :where(.lr-wgt-icons, .lr-wgt-common),
 :host {
-  --icon-default: 'm13 21.9506c5.0533-.5017 9-4.7653 9-9.9506 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.1853 3.94668 9.4489 9 9.9506v-11.5364l-2.79289 2.7929c-.39053.3906-1.02369.3906-1.41422 0-.39052-.3905-.39052-1.0237 0-1.4142l5.20711-5.20708 5.2071 5.20708c.3905.3905.3905 1.0237 0 1.4142-.3905.3906-1.0237.3906-1.4142 0l-2.7929-2.7929z';
-  --icon-file: 'm13.3333 5.57143 4 3.85714h-4zm-6.66663-2.57143c-1.47266 0-2.66667 1.15121-2.66667 2.57143v12.85717c0 1.4202 1.19401 2.5714 2.66667 2.5714h10.66663c1.4727 0 2.6667-1.1512 2.6667-2.5714v-9.00003l-6.6667-6.42857z';
-  --icon-close: 'M17.6569 7.75734c.3905-.39053.3905-1.02369 0-1.41421-.3906-.39053-1.0237-.39053-1.4143 0L12 10.5858 7.75736 6.34313c-.39053-.39053-1.02369-.39053-1.41421 0-.39053.39052-.39053 1.02368 0 1.41421L10.5858 12l-4.24266 4.2426c-.39052.3905-.39052 1.0237 0 1.4142.39053.3906 1.02369.3906 1.41422 0L12 13.4142l4.2426 4.2426c.3906.3906 1.0237.3906 1.4143 0 .3905-.3905.3905-1.0237 0-1.4142L13.4142 12l4.2427-4.24266Z';
+  --icon-default: 'm11.5014.392135c.2844-.253315.7134-.253315.9978 0l6.7037 5.971925c.3093.27552.3366.74961.0611 1.05889-.2755.30929-.7496.33666-1.0589.06113l-5.4553-4.85982v13.43864c0 .4142-.3358.75-.75.75s-.75-.3358-.75-.75v-13.43771l-5.45427 4.85889c-.30929.27553-.78337.24816-1.0589-.06113-.27553-.30928-.24816-.78337.06113-1.05889zm-10.644466 16.336765c.414216 0 .749996.3358.749996.75v4.9139h20.78567v-4.9139c0-.4142.3358-.75.75-.75.4143 0 .75.3358.75.75v5.6639c0 .4143-.3357.75-.75.75h-22.285666c-.414214 0-.75-.3357-.75-.75v-5.6639c0-.4142.335786-.75.75-.75z';
+  --icon-file: 'm2.89453 1.2012c0-.473389.38376-.857145.85714-.857145h8.40003c.2273 0 .4453.090306.6061.251051l8.4 8.400004c.1607.16074.251.37876.251.60609v13.2c0 .4734-.3837.8571-.8571.8571h-16.80003c-.47338 0-.85714-.3837-.85714-.8571zm1.71429.85714v19.88576h15.08568v-11.4858h-7.5428c-.4734 0-.8572-.3837-.8572-.8571v-7.54286zm8.39998 1.21218 5.4736 5.47353-5.4736.00001z';
+  --icon-close: 'm4.60395 4.60395c.29289-.2929.76776-.2929 1.06066 0l6.33539 6.33535 6.3354-6.33535c.2929-.2929.7677-.2929 1.0606 0 .2929.29289.2929.76776 0 1.06066l-6.3353 6.33539 6.3353 6.3354c.2929.2929.2929.7677 0 1.0606s-.7677.2929-1.0606 0l-6.3354-6.3353-6.33539 6.3353c-.2929.2929-.76777.2929-1.06066 0-.2929-.2929-.2929-.7677 0-1.0606l6.33535-6.3354-6.33535-6.33539c-.2929-.2929-.2929-.76777 0-1.06066z';
+  --icon-collapse: 'M3.11572 12C3.11572 11.5858 3.45151 11.25 3.86572 11.25H20.1343C20.5485 11.25 20.8843 11.5858 20.8843 12C20.8843 12.4142 20.5485 12.75 20.1343 12.75H3.86572C3.45151 12.75 3.11572 12.4142 3.11572 12Z';
+  --icon-expand: 'M12.0001 8.33716L3.53033 16.8068C3.23743 17.0997 2.76256 17.0997 2.46967 16.8068C2.17678 16.5139 2.17678 16.0391 2.46967 15.7462L11.0753 7.14067C11.1943 7.01825 11.3365 6.92067 11.4936 6.8536C11.6537 6.78524 11.826 6.75 12.0001 6.75C12.1742 6.75 12.3465 6.78524 12.5066 6.8536C12.6637 6.92067 12.8059 7.01826 12.925 7.14068L21.5304 15.7462C21.8233 16.0391 21.8233 16.5139 21.5304 16.8068C21.2375 17.0997 20.7627 17.0997 20.4698 16.8068L12.0001 8.33716Z';
   --icon-info: 'M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z';
   --icon-error: 'M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z';
-  --icon-upload: 'm13 21.9506c5.0533-.5017 9-4.7653 9-9.9506 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.1853 3.94668 9.4489 9 9.9506v-11.5364l-2.79289 2.7929c-.39053.3906-1.02369.3906-1.41422 0-.39052-.3905-.39052-1.0237 0-1.4142l5.20711-5.20708 5.2071 5.20708c.3905.3905.3905 1.0237 0 1.4142-.3905.3906-1.0237.3906-1.4142 0l-2.7929-2.7929z';
-  --icon-local: 'M2 10.0928C2 7.7191 2 6.53224 2.55634 5.66549C2.84743 5.21197 3.23952 4.8286 3.70334 4.54398C4.58979 4 5.80363 4 8.23131 4C9.21033 4 9.69984 4 10.1402 4.15191C10.374 4.23254 10.5954 4.34395 10.7983 4.48306C11.1807 4.74515 11.4652 5.13463 12.0343 5.91358L12.9091 7.11111H15.4091C18.1796 7.11111 19.5649 7.11111 20.5298 7.81082C20.8171 8.01913 21.0713 8.26774 21.2844 8.54862C22 9.49207 22 10.8466 22 13.5556C22 16.2645 22 17.619 21.2844 18.5625C21.0713 18.8434 20.8171 19.092 20.5298 19.3003C19.5649 20 18.1797 20 15.4091 20H9.27273C5.84433 20 4.13013 20 3.06507 18.9586C2 17.9172 2 16.2411 2 12.8889V10.0928Z';
-  --icon-url: 'm15.069028 1.7437159c-1.839249 0-3.678387.7023305-5.0816705 2.105638l-1.0683184 1.0683191c-.5721674.572155-.5721674 1.5000856 0 2.0722529.5721673.5721673 1.4977379.5721673 2.0698679 0l1.070704-1.0683191c1.662305-1.6622801 4.356529-1.6622801 6.018834 0 1.662304 1.6622801 1.662304 4.3566512 0 6.0188332l-1.068319 1.070704c-.572131.572131-.572131 1.497737 0 2.069869.572131.57213 1.500121.57213 2.072253 0l1.068318-1.06832c2.806688-2.806565 2.806688-7.3567246 0-10.1633391-1.403282-1.4033075-3.24242-2.105638-5.081669-2.105638zm-.138309 5.8614473c-.37495 0-.751254.1431516-1.037319.4292353l-5.8590627 5.8590625c-.5721673.572253-.5721673 1.500123 0 2.072253.5721673.572131 1.5001344.572131 2.0722527 0l5.859063-5.859062c.572252-.5721679.572252-1.5000862 0-2.0722535-.286066-.2860837-.659984-.4292353-1.034934-.4292353zm-8.9757886.8847018c-.3749556 0-.7512351.1431516-1.0373187.4292353l-1.0683191 1.0683185c-2.8066147 2.8066882-2.8066148 7.3567742 0 10.1633392 2.8066147 2.806689 7.3567734 2.806689 10.1633404 0l1.068319-1.068319c.572251-.57213.572253-1.500121 0-2.072251-.572132-.572254-1.497739-.572254-2.069869 0l-1.070704 1.068318c-1.662305 1.662183-4.3565534 1.662183-6.0188335 0-1.6622801-1.662304-1.6622801-4.356529 0-6.018833l1.0683191-1.070704c.5721673-.572131.5721673-1.4977014 0-2.0698687-.2860836-.2860837-.6599786-.4292353-1.0349342-.4292353z';
-  --icon-camera: 'm11 3c-.9428 0-1.4141313.0000788-1.7070312.2929688-.2714001.2714099-.2915088.6968024-.2929688 1.5078124-3.45256.0000701-5.18871.0076507-6.34375.9941407-.16547.14133-.3196175.2954675-.4609375.4609375-.99524 1.16527-.9960937 2.9216069-.9960937 6.4355466 0 3.5139.0008537 5.2722.9960937 6.4375.14132.1654.2954675.319538.4609375.460938 1.16527.9952 2.9216169.99414 6.4355469.99414h5.8164061c3.5139 0 5.270247.00106 6.435547-.99414.1654-.1414.319637-.295538.460938-.460938.9952-1.1653.996093-2.9236.996093-6.4375 0-3.5139397-.000893-5.2702766-.996093-6.4355466-.1413-.16547-.295538-.3196075-.460938-.4609375-1.1551-.98649-2.89125-.9940706-6.34375-.9941407-.0015-.8110099-.021569-1.2364025-.292969-1.5078124-.2929-.29289-.764231-.2929688-1.707031-.2929688zm1 5.1230469c2.5235 0 4.568359 2.0448591 4.568359 4.5683591s-2.044859 4.570313-4.568359 4.570313-4.5683594-2.046813-4.5683594-4.570313 2.0448594-4.5683591 4.5683594-4.5683591zm6.646484 0c.4588 0 .830078.3712581.830078.8300781 0 .45883-.371278.8320312-.830078.8320312-.4589 0-.832031-.3732012-.832031-.8320312 0-.45882.373131-.8300781.832031-.8300781z';
+  --icon-arrow-down: 'm11.5009 23.0302c.2844.2533.7135.2533.9978 0l9.2899-8.2758c.3092-.2756.3366-.7496.0611-1.0589s-.7496-.3367-1.0589-.0612l-8.0417 7.1639v-19.26834c0-.41421-.3358-.749997-.75-.749997s-.75.335787-.75.749997v19.26704l-8.04025-7.1626c-.30928-.2755-.78337-.2481-1.05889.0612-.27553.3093-.24816.7833.06112 1.0589z';
+  --icon-upload: 'm11.5014.392135c.2844-.253315.7134-.253315.9978 0l6.7037 5.971925c.3093.27552.3366.74961.0611 1.05889-.2755.30929-.7496.33666-1.0589.06113l-5.4553-4.85982v13.43864c0 .4142-.3358.75-.75.75s-.75-.3358-.75-.75v-13.43771l-5.45427 4.85889c-.30929.27553-.78337.24816-1.0589-.06113-.27553-.30928-.24816-.78337.06113-1.05889zm-10.644466 16.336765c.414216 0 .749996.3358.749996.75v4.9139h20.78567v-4.9139c0-.4142.3358-.75.75-.75.4143 0 .75.3358.75.75v5.6639c0 .4143-.3357.75-.75.75h-22.285666c-.414214 0-.75-.3357-.75-.75v-5.6639c0-.4142.335786-.75.75-.75z';
+  --icon-local: 'm3 3.75c-.82843 0-1.5.67157-1.5 1.5v13.5c0 .8284.67157 1.5 1.5 1.5h18c.8284 0 1.5-.6716 1.5-1.5v-9.75c0-.82843-.6716-1.5-1.5-1.5h-9c-.2634 0-.5076-.13822-.6431-.36413l-2.03154-3.38587zm-3 1.5c0-1.65685 1.34315-3 3-3h6.75c.2634 0 .5076.13822.6431.36413l2.0315 3.38587h8.5754c1.6569 0 3 1.34315 3 3v9.75c0 1.6569-1.3431 3-3 3h-18c-1.65685 0-3-1.3431-3-3z';
+  --icon-url: 'm19.1099 3.67026c-1.7092-1.70917-4.5776-1.68265-6.4076.14738l-2.2212 2.22122c-.2929.29289-.7678.29289-1.0607 0-.29289-.29289-.29289-.76777 0-1.06066l2.2212-2.22122c2.376-2.375966 6.1949-2.481407 8.5289-.14738l1.2202 1.22015c2.334 2.33403 2.2286 6.15294-.1474 8.52895l-2.2212 2.2212c-.2929.2929-.7678.2929-1.0607 0s-.2929-.7678 0-1.0607l2.2212-2.2212c1.8301-1.83003 1.8566-4.69842.1474-6.40759zm-3.3597 4.57991c.2929.29289.2929.76776 0 1.06066l-6.43918 6.43927c-.29289.2928-.76777.2928-1.06066 0-.29289-.2929-.29289-.7678 0-1.0607l6.43924-6.43923c.2929-.2929.7677-.2929 1.0606 0zm-9.71158 1.17048c.29289.29289.29289.76775 0 1.06065l-2.22123 2.2212c-1.83002 1.8301-1.85654 4.6984-.14737 6.4076l1.22015 1.2202c1.70917 1.7091 4.57756 1.6826 6.40763-.1474l2.2212-2.2212c.2929-.2929.7677-.2929 1.0606 0s.2929.7677 0 1.0606l-2.2212 2.2212c-2.37595 2.376-6.19486 2.4815-8.52889.1474l-1.22015-1.2201c-2.334031-2.3341-2.22859-6.153.14737-8.5289l2.22123-2.22125c.29289-.2929.76776-.2929 1.06066 0z';
+  --icon-camera: 'm7.65 2.55c.14164-.18885.36393-.3.6-.3h7.5c.2361 0 .4584.11115.6.3l2.025 2.7h2.625c1.6569 0 3 1.34315 3 3v10.5c0 1.6569-1.3431 3-3 3h-18c-1.65685 0-3-1.3431-3-3v-10.5c0-1.65685 1.34315-3 3-3h2.625zm.975 1.2-2.025 2.7c-.14164.18885-.36393.3-.6.3h-3c-.82843 0-1.5.67157-1.5 1.5v10.5c0 .8284.67157 1.5 1.5 1.5h18c.8284 0 1.5-.6716 1.5-1.5v-10.5c0-.82843-.6716-1.5-1.5-1.5h-3c-.2361 0-.4584-.11115-.6-.3l-2.025-2.7zm3.375 6c-1.864 0-3.375 1.511-3.375 3.375s1.511 3.375 3.375 3.375 3.375-1.511 3.375-3.375-1.511-3.375-3.375-3.375zm-4.875 3.375c0-2.6924 2.18261-4.875 4.875-4.875 2.6924 0 4.875 2.1826 4.875 4.875s-2.1826 4.875-4.875 4.875c-2.69239 0-4.875-2.1826-4.875-4.875z';
   --icon-dots: 'M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z';
-  --icon-back: 'M15.41,16.58L10.83,12L15.41,7.41L14,6L8,12L14,18L15.41,16.58Z';
+  --icon-back: 'M20.251 12.0001C20.251 12.4143 19.9152 12.7501 19.501 12.7501L6.06696 12.7501L11.7872 18.6007C12.0768 18.8968 12.0715 19.3717 11.7753 19.6613C11.4791 19.9508 11.0043 19.9455 10.7147 19.6493L4.13648 12.9213C4.01578 12.8029 3.91947 12.662 3.85307 12.5065C3.78471 12.3464 3.74947 12.1741 3.74947 12C3.74947 11.8259 3.78471 11.6536 3.85307 11.4935C3.91947 11.338 4.01578 11.1971 4.13648 11.0787L10.7147 4.35068C11.0043 4.0545 11.4791 4.04916 11.7753 4.33873C12.0715 4.62831 12.0768 5.10315 11.7872 5.39932L6.06678 11.2501L19.501 11.2501C19.9152 11.2501 20.251 11.5859 20.251 12.0001Z';
   --icon-remove: 'm6.35673 9.71429c-.76333 0-1.35856.66121-1.27865 1.42031l1.01504 9.6429c.06888.6543.62067 1.1511 1.27865 1.1511h9.25643c.658 0 1.2098-.4968 1.2787-1.1511l1.015-9.6429c.0799-.7591-.5153-1.42031-1.2786-1.42031zm.50041-4.5v.32142h-2.57143c-.71008 0-1.28571.57564-1.28571 1.28572s.57563 1.28571 1.28571 1.28571h15.42859c.7101 0 1.2857-.57563 1.2857-1.28571s-.5756-1.28572-1.2857-1.28572h-2.5714v-.32142c0-1.77521-1.4391-3.21429-3.2143-3.21429h-3.8572c-1.77517 0-3.21426 1.43908-3.21426 3.21429zm7.07146-.64286c.355 0 .6428.28782.6428.64286v.32142h-5.14283v-.32142c0-.35504.28782-.64286.64283-.64286z';
   --icon-edit: 'M3.96371 14.4792c-.15098.151-.25578.3419-.3021.5504L2.52752 20.133c-.17826.8021.53735 1.5177 1.33951 1.3395l5.10341-1.1341c.20844-.0463.39934-.1511.55032-.3021l8.05064-8.0507-5.557-5.55702-8.05069 8.05062ZM13.4286 5.01437l5.557 5.55703 2.0212-2.02111c.6576-.65765.6576-1.72393 0-2.38159l-3.1755-3.17546c-.6577-.65765-1.7239-.65765-2.3816 0l-2.0211 2.02113Z';
   --icon-detail: 'M5,3C3.89,3 3,3.89 3,5V19C3,20.11 3.89,21 5,21H19C20.11,21 21,20.11 21,19V5C21,3.89 20.11,3 19,3H5M5,5H19V19H5V5M7,7V9H17V7H7M7,11V13H17V11H7M7,15V17H14V15H7Z';
   --icon-select: 'M7,10L12,15L17,10H7Z';
   --icon-check: 'm12 22c5.5228 0 10-4.4772 10-10 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.5228 4.47715 10 10 10zm4.7071-11.4929-5.9071 5.9071-3.50711-3.5071c-.39052-.3905-.39052-1.0237 0-1.4142.39053-.3906 1.02369-.3906 1.41422 0l2.09289 2.0929 4.4929-4.49294c.3905-.39052 1.0237-.39052 1.4142 0 .3905.39053.3905 1.02374 0 1.41424z';
-  --icon-edit-file: 'M3.96371 14.4792c-.15098.151-.25578.3419-.3021.5504L2.52752 20.133c-.17826.8021.53735 1.5177 1.33951 1.3395l5.10341-1.1341c.20844-.0463.39934-.1511.55032-.3021l8.05064-8.0507-5.557-5.55702-8.05069 8.05062ZM13.4286 5.01437l5.557 5.55703 2.0212-2.02111c.6576-.65765.6576-1.72393 0-2.38159l-3.1755-3.17546c-.6577-.65765-1.7239-.65765-2.3816 0l-2.0211 2.02113Z';
-  --icon-remove-file: 'm12 22c5.5228 0 10-4.4772 10-10 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.5228 4.47715 10 10 10zm3.7071-13.70711c.3905.39053.3905 1.02369 0 1.41422l-2.2929 2.29289 2.2929 2.2929c.3905.3905.3905 1.0237 0 1.4142s-1.0237.3905-1.4142 0l-2.2929-2.2929-2.29289 2.2929c-.39053.3905-1.02369.3905-1.41422 0-.39052-.3905-.39052-1.0237 0-1.4142l2.29291-2.2929-2.2929-2.29289c-.39053-.39053-.39053-1.02369 0-1.41422.39052-.39052 1.02369-.39052 1.41421 0l2.29289 2.29291 2.2929-2.29291c.3905-.39052 1.0237-.39052 1.4142 0z';
+  --icon-add: 'M12.75 21C12.75 21.4142 12.4142 21.75 12 21.75C11.5858 21.75 11.25 21.4142 11.25 21V12.7499H3C2.58579 12.7499 2.25 12.4141 2.25 11.9999C2.25 11.5857 2.58579 11.2499 3 11.2499H11.25V3C11.25 2.58579 11.5858 2.25 12 2.25C12.4142 2.25 12.75 2.58579 12.75 3V11.2499H21C21.4142 11.2499 21.75 11.5857 21.75 11.9999C21.75 12.4141 21.4142 12.7499 21 12.7499H12.75V21Z';
+  --icon-edit-file: 'm12.1109 6c.3469-1.69213 1.8444-2.96484 3.6391-2.96484s3.2922 1.27271 3.6391 2.96484h2.314c.4142 0 .75.33578.75.75 0 .41421-.3358.75-.75.75h-2.314c-.3469 1.69213-1.8444 2.9648-3.6391 2.9648s-3.2922-1.27267-3.6391-2.9648h-9.81402c-.41422 0-.75001-.33579-.75-.75 0-.41422.33578-.75.75-.75zm3.6391-1.46484c-1.2232 0-2.2148.99162-2.2148 2.21484s.9916 2.21484 2.2148 2.21484 2.2148-.99162 2.2148-2.21484-.9916-2.21484-2.2148-2.21484zm-11.1391 11.96484c.34691-1.6921 1.84437-2.9648 3.6391-2.9648 1.7947 0 3.2922 1.2727 3.6391 2.9648h9.814c.4142 0 .75.3358.75.75s-.3358.75-.75.75h-9.814c-.3469 1.6921-1.8444 2.9648-3.6391 2.9648-1.79473 0-3.29219-1.2727-3.6391-2.9648h-2.31402c-.41422 0-.75-.3358-.75-.75s.33578-.75.75-.75zm3.6391-1.4648c-1.22322 0-2.21484.9916-2.21484 2.2148s.99162 2.2148 2.21484 2.2148 2.2148-.9916 2.2148-2.2148-.99158-2.2148-2.2148-2.2148z';
+  --icon-remove-file: 'm11.9554 3.29999c-.7875 0-1.5427.31281-2.0995.86963-.49303.49303-.79476 1.14159-.85742 1.83037h5.91382c-.0627-.68878-.3644-1.33734-.8575-1.83037-.5568-.55682-1.312-.86963-2.0994-.86963zm4.461 2.7c-.0656-1.08712-.5264-2.11657-1.3009-2.89103-.8381-.83812-1.9749-1.30897-3.1601-1.30897-1.1853 0-2.32204.47085-3.16016 1.30897-.77447.77446-1.23534 1.80391-1.30087 2.89103h-2.31966c-.03797 0-.07529.00282-.11174.00827h-1.98826c-.41422 0-.75.33578-.75.75 0 .41421.33578.75.75.75h1.35v11.84174c0 .7559.30026 1.4808.83474 2.0152.53448.5345 1.25939.8348 2.01526.8348h9.44999c.7559 0 1.4808-.3003 2.0153-.8348.5344-.5344.8347-1.2593.8347-2.0152v-11.84174h1.35c.4142 0 .75-.33579.75-.75 0-.41422-.3358-.75-.75-.75h-1.9883c-.0364-.00545-.0737-.00827-.1117-.00827zm-10.49169 1.50827v11.84174c0 .358.14223.7014.3954.9546.25318.2532.59656.3954.9546.3954h9.44999c.358 0 .7014-.1422.9546-.3954s.3954-.5966.3954-.9546v-11.84174z';
   --icon-trash-file: var(--icon-remove);
   --icon-upload-error: var(--icon-error);
   --icon-fullscreen: 'M5,5H10V7H7V10H5V5M14,5H19V10H17V7H14V5M17,14H19V19H14V17H17V14M10,17V19H5V14H7V17H10Z';
   --icon-fullscreen-exit: 'M14,14H19V16H16V19H14V14M5,14H10V19H8V16H5V14M8,5H10V10H5V8H8V5M19,8V10H14V5H16V8H19Z';
   --icon-badge-success: 'M10.5 18.2044L18.0992 10.0207C18.6629 9.41362 18.6277 8.46452 18.0207 7.90082C17.4136 7.33711 16.4645 7.37226 15.9008 7.97933L10.5 13.7956L8.0992 11.2101C7.53549 10.603 6.5864 10.5679 5.97933 11.1316C5.37226 11.6953 5.33711 12.6444 5.90082 13.2515L10.5 18.2044Z';
   --icon-badge-error: 'm13.6 18.4c0 .8837-.7164 1.6-1.6 1.6-.8837 0-1.6-.7163-1.6-1.6s.7163-1.6 1.6-1.6c.8836 0 1.6.7163 1.6 1.6zm-1.6-13.9c.8284 0 1.5.67157 1.5 1.5v7c0 .8284-.6716 1.5-1.5 1.5s-1.5-.6716-1.5-1.5v-7c0-.82843.6716-1.5 1.5-1.5z';
+  --icon-about: 'M11.152 14.12v.1h1.523v-.1c.007-.409.053-.752.138-1.028.086-.277.22-.517.405-.72.188-.202.434-.397.735-.586.32-.191.593-.412.82-.66.232-.249.41-.531.533-.847.125-.32.187-.678.187-1.076 0-.579-.137-1.085-.41-1.518a2.717 2.717 0 0 0-1.14-1.018c-.49-.245-1.062-.367-1.715-.367-.597 0-1.142.114-1.636.34-.49.228-.884.564-1.182 1.008-.299.44-.46.98-.485 1.619h1.62c.024-.377.118-.684.282-.922.163-.241.369-.419.617-.532.25-.114.51-.17.784-.17.301 0 .575.063.82.191.248.124.447.302.597.533.149.23.223.504.223.82 0 .263-.05.502-.149.72-.1.216-.234.408-.405.574a3.48 3.48 0 0 1-.575.453c-.33.199-.613.42-.847.66-.234.242-.415.558-.543.949-.125.39-.19.916-.197 1.577ZM11.205 17.15c.21.206.46.31.75.31.196 0 .374-.049.534-.144.16-.096.287-.224.383-.384.1-.163.15-.343.15-.538a1 1 0 0 0-.32-.746 1.019 1.019 0 0 0-.746-.314c-.291 0-.542.105-.751.314-.21.206-.314.455-.314.746 0 .295.104.547.314.756ZM24 12c0 6.627-5.373 12-12 12S0 18.627 0 12 5.373 0 12 0s12 5.373 12 12Zm-1.5 0c0 5.799-4.701 10.5-10.5 10.5S1.5 17.799 1.5 12 6.201 1.5 12 1.5 22.5 6.201 22.5 12Z';
 
+  /* editor section is to be removed */
   --icon-edit-rotate: 'M16.89,15.5L18.31,16.89C19.21,15.73 19.76,14.39 19.93,13H17.91C17.77,13.87 17.43,14.72 16.89,15.5M13,17.9V19.92C14.39,19.75 15.74,19.21 16.9,18.31L15.46,16.87C14.71,17.41 13.87,17.76 13,17.9M19.93,11C19.76,9.61 19.21,8.27 18.31,7.11L16.89,8.53C17.43,9.28 17.77,10.13 17.91,11M15.55,5.55L11,1V4.07C7.06,4.56 4,7.92 4,12C4,16.08 7.05,19.44 11,19.93V17.91C8.16,17.43 6,14.97 6,12C6,9.03 8.16,6.57 11,6.09V10L15.55,5.55Z';
   --icon-edit-flip-v: 'M3 15V17H5V15M15 19V21H17V19M19 3H5C3.9 3 3 3.9 3 5V9H5V5H19V9H21V5C21 3.9 20.1 3 19 3M21 19H19V21C20.1 21 21 20.1 21 19M1 11V13H23V11M7 19V21H9V19M19 15V17H21V15M11 19V21H13V19M3 19C3 20.1 3.9 21 5 21V19Z';
   --icon-edit-flip-h: 'M15 21H17V19H15M19 9H21V7H19M3 5V19C3 20.1 3.9 21 5 21H9V19H5V5H9V3H5C3.9 3 3 3.9 3 5M19 3V5H21C21 3.9 20.1 3 19 3M11 23H13V1H11M19 17H21V15H19M15 5H17V3H15M19 13H21V11H19M19 21C20.1 21 21 20.1 21 19H19Z';
@@ -38,12 +44,12 @@
   --icon-edit-color: 'M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3Z';
   --icon-edit-resize: 'M10.59,12L14.59,8H11V6H18V13H16V9.41L12,13.41V16H20V4H8V12H10.59M22,2V18H12V22H2V12H6V2H22M10,14H4V20H10V14Z';
 
-  --icon-external-source-placeholder: 'M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z';
-  --icon-facebook: 'M12 2.04C6.5 2.04 2 6.53 2 12.06C2 17.06 5.66 21.21 10.44 21.96V14.96H7.9V12.06H10.44V9.85C10.44 7.34 11.93 5.96 14.22 5.96C15.31 5.96 16.45 6.15 16.45 6.15V8.62H15.19C13.95 8.62 13.56 9.39 13.56 10.18V12.06H16.34L15.89 14.96H13.56V21.96A10 10 0 0 0 22 12.06C22 6.53 17.5 2.04 12 2.04Z';
-  --icon-dropbox: 'm6.0344426 1.9570014-5.96360421 3.7989306 5.96360421 3.7989309 5.9636044-3.7989309zm5.9636044 3.7989306 5.963604 3.7989309 5.963605-3.7989309-5.963605-3.7989306zm5.963604 3.7989309-5.963604 3.7989311 5.963604 3.798929 5.963605-3.798929zm-5.963604 3.7989311-5.9636044-3.7989311-5.96360421 3.7989311 5.96360421 3.798929zm.0024 1.204188-5.9636041 3.80132 5.9636041 3.798931 5.963604-3.798931z';
-  --icon-gdrive: 'M7.71,3.5L1.15,15L4.58,21L11.13,9.5M9.73,15L6.3,21H19.42L22.85,15M22.28,14L15.42,2H8.58L8.57,2L15.43,14H22.28Z';
-  --icon-gphotos: 'M21.35,11.1H12.18V13.83H18.69C18.36,17.64 15.19,19.27 12.19,19.27C8.36,19.27 5,16.25 5,12C5,7.9 8.2,4.73 12.2,4.73C15.29,4.73 17.1,6.7 17.1,6.7L19,4.72C19,4.72 16.56,2 12.1,2C6.42,2 2.03,6.8 2.03,12C2.03,17.05 6.16,22 12.25,22C17.6,22 21.5,18.33 21.5,12.91C21.5,11.76 21.35,11.1 21.35,11.1V11.1Z';
-  --icon-instagram: 'm 16.6963,8.35462 c 0.5834,0 1.0564,-0.47293 1.0564,-1.05632 0,-0.58339 -0.473,-1.05632 -1.0564,-1.05632 -0.5833,0 -1.0563,0.47293 -1.0563,1.05632 0,0.58339 0.473,1.05632 1.0563,1.05632 z m -4.699,-0.87741 c -0.8941,0 -1.7681,0.26513 -2.51154,0.76187 -0.74341,0.49674 -1.32282,1.20277 -1.66495,2.02882 -0.34214,0.826 -0.43164,1.735 -0.25719,2.6119 0.17446,0.8769 0.60503,1.6824 1.23727,2.3146 0.63224,0.6322 1.43771,1.0627 2.31471,1.2371 0.8769,0.1743 1.7858,0.0848 2.6118,-0.2574 0.826,-0.3422 1.532,-0.9217 2.0287,-1.6651 0.4967,-0.7435 0.7618,-1.6175 0.7617,-2.5116 0,-0.5937 -0.1169,-1.1815 -0.344,-1.7299 C 15.9466,9.719 15.6136,9.22066 15.1938,8.80091 14.7741,8.38116 14.2757,8.04822 13.7272,7.82109 13.1787,7.59397 12.5909,7.47712 11.9973,7.47721 Z m 0,7.45429 c -0.5806,0 -1.148,-0.1721 -1.6307,-0.4946 C 9.88388,14.1143 9.50767,13.6559 9.28551,13.1196 9.06335,12.5833 9.00523,11.9931 9.11848,11.4237 9.23174,10.8543 9.51128,10.3313 9.92178,9.92085 10.3323,9.51036 10.8553,9.23081 11.4246,9.11756 11.994,9.0043 12.5842,9.06243 13.1205,9.28459 c 0.5363,0.22215 0.9948,0.59836 1.3173,1.08101 0.3225,0.4827 0.4946,1.0502 0.4946,1.6307 0,0.7785 -0.3092,1.5251 -0.8597,2.0755 -0.5504,0.5505 -1.297,0.8597 -2.0754,0.8597 z m 0,-10.15082 c 2.3506,0 2.6287,0.00909 3.5571,0.05137 0.8582,0.03913 1.3243,0.1824 1.6346,0.30295 0.3828,0.14096 0.7291,0.36604 1.0134,0.65867 0.2926,0.28423 0.5177,0.63052 0.6586,1.01334 0.1206,0.31029 0.2639,0.77642 0.303,1.63461 0.0423,0.92843 0.0514,1.20657 0.0514,3.55718 0,2.3506 -0.0091,2.6287 -0.0514,3.5572 -0.0391,0.8581 -0.1824,1.3243 -0.303,1.6346 -0.1466,0.3795 -0.3709,0.7242 -0.6586,1.0119 -0.2877,0.2877 -0.6324,0.5121 -1.012,0.6587 -0.3103,0.1205 -0.7764,0.2638 -1.6346,0.3029 -0.9281,0.0423 -1.2066,0.0514 -3.5571,0.0514 -2.35063,0 -2.62912,-0.0091 -3.5572,-0.0514 C 7.58331,19.125 7.11718,18.9817 6.80689,18.8612 6.42407,18.7202 6.07778,18.4951 5.79355,18.2025 5.50093,17.9183 5.27584,17.572 5.13488,17.1892 5.01433,16.8789 4.87107,16.4127 4.83193,15.5546 4.78965,14.6261 4.78056,14.348 4.78056,11.9974 4.78056,9.6468 4.78965,9.36865 4.83193,8.44023 4.87107,7.58203 5.01433,7.1159 5.13488,6.80561 5.27584,6.42279 5.50093,6.0765 5.79355,5.79227 6.07778,5.49965 6.42407,5.27456 6.80689,5.1336 7.11718,5.01305 7.58331,4.86979 8.4415,4.83065 9.36993,4.78837 9.64807,4.77928 11.9987,4.77928 Z m 0.0014,-1.58744 c -2.39081,0 -2.69062,0.01013 -3.62953,0.05311 C 7.43026,3.28933 6.79116,3.43923 6.23103,3.65693 5.64371,3.87792 5.11163,4.22433 4.67189,4.67201 4.22484,5.11192 3.87904,5.64398 3.65856,6.23115 3.43912,6.79128 3.29026,7.43108 3.24763,8.3679 3.205,9.30471 3.19452,9.60661 3.19452,11.9974 c 0,2.3908 0.01013,2.6906 0.05311,3.6295 0.04298,0.9389 0.19149,1.5766 0.40918,2.1367 0.22099,0.5874 0.5674,1.1194 1.01508,1.5592 0.43982,0.4476 0.97187,0.7941 1.55914,1.0154 0.55908,0.2173 1.19993,0.3662 2.13674,0.4092 0.93681,0.043 1.23872,0.0527 3.62953,0.0527 2.3907,0 2.6905,-0.0101 3.6295,-0.0527 0.9389,-0.0426 1.5766,-0.1919 2.1367,-0.4092 0.5847,-0.2262 1.1158,-0.5721 1.5591,-1.0154 0.4434,-0.4434 0.7892,-0.9744 1.0155,-1.5592 0.2173,-0.5591 0.3662,-1.1999 0.4091,-2.1367 C 20.7902,14.6901 20.8,14.3882 20.8,11.9974 20.8,9.60661 20.7899,9.3068 20.7472,8.3679 20.7046,7.42899 20.5554,6.79128 20.3381,6.23115 20.1168,5.64388 19.7703,5.11183 19.3226,4.67201 18.8827,4.22496 18.3507,3.87916 17.7635,3.65867 17.2034,3.43923 16.5636,3.29038 15.6268,3.24775 14.6899,3.20512 14.388,3.19464 11.9973,3.19464 Z';
+  --icon-external-source-placeholder: 'M6.341 3.27a10.5 10.5 0 0 1 5.834-1.77.75.75 0 0 0 0-1.5 12 12 0 1 0 12 12 .75.75 0 0 0-1.5 0A10.5 10.5 0 1 1 6.34 3.27Zm14.145 1.48a.75.75 0 1 0-1.06-1.062L9.925 13.19V7.95a.75.75 0 1 0-1.5 0V15c0 .414.336.75.75.75h7.05a.75.75 0 0 0 0-1.5h-5.24l9.501-9.5Z';
+  --icon-facebook: 'm12 1.5c-5.79901 0-10.5 4.70099-10.5 10.5 0 4.9427 3.41586 9.0888 8.01562 10.2045v-6.1086h-2.13281c-.41421 0-.75-.3358-.75-.75v-3.2812c0-.4142.33579-.75.75-.75h2.13281v-1.92189c0-.95748.22571-2.51089 1.38068-3.6497 1.1934-1.17674 3.1742-1.71859 6.2536-1.05619.3455.07433.5923.3798.5923.73323v2.75395c0 .41422-.3358.75-.75.75-.6917 0-1.2029.02567-1.5844.0819-.3865.05694-.5781.13711-.675.20223-.1087.07303-.2367.20457-.2367 1.02837v1.0781h2.3906c.2193 0 .4275.0959.57.2626.1425.1666.205.3872.1709.6038l-.5156 3.2813c-.0573.3647-.3716.6335-.7409.6335h-1.875v6.1058c4.5939-1.1198 8.0039-5.2631 8.0039-10.2017 0-5.79901-4.701-10.5-10.5-10.5zm-12 10.5c0-6.62744 5.37256-12 12-12 6.6274 0 12 5.37256 12 12 0 5.9946-4.3948 10.9614-10.1384 11.8564-.2165.0337-.4369-.0289-.6033-.1714s-.2622-.3506-.2622-.5697v-7.7694c0-.4142.3358-.75.75-.75h1.9836l.28-1.7812h-2.2636c-.4142 0-.75-.3358-.75-.75v-1.8281c0-.82854.0888-1.72825.9-2.27338.3631-.24396.8072-.36961 1.293-.4412.3081-.0454.6583-.07238 1.0531-.08618v-1.39629c-2.4096-.40504-3.6447.13262-4.2928.77165-.7376.72735-.9338 1.79299-.9338 2.58161v2.67189c0 .4142-.3358.75-.75.75h-2.13279v1.7812h2.13279c.4142 0 .75.3358.75.75v7.7712c0 .219-.0956.427-.2619.5695-.1662.1424-.3864.2052-.6028.1717-5.74968-.8898-10.1509-5.8593-10.1509-11.8583z';
+  --icon-dropbox: 'm6.01895 1.92072c.24583-.15659.56012-.15658.80593.00003l5.17512 3.29711 5.1761-3.29714c.2458-.15659.5601-.15658.8059.00003l5.5772 3.55326c.2162.13771.347.37625.347.63253 0 .25629-.1308.49483-.347.63254l-4.574 2.91414 4.574 2.91418c.2162.1377.347.3762.347.6325s-.1308.4948-.347.6325l-5.5772 3.5533c-.2458.1566-.5601.1566-.8059 0l-5.1761-3.2971-5.17512 3.2971c-.24581.1566-.5601.1566-.80593 0l-5.578142-3.5532c-.216172-.1377-.347058-.3763-.347058-.6326s.130886-.4949.347058-.6326l4.574772-2.91408-4.574772-2.91411c-.216172-.1377-.347058-.37626-.347058-.63257 0-.2563.130886-.49486.347058-.63256zm.40291 8.61518-4.18213 2.664 4.18213 2.664 4.18144-2.664zm6.97504 2.664 4.1821 2.664 4.1814-2.664-4.1814-2.664zm2.7758-3.54668-4.1727 2.65798-4.17196-2.65798 4.17196-2.658zm1.4063-.88268 4.1814-2.664-4.1814-2.664-4.1821 2.664zm-6.9757-2.664-4.18144-2.664-4.18213 2.664 4.18213 2.664zm-4.81262 12.43736c.22254-.3494.68615-.4522 1.03551-.2297l5.17521 3.2966 5.1742-3.2965c.3493-.2226.813-.1198 1.0355.2295.2226.3494.1198.813-.2295 1.0355l-5.5772 3.5533c-.2458.1566-.5601.1566-.8059 0l-5.57819-3.5532c-.34936-.2226-.45216-.6862-.22963-1.0355z';
+  --icon-gdrive: 'm7.73633 1.81806c.13459-.22968.38086-.37079.64707-.37079h7.587c.2718 0 .5223.14697.6548.38419l7.2327 12.94554c.1281.2293.1269.5089-.0031.7371l-3.7935 6.6594c-.1334.2342-.3822.3788-.6517.3788l-14.81918.0004c-.26952 0-.51831-.1446-.65171-.3788l-3.793526-6.6598c-.1327095-.233-.130949-.5191.004617-.7504zm.63943 1.87562-6.71271 11.45452 2.93022 5.1443 6.65493-11.58056zm3.73574 6.52652-2.39793 4.1727 4.78633.0001zm4.1168 4.1729 5.6967-.0002-6.3946-11.44563h-5.85354zm5.6844 1.4998h-13.06111l-2.96515 5.1598 13.08726-.0004z';
+  --icon-gphotos: 'M12.51 0c-.702 0-1.272.57-1.272 1.273V7.35A6.381 6.381 0 0 0 0 11.489c0 .703.57 1.273 1.273 1.273H7.35A6.381 6.381 0 0 0 11.488 24c.704 0 1.274-.57 1.274-1.273V16.65A6.381 6.381 0 0 0 24 12.51c0-.703-.57-1.273-1.273-1.273H16.65A6.381 6.381 0 0 0 12.511 0Zm.252 11.232V1.53a4.857 4.857 0 0 1 0 9.702Zm-1.53.006H1.53a4.857 4.857 0 0 1 9.702 0Zm1.536 1.524a4.857 4.857 0 0 0 9.702 0h-9.702Zm-6.136 4.857c0-2.598 2.04-4.72 4.606-4.85v9.7a4.857 4.857 0 0 1-4.606-4.85Z';
+  --icon-instagram: 'M6.225 12a5.775 5.775 0 1 1 11.55 0 5.775 5.775 0 0 1-11.55 0zM12 7.725a4.275 4.275 0 1 0 0 8.55 4.275 4.275 0 0 0 0-8.55zM18.425 6.975a1.4 1.4 0 1 0 0-2.8 1.4 1.4 0 0 0 0 2.8zM11.958.175h.084c2.152 0 3.823 0 5.152.132 1.35.134 2.427.41 3.362 1.013a7.15 7.15 0 0 1 2.124 2.124c.604.935.88 2.012 1.013 3.362.132 1.329.132 3 .132 5.152v.084c0 2.152 0 3.823-.132 5.152-.134 1.35-.41 2.427-1.013 3.362a7.15 7.15 0 0 1-2.124 2.124c-.935.604-2.012.88-3.362 1.013-1.329.132-3 .132-5.152.132h-.084c-2.152 0-3.824 0-5.153-.132-1.35-.134-2.427-.409-3.36-1.013a7.15 7.15 0 0 1-2.125-2.124C.716 19.62.44 18.544.307 17.194c-.132-1.329-.132-3-.132-5.152v-.084c0-2.152 0-3.823.132-5.152.133-1.35.409-2.427 1.013-3.362A7.15 7.15 0 0 1 3.444 1.32C4.378.716 5.456.44 6.805.307c1.33-.132 3-.132 5.153-.132zM6.953 1.799c-1.234.123-2.043.36-2.695.78A5.65 5.65 0 0 0 2.58 4.26c-.42.65-.657 1.46-.78 2.695C1.676 8.2 1.675 9.797 1.675 12c0 2.203 0 3.8.124 5.046.123 1.235.36 2.044.78 2.696a5.649 5.649 0 0 0 1.68 1.678c.65.421 1.46.658 2.694.78 1.247.124 2.844.125 5.047.125s3.8 0 5.046-.124c1.235-.123 2.044-.36 2.695-.78a5.648 5.648 0 0 0 1.68-1.68c.42-.65.657-1.46.78-2.694.123-1.247.124-2.844.124-5.047s-.001-3.8-.125-5.046c-.122-1.235-.359-2.044-.78-2.695a5.65 5.65 0 0 0-1.679-1.68c-.651-.42-1.46-.657-2.695-.78-1.246-.123-2.843-.124-5.046-.124-2.203 0-3.8 0-5.047.124z';
   --icon-flickr: var(--icon-external-source-placeholder);
   --icon-vk: var(--icon-external-source-placeholder);
   --icon-evernote: var(--icon-external-source-placeholder);
diff --git a/blocks/themes/lr-basic/index.css b/blocks/themes/lr-basic/index.css
index 383ec5c70..d1cd8c1fb 100644
--- a/blocks/themes/lr-basic/index.css
+++ b/blocks/themes/lr-basic/index.css
@@ -38,7 +38,7 @@
 @import url('../../ConfirmationDialog/confirmation.css');
 @import url('../../ProgressBarCommon/progress-bar-common.css');
 @import url('../../ProgressBar/progress-bar.css');
-@import url('../../ActivityCaption/activity-caption.css');
-@import url('../../ActivityIcon/activity-icon.css');
+@import url('../../ActivityHeader/activity-header.css');
+@import url('../../Copyright/copyright.css');
 @import url('../../CloudImageEditor/index.css');
 @import url('../../Select/select.css');
diff --git a/blocks/themes/lr-basic/l10n.css b/blocks/themes/lr-basic/l10n.css
index 5f1f4a81e..b42ae87f6 100644
--- a/blocks/themes/lr-basic/l10n.css
+++ b/blocks/themes/lr-basic/l10n.css
@@ -1,7 +1,11 @@
 :where(.lr-wgt-l10n_en-US, .lr-wgt-common),
 :host {
+  --l10n-locale-name: 'en-US';
+
   --l10n-upload-file: 'Upload file';
   --l10n-upload-files: 'Upload files';
+  --l10n-choose-file: 'Choose file';
+  --l10n-choose-files: 'Choose files';
   --l10n-drop-files-here: 'Drop files here';
   --l10n-select-file-source: 'Select file source';
   --l10n-selected: 'Selected';
@@ -11,6 +15,7 @@
   --l10n-clear: 'Clear';
   --l10n-camera-shot: 'Shot';
   --l10n-upload-url: 'Import';
+  --l10n-upload-url-placeholder: 'Paste link here';
   --l10n-edit-image: 'Edit image';
   --l10n-edit-detail: 'Details';
   --l10n-back: 'Back';
@@ -27,15 +32,23 @@
   --l10n-no-files: 'No files selected';
   --l10n-browse: 'Browse';
   --l10n-not-uploaded-yet: 'Not uploaded yet...';
+  --l10n-file__one: 'file';
+  --l10n-file__other: 'files';
+  --l10n-error__one: 'error';
+  --l10n-error__other: 'errors';
+  --l10n-header-uploading: 'Uploading {{count}} {{plural:file(count)}}';
+  --l10n-header-failed: '{{count}} {{plural:error(count)}}';
+  --l10n-header-succeed: '{{count}} {{plural:file(count)}} uploaded';
+  --l10n-header-selected: '{{count}} {{plural:file(count)}} selected';
 
-  --l10n-src-type-local: 'Local file';
-  --l10n-src-type-from-url: 'From URL';
+  --l10n-src-type-local: 'From device';
+  --l10n-src-type-from-url: 'From link';
   --l10n-src-type-camera: 'Camera';
   --l10n-src-type-draw: 'Draw';
   --l10n-src-type-facebook: 'Facebook';
   --l10n-src-type-dropbox: 'Dropbox';
-  --l10n-src-type-gdrive: 'Gdrive';
-  --l10n-src-type-gphotos: 'Gphotos';
+  --l10n-src-type-gdrive: 'Google Drive';
+  --l10n-src-type-gphotos: 'Google Photos';
   --l10n-src-type-instagram: 'Instagram';
   --l10n-src-type-flickr: 'Flickr';
   --l10n-src-type-vk: 'VK';
@@ -47,7 +60,7 @@
 
   --l10n-src-type: var(--l10n-src-type-local);
 
-  --l10n-caption-from-url: 'Import from external URL';
+  --l10n-caption-from-url: 'Import from link';
   --l10n-caption-camera: 'Camera';
   --l10n-caption-draw: 'Draw';
   --l10n-caption-edit-file: 'Edit file';
@@ -78,8 +91,8 @@
   --l10n-file-size-unknown: 'Unknown';
 
   --l10n-camera-permissions-denied: 'Camera access denied';
-  --l10n-camera-permissions-prompt: 'Camera access prompted';
-  --l10n-camera-permissions-request: 'Request permissions';
+  --l10n-camera-permissions-prompt: 'Please allow access to the camera';
+  --l10n-camera-permissions-request: 'Request access';
 
   --l10n-files-count-limit-error-title: 'Files count limit overflow';
   --l10n-files-count-limit-error-too-few: 'You’ve chosen {{total}}. At least {{min}} required.';
diff --git a/blocks/themes/lr-basic/theme.css b/blocks/themes/lr-basic/theme.css
index 5167c2f1b..a23d136e5 100644
--- a/blocks/themes/lr-basic/theme.css
+++ b/blocks/themes/lr-basic/theme.css
@@ -1,4 +1,4 @@
-:where(.lr-wgt-theme, .lr-wgt-common, ::backdrop),
+:where(.lr-wgt-theme, .lr-wgt-common),
 :host {
   /* Base values */
 
@@ -6,19 +6,19 @@
 
   --h-foreground: 208;
   --s-foreground: 4%;
-  --l-foreground: calc(15% + 70% * var(--darkmode));
+  --l-foreground: calc(10% + 70% * var(--darkmode));
 
   --h-background: 208;
   --s-background: 4%;
-  --l-background: calc(95% - 87% * var(--darkmode));
+  --l-background: calc(97% - 87% * var(--darkmode));
 
   --h-accent: 211;
   --s-accent: 100%;
   --l-accent: calc(50% - 5% * var(--darkmode));
 
-  --h-confirm: 140;
-  --s-confirm: 60%;
-  --l-confirm: 60%;
+  --h-confirm: 137;
+  --s-confirm: 85%;
+  --l-confirm: 53%;
 
   --h-error: 358;
   --s-error: 100%;
@@ -30,46 +30,55 @@
   --s-shadow: 0%;
   --l-shadow: 0%;
 
-  --opacity-normal: 0.5;
-  --opacity-hover: 0.8;
+  --opacity-normal: 0.6;
+  --opacity-hover: 0.9;
   --opacity-active: 1;
 
-  --ui-size: 36px;
+  --ui-size: 32px;
 
   --gap-min: 2px;
+  --gap-small: 4px;
   --gap-mid: 10px;
   --gap-max: 20px;
   --gap-table: 0px;
 
   --borders: 1;
 
-  --border-radius-element: 7px;
-  --border-radius-frame: 10px;
-  --border-radius-thumb: 5px;
+  --border-radius-element: 8px;
+  --border-radius-frame: 12px;
+  --border-radius-thumb: 6px;
 
   --transition-duration: 0.2s;
 
   --modal-max-w: 800px;
   --modal-max-h: 600px;
-  --modal-backdrop-background-image: url('data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwIiB3aWR0aD0iMTAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHBhdGggc3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIC4xKSIgZD0iTTAgMTAgMTAgMCIvPgo8L3N2Zz4=');
+  --modal-normal-w: 430px;
 
   /* Derivative values */
 
   --darkmode-minus: calc(1 + var(--darkmode) * -2);
 
   --clr-background: hsl(var(--h-background), var(--s-background), var(--l-background));
-  --clr-background-dark: hsl(var(--h-background), var(--s-background), calc(var(--l-background) - 3%));
-  --clr-background-light: hsl(var(--h-background), var(--s-background), calc(var(--l-background) + 3%));
-
-  --clr-generic-file-icon: hsl(
+  --clr-background-dark: hsl(
+    var(--h-background),
+    var(--s-background),
+    calc(var(--l-background) - 3% * var(--darkmode-minus))
+  );
+  --clr-background-light: hsl(
     var(--h-background),
     var(--s-background),
-    calc(var(--l-background) + 4% * var(--darkmode-minus))
+    calc(var(--l-background) + 3% * var(--darkmode-minus))
   );
 
   --clr-accent: hsl(var(--h-accent), var(--s-accent), var(--l-accent));
-  --clr-accent-light: hsla(var(--h-accent), var(--s-accent), var(--l-accent), 50%);
+  --clr-accent-light: hsla(var(--h-accent), var(--s-accent), var(--l-accent), 30%);
   --clr-accent-lightest: hsla(var(--h-accent), var(--s-accent), var(--l-accent), 10%);
+  --clr-accent-light-opaque: hsl(var(--h-accent), var(--s-accent), calc(var(--l-accent) + 45% * var(--darkmode-minus)));
+  --clr-accent-lightest-opaque: hsl(
+    var(--h-accent),
+    var(--s-accent),
+    calc(var(--l-accent) + 47% * var(--darkmode-minus))
+  );
 
   --clr-confirm: hsl(var(--h-confirm), var(--s-confirm), var(--l-confirm));
 
@@ -79,7 +88,7 @@
   --clr-error-message-bgr: hsl(var(--h-error), var(--s-error), calc(var(--l-error) + 30% * var(--darkmode-minus)));
 
   --clr-txt: hsl(var(--h-foreground), var(--s-foreground), var(--l-foreground));
-  --clr-txt-mid: hsl(var(--h-foreground), var(--s-foreground), calc(var(--l-foreground) + 15% * var(--darkmode-minus)));
+  --clr-txt-mid: hsl(var(--h-foreground), var(--s-foreground), calc(var(--l-foreground) + 20% * var(--darkmode-minus)));
   --clr-txt-light: hsl(
     var(--h-foreground),
     var(--s-foreground),
@@ -95,6 +104,8 @@
   --clr-shade-lv2: hsla(var(--h-foreground), var(--s-foreground), var(--l-foreground), 8%);
   --clr-shade-lv3: hsla(var(--h-foreground), var(--s-foreground), var(--l-foreground), 12%);
 
+  --clr-generic-file-icon: var(--clr-txt-lightest);
+
   --border-light: 1px solid
     hsla(
       var(--h-foreground),
@@ -110,19 +121,15 @@
       calc((0.2 - 0.1 * var(--darkmode)) * var(--borders))
     );
   --border-accent: 1px solid hsla(var(--h-accent), var(--s-accent), var(--l-accent), 1 * var(--borders));
-  --border-dashed: 2px dashed
-    hsla(var(--h-foreground), var(--s-foreground), var(--l-foreground), calc(0.1 * var(--borders)));
+  --border-dashed: 1px dashed
+    hsla(var(--h-foreground), var(--s-foreground), var(--l-foreground), calc(0.2 * var(--borders)));
 
-  --clr-curtain: hsla(var(--h-background), var(--s-background), calc(var(--l-background) - 10%), 70%);
+  --clr-curtain: hsla(var(--h-background), var(--s-background), calc(var(--l-background)), 60%);
 
   --hsl-shadow: var(--h-shadow), var(--s-shadow), var(--l-shadow);
 
-  --modal-shadow: 0px 0px 1px hsla(var(--hsl-shadow), calc((0.35 + 0.65 * var(--darkmode)) * var(--shadows))),
-    0px 6px 40px hsla(var(--hsl-shadow), calc((0.2 + 0.4 * var(--darkmode)) * var(--shadows)));
-
-  --inset-shadow: inset 0px 2px 3px hsla(var(--hsl-shadow), calc(0.09 + 0.1 * var(--darkmode)));
-
-  /* Maybe move directly to the styles of the buttons? */
+  --modal-shadow: 0px 0px 1px hsla(var(--hsl-shadow), calc((0.3 + 0.65 * var(--darkmode)) * var(--shadows))),
+    0px 6px 20px hsla(var(--hsl-shadow), calc((0.1 + 0.4 * var(--darkmode)) * var(--shadows)));
 
   --clr-btn-bgr-primary: var(--clr-accent);
   --clr-btn-bgr-primary-hover: hsl(
@@ -135,34 +142,30 @@
     var(--s-accent),
     calc(var(--l-accent) - 8% * var(--darkmode-minus))
   );
-  --clr-btn-txt-primary: var(--clr-background-light);
-  --shadow-btn-primary: 0px 1px 2px hsla(var(--hsl-shadow), calc(0.26 * var(--shadows))),
-    0px 2px 8px hsla(var(--hsl-shadow), calc(0.08 * var(--shadows))),
-    inset 0px 0px 2px hsla(var(--hsl-shadow), calc(0.2 * var(--shadows)));
+  --clr-btn-txt-primary: hsl(var(--h-accent), var(--s-accent), 98%);
+  --shadow-btn-primary: none;
 
   --clr-btn-bgr-secondary: hsl(
     var(--h-background),
     var(--s-background),
-    calc(var(--l-background) + 3% + 3% * var(--darkmode))
+    calc(var(--l-background) - 3% * var(--darkmode-minus))
   );
   --clr-btn-bgr-secondary-hover: hsl(
     var(--h-background),
     var(--s-background),
-    calc(var(--l-background) + 8% * var(--darkmode))
+    calc(var(--l-background) - 7% * var(--darkmode-minus))
   );
   --clr-btn-bgr-secondary-active: hsl(
     var(--h-background),
     var(--s-background),
-    calc(var(--l-background) - 3% + 13% * var(--darkmode))
+    calc(var(--l-background) - 12% * var(--darkmode-minus))
   );
-  --clr-btn-txt-secondary: var(--clr-txt);
-  --shadow-btn-secondary: 0px 1px 1px hsla(var(--hsl-shadow), calc(0.07 * var(--shadows))),
-    0px 2px 8px hsla(var(--hsl-shadow), calc(0.06 * var(--shadows))),
-    inset 0px 0px 1px hsla(var(--hsl-shadow), calc(0.4 * var(--shadows)));
+  --clr-btn-txt-secondary: var(--clr-txt-mid);
+  --shadow-btn-secondary: none;
 
   --clr-btn-bgr-disabled: var(--clr-background);
   --clr-btn-txt-disabled: var(--clr-txt-lightest);
-  --shadow-btn-disabled: inset 0px 0px 1px hsla(var(--hsl-shadow), calc(0.4 * var(--shadows)));
+  --shadow-btn-disabled: none;
 }
 
 @media only screen and (max-height: 600px) {
@@ -172,10 +175,10 @@
   }
 }
 
-@media only screen and (max-width: 800px) {
+@media only screen and (max-width: 430px) {
   :where(.lr-wgt-theme, .lr-wgt-common),
   :host {
-    --modal-max-w: 100%;
-    --modal-max-h: 100%;
+    --modal-max-w: 100vw;
+    --modal-max-h: var(--uploadcare-blocks-window-height);
   }
 }
diff --git a/docs/activities/README.md b/docs/activities/README.md
index 6fb3045f0..2c27a0e15 100644
--- a/docs/activities/README.md
+++ b/docs/activities/README.md
@@ -7,14 +7,16 @@ import { LR } from '@uploadcare/blocks';
 
 class MyBlock extends LR.BlockComponent {
   initCallback() {
-    this.onActivation = () => {
-      '*activityCaption': this.l10n('some-caption'),
-      '*activityIcon': 'my-icon-name',
+    const onActivate = () => {
+      console.log('activity-name is activated');
     };
-    this.onDeactivation = () => {
-      console.log('activity-name is deactivated');
+    const onDeactivate = () => {
+      console.log('activity-name is deactcivated');
     };
-    this.registerActivity('my-activity-name', this.onActivation, this.onDeactivation);
+    this.registerActivity('my-activity-name', {
+      onActivate,
+      onDeactivate,
+    });
   }
 }
 ```
diff --git a/index.js b/index.js
index bd4678423..7256280cf 100644
--- a/index.js
+++ b/index.js
@@ -31,11 +31,11 @@ export { CloudImageEditor } from './blocks/CloudImageEditor/CloudImageEditor.js'
 export { ExternalSource } from './blocks/ExternalSource/ExternalSource.js';
 export { Tabs } from './blocks/Tabs/Tabs.js';
 export { DataOutput } from './blocks/DataOutput/DataOutput.js';
-export { ActivityCaption } from './blocks/ActivityCaption/ActivityCaption.js';
-export { ActivityIcon } from './blocks/ActivityIcon/ActivityIcon.js';
+export { ActivityHeader } from './blocks/ActivityHeader/ActivityHeader.js';
 export { Select } from './blocks/Select/Select.js';
 export { Video } from './blocks/Video/Video.js';
 export { ShadowWrapper } from './blocks/ShadowWrapper/ShadowWrapper.js';
+export { Copyright } from './blocks/Copyright/Copyright.js';
 
 // Solutions:
 export { FileUploaderRegular } from './solutions/file-uploader/regular/FileUploaderRegular.js';
diff --git a/package-lock.json b/package-lock.json
index 967a6232c..17425d7ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@uploadcare/blocks",
-  "version": "0.14.3",
+  "version": "0.15.0-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@uploadcare/blocks",
-      "version": "0.14.3",
+      "version": "0.15.0-alpha.6",
       "license": "MIT",
       "dependencies": {
-        "@symbiotejs/symbiote": "^1.11.2",
-        "@uploadcare/upload-client": "^4.3.1"
+        "@symbiotejs/symbiote": "^1.11.5",
+        "@uploadcare/upload-client": "^6.2.1"
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.17.0",
@@ -38,15 +38,39 @@
         "puppeteer": "^14.4.1",
         "rimraf": "^3.0.2",
         "shipjs": "^0.24.4",
-        "stylelint": "^14.7.1",
-        "stylelint-config-prettier": "^9.0.3",
+        "stylelint": "^14.16.1",
+        "stylelint-config-prettier": "^9.0.4",
         "stylelint-config-rational-order": "^0.1.2",
-        "stylelint-config-standard": "^25.0.0",
-        "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
-        "stylelint-order": "^5.0.0",
+        "stylelint-config-standard": "^29.0.0",
+        "stylelint-declaration-block-no-ignored-properties": "^2.6.0",
+        "stylelint-order": "^6.0.1",
         "typescript": "^4.8.2"
       }
     },
+    "../symbiote.js": {
+      "name": "@symbiotejs/symbiote",
+      "version": "1.11.5-alpha",
+      "extraneous": true,
+      "license": "MIT",
+      "devDependencies": {
+        "@babel/eslint-parser": "^7.15.8",
+        "@babel/preset-env": "^7.15.8",
+        "@esm-bundle/chai": "^4.3.4-fix.0",
+        "@types/node": "^17.0.14",
+        "@web/test-runner": "^0.14.0",
+        "dts-bundle-generator": "^6.5.0",
+        "esbuild": "^0.14.8",
+        "eslint": "^8.0.1",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-html": "^7.1.0",
+        "husky": "^1.3.1",
+        "lint-staged": "^11.2.3",
+        "prettier": "^2.0.5",
+        "prettier-plugin-jsdoc": "0.0.17",
+        "typescript": "^4.5.5"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
@@ -1633,6 +1657,39 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.0.tgz",
+      "integrity": "sha512-zJ6hb3FDgBbO8d2e83vg6zq7tNvDqSq9RwdwfzJ8tdm9JHNvANq2fqwyRn6mlpUb7CwTs5ILdUrGwi9Gk4vY5w==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4",
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
+      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
@@ -2031,9 +2088,9 @@
       }
     },
     "node_modules/@symbiotejs/symbiote": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@symbiotejs/symbiote/-/symbiote-1.11.2.tgz",
-      "integrity": "sha512-P2TUImgZ7jTL/OGEJWr0v3NWgyA27Jj1nrgpdovc/hriYcT14UG5wOYH/Gy9jXs0JlZqPFPU1U9wu0RB6R1XOQ=="
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@symbiotejs/symbiote/-/symbiote-1.11.5.tgz",
+      "integrity": "sha512-50g0HzDwZrJQMXKzM1e16hI8CNYsBmDqnQEt7VkBVpw08kIymc4Ad52xM7aff1Axn6yEwKsG5wTsbs1sPekRdw=="
     },
     "node_modules/@types/accepts": {
       "version": "1.3.5",
@@ -2383,9 +2440,9 @@
       }
     },
     "node_modules/@uploadcare/upload-client": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@uploadcare/upload-client/-/upload-client-4.3.1.tgz",
-      "integrity": "sha512-VVNmbg0ty6mFtXZlPwEf14G2dJXoUvVhQWYcgM+XQUCvOobjVIUIPxL1lfCKjLsD+wCHdH5DuQPhbpgpEqe9SQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@uploadcare/upload-client/-/upload-client-6.2.1.tgz",
+      "integrity": "sha512-OsKJrQcFudQ6vjLeDvo/ICjtS/wpW+tx1WsTcxIYu2kMulDJNscu8nOiZ39o4o1aQqqeNU/uYDehpHV7SGQxBQ==",
       "dependencies": {
         "form-data": "^4.0.0",
         "ws": "^8.2.3"
@@ -2395,15 +2452,15 @@
       }
     },
     "node_modules/@uploadcare/upload-client/node_modules/ws": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-      "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -3928,27 +3985,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "dependencies": {
-        "is-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-regexp/node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4010,9 +4046,9 @@
       "dev": true
     },
     "node_modules/colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "node_modules/colorette": {
@@ -4513,9 +4549,9 @@
       }
     },
     "node_modules/css-functions-list": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
+      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
       "dev": true,
       "engines": {
         "node": ">=12.22"
@@ -5031,9 +5067,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.38.tgz",
-      "integrity": "sha512-12fzJ0fsm7gVZX1YQ1InkOE5f9Tl7cgf6JPYXRJtPIoE0zkWAbHdPHVPPaLi9tYAcEBqheGzqLn/3RdTOyBfcA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -5043,32 +5079,33 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "esbuild-android-64": "0.14.38",
-        "esbuild-android-arm64": "0.14.38",
-        "esbuild-darwin-64": "0.14.38",
-        "esbuild-darwin-arm64": "0.14.38",
-        "esbuild-freebsd-64": "0.14.38",
-        "esbuild-freebsd-arm64": "0.14.38",
-        "esbuild-linux-32": "0.14.38",
-        "esbuild-linux-64": "0.14.38",
-        "esbuild-linux-arm": "0.14.38",
-        "esbuild-linux-arm64": "0.14.38",
-        "esbuild-linux-mips64le": "0.14.38",
-        "esbuild-linux-ppc64le": "0.14.38",
-        "esbuild-linux-riscv64": "0.14.38",
-        "esbuild-linux-s390x": "0.14.38",
-        "esbuild-netbsd-64": "0.14.38",
-        "esbuild-openbsd-64": "0.14.38",
-        "esbuild-sunos-64": "0.14.38",
-        "esbuild-windows-32": "0.14.38",
-        "esbuild-windows-64": "0.14.38",
-        "esbuild-windows-arm64": "0.14.38"
+        "@esbuild/linux-loong64": "0.14.54",
+        "esbuild-android-64": "0.14.54",
+        "esbuild-android-arm64": "0.14.54",
+        "esbuild-darwin-64": "0.14.54",
+        "esbuild-darwin-arm64": "0.14.54",
+        "esbuild-freebsd-64": "0.14.54",
+        "esbuild-freebsd-arm64": "0.14.54",
+        "esbuild-linux-32": "0.14.54",
+        "esbuild-linux-64": "0.14.54",
+        "esbuild-linux-arm": "0.14.54",
+        "esbuild-linux-arm64": "0.14.54",
+        "esbuild-linux-mips64le": "0.14.54",
+        "esbuild-linux-ppc64le": "0.14.54",
+        "esbuild-linux-riscv64": "0.14.54",
+        "esbuild-linux-s390x": "0.14.54",
+        "esbuild-netbsd-64": "0.14.54",
+        "esbuild-openbsd-64": "0.14.54",
+        "esbuild-sunos-64": "0.14.54",
+        "esbuild-windows-32": "0.14.54",
+        "esbuild-windows-64": "0.14.54",
+        "esbuild-windows-arm64": "0.14.54"
       }
     },
     "node_modules/esbuild-android-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz",
-      "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
+      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
       "cpu": [
         "x64"
       ],
@@ -5082,9 +5119,9 @@
       }
     },
     "node_modules/esbuild-android-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz",
-      "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
+      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
       "cpu": [
         "arm64"
       ],
@@ -5098,9 +5135,9 @@
       }
     },
     "node_modules/esbuild-darwin-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz",
-      "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
+      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
       "cpu": [
         "x64"
       ],
@@ -5114,9 +5151,9 @@
       }
     },
     "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.38.tgz",
-      "integrity": "sha512-eqF+OejMI3mC5Dlo9Kdq/Ilbki9sQBw3QlHW3wjLmsLh+quNfHmGMp3Ly1eWm981iGBMdbtSS9+LRvR2T8B3eQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
+      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
       "cpu": [
         "arm64"
       ],
@@ -5130,9 +5167,9 @@
       }
     },
     "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz",
-      "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
+      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
       "cpu": [
         "x64"
       ],
@@ -5146,9 +5183,9 @@
       }
     },
     "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz",
-      "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
+      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
       "cpu": [
         "arm64"
       ],
@@ -5162,9 +5199,9 @@
       }
     },
     "node_modules/esbuild-linux-32": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz",
-      "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
+      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
       "cpu": [
         "ia32"
       ],
@@ -5178,9 +5215,9 @@
       }
     },
     "node_modules/esbuild-linux-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz",
-      "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
+      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
       "cpu": [
         "x64"
       ],
@@ -5194,9 +5231,9 @@
       }
     },
     "node_modules/esbuild-linux-arm": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz",
-      "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
+      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
       "cpu": [
         "arm"
       ],
@@ -5210,9 +5247,9 @@
       }
     },
     "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz",
-      "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
+      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
       "cpu": [
         "arm64"
       ],
@@ -5226,9 +5263,9 @@
       }
     },
     "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz",
-      "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
+      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
       "cpu": [
         "mips64el"
       ],
@@ -5242,9 +5279,9 @@
       }
     },
     "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz",
-      "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
+      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
       "cpu": [
         "ppc64"
       ],
@@ -5258,9 +5295,9 @@
       }
     },
     "node_modules/esbuild-linux-riscv64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz",
-      "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
+      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
       "cpu": [
         "riscv64"
       ],
@@ -5274,9 +5311,9 @@
       }
     },
     "node_modules/esbuild-linux-s390x": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz",
-      "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
+      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
       "cpu": [
         "s390x"
       ],
@@ -5290,9 +5327,9 @@
       }
     },
     "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz",
-      "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
+      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
       "cpu": [
         "x64"
       ],
@@ -5306,9 +5343,9 @@
       }
     },
     "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz",
-      "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
+      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
       "cpu": [
         "x64"
       ],
@@ -5322,9 +5359,9 @@
       }
     },
     "node_modules/esbuild-sunos-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz",
-      "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
+      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
       "cpu": [
         "x64"
       ],
@@ -5338,9 +5375,9 @@
       }
     },
     "node_modules/esbuild-windows-32": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz",
-      "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
+      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
       "cpu": [
         "ia32"
       ],
@@ -5354,9 +5391,9 @@
       }
     },
     "node_modules/esbuild-windows-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz",
-      "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
+      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
       "cpu": [
         "x64"
       ],
@@ -5370,9 +5407,9 @@
       }
     },
     "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz",
-      "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
+      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
       "cpu": [
         "arm64"
       ],
@@ -6053,18 +6090,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "dependencies": {
-        "clone-regexp": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -6335,9 +6360,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -6363,10 +6388,13 @@
       "dev": true
     },
     "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.9.1"
+      }
     },
     "node_modules/fastq": {
       "version": "1.13.0",
@@ -7257,9 +7285,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -8309,9 +8337,9 @@
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
       "dev": true
     },
     "node_modules/koa": {
@@ -8714,7 +8742,7 @@
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "node_modules/log-symbols": {
@@ -10702,9 +10730,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
+      "version": "8.4.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
       "dev": true,
       "funding": [
         {
@@ -10717,7 +10745,7 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.3",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -10971,9 +10999,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -10984,12 +11012,12 @@
       }
     },
     "node_modules/postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.1.tgz",
+      "integrity": "sha512-go9Zoxx7KQH+uLrJ9xa5wRErFeXu01ydA6O8m7koPXkmAN7Ts//eRcIqjo0stBR4+Nir2gMYDOWAOx7O5EPUZA==",
       "dev": true,
       "peerDependencies": {
-        "postcss": "^8.3.9"
+        "postcss": "^8.4.20"
       }
     },
     "node_modules/postcss-syntax": {
@@ -12852,52 +12880,49 @@
       "dev": true
     },
     "node_modules/stylelint": {
-      "version": "14.7.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
-      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
+      "version": "14.16.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+      "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
       "dev": true,
       "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
         "balanced-match": "^2.0.0",
-        "colord": "^2.9.2",
-        "cosmiconfig": "^7.0.1",
-        "css-functions-list": "^3.0.1",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^7.1.0",
+        "css-functions-list": "^3.1.0",
         "debug": "^4.3.4",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.11",
-        "fastest-levenshtein": "^1.0.12",
+        "fast-glob": "^3.2.12",
+        "fastest-levenshtein": "^1.0.16",
         "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.2.0",
-        "ignore": "^5.2.0",
+        "ignore": "^5.2.1",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.24.0",
+        "known-css-properties": "^0.26.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
+        "postcss": "^8.4.19",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
-        "specificity": "^0.4.1",
         "string-width": "^4.2.3",
         "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.2.0",
+        "supports-hyperlinks": "^2.3.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.8.0",
+        "table": "^6.8.1",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.1"
+        "write-file-atomic": "^4.0.2"
       },
       "bin": {
         "stylelint": "bin/stylelint.js"
@@ -12911,9 +12936,9 @@
       }
     },
     "node_modules/stylelint-config-prettier": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz",
-      "integrity": "sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.4.tgz",
+      "integrity": "sha512-38nIGTGpFOiK5LjJ8Ma1yUgpKENxoKSOhbDNSemY7Ep0VsJoXIW9Iq/2hSt699oB9tReynfWicTAoIHiq8Rvbg==",
       "dev": true,
       "bin": {
         "stylelint-config-prettier": "bin/check.js",
@@ -13662,30 +13687,30 @@
       }
     },
     "node_modules/stylelint-config-recommended": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
-      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz",
+      "integrity": "sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==",
       "dev": true,
       "peerDependencies": {
-        "stylelint": "^14.4.0"
+        "stylelint": "^14.10.0"
       }
     },
     "node_modules/stylelint-config-standard": {
-      "version": "25.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
-      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "version": "29.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz",
+      "integrity": "sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==",
       "dev": true,
       "dependencies": {
-        "stylelint-config-recommended": "^7.0.0"
+        "stylelint-config-recommended": "^9.0.0"
       },
       "peerDependencies": {
-        "stylelint": "^14.4.0"
+        "stylelint": "^14.14.0"
       }
     },
     "node_modules/stylelint-declaration-block-no-ignored-properties": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.5.0.tgz",
-      "integrity": "sha512-UNz5nUC5GMgMb6GPc/pHUTC0+ydxTdj2mUn7XcKRdwQoiUzzUmWWdSf1aFv2UzrW4x8JYNReE1u5JOj7g0ThJw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.6.0.tgz",
+      "integrity": "sha512-S9EC/tVJL19ppMRC4A4ecxtkENHZ7WNrEAukJVDtFt+iZgNP3SmokOLlYUhe6qZuB2XUvETqUx6r2p3Xfo7Rxw==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -13695,13 +13720,13 @@
       }
     },
     "node_modules/stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.1.tgz",
+      "integrity": "sha512-C9gJDZArRBZvn+4MPgggwYTp7dK49WPnYa5+6tBEkZnW/YWj4xBVNJdQjIik14w5orlF9RqFpYDHN0FPWIFOSQ==",
       "dev": true,
       "dependencies": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
+        "postcss": "^8.4.20",
+        "postcss-sorting": "^8.0.1"
       },
       "peerDependencies": {
         "stylelint": "^14.0.0"
@@ -13714,9 +13739,9 @@
       "dev": true
     },
     "node_modules/stylelint/node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
       "dependencies": {
         "@types/parse-json": "^4.0.0",
@@ -13729,18 +13754,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/stylelint/node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stylelint/node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -14008,9 +14021,9 @@
       }
     },
     "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
       "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0",
@@ -14060,9 +14073,9 @@
       "dev": true
     },
     "node_modules/table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
@@ -14109,9 +14122,9 @@
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -15131,16 +15144,16 @@
       }
     },
     "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/ws": {
@@ -16352,6 +16365,20 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@csstools/selector-specificity": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.0.tgz",
+      "integrity": "sha512-zJ6hb3FDgBbO8d2e83vg6zq7tNvDqSq9RwdwfzJ8tdm9JHNvANq2fqwyRn6mlpUb7CwTs5ILdUrGwi9Gk4vY5w==",
+      "dev": true,
+      "requires": {}
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
+      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "dev": true,
+      "optional": true
+    },
     "@eslint/eslintrc": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz",
@@ -16695,9 +16722,9 @@
       }
     },
     "@symbiotejs/symbiote": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@symbiotejs/symbiote/-/symbiote-1.11.2.tgz",
-      "integrity": "sha512-P2TUImgZ7jTL/OGEJWr0v3NWgyA27Jj1nrgpdovc/hriYcT14UG5wOYH/Gy9jXs0JlZqPFPU1U9wu0RB6R1XOQ=="
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@symbiotejs/symbiote/-/symbiote-1.11.5.tgz",
+      "integrity": "sha512-50g0HzDwZrJQMXKzM1e16hI8CNYsBmDqnQEt7VkBVpw08kIymc4Ad52xM7aff1Axn6yEwKsG5wTsbs1sPekRdw=="
     },
     "@types/accepts": {
       "version": "1.3.5",
@@ -17046,18 +17073,18 @@
       }
     },
     "@uploadcare/upload-client": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@uploadcare/upload-client/-/upload-client-4.3.1.tgz",
-      "integrity": "sha512-VVNmbg0ty6mFtXZlPwEf14G2dJXoUvVhQWYcgM+XQUCvOobjVIUIPxL1lfCKjLsD+wCHdH5DuQPhbpgpEqe9SQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@uploadcare/upload-client/-/upload-client-6.2.1.tgz",
+      "integrity": "sha512-OsKJrQcFudQ6vjLeDvo/ICjtS/wpW+tx1WsTcxIYu2kMulDJNscu8nOiZ39o4o1aQqqeNU/uYDehpHV7SGQxBQ==",
       "requires": {
         "form-data": "^4.0.0",
         "ws": "^8.2.3"
       },
       "dependencies": {
         "ws": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
-          "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+          "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
           "requires": {}
         }
       }
@@ -18192,23 +18219,6 @@
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
-    "clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "requires": {
-        "is-regexp": "^2.0.0"
-      },
-      "dependencies": {
-        "is-regexp": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-          "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-          "dev": true
-        }
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -18259,9 +18269,9 @@
       "dev": true
     },
     "colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "colorette": {
@@ -18660,9 +18670,9 @@
       }
     },
     "css-functions-list": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
+      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
       "dev": true
     },
     "cssesc": {
@@ -19064,170 +19074,171 @@
       }
     },
     "esbuild": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.38.tgz",
-      "integrity": "sha512-12fzJ0fsm7gVZX1YQ1InkOE5f9Tl7cgf6JPYXRJtPIoE0zkWAbHdPHVPPaLi9tYAcEBqheGzqLn/3RdTOyBfcA==",
-      "dev": true,
-      "requires": {
-        "esbuild-android-64": "0.14.38",
-        "esbuild-android-arm64": "0.14.38",
-        "esbuild-darwin-64": "0.14.38",
-        "esbuild-darwin-arm64": "0.14.38",
-        "esbuild-freebsd-64": "0.14.38",
-        "esbuild-freebsd-arm64": "0.14.38",
-        "esbuild-linux-32": "0.14.38",
-        "esbuild-linux-64": "0.14.38",
-        "esbuild-linux-arm": "0.14.38",
-        "esbuild-linux-arm64": "0.14.38",
-        "esbuild-linux-mips64le": "0.14.38",
-        "esbuild-linux-ppc64le": "0.14.38",
-        "esbuild-linux-riscv64": "0.14.38",
-        "esbuild-linux-s390x": "0.14.38",
-        "esbuild-netbsd-64": "0.14.38",
-        "esbuild-openbsd-64": "0.14.38",
-        "esbuild-sunos-64": "0.14.38",
-        "esbuild-windows-32": "0.14.38",
-        "esbuild-windows-64": "0.14.38",
-        "esbuild-windows-arm64": "0.14.38"
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
+      "dev": true,
+      "requires": {
+        "@esbuild/linux-loong64": "0.14.54",
+        "esbuild-android-64": "0.14.54",
+        "esbuild-android-arm64": "0.14.54",
+        "esbuild-darwin-64": "0.14.54",
+        "esbuild-darwin-arm64": "0.14.54",
+        "esbuild-freebsd-64": "0.14.54",
+        "esbuild-freebsd-arm64": "0.14.54",
+        "esbuild-linux-32": "0.14.54",
+        "esbuild-linux-64": "0.14.54",
+        "esbuild-linux-arm": "0.14.54",
+        "esbuild-linux-arm64": "0.14.54",
+        "esbuild-linux-mips64le": "0.14.54",
+        "esbuild-linux-ppc64le": "0.14.54",
+        "esbuild-linux-riscv64": "0.14.54",
+        "esbuild-linux-s390x": "0.14.54",
+        "esbuild-netbsd-64": "0.14.54",
+        "esbuild-openbsd-64": "0.14.54",
+        "esbuild-sunos-64": "0.14.54",
+        "esbuild-windows-32": "0.14.54",
+        "esbuild-windows-64": "0.14.54",
+        "esbuild-windows-arm64": "0.14.54"
       }
     },
     "esbuild-android-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.38.tgz",
-      "integrity": "sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
+      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-android-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.38.tgz",
-      "integrity": "sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
+      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.38.tgz",
-      "integrity": "sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
+      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.38.tgz",
-      "integrity": "sha512-eqF+OejMI3mC5Dlo9Kdq/Ilbki9sQBw3QlHW3wjLmsLh+quNfHmGMp3Ly1eWm981iGBMdbtSS9+LRvR2T8B3eQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
+      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.38.tgz",
-      "integrity": "sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
+      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.38.tgz",
-      "integrity": "sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
+      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.38.tgz",
-      "integrity": "sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
+      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.38.tgz",
-      "integrity": "sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
+      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.38.tgz",
-      "integrity": "sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
+      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.38.tgz",
-      "integrity": "sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
+      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.38.tgz",
-      "integrity": "sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
+      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.38.tgz",
-      "integrity": "sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
+      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-riscv64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.38.tgz",
-      "integrity": "sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
+      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-s390x": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.38.tgz",
-      "integrity": "sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
+      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
       "dev": true,
       "optional": true
     },
     "esbuild-netbsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.38.tgz",
-      "integrity": "sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
+      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
       "dev": true,
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.38.tgz",
-      "integrity": "sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
+      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
       "dev": true,
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.38.tgz",
-      "integrity": "sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
+      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-32": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.38.tgz",
-      "integrity": "sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
+      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.38.tgz",
-      "integrity": "sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
+      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.14.38",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.38.tgz",
-      "integrity": "sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw==",
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
+      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
       "dev": true,
       "optional": true
     },
@@ -19735,15 +19746,6 @@
         }
       }
     },
-    "execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "requires": {
-        "clone-regexp": "^2.1.0"
-      }
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -19962,9 +19964,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -19987,9 +19989,9 @@
       "dev": true
     },
     "fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
       "dev": true
     },
     "fastq": {
@@ -20656,9 +20658,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
@@ -21399,9 +21401,9 @@
       "dev": true
     },
     "known-css-properties": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
       "dev": true
     },
     "koa": {
@@ -21726,7 +21728,7 @@
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "log-symbols": {
@@ -23130,12 +23132,12 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
+      "version": "8.4.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.3",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -23324,9 +23326,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -23334,9 +23336,9 @@
       }
     },
     "postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.1.tgz",
+      "integrity": "sha512-go9Zoxx7KQH+uLrJ9xa5wRErFeXu01ydA6O8m7koPXkmAN7Ts//eRcIqjo0stBR4+Nir2gMYDOWAOx7O5EPUZA==",
       "dev": true,
       "requires": {}
     },
@@ -24767,52 +24769,49 @@
       "dev": true
     },
     "stylelint": {
-      "version": "14.7.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
-      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
+      "version": "14.16.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+      "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
       "dev": true,
       "requires": {
+        "@csstools/selector-specificity": "^2.0.2",
         "balanced-match": "^2.0.0",
-        "colord": "^2.9.2",
-        "cosmiconfig": "^7.0.1",
-        "css-functions-list": "^3.0.1",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^7.1.0",
+        "css-functions-list": "^3.1.0",
         "debug": "^4.3.4",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.11",
-        "fastest-levenshtein": "^1.0.12",
+        "fast-glob": "^3.2.12",
+        "fastest-levenshtein": "^1.0.16",
         "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.2.0",
-        "ignore": "^5.2.0",
+        "ignore": "^5.2.1",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.24.0",
+        "known-css-properties": "^0.26.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "normalize-selector": "^0.2.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
+        "postcss": "^8.4.19",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
-        "specificity": "^0.4.1",
         "string-width": "^4.2.3",
         "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.2.0",
+        "supports-hyperlinks": "^2.3.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.8.0",
+        "table": "^6.8.1",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.1"
+        "write-file-atomic": "^4.0.2"
       },
       "dependencies": {
         "balanced-match": {
@@ -24822,9 +24821,9 @@
           "dev": true
         },
         "cosmiconfig": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-          "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+          "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
           "dev": true,
           "requires": {
             "@types/parse-json": "^4.0.0",
@@ -24834,12 +24833,6 @@
             "yaml": "^1.10.0"
           }
         },
-        "get-stdin": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-          "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-          "dev": true
-        },
         "globby": {
           "version": "11.1.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -25000,9 +24993,9 @@
       }
     },
     "stylelint-config-prettier": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz",
-      "integrity": "sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-9.0.4.tgz",
+      "integrity": "sha512-38nIGTGpFOiK5LjJ8Ma1yUgpKENxoKSOhbDNSemY7Ep0VsJoXIW9Iq/2hSt699oB9tReynfWicTAoIHiq8Rvbg==",
       "dev": true,
       "requires": {}
     },
@@ -25596,36 +25589,36 @@
       }
     },
     "stylelint-config-recommended": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
-      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz",
+      "integrity": "sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==",
       "dev": true,
       "requires": {}
     },
     "stylelint-config-standard": {
-      "version": "25.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
-      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "version": "29.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz",
+      "integrity": "sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==",
       "dev": true,
       "requires": {
-        "stylelint-config-recommended": "^7.0.0"
+        "stylelint-config-recommended": "^9.0.0"
       }
     },
     "stylelint-declaration-block-no-ignored-properties": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.5.0.tgz",
-      "integrity": "sha512-UNz5nUC5GMgMb6GPc/pHUTC0+ydxTdj2mUn7XcKRdwQoiUzzUmWWdSf1aFv2UzrW4x8JYNReE1u5JOj7g0ThJw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/stylelint-declaration-block-no-ignored-properties/-/stylelint-declaration-block-no-ignored-properties-2.6.0.tgz",
+      "integrity": "sha512-S9EC/tVJL19ppMRC4A4ecxtkENHZ7WNrEAukJVDtFt+iZgNP3SmokOLlYUhe6qZuB2XUvETqUx6r2p3Xfo7Rxw==",
       "dev": true,
       "requires": {}
     },
     "stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.1.tgz",
+      "integrity": "sha512-C9gJDZArRBZvn+4MPgggwYTp7dK49WPnYa5+6tBEkZnW/YWj4xBVNJdQjIik14w5orlF9RqFpYDHN0FPWIFOSQ==",
       "dev": true,
       "requires": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
+        "postcss": "^8.4.20",
+        "postcss-sorting": "^8.0.1"
       }
     },
     "sugarss": {
@@ -25671,9 +25664,9 @@
       }
     },
     "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
@@ -25710,9 +25703,9 @@
       "dev": true
     },
     "table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
@@ -25723,9 +25716,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -26556,9 +26549,9 @@
       }
     },
     "write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
diff --git a/package.json b/package.json
index a2202acbb..3296faa72 100644
--- a/package.json
+++ b/package.json
@@ -104,18 +104,18 @@
     "puppeteer": "^14.4.1",
     "rimraf": "^3.0.2",
     "shipjs": "^0.24.4",
-    "stylelint": "^14.7.1",
-    "stylelint-config-prettier": "^9.0.3",
+    "stylelint": "^14.16.1",
+    "stylelint-config-prettier": "^9.0.4",
     "stylelint-config-rational-order": "^0.1.2",
-    "stylelint-config-standard": "^25.0.0",
-    "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
-    "stylelint-order": "^5.0.0",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-declaration-block-no-ignored-properties": "^2.6.0",
+    "stylelint-order": "^6.0.1",
     "typescript": "^4.8.2"
   },
   "author": "Uploadcare Inc.",
   "license": "MIT",
   "dependencies": {
-    "@symbiotejs/symbiote": "^1.11.2",
-    "@uploadcare/upload-client": "^4.3.1"
+    "@symbiotejs/symbiote": "^1.11.5",
+    "@uploadcare/upload-client": "^6.2.1"
   }
 }
diff --git a/solutions/file-uploader/README.md b/solutions/file-uploader/README.md
index ebb723446..42bb1cb89 100644
--- a/solutions/file-uploader/README.md
+++ b/solutions/file-uploader/README.md
@@ -409,14 +409,16 @@ import { LR } from '@uploadcare/blocks';
 
 class MyBlock extends LR.BlockComponent {
   initCallback() {
-    this.onActivation = () => {
-      '*activityCaption': this.l10n('some-caption'),
-      '*activityIcon': 'my-icon-name',
+    const onActivate = () => {
+      console.log('activity-name is activated');
     };
-    this.onDeactivation = () => {
-      console.log('activity-name is deactivated');
+    const onDeactivate = () => {
+      console.log('activity-name is deactcivated');
     };
-    this.registerActivity('my-activity-name', this.onActivation, this.onDeactivation);
+    this.registerActivity('my-activity-name', {
+      onActivate,
+      onDeactivate,
+    });
   }
 }
 ```
diff --git a/solutions/file-uploader/inline/FileUploaderInline.js b/solutions/file-uploader/inline/FileUploaderInline.js
index d751f9fd1..7faac0cdd 100644
--- a/solutions/file-uploader/inline/FileUploaderInline.js
+++ b/solutions/file-uploader/inline/FileUploaderInline.js
@@ -24,14 +24,14 @@ export class FileUploaderInline extends SolutionBlock {
 }
 
 FileUploaderInline.template = /* HTML */ ` <lr-start-from>
+    <lr-drop-area set="@hidden: dropAreaHidden" with-icon clickable></lr-drop-area>
     <lr-source-list wrap></lr-source-list>
-    <lr-drop-area set="@hidden: dropAreaHidden" clickable></lr-drop-area>
+    <lr-copyright></lr-copyright>
   </lr-start-from>
   <lr-upload-list ref="uBlock"></lr-upload-list>
   <lr-camera-source></lr-camera-source>
   <lr-url-source></lr-url-source>
   <lr-external-source></lr-external-source>
-  <lr-upload-details></lr-upload-details>
   <lr-confirmation-dialog></lr-confirmation-dialog>
   <lr-message-box></lr-message-box>
   <lr-progress-bar></lr-progress-bar>
diff --git a/solutions/file-uploader/inline/demo.htm b/solutions/file-uploader/inline/demo.htm
index e5cbdce17..c1720bf33 100644
--- a/solutions/file-uploader/inline/demo.htm
+++ b/solutions/file-uploader/inline/demo.htm
@@ -14,6 +14,7 @@ <h2>Multiple sources</h2>
 
     .lr-wgt-common {
       --cfg-pubkey: 'demopublickey';
+      --darkmode: 0;
     }
   </style>
 
@@ -41,6 +42,7 @@ <h2>Single source</h2>
     .lr-wgt-common {
       --cfg-pubkey: 'demopublickey';
       --cfg-source-list: 'local';
+      --darkmode: 0;
     }
   </style>
 
diff --git a/solutions/file-uploader/inline/index.css b/solutions/file-uploader/inline/index.css
index 886df488d..f4fa52584 100644
--- a/solutions/file-uploader/inline/index.css
+++ b/solutions/file-uploader/inline/index.css
@@ -19,3 +19,26 @@ lr-uploader {
       calc((0.1 - 0.05 * var(--darkmode)) * var(--borders))
     );
 }
+
+lr-start-from {
+  height: 100%;
+}
+
+:host {
+  container-type: inline-size;
+}
+
+@container (min-width: 500px) {
+  lr-start-from {
+    grid-template-rows: 1fr max-content;
+    grid-template-columns: 1fr max-content;
+  }
+
+  lr-start-from lr-copyright {
+    grid-column: 2;
+  }
+
+  lr-start-from lr-drop-area {
+    grid-row: span 2;
+  }
+}
diff --git a/solutions/file-uploader/minimal/FileUploaderMinimal.js b/solutions/file-uploader/minimal/FileUploaderMinimal.js
index 3a07782d8..b7d997a4b 100644
--- a/solutions/file-uploader/minimal/FileUploaderMinimal.js
+++ b/solutions/file-uploader/minimal/FileUploaderMinimal.js
@@ -30,7 +30,8 @@ export class FileUploaderMinimal extends SolutionBlock {
 
 FileUploaderMinimal.template = /* HTML */ `
   <lr-start-from>
-    <lr-drop-area clickable l10n="drop-files-here"></lr-drop-area>
+    <lr-drop-area clickable l10n="choose-file"></lr-drop-area>
+    <lr-copyright></lr-copyright>
   </lr-start-from>
   <lr-upload-list ref="uBlock"></lr-upload-list>
   <lr-message-box></lr-message-box>
diff --git a/solutions/file-uploader/minimal/demo.htm b/solutions/file-uploader/minimal/demo.htm
index 7e2513a35..76fa591ec 100644
--- a/solutions/file-uploader/minimal/demo.htm
+++ b/solutions/file-uploader/minimal/demo.htm
@@ -9,13 +9,13 @@ <h2>Live example</h2>
     lr-file-uploader-minimal {
       --cfg-pubkey: 'demopublickey';
       --ctx-name: 'uploader-ctx';
+      --darkmode: 0;
     }
   </style>
 
   <!-- Uploader widget element: -->
   <lr-file-uploader-minimal
-    css-src="./minimal/index.css">
-  </lr-file-uploader-minimal>
+    css-src="./minimal/index.css"></lr-file-uploader-minimal>
 
   <lr-data-output
     use-console
diff --git a/solutions/file-uploader/minimal/index.css b/solutions/file-uploader/minimal/index.css
index d01deab96..3dd471054 100644
--- a/solutions/file-uploader/minimal/index.css
+++ b/solutions/file-uploader/minimal/index.css
@@ -14,22 +14,26 @@
 @import url('../../../blocks/Icon/icon.css');
 @import url('../../../blocks/ProgressBar/progress-bar.css');
 @import url('../../../blocks/MessageBox/message-box.css');
+@import url('../../../blocks/Copyright/copyright.css');
 
 /* ICONS: */
 :where(.lr-wgt-icons, .lr-wgt-common),
 :host {
-  --icon-close: 'M17.6569 7.75734c.3905-.39053.3905-1.02369 0-1.41421-.3906-.39053-1.0237-.39053-1.4143 0L12 10.5858 7.75736 6.34313c-.39053-.39053-1.02369-.39053-1.41421 0-.39053.39052-.39053 1.02368 0 1.41421L10.5858 12l-4.24266 4.2426c-.39052.3905-.39052 1.0237 0 1.4142.39053.3906 1.02369.3906 1.41422 0L12 13.4142l4.2426 4.2426c.3906.3906 1.0237.3906 1.4143 0 .3905-.3905.3905-1.0237 0-1.4142L13.4142 12l4.2427-4.24266Z';
+  --icon-arrow-down: 'm11.5009 23.0302c.2844.2533.7135.2533.9978 0l9.2899-8.2758c.3092-.2756.3366-.7496.0611-1.0589s-.7496-.3367-1.0589-.0612l-8.0417 7.1639v-19.26834c0-.41421-.3358-.749997-.75-.749997s-.75.335787-.75.749997v19.26704l-8.04025-7.1626c-.30928-.2755-.78337-.2481-1.05889.0612-.27553.3093-.24816.7833.06112 1.0589z';
+  --icon-default: 'm11.5014.392135c.2844-.253315.7134-.253315.9978 0l6.7037 5.971925c.3093.27552.3366.74961.0611 1.05889-.2755.30929-.7496.33666-1.0589.06113l-5.4553-4.85982v13.43864c0 .4142-.3358.75-.75.75s-.75-.3358-.75-.75v-13.43771l-5.45427 4.85889c-.30929.27553-.78337.24816-1.0589-.06113-.27553-.30928-.24816-.78337.06113-1.05889zm-10.644466 16.336765c.414216 0 .749996.3358.749996.75v4.9139h20.78567v-4.9139c0-.4142.3358-.75.75-.75.4143 0 .75.3358.75.75v5.6639c0 .4143-.3357.75-.75.75h-22.285666c-.414214 0-.75-.3357-.75-.75v-5.6639c0-.4142.335786-.75.75-.75z';
+  --icon-close: 'm4.60395 4.60395c.29289-.2929.76776-.2929 1.06066 0l6.33539 6.33535 6.3354-6.33535c.2929-.2929.7677-.2929 1.0606 0 .2929.29289.2929.76776 0 1.06066l-6.3353 6.33539 6.3353 6.3354c.2929.2929.2929.7677 0 1.0606s-.7677.2929-1.0606 0l-6.3354-6.3353-6.33539 6.3353c-.2929.2929-.76777.2929-1.06066 0-.2929-.2929-.2929-.7677 0-1.0606l6.33535-6.3354-6.33535-6.33539c-.2929-.2929-.2929-.76777 0-1.06066z';
   --icon-info: 'M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z';
   --icon-error: 'M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z';
   --icon-remove: 'm6.35673 9.71429c-.76333 0-1.35856.66121-1.27865 1.42031l1.01504 9.6429c.06888.6543.62067 1.1511 1.27865 1.1511h9.25643c.658 0 1.2098-.4968 1.2787-1.1511l1.015-9.6429c.0799-.7591-.5153-1.42031-1.2786-1.42031zm.50041-4.5v.32142h-2.57143c-.71008 0-1.28571.57564-1.28571 1.28572s.57563 1.28571 1.28571 1.28571h15.42859c.7101 0 1.2857-.57563 1.2857-1.28571s-.5756-1.28572-1.2857-1.28572h-2.5714v-.32142c0-1.77521-1.4391-3.21429-3.2143-3.21429h-3.8572c-1.77517 0-3.21426 1.43908-3.21426 3.21429zm7.07146-.64286c.355 0 .6428.28782.6428.64286v.32142h-5.14283v-.32142c0-.35504.28782-.64286.64283-.64286z';
   --icon-check: 'm12 22c5.5228 0 10-4.4772 10-10 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.5228 4.47715 10 10 10zm4.7071-11.4929-5.9071 5.9071-3.50711-3.5071c-.39052-.3905-.39052-1.0237 0-1.4142.39053-.3906 1.02369-.3906 1.41422 0l2.09289 2.0929 4.4929-4.49294c.3905-.39052 1.0237-.39052 1.4142 0 .3905.39053.3905 1.02374 0 1.41424z';
-  --icon-remove-file: 'm12 22c5.5228 0 10-4.4772 10-10 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.5228 4.47715 10 10 10zm3.7071-13.70711c.3905.39053.3905 1.02369 0 1.41422l-2.2929 2.29289 2.2929 2.2929c.3905.3905.3905 1.0237 0 1.4142s-1.0237.3905-1.4142 0l-2.2929-2.2929-2.29289 2.2929c-.39053.3905-1.02369.3905-1.41422 0-.39052-.3905-.39052-1.0237 0-1.4142l2.29291-2.2929-2.2929-2.29289c-.39053-.39053-.39053-1.02369 0-1.41422.39052-.39052 1.02369-.39052 1.41421 0l2.29289 2.29291 2.2929-2.29291c.3905-.39052 1.0237-.39052 1.4142 0z';
+  --icon-remove-file: 'm11.9554 3.29999c-.7875 0-1.5427.31281-2.0995.86963-.49303.49303-.79476 1.14159-.85742 1.83037h5.91382c-.0627-.68878-.3644-1.33734-.8575-1.83037-.5568-.55682-1.312-.86963-2.0994-.86963zm4.461 2.7c-.0656-1.08712-.5264-2.11657-1.3009-2.89103-.8381-.83812-1.9749-1.30897-3.1601-1.30897-1.1853 0-2.32204.47085-3.16016 1.30897-.77447.77446-1.23534 1.80391-1.30087 2.89103h-2.31966c-.03797 0-.07529.00282-.11174.00827h-1.98826c-.41422 0-.75.33578-.75.75 0 .41421.33578.75.75.75h1.35v11.84174c0 .7559.30026 1.4808.83474 2.0152.53448.5345 1.25939.8348 2.01526.8348h9.44999c.7559 0 1.4808-.3003 2.0153-.8348.5344-.5344.8347-1.2593.8347-2.0152v-11.84174h1.35c.4142 0 .75-.33579.75-.75 0-.41422-.3358-.75-.75-.75h-1.9883c-.0364-.00545-.0737-.00827-.1117-.00827zm-10.49169 1.50827v11.84174c0 .358.14223.7014.3954.9546.25318.2532.59656.3954.9546.3954h9.44999c.358 0 .7014-.1422.9546-.3954s.3954-.5966.3954-.9546v-11.84174z';
   --icon-trash-file: var(--icon-remove);
   --icon-upload-error: var(--icon-error);
   --icon-badge-success: 'M10.5 18.2044L18.0992 10.0207C18.6629 9.41362 18.6277 8.46452 18.0207 7.90082C17.4136 7.33711 16.4645 7.37226 15.9008 7.97933L10.5 13.7956L8.0992 11.2101C7.53549 10.603 6.5864 10.5679 5.97933 11.1316C5.37226 11.6953 5.33711 12.6444 5.90082 13.2515L10.5 18.2044Z';
   --icon-badge-error: 'm13.6 18.4c0 .8837-.7164 1.6-1.6 1.6-.8837 0-1.6-.7163-1.6-1.6s.7163-1.6 1.6-1.6c.8836 0 1.6.7163 1.6 1.6zm-1.6-13.9c.8284 0 1.5.67157 1.5 1.5v7c0 .8284-.6716 1.5-1.5 1.5s-1.5-.6716-1.5-1.5v-7c0-.82843.6716-1.5 1.5-1.5z';
-  --icon-edit-file: 'M3.96371 14.4792c-.15098.151-.25578.3419-.3021.5504L2.52752 20.133c-.17826.8021.53735 1.5177 1.33951 1.3395l5.10341-1.1341c.20844-.0463.39934-.1511.55032-.3021l8.05064-8.0507-5.557-5.55702-8.05069 8.05062ZM13.4286 5.01437l5.557 5.55703 2.0212-2.02111c.6576-.65765.6576-1.72393 0-2.38159l-3.1755-3.17546c-.6577-.65765-1.7239-.65765-2.3816 0l-2.0211 2.02113Z';
-  --icon-upload: 'm13 21.9506c5.0533-.5017 9-4.7653 9-9.9506 0-5.52285-4.4772-10-10-10-5.52285 0-10 4.47715-10 10 0 5.1853 3.94668 9.4489 9 9.9506v-11.5364l-2.79289 2.7929c-.39053.3906-1.02369.3906-1.41422 0-.39052-.3905-.39052-1.0237 0-1.4142l5.20711-5.20708 5.2071 5.20708c.3905.3905.3905 1.0237 0 1.4142-.3905.3906-1.0237.3906-1.4142 0l-2.7929-2.7929z';
+  --icon-edit-file: 'm12.1109 6c.3469-1.69213 1.8444-2.96484 3.6391-2.96484s3.2922 1.27271 3.6391 2.96484h2.314c.4142 0 .75.33578.75.75 0 .41421-.3358.75-.75.75h-2.314c-.3469 1.69213-1.8444 2.9648-3.6391 2.9648s-3.2922-1.27267-3.6391-2.9648h-9.81402c-.41422 0-.75001-.33579-.75-.75 0-.41422.33578-.75.75-.75zm3.6391-1.46484c-1.2232 0-2.2148.99162-2.2148 2.21484s.9916 2.21484 2.2148 2.21484 2.2148-.99162 2.2148-2.21484-.9916-2.21484-2.2148-2.21484zm-11.1391 11.96484c.34691-1.6921 1.84437-2.9648 3.6391-2.9648 1.7947 0 3.2922 1.2727 3.6391 2.9648h9.814c.4142 0 .75.3358.75.75s-.3358.75-.75.75h-9.814c-.3469 1.6921-1.8444 2.9648-3.6391 2.9648-1.79473 0-3.29219-1.2727-3.6391-2.9648h-2.31402c-.41422 0-.75-.3358-.75-.75s.33578-.75.75-.75zm3.6391-1.4648c-1.22322 0-2.21484.9916-2.21484 2.2148s.99162 2.2148 2.21484 2.2148 2.2148-.9916 2.2148-2.2148-.99158-2.2148-2.2148-2.2148z';
+  --icon-upload: 'm11.5014.392135c.2844-.253315.7134-.253315.9978 0l6.7037 5.971925c.3093.27552.3366.74961.0611 1.05889-.2755.30929-.7496.33666-1.0589.06113l-5.4553-4.85982v13.43864c0 .4142-.3358.75-.75.75s-.75-.3358-.75-.75v-13.43771l-5.45427 4.85889c-.30929.27553-.78337.24816-1.0589-.06113-.27553-.30928-.24816-.78337.06113-1.05889zm-10.644466 16.336765c.414216 0 .749996.3358.749996.75v4.9139h20.78567v-4.9139c0-.4142.3358-.75.75-.75.4143 0 .75.3358.75.75v5.6639c0 .4143-.3357.75-.75.75h-22.285666c-.414214 0-.75-.3357-.75-.75v-5.6639c0-.4142.335786-.75.75-.75z';
+  --icon-add: 'M12.75 21C12.75 21.4142 12.4142 21.75 12 21.75C11.5858 21.75 11.25 21.4142 11.25 21V12.7499H3C2.58579 12.7499 2.25 12.4141 2.25 11.9999C2.25 11.5857 2.58579 11.2499 3 11.2499H11.25V3C11.25 2.58579 11.5858 2.25 12 2.25C12.4142 2.25 12.75 2.58579 12.75 3V11.2499H21C21.4142 11.2499 21.75 11.5857 21.75 11.9999C21.75 12.4141 21.4142 12.7499 21 12.7499H12.75V21Z';
 }
 
 /* L10N: */
@@ -37,6 +41,11 @@
 :host {
   --l10n-drop-files-here: 'Drop file here';
 
+  --l10n-choose-file: 'Choose file...';
+  --l10n-choose-files: 'Choose files...';
+
+  --l10n-add-more: 'Add more';
+
   --l10n-upload-error: 'Upload error';
   --l10n-validation-error: 'Validation error';
   --l10n-no-files: 'No files selected';
@@ -60,59 +69,89 @@
 
 :where(.lr-wgt-common),
 :host {
-  --cfg-multiple: 0;
+  --cfg-multiple: 1;
   --cfg-confirm-upload: 0;
   --cfg-init-activity: 'start-from';
   --cfg-done-activity: 'upload-list';
+  --cfg-source-list: 'local';
 
   position: relative;
   display: block;
 }
 
 lr-start-from {
-  display: block;
-  width: 100%; /* test value */
-  height: unset; /* test value */
+  display: flex;
+  flex-direction: column;
+  gap: var(--gap-min);
   padding: 0;
+  overflow: hidden;
   text-align: center;
+  background-color: transparent;
 }
 
 lr-drop-area {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 100%;
-  height: calc(var(--ui-size) + var(--gap-mid) * 2 + var(--gap-min) * 4);
+  min-height: calc(var(--ui-size) + var(--gap-mid) * 2 + var(--gap-min) * 4);
   padding: 0;
-  color: var(--clr-accent);
   line-height: 140%;
   text-align: center;
-  border-color: var(--clr-accent-lightest);
-  border-style: solid;
+  background-color: var(--clr-background);
   border-radius: var(--border-radius-frame);
   cursor: pointer;
 }
 
-lr-drop-area[drag-state='inactive'] {
-  background-color: transparent;
+lr-upload-list lr-activity-header {
+  display: none;
 }
 
-lr-drop-area::after {
-  content: '';
+lr-upload-list > .toolbar {
+  background-color: transparent;
 }
 
 lr-upload-list {
   width: 100%;
   height: unset;
-  padding: var(--gap-min);
+  padding: var(--gap-small);
   background-color: transparent;
   border: var(--border-dashed);
-  border-style: solid;
   border-radius: var(--border-radius-frame);
 }
 
+lr-upload-list .files {
+  padding: 0;
+}
+
 lr-upload-list .toolbar {
+  display: block;
+  padding: 0;
+}
+
+lr-upload-list .toolbar .cancel-btn,
+lr-upload-list .toolbar .upload-btn,
+lr-upload-list .toolbar .done-btn {
+  display: none;
+}
+
+lr-upload-list .toolbar .add-more-btn {
+  width: 100%;
+  height: calc(var(--ui-size) + var(--gap-mid) * 2);
+  margin-top: var(--gap-small);
+  background-color: var(--clr-background);
+}
+
+lr-upload-list .toolbar .add-more-btn:hover {
+  background-color: var(--clr-background-dark);
+}
+
+lr-upload-list .toolbar .add-more-btn > span {
   display: none;
 }
 
 lr-file-item {
+  background-color: var(--clr-background);
   border-radius: var(--border-radius-element);
 }
 
@@ -129,3 +168,10 @@ lr-file-item lr-progress-bar .progress {
   background-color: var(--clr-accent-lightest);
   border-radius: var(--border-radius-element);
 }
+
+lr-upload-list lr-drop-area {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  border-radius: var(--border-radius-frame);
+}
diff --git a/solutions/file-uploader/minimal/index.js b/solutions/file-uploader/minimal/index.js
index 9051a0d96..b214bfa9f 100644
--- a/solutions/file-uploader/minimal/index.js
+++ b/solutions/file-uploader/minimal/index.js
@@ -7,6 +7,7 @@ import { FileItem } from '../../../blocks/FileItem/FileItem.js';
 import { Icon } from '../../../blocks/Icon/Icon.js';
 import { ProgressBar } from '../../../blocks/ProgressBar/ProgressBar.js';
 import { MessageBox } from '../../../blocks/MessageBox/MessageBox.js';
+import { Copyright } from '../../../blocks/Copyright/Copyright.js';
 
 registerBlocks({
   FileUploaderMinimal,
@@ -17,4 +18,5 @@ registerBlocks({
   Icon,
   ProgressBar,
   MessageBox,
+  Copyright,
 });
diff --git a/solutions/file-uploader/regular/FileUploaderRegular.js b/solutions/file-uploader/regular/FileUploaderRegular.js
index c001b4443..d85bbf2b9 100644
--- a/solutions/file-uploader/regular/FileUploaderRegular.js
+++ b/solutions/file-uploader/regular/FileUploaderRegular.js
@@ -6,17 +6,15 @@ FileUploaderRegular.template = /* HTML */ `
   <lr-simple-btn></lr-simple-btn>
 
   <lr-modal strokes block-body-scrolling>
-    <lr-activity-icon slot="heading"></lr-activity-icon>
-    <lr-activity-caption slot="heading"></lr-activity-caption>
     <lr-start-from>
+      <lr-drop-area with-icon clickable></lr-drop-area>
       <lr-source-list wrap></lr-source-list>
-      <lr-drop-area clickable></lr-drop-area>
+      <lr-copyright></lr-copyright>
     </lr-start-from>
     <lr-upload-list></lr-upload-list>
     <lr-camera-source></lr-camera-source>
     <lr-url-source></lr-url-source>
     <lr-external-source></lr-external-source>
-    <lr-upload-details></lr-upload-details>
     <lr-confirmation-dialog></lr-confirmation-dialog>
     <lr-cloud-image-editor></lr-cloud-image-editor>
   </lr-modal>
diff --git a/solutions/file-uploader/regular/demo.htm b/solutions/file-uploader/regular/demo.htm
index c52180776..52b441ac1 100644
--- a/solutions/file-uploader/regular/demo.htm
+++ b/solutions/file-uploader/regular/demo.htm
@@ -8,6 +8,7 @@ <h2>Button with modal window</h2>
   <style>
     lr-file-uploader-regular {
       --cfg-pubkey: 'demopublickey';
+      --darkmode: 0;
     }
   </style>
 
@@ -25,6 +26,7 @@ <h2>Single source</h2>
     lr-file-uploader-regular {
       --cfg-pubkey: 'demopublickey';
       --cfg-source-list: 'local';
+      --darkmode: 0;
     }
   </style>
 
diff --git a/static-gen/importmap.json b/static-gen/importmap.json
index 6db743902..bd3a40b8b 100644
--- a/static-gen/importmap.json
+++ b/static-gen/importmap.json
@@ -1,6 +1,6 @@
 {
   "imports": {
-    "@symbiotejs/symbiote": "https://cdn.skypack.dev/pin/@symbiotejs/symbiote@v1.11.1-nb4uuMnoyFEHQ78uWIov/mode=imports,min/optimized/@symbiotejs/symbiote.js",
-    "@uploadcare/upload-client": "https://cdn.skypack.dev/-/@uploadcare/upload-client@v5.1.0-ikuQtxJ0wUDrZwcMWBtL/dist=es2020,mode=raw,min/dist/index.browser.js"
+    "@symbiotejs/symbiote": "https://cdn.skypack.dev/pin/@symbiotejs/symbiote@v1.11.5-xok0d4yq3JnqOTheB68R/mode=imports,min/optimized/@symbiotejs/symbiote.js",
+    "@uploadcare/upload-client": "https://cdn.skypack.dev/-/@uploadcare/upload-client@v6.2.1-BoihH4bL0d7hAb0UH0Rx/dist=es2020,mode=raw,min/dist/index.browser.js"
   }
 }
diff --git a/types/tags.d.ts b/types/tags.d.ts
index 7f8bbefc9..5d18cf47c 100644
--- a/types/tags.d.ts
+++ b/types/tags.d.ts
@@ -37,8 +37,7 @@ declare namespace JSX {
     'lr-external-source': any;
     'lr-tabs': any;
     'lr-data-output': any;
-    'lr-activity-caption': any;
-    'lr-activity-icon': any;
+    'lr-activity-heading': any;
     'lr-file-uploader-regular': any;
     'lr-file-uploader-minimal': any;
   }
diff --git a/utils/applyTemplateData.js b/utils/applyTemplateData.js
deleted file mode 100644
index c02f60c48..000000000
--- a/utils/applyTemplateData.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @typedef {{ [key: String]: String | Number | Boolean | InputData }} InputData */
-
-const DEFAULT_TRANSFORMER = (value) => value;
-
-/**
- * @typedef {Object} Options
- * @property {String} [openToken='{{'] Default is `'{{'`
- * @property {String} [closeToken='}}'] Default is `'}}'`
- * @property {(value: String) => String} [transform=DEFAULT_TRANSFORMER] Default is `DEFAULT_TRANSFORMER`
- */
-
-/**
- * @param {String} template
- * @param {InputData} [data={}] Default is `{}`
- * @param {Options} [options={}] Default is `{}`
- * @returns {String}
- */
-export function applyTemplateData(template, data, options = {}) {
-  let { openToken = '{{', closeToken = '}}', transform = DEFAULT_TRANSFORMER } = options;
-  for (let key in data) {
-    let value = data[key]?.toString();
-    template = template.replaceAll(openToken + key + closeToken, typeof value === 'string' ? transform(value) : value);
-  }
-  return template;
-}
diff --git a/utils/applyTemplateData.test.js b/utils/applyTemplateData.test.js
deleted file mode 100644
index 21f8db308..000000000
--- a/utils/applyTemplateData.test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { expect } from '@esm-bundle/chai';
-import { applyTemplateData } from './applyTemplateData.js';
-
-describe('applyTemplateData', () => {
-  it('should return the same string if no variables passed', () => {
-    let result = applyTemplateData('Hello world!');
-    expect(result).to.equal('Hello world!');
-  });
-
-  it('should replace variables', () => {
-    let result = applyTemplateData("Hello world! My name is {{name}}. I'm {{age}} years old.", {
-      name: 'John Doe',
-      age: 12,
-    });
-    expect(result).to.equal("Hello world! My name is John Doe. I'm 12 years old.");
-  });
-
-  it('should work with variables at start/end', () => {
-    const result = applyTemplateData("{{name}} my name is. I'm {{age}}", { name: 'John Doe', age: 12 });
-    expect(result).to.equal("John Doe my name is. I'm 12");
-  });
-
-  it('should work with single variable', () => {
-    const result = applyTemplateData('{{name}}', { name: 'John Doe' });
-    expect(result).to.equal('John Doe');
-  });
-
-  it('should not replace non-defined variabled', () => {
-    let result = applyTemplateData('My name is {{name}}');
-    expect(result).to.equal('My name is {{name}}');
-  });
-
-  it('should accept `transform` option', () => {
-    let result = applyTemplateData(
-      'My name is {{name}}',
-      { name: 'John Doe' },
-      { transform: (value) => value.toUpperCase() }
-    );
-    expect(result).to.equal('My name is JOHN DOE');
-  });
-});
diff --git a/utils/cdn-utils.js b/utils/cdn-utils.js
index 7ba796816..c234adc6b 100644
--- a/utils/cdn-utils.js
+++ b/utils/cdn-utils.js
@@ -68,6 +68,41 @@ export function extractFilename(cdnUrl) {
   return filename;
 }
 
+/**
+ * Extract UUID from CDN URL
+ *
+ * @param {string} cdnUrl
+ * @returns {string}
+ */
+export function extractUuid(cdnUrl) {
+  let url = new URL(cdnUrl);
+  let { pathname } = url;
+  const slashIndex = pathname.indexOf('/');
+  const secondSlashIndex = pathname.indexOf('/', slashIndex + 1);
+  return pathname.substring(slashIndex + 1, secondSlashIndex);
+}
+
+/**
+ * Extract UUID from CDN URL
+ *
+ * @param {string} cdnUrl
+ * @returns {string[]}
+ */
+export function extractOperations(cdnUrl) {
+  let withoutFilename = trimFilename(cdnUrl);
+  let url = new URL(withoutFilename);
+  let operationsMarker = url.pathname.indexOf('/-/');
+  if (operationsMarker === -1) {
+    return [];
+  }
+  let operationsStr = url.pathname.substring(operationsMarker);
+
+  return operationsStr
+    .split('/-/')
+    .filter(Boolean)
+    .map((operation) => normalizeCdnOperation(operation));
+}
+
 /**
  * Trim filename or file URL
  *
diff --git a/utils/cdn-utils.test.js b/utils/cdn-utils.test.js
index 23ec899d2..11583cee9 100644
--- a/utils/cdn-utils.test.js
+++ b/utils/cdn-utils.test.js
@@ -7,6 +7,8 @@ import {
   createOriginalUrl,
   extractFilename,
   trimFilename,
+  extractUuid,
+  extractOperations,
 } from './cdn-utils.js';
 
 const falsyValues = ['', undefined, null, false, true, 0, 10];
@@ -183,3 +185,29 @@ describe('cdn-utils/trimFilename', () => {
     );
   });
 });
+
+describe('cdn-utils/extractUuid', () => {
+  it('should extract uuid from cdn url', () => {
+    expect(extractUuid('https://ucarecdn.com/:uuid/image.jpeg')).to.eq(':uuid');
+    expect(extractUuid('https://ucarecdn.com/:uuid/-/resize/100x/image.jpeg')).to.eq(':uuid');
+
+    expect(extractUuid('https://ucarecdn.com/c2499162-eb07-4b93-b31e-94a89a47e858/image.jpeg')).to.eq(
+      'c2499162-eb07-4b93-b31e-94a89a47e858'
+    );
+    expect(extractUuid('https://ucarecdn.com/c2499162-eb07-4b93-b31e-94a89a47e858/-/resize/100x/image.jpeg')).to.eq(
+      'c2499162-eb07-4b93-b31e-94a89a47e858'
+    );
+  });
+});
+
+describe('cdn-utils/extractOperations', () => {
+  it('should extract operations from cdn url', () => {
+    expect(extractOperations('https://ucarecdn.com/:uuid/image.jpeg')).to.eql([]);
+    expect(
+      extractOperations('https://ucarecdn.com/c2499162-eb07-4b93-b31e-94a89a47e858/-/resize/100x/image.jpeg')
+    ).to.eql(['resize/100x']);
+    expect(extractOperations('https://domain.ucr.io:8080/-/resize/100x/https://domain.com/image.jpg?q=1#hash')).to.eql([
+      'resize/100x',
+    ]);
+  });
+});
diff --git a/utils/template-utils.js b/utils/template-utils.js
new file mode 100644
index 000000000..6c52891ad
--- /dev/null
+++ b/utils/template-utils.js
@@ -0,0 +1,50 @@
+/** @typedef {{ [key: String]: String | Number | Boolean | InputData }} InputData */
+
+const DEFAULT_TRANSFORMER = (value) => value;
+const OPEN_TOKEN = '{{';
+const CLOSE_TOKEN = '}}';
+const PLURAL_PREFIX = 'plural:';
+
+/**
+ * @typedef {Object} Options
+ * @property {String} [openToken='{{'] Default is `'{{'`
+ * @property {String} [closeToken='}}'] Default is `'}}'`
+ * @property {(value: String) => String} [transform=DEFAULT_TRANSFORMER] Default is `DEFAULT_TRANSFORMER`
+ */
+
+/**
+ * @param {String} template
+ * @param {InputData} [data={}] Default is `{}`
+ * @param {Options} [options={}] Default is `{}`
+ * @returns {String}
+ */
+export function applyTemplateData(template, data, options = {}) {
+  let { openToken = OPEN_TOKEN, closeToken = CLOSE_TOKEN, transform = DEFAULT_TRANSFORMER } = options;
+
+  for (let key in data) {
+    let value = data[key]?.toString();
+    template = template.replaceAll(openToken + key + closeToken, typeof value === 'string' ? transform(value) : value);
+  }
+  return template;
+}
+
+/**
+ * @param {String} template
+ * @returns {{ variable: string; pluralKey: string; countVariable: string }[]}
+ */
+export function getPluralObjects(template) {
+  const pluralObjects = [];
+  let open = template.indexOf(OPEN_TOKEN);
+  while (open !== -1) {
+    const close = template.indexOf(CLOSE_TOKEN, open);
+    const variable = template.substring(open + 2, close);
+    if (variable.startsWith(PLURAL_PREFIX)) {
+      const keyValue = template.substring(open + 2, close).replace(PLURAL_PREFIX, '');
+      const key = keyValue.substring(0, keyValue.indexOf('('));
+      const count = keyValue.substring(keyValue.indexOf('(') + 1, keyValue.indexOf(')'));
+      pluralObjects.push({ variable, pluralKey: key, countVariable: count });
+    }
+    open = template.indexOf(OPEN_TOKEN, close);
+  }
+  return pluralObjects;
+}
diff --git a/utils/template-utils.test.js b/utils/template-utils.test.js
new file mode 100644
index 000000000..b0d637222
--- /dev/null
+++ b/utils/template-utils.test.js
@@ -0,0 +1,56 @@
+import { expect } from '@esm-bundle/chai';
+import { applyTemplateData, getPluralObjects } from './template-utils.js';
+
+describe('template-utils', () => {
+  describe('applyTemplateData', () => {
+    it('should return the same string if no variables passed', () => {
+      let result = applyTemplateData('Hello world!');
+      expect(result).to.equal('Hello world!');
+    });
+
+    it('should replace variables', () => {
+      let result = applyTemplateData("Hello world! My name is {{name}}. I'm {{age}} years old.", {
+        name: 'John Doe',
+        age: 12,
+      });
+      expect(result).to.equal("Hello world! My name is John Doe. I'm 12 years old.");
+    });
+
+    it('should work with variables at start/end', () => {
+      const result = applyTemplateData("{{name}} my name is. I'm {{age}}", { name: 'John Doe', age: 12 });
+      expect(result).to.equal("John Doe my name is. I'm 12");
+    });
+
+    it('should work with single variable', () => {
+      const result = applyTemplateData('{{name}}', { name: 'John Doe' });
+      expect(result).to.equal('John Doe');
+    });
+
+    it('should not replace non-defined variabled', () => {
+      let result = applyTemplateData('My name is {{name}}');
+      expect(result).to.equal('My name is {{name}}');
+    });
+
+    it('should accept `transform` option', () => {
+      let result = applyTemplateData(
+        'My name is {{name}}',
+        { name: 'John Doe' },
+        { transform: (value) => value.toUpperCase() }
+      );
+      expect(result).to.equal('My name is JOHN DOE');
+    });
+  });
+
+  describe('getPluralObjects', () => {
+    it('should return array of plural objects', () => {
+      expect(
+        getPluralObjects(
+          'Uploading {{filesCount}} {{plural:file(filesCount)}} with {{errorsCount}} {{plural:error(errorsCount)}}'
+        )
+      ).to.deep.equal([
+        { variable: 'plural:file(filesCount)', pluralKey: 'file', countVariable: 'filesCount' },
+        { variable: 'plural:error(errorsCount)', pluralKey: 'error', countVariable: 'errorsCount' },
+      ]);
+    });
+  });
+});