diff --git a/app/AdminModule/CmsModule/Components/DocumentTagsGridControl.php b/app/AdminModule/CmsModule/Components/DocumentTagsGridControl.php
index 3871beae8..284e2b616 100644
--- a/app/AdminModule/CmsModule/Components/DocumentTagsGridControl.php
+++ b/app/AdminModule/CmsModule/Components/DocumentTagsGridControl.php
@@ -20,6 +20,7 @@
 use Ublaboo\DataGrid\Exception\DataGridException;
 
 use function array_keys;
+use function assert;
 use function count;
 
 /**
@@ -71,11 +72,11 @@ public function createComponentDocumentTagsGrid(string $name): void
         $grid->setDefaultSort(['name' => 'ASC']);
         $grid->setPagination(false);
 
-        $grid->addColumnText('name', 'admin.cms.tags_name');
+        $grid->addColumnText('name', 'admin.cms.documents.tags.column.name');
 
-        $grid->addColumnText('roles', 'admin.cms.tags_roles', 'rolesText')
+        $grid->addColumnText('roles', 'admin.cms.documents.tags.column.roles', 'rolesText')
             ->setRendererOnCondition(function () {
-                return $this->translator->translate('admin.cms.tags_roles_all');
+                return $this->translator->translate('admin.cms.documents.tags.column.roles_all');
             }, function (Tag $tag) {
                 return count($this->roleRepository->findAll()) === $tag->getRoles()->count();
             });
@@ -84,24 +85,24 @@ public function createComponentDocumentTagsGrid(string $name): void
 
         $grid->addInlineAdd()->setPositionTop()->onControlAdd[] = function (Container $container) use ($rolesOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.tags_name_empty')
-                ->addRule(Form::IS_NOT_IN, 'admin.cms.tags_name_exists', $this->tagRepository->findAllNames());
+                ->addRule(Form::FILLED, 'admin.cms.documents.tags.column.name_empty')
+                ->addRule(Form::IS_NOT_IN, 'admin.cms.documents.tags.column.name_exists', $this->tagRepository->findAllNames());
             $container->addMultiSelect('roles', '', $rolesOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
                 ->setDefaultValue(array_keys($rolesOptions))
-                ->addRule(Form::FILLED, 'admin.cms.tags_roles_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.tags.column.roles_empty');
         };
         $grid->getInlineAdd()->onSubmit[]                       = [$this, 'add'];
 
         $grid->addInlineEdit()->onControlAdd[]  = static function (Container $container) use ($rolesOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.tags_name_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.tags.column.name_empty');
             $container->addMultiSelect('roles', '', $rolesOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
-                ->addRule(Form::FILLED, 'admin.cms.tags_roles_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.tags.column.roles_empty');
         };
         $grid->getInlineEdit()->onSetDefaults[] = function (Container $container, Tag $item): void {
-            /** @var TextInput $nameText */
             $nameText = $container['name'];
-            $nameText->addRule(Form::IS_NOT_IN, 'admin.cms.tags_name_exists', $this->tagRepository->findOthersNames($item->getId()));
+            assert($nameText instanceof TextInput);
+            $nameText->addRule(Form::IS_NOT_IN, 'admin.cms.documents.tags.column.name_exists', $this->tagRepository->findOthersNames($item->getId()));
 
             $container->setDefaults([
                 'name' => $item->getName(),
@@ -116,7 +117,7 @@ public function createComponentDocumentTagsGrid(string $name): void
             ->setClass('btn btn-xs btn-danger')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.cms.tags_delete_confirm'),
+                'data-content' => $this->translator->translate('admin.cms.documents.tags.action.delete_confirm'),
             ]);
     }
 
@@ -135,7 +136,7 @@ public function add(stdClass $values): void
 
         $this->tagRepository->save($tag);
 
-        $this->getPresenter()->flashMessage('admin.cms.tags_saved', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.tags.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -155,7 +156,7 @@ public function edit(string $id, stdClass $values): void
 
         $this->tagRepository->save($tag);
 
-        $this->getPresenter()->flashMessage('admin.cms.tags_saved', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.tags.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -171,7 +172,7 @@ public function handleDelete(int $id): void
         $tag = $this->tagRepository->findById($id);
         $this->tagRepository->remove($tag);
 
-        $this->getPresenter()->flashMessage('admin.cms.tags_deleted', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.tags.message.delete_success', 'success');
 
         $this->redirect('this');
     }
diff --git a/app/AdminModule/CmsModule/Components/DocumentsGridControl.php b/app/AdminModule/CmsModule/Components/DocumentsGridControl.php
index d43fcf345..e2a316a9e 100644
--- a/app/AdminModule/CmsModule/Components/DocumentsGridControl.php
+++ b/app/AdminModule/CmsModule/Components/DocumentsGridControl.php
@@ -18,12 +18,13 @@
 use Nette\Http\FileUpload;
 use Nette\Localization\ITranslator;
 use Nette\Utils\Html;
-use Nette\Utils\Random;
-use Nette\Utils\Strings;
 use stdClass;
 use Ublaboo\DataGrid\DataGrid;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
+use function assert;
+use function basename;
+
 use const UPLOAD_ERR_OK;
 
 /**
@@ -75,9 +76,9 @@ public function createComponentDocumentsGrid(string $name): void
         $grid->setDefaultSort(['name' => 'ASC']);
         $grid->setPagination(false);
 
-        $grid->addColumnText('name', 'admin.cms.documents_name');
+        $grid->addColumnText('name', 'admin.cms.documents.column.name');
 
-        $grid->addColumnText('tags', 'admin.cms.documents_tags')
+        $grid->addColumnText('tags', 'admin.cms.documents.column.tags')
             ->setRenderer(static function (Document $row) {
                 $tags = Html::el();
                 foreach ($row->getTags() as $tag) {
@@ -90,34 +91,32 @@ public function createComponentDocumentsGrid(string $name): void
                 return $tags;
             });
 
-        $grid->addColumnText('file', 'admin.cms.documents_file')
-            ->setRenderer(function (Document $row) {
+        $grid->addColumnText('file', 'admin.cms.documents.column.file')
+            ->setRenderer(static function (Document $document) {
                 return Html::el('a')
-                    ->setAttribute('href', $this->getPresenter()->getTemplate()->basePath
-                        . '/files' . $row->getFile())
+                    ->setAttribute('href', $document->getFile())
                     ->setAttribute('target', '_blank')
                     ->setAttribute('class', 'btn btn-xs btn-secondary')
-                    ->addHtml(
-                        Html::el('span')->setAttribute('class', 'fa fa-download')
-                    );
+                    ->addHtml(Html::el('span')->setAttribute('class', 'fa fa-download'))
+                    ->addText(' ' . basename($document->getFile()));
             });
 
-        $grid->addColumnText('description', 'admin.cms.documents_description');
+        $grid->addColumnText('description', 'admin.cms.documents.column.description');
 
-        $grid->addColumnDateTime('timestamp', 'admin.cms.documents_timestamp')
+        $grid->addColumnDateTime('timestamp', 'admin.cms.documents.column.timestamp')
             ->setFormat(Helpers::DATETIME_FORMAT);
 
         $tagsOptions = $this->tagRepository->getTagsOptions();
 
         $grid->addInlineAdd()->setPositionTop()->onControlAdd[] = static function (Container $container) use ($tagsOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.documents_name_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.column.name_empty');
 
             $container->addMultiSelect('tags', '', $tagsOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
-                ->addRule(Form::FILLED, 'admin.cms.documents_tags_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.column.tags_empty');
 
             $container->addUpload('file', '')->setHtmlAttribute('class', 'datagrid-upload')
-                ->addRule(Form::FILLED, 'admin.cms.documents_file_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.column.file_empty');
 
             $container->addText('description', '');
         };
@@ -125,10 +124,10 @@ public function createComponentDocumentsGrid(string $name): void
 
         $grid->addInlineEdit()->onControlAdd[]  = static function (Container $container) use ($tagsOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.documents_name_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.column.name_empty');
 
             $container->addMultiSelect('tags', '', $tagsOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
-                ->addRule(Form::FILLED, 'admin.cms.documents_tags_empty');
+                ->addRule(Form::FILLED, 'admin.cms.documents.column.tags_empty');
 
             $container->addUpload('file', '')->setHtmlAttribute('class', 'datagrid-upload');
 
@@ -149,7 +148,7 @@ public function createComponentDocumentsGrid(string $name): void
             ->setClass('btn btn-xs btn-danger')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.cms.documents_delete_confirm'),
+                'data-content' => $this->translator->translate('admin.cms.documents.action.delete_confirm'),
             ]);
     }
 
@@ -162,8 +161,7 @@ public function createComponentDocumentsGrid(string $name): void
     public function add(stdClass $values): void
     {
         $file = $values->file;
-        $path = $this->generatePath($file);
-        $this->filesService->save($file, $path);
+        $path = $this->filesService->save($file, Document::PATH, true, $file->name);
 
         $document = new Document();
 
@@ -175,7 +173,7 @@ public function add(stdClass $values): void
 
         $this->documentRepository->save($document);
 
-        $this->getPresenter()->flashMessage('admin.cms.documents_saved', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -190,13 +188,11 @@ public function edit(string $id, stdClass $values): void
     {
         $document = $this->documentRepository->findById((int) $id);
 
-        /** @var FileUpload $file */
         $file = $values->file;
+        assert($file instanceof FileUpload);
         if ($file->getError() == UPLOAD_ERR_OK) {
             $this->filesService->delete($this->documentRepository->findById((int) $id)->getFile());
-            $path = $this->generatePath($file);
-            $this->filesService->save($file, $path);
-
+            $path = $this->filesService->save($file, Document::PATH, true, $file->name);
             $document->setFile($path);
             $document->setTimestamp(new DateTimeImmutable());
         }
@@ -207,7 +203,7 @@ public function edit(string $id, stdClass $values): void
 
         $this->documentRepository->save($document);
 
-        $this->getPresenter()->flashMessage('admin.cms.documents_saved', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -224,16 +220,8 @@ public function handleDelete(int $id): void
         $this->filesService->delete($document->getFile());
         $this->documentRepository->remove($document);
 
-        $this->getPresenter()->flashMessage('admin.cms.documents_deleted', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.documents.message.delete_success', 'success');
 
         $this->redirect('this');
     }
-
-    /**
-     * Vygeneruje cestu dokumentu.
-     */
-    private function generatePath(FileUpload $file): string
-    {
-        return Document::PATH . '/' . Random::generate(5) . '/' . Strings::webalize($file->name, '.');
-    }
 }
diff --git a/app/AdminModule/CmsModule/Components/FaqGridControl.php b/app/AdminModule/CmsModule/Components/FaqGridControl.php
index 676fc8f9f..906a153fe 100644
--- a/app/AdminModule/CmsModule/Components/FaqGridControl.php
+++ b/app/AdminModule/CmsModule/Components/FaqGridControl.php
@@ -46,7 +46,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentFaqGrid(string $name): void
+    public function createComponentFaqGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -55,20 +55,20 @@ public function createComponentFaqGrid(string $name): void
         $grid->setDataSource($this->faqRepository->createQueryBuilder('f')->orderBy('f.position'));
         $grid->setPagination(false);
 
-        $grid->addColumnText('question', 'admin.cms.faq_question');
+        $grid->addColumnText('question', 'admin.cms.faq.common.question');
 
-        $grid->addColumnText('author', 'admin.cms.faq_author', 'author.displayName');
+        $grid->addColumnText('author', 'admin.cms.faq.column.author', 'author.displayName');
 
-        $grid->addColumnStatus('public', 'admin.cms.faq_public')
-            ->addOption(false, 'admin.cms.faq_public_private')
+        $grid->addColumnStatus('public', 'admin.cms.faq.column.public')
+            ->addOption(false, 'admin.cms.faq.column.public_private')
             ->setClass('btn-danger')
             ->endOption()
-            ->addOption(true, 'admin.cms.faq_public_public')
+            ->addOption(true, 'admin.cms.faq.column.public_public')
             ->setClass('btn-success')
             ->endOption()
             ->onChange[] = [$this, 'changeStatus'];
 
-        $grid->addColumnText('answered', 'admin.cms.faq_answered')
+        $grid->addColumnText('answered', 'admin.cms.faq.column.answered')
             ->setReplacement([
                 false => $this->translator->translate('admin.common.no'),
                 true => $this->translator->translate('admin.common.yes'),
@@ -86,8 +86,10 @@ public function createComponentFaqGrid(string $name): void
             ->setClass('btn btn-xs btn-danger')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.cms.faq_delete_confirm'),
+                'data-content' => $this->translator->translate('admin.cms.faq.action.delete_confirm'),
             ]);
+
+        return $grid;
     }
 
     /**
@@ -101,7 +103,7 @@ public function handleDelete(int $id): void
         $faq = $this->faqRepository->findById($id);
         $this->faqRepository->remove($faq);
 
-        $this->getPresenter()->flashMessage('admin.cms.faq_deleted', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.faq.message.delete_success', 'success');
 
         $this->redirect('this');
     }
@@ -117,12 +119,11 @@ public function handleSort(?string $item_id, ?string $prev_id, ?string $next_id)
         $this->faqRepository->sort((int) $item_id, (int) $prev_id, (int) $next_id);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.faq_order_saved', 'success');
+        $p->flashMessage('admin.cms.faq.message.order_save_success', 'success');
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $faqGrid */
-            $faqGrid = $this['faqGrid'];
+            $faqGrid = $this->getComponent('faqGrid');
             $faqGrid->reload();
         } else {
             $this->redirect('this');
@@ -143,12 +144,11 @@ public function changeStatus(string $id, string $public): void
         $this->faqRepository->save($faq);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.faq_changed_public', 'success');
+        $p->flashMessage('admin.cms.faq.message.public_change_success', 'success');
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $faqGrid */
-            $faqGrid = $this['faqGrid'];
+            $faqGrid = $this->getComponent('faqGrid');
             $faqGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/CmsModule/Components/NewsGridControl.php b/app/AdminModule/CmsModule/Components/NewsGridControl.php
index 3bda9df9b..3a679d976 100644
--- a/app/AdminModule/CmsModule/Components/NewsGridControl.php
+++ b/app/AdminModule/CmsModule/Components/NewsGridControl.php
@@ -46,7 +46,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentNewsGrid(string $name): void
+    public function createComponentNewsGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTemplateFile(__DIR__ . '/templates/news_grid_template.latte');
@@ -55,20 +55,20 @@ public function createComponentNewsGrid(string $name): void
         $grid->setDefaultSort(['published' => 'DESC']);
         $grid->setPagination(false);
 
-        $grid->addColumnDateTime('published', 'admin.cms.news_published')
+        $grid->addColumnDateTime('published', 'admin.cms.news.common.published')
             ->setFormat(Helpers::DATETIME_FORMAT);
 
-        $columnMandatory = $grid->addColumnStatus('pinned', 'admin.cms.news_pinned');
+        $columnMandatory = $grid->addColumnStatus('pinned', 'admin.cms.news.column.pinned');
         $columnMandatory
-            ->addOption(false, 'admin.cms.news_pinned_unpinned')
+            ->addOption(false, 'admin.cms.news.column.pinned_unpinned')
             ->setClass('btn-primary')
             ->endOption()
-            ->addOption(true, 'admin.cms.news_pinned_pinned')
+            ->addOption(true, 'admin.cms.news.column.pinned_pinned')
             ->setClass('btn-warning')
             ->endOption()
             ->onChange[] = [$this, 'changePinned'];
 
-        $grid->addColumnText('text', 'admin.cms.news_text');
+        $grid->addColumnText('text', 'admin.cms.news.common.text');
 
         $grid->addToolbarButton('News:add')
             ->setIcon('plus')
@@ -82,8 +82,10 @@ public function createComponentNewsGrid(string $name): void
             ->setClass('btn btn-xs btn-danger')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.cms.news_delete_confirm'),
+                'data-content' => $this->translator->translate('admin.cms.news.action.delete_confirm'),
             ]);
+
+        return $grid;
     }
 
     /**
@@ -97,7 +99,7 @@ public function handleDelete(int $id): void
         $news = $this->newsRepository->findById($id);
         $this->newsRepository->remove($news);
 
-        $this->getPresenter()->flashMessage('admin.cms.news_deleted', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.news.message.delete_success', 'success');
 
         $this->redirect('this');
     }
@@ -115,12 +117,11 @@ public function changePinned(string $id, string $pinned): void
         $this->newsRepository->save($news);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.news_changed_pinned', 'success');
+        $p->flashMessage('admin.cms.news.message.pinned_change_success', 'success');
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $newsGrid */
-            $newsGrid = $this['newsGrid'];
+            $newsGrid = $this->getComponent('newsGrid');
             $newsGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/CmsModule/Components/PagesGridControl.php b/app/AdminModule/CmsModule/Components/PagesGridControl.php
index 5ad038f86..b55a07aef 100644
--- a/app/AdminModule/CmsModule/Components/PagesGridControl.php
+++ b/app/AdminModule/CmsModule/Components/PagesGridControl.php
@@ -25,6 +25,7 @@
 use Ublaboo\DataGrid\Exception\DataGridException;
 
 use function array_keys;
+use function assert;
 use function count;
 
 /**
@@ -73,7 +74,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentPagesGrid(string $name): void
+    public function createComponentPagesGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -82,44 +83,44 @@ public function createComponentPagesGrid(string $name): void
         $grid->setDataSource($this->pageRepository->createQueryBuilder('p')->orderBy('p.position'));
         $grid->setPagination(false);
 
-        $grid->addColumnText('name', 'admin.cms.pages_name');
+        $grid->addColumnText('name', 'admin.cms.pages.column.name');
 
-        $grid->addColumnText('slug', 'admin.cms.pages_slug');
+        $grid->addColumnText('slug', 'admin.cms.pages.column.slug');
 
-        $grid->addColumnStatus('public', 'admin.cms.pages_public')
-            ->addOption(false, 'admin.cms.pages_public_private')
+        $grid->addColumnStatus('public', 'admin.cms.pages.column.public')
+            ->addOption(false, 'admin.cms.pages.column.public_private')
             ->setClass('btn-danger')
             ->endOption()
-            ->addOption(true, 'admin.cms.pages_public_public')
+            ->addOption(true, 'admin.cms.pages.column.public_public')
             ->setClass('btn-success')
             ->endOption()
             ->onChange[] = [$this, 'changeStatus'];
 
-        $grid->addColumnText('roles', 'admin.cms.pages_roles', 'rolesText')
+        $grid->addColumnText('roles', 'admin.cms.pages.column.roles', 'rolesText')
             ->setRendererOnCondition(function () {
-                return $this->translator->translate('admin.cms.pages_roles_all');
+                return $this->translator->translate('admin.cms.pages.column.roles_all');
             }, function (Page $page) {
                 return count($this->roleRepository->findAll()) === $page->getRoles()->count();
             });
 
         $rolesOptions  = $this->aclService->getRolesWithoutRolesOptions([]);
         $publicOptions = [
-            false => 'admin.cms.pages_public_private',
-            true => 'admin.cms.pages_public_public',
+            false => 'admin.cms.pages.column.public_private',
+            true => 'admin.cms.pages.column.public_public',
         ];
 
         $grid->addInlineAdd()->setPositionTop()->onControlAdd[] = function (Container $container) use ($rolesOptions, $publicOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.pages_name_empty');
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.name_empty');
 
             $container->addText('slug', '')
-                ->addRule(Form::FILLED, 'admin.cms.pages_slug_empty')
-                ->addRule(Form::PATTERN, 'admin.cms.pages_slug_format', '^[a-z0-9-]*$')
-                ->addRule(Form::IS_NOT_IN, 'admin.cms.pages_slug_exists', $this->pageRepository->findAllSlugs());
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.slug_empty')
+                ->addRule(Form::PATTERN, 'admin.cms.pages.column.slug_format', '^[a-z0-9-]*$')
+                ->addRule(Form::IS_NOT_IN, 'admin.cms.pages.column.slug_exists', $this->pageRepository->findAllSlugs());
 
             $container->addMultiSelect('roles', '', $rolesOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
                 ->setDefaultValue(array_keys($rolesOptions))
-                ->addRule(Form::FILLED, 'admin.cms.pages_roles_empty');
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.roles_empty');
 
             $container->addSelect('public', '', $publicOptions);
         };
@@ -127,21 +128,21 @@ public function createComponentPagesGrid(string $name): void
 
         $grid->addInlineEdit()->onControlAdd[]  = static function (Container $container) use ($rolesOptions, $publicOptions): void {
             $container->addText('name', '')
-                ->addRule(Form::FILLED, 'admin.cms.pages_name_empty');
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.name_empty');
 
             $container->addText('slug', '')
-                ->addRule(Form::FILLED, 'admin.cms.pages_slug_empty')
-                ->addRule(Form::PATTERN, 'admin.cms.pages_slug_format', '^([a-z0-9-]*)|/$');
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.slug_empty')
+                ->addRule(Form::PATTERN, 'admin.cms.pages.column.slug_format', '^([a-z0-9-]*)|/$');
 
             $container->addMultiSelect('roles', '', $rolesOptions)->setHtmlAttribute('class', 'datagrid-multiselect')
-                ->addRule(Form::FILLED, 'admin.cms.pages_roles_empty');
+                ->addRule(Form::FILLED, 'admin.cms.pages.column.roles_empty');
 
             $container->addSelect('public', '', $publicOptions);
         };
         $grid->getInlineEdit()->onSetDefaults[] = function (Container $container, Page $item): void {
-            /** @var TextInput $slugText */
             $slugText = $container['slug'];
-            $slugText->addRule(Form::IS_NOT_IN, 'admin.cms.pages_slug_exists', $this->pageRepository->findOthersSlugs($item->getId()));
+            assert($slugText instanceof TextInput);
+            $slugText->addRule(Form::IS_NOT_IN, 'admin.cms.pages.column.slug_exists', $this->pageRepository->findOthersSlugs($item->getId()));
 
             $container->setDefaults([
                 'name' => $item->getName(),
@@ -152,7 +153,7 @@ public function createComponentPagesGrid(string $name): void
         };
         $grid->getInlineEdit()->onSubmit[]      = [$this, 'edit'];
 
-        $grid->addAction('content', 'admin.cms.pages_edit_content', 'Pages:content')
+        $grid->addAction('content', 'admin.cms.pages.action.edit_content', 'Pages:content')
             ->addParameters(['area' => 'main'])
             ->setClass('btn btn-xs btn-primary');
 
@@ -162,11 +163,13 @@ public function createComponentPagesGrid(string $name): void
             ->setClass('btn btn-xs btn-danger')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.cms.pages_delete_confirm'),
+                'data-content' => $this->translator->translate('admin.cms.pages.action.delete_confirm'),
             ]);
         $grid->allowRowsAction('delete', static function (Page $item) {
             return $item->getSlug() !== '/';
         });
+
+        return $grid;
     }
 
     /**
@@ -187,7 +190,7 @@ public function add(stdClass $values): void
         $this->cmsService->savePage($page);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.pages_saved', 'success');
+        $p->flashMessage('admin.cms.pages.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -212,7 +215,7 @@ public function edit(string $id, stdClass $values): void
         $this->cmsService->savePage($page);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.pages_saved', 'success');
+        $p->flashMessage('admin.cms.pages.message.save_success', 'success');
 
         $this->redirect('this');
     }
@@ -230,7 +233,7 @@ public function handleDelete(int $id): void
         $page = $this->pageRepository->findById($id);
         $this->cmsService->removePage($page);
 
-        $this->getPresenter()->flashMessage('admin.cms.pages_deleted', 'success');
+        $this->getPresenter()->flashMessage('admin.cms.pages.message.delete_success', 'success');
 
         $this->redirect('this');
     }
@@ -247,12 +250,11 @@ public function handleSort(?string $item_id, ?string $prev_id, ?string $next_id)
         $this->cmsService->sort((int) $item_id, (int) $prev_id, (int) $next_id);
 
         $p = $this->getPresenter();
-        $p->flashMessage('admin.cms.pages_order_saved', 'success');
+        $p->flashMessage('admin.cms.pages.message.order_save_success', 'success');
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $pagesGrid */
-            $pagesGrid = $this['pagesGrid'];
+            $pagesGrid = $this->getComponent('pagesGrid');
             $pagesGrid->reload();
         } else {
             $this->redirect('this');
@@ -274,18 +276,17 @@ public function changeStatus(string $id, string $public): void
         $page = $this->pageRepository->findById((int) $id);
 
         if ($page->getSlug() === '/' && ! $public) {
-            $p->flashMessage('admin.cms.pages_change_public_denied', 'danger');
+            $p->flashMessage('admin.cms.pages.message.public_change_denied', 'danger');
         } else {
             $page->setPublic((bool) $public);
             $this->cmsService->savePage($page);
 
-            $p->flashMessage('admin.cms.pages_changed_public', 'success');
+            $p->flashMessage('admin.cms.pages.message.public_change_success', 'success');
         }
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $pagesGrid */
-            $pagesGrid = $this['pagesGrid'];
+            $pagesGrid = $this->getComponent('pagesGrid');
             $pagesGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/CmsModule/Forms/FaqFormFactory.php b/app/AdminModule/CmsModule/Forms/FaqFormFactory.php
index 0a1039658..a63b2d8fd 100644
--- a/app/AdminModule/CmsModule/Forms/FaqFormFactory.php
+++ b/app/AdminModule/CmsModule/Forms/FaqFormFactory.php
@@ -60,13 +60,13 @@ public function create(?int $id, int $userId): Form
 
         $form->addHidden('id');
 
-        $form->addTextArea('question', 'admin.cms.faq_question')
-            ->addRule(Form::FILLED, 'admin.cms.faq_question_empty');
+        $form->addTextArea('question', 'admin.cms.faq.common.question')
+            ->addRule(Form::FILLED, 'admin.cms.faq.form.question_empty');
 
-        $form->addTextArea('answer', 'admin.cms.faq_answer')
+        $form->addTextArea('answer', 'admin.cms.faq.form.answer')
             ->setHtmlAttribute('class', 'tinymce-paragraph');
 
-        $form->addCheckbox('public', 'admin.cms.faq_public_form');
+        $form->addCheckbox('public', 'admin.cms.faq.form.public');
 
         $form->addSubmit('submit', 'admin.common.save');
 
diff --git a/app/AdminModule/CmsModule/Forms/NewsFormFactory.php b/app/AdminModule/CmsModule/Forms/NewsFormFactory.php
index 59b3be000..80cbd973b 100644
--- a/app/AdminModule/CmsModule/Forms/NewsFormFactory.php
+++ b/app/AdminModule/CmsModule/Forms/NewsFormFactory.php
@@ -50,14 +50,14 @@ public function create(?int $id): Form
 
         $form->addHidden('id');
 
-        $publishedDateTime = new DateTimeControl('admin.cms.news_published');
-        $publishedDateTime->addRule(Form::FILLED, 'admin.cms.news_published_empty');
+        $publishedDateTime = new DateTimeControl('admin.cms.news.common.published');
+        $publishedDateTime->addRule(Form::FILLED, 'admin.cms.news.form.published_empty');
         $form->addComponent($publishedDateTime, 'published');
 
-        $form->addCheckbox('pinned', 'admin.cms.news_edit_pinned');
+        $form->addCheckbox('pinned', 'admin.cms.news.form.pinned');
 
-        $form->addTextArea('text', 'admin.cms.news_text')
-            ->addRule(Form::FILLED, 'admin.cms.news_text_empty')
+        $form->addTextArea('text', 'admin.cms.news.common.text')
+            ->addRule(Form::FILLED, 'admin.cms.news.form.text_empty')
             ->setHtmlAttribute('class', 'tinymce-paragraph');
 
         $form->addSubmit('submit', 'admin.common.save');
diff --git a/app/AdminModule/CmsModule/Forms/PageForm.php b/app/AdminModule/CmsModule/Forms/PageForm.php
index 9fb07ad7b..163c49bca 100644
--- a/app/AdminModule/CmsModule/Forms/PageForm.php
+++ b/app/AdminModule/CmsModule/Forms/PageForm.php
@@ -14,6 +14,7 @@
 use App\Model\Cms\Page;
 use App\Model\Cms\Repositories\PageRepository;
 use App\Model\Cms\Repositories\TagRepository;
+use App\Model\Cms\SlideshowContent;
 use App\Model\Cms\UsersContent;
 use App\Services\AclService;
 use App\Services\CmsService;
@@ -131,7 +132,7 @@ public function createComponentForm(): Form
 
         $form->addHidden('id')->setDefaultValue($this->page->getId());
         $form->addHidden('area')->setDefaultValue($this->area);
-        $form->addSelect('type', 'admin.cms.pages_content_type', $this->prepareContentTypesOptions());
+        $form->addSelect('type', 'admin.cms.pages.content.form.type', $this->prepareContentTypesOptions());
 
         foreach ($this->page->getContents($this->area) as $content) {
             switch (get_class($content)) {
@@ -145,6 +146,9 @@ public function createComponentForm(): Form
                 case ImageContent::class:
                     $content->injectFilesService($this->filesService);
                     break;
+                case SlideshowContent::class:
+                    $content->injectFilesService($this->filesService);
+                    break;
                 case UsersContent::class:
                     $content->injectRoleRepository($this->roleRepository);
                     $content->injectAclService($this->aclService);
diff --git a/app/AdminModule/CmsModule/Forms/templates/page_form.latte b/app/AdminModule/CmsModule/Forms/templates/page_form.latte
index cc3ee241b..f7063d59c 100644
--- a/app/AdminModule/CmsModule/Forms/templates/page_form.latte
+++ b/app/AdminModule/CmsModule/Forms/templates/page_form.latte
@@ -2,16 +2,10 @@
 
 <script>
     $(function () {
-        // nastaveni trid a identifikatoru pro spravnou funkcnost mazani a razeni contentu
-        $('.contents-item').each(function () {
-            var id = $(this).find('input.id').val();
-            $(this).attr('id', 'content-' + id);
-            $(this).find('.delete-content').attr('href', '#content-' + id);
-        });
-
         // razeni contentu
         $('#contents').sortable({
             delay: 300,
+            handle: '.card-header',
             update: function (event, ui) {
             },
             start: function (event, ui) {
@@ -39,6 +33,7 @@
             var contentToDeleteSelector = $('#' + contentToDelete);
             contentToDeleteSelector.find('input[type=text]').prop('disabled', true).val('');
             contentToDeleteSelector.find('input[type=file]').prop('disabled', true).val('');
+            contentToDeleteSelector.find('select').prop('disabled', true).val('');
             contentToDeleteSelector.find('textarea').prop('disabled', true).val('');
             contentToDeleteSelector.fadeOut();
         });
@@ -76,13 +71,13 @@
             {var $type = $content->getType()}
             {var $id = $content->getId()}
 
-            <div class="card contents-item mb-3">
+            <div id="content-{$id}" class="card contents-item mb-3">
                 <div class="card-header">
                     <div class="pull-left">
                         {_common.content.name.$type}
                     </div>
                     <div class="pull-right">
-                        <a href="#" class="btn btn-xs btn-danger delete-content">
+                        <a href="#content-{$id}" class="btn btn-xs btn-danger delete-content">
                             <i class="fa fa-trash"></i>
                         </a>
                         <a href="#" class="btn btn-xs btn-secondary" onclick="return false;">
@@ -98,22 +93,6 @@
 
                         {if $prototype->getAttribute('type') == 'hidden'}
                             {input $input}
-
-                        {elseif $prototype->getAttribute('data-type') == 'image'}
-                            <div class="form-group row">
-                                <div class="col-3">
-                                    {_$input->caption}
-                                </div>
-                                <div class="col-9 overflow-hidden">
-                                    {var $image = $prototype->getAttribute('data-image')}
-                                    {if $image}
-                                        <img src="{$basePath}/files/{$image}" width="{$prototype->getAttribute('data-width')}" height="{$prototype->getAttribute('data-height')}"/>
-                                    {else}
-                                        <div>Žádný obrázek</div>
-                                    {/if}
-                                </div>
-                            </div>
-
                         {else}
                             <div class="form-group row {$input->required ? required}">
                                 <div class="col-3 col-form-label">
diff --git a/app/AdminModule/CmsModule/Presenters/FaqPresenter.php b/app/AdminModule/CmsModule/Presenters/FaqPresenter.php
index 209aec86b..66bf21a9f 100644
--- a/app/AdminModule/CmsModule/Presenters/FaqPresenter.php
+++ b/app/AdminModule/CmsModule/Presenters/FaqPresenter.php
@@ -46,7 +46,7 @@ protected function createComponentFaqForm(): Form
                 $this->redirect('Faq:default');
             }
 
-            $this->flashMessage('admin.cms.faq_saved', 'success');
+            $this->flashMessage('admin.cms.faq.message.save_success', 'success');
 
             if ($form->isSubmitted() === $form['submitAndContinue']) {
                 $id = $values->id ?: $this->faqRepository->findLastId(); // todo: nahradit
diff --git a/app/AdminModule/CmsModule/Presenters/NewsPresenter.php b/app/AdminModule/CmsModule/Presenters/NewsPresenter.php
index 25b5e27e7..caf6b915f 100644
--- a/app/AdminModule/CmsModule/Presenters/NewsPresenter.php
+++ b/app/AdminModule/CmsModule/Presenters/NewsPresenter.php
@@ -46,7 +46,7 @@ protected function createComponentNewsForm(): Form
                 $this->redirect('News:default');
             }
 
-            $this->flashMessage('admin.cms.news_saved', 'success');
+            $this->flashMessage('admin.cms.news.message.save_success', 'success');
 
             if ($form->isSubmitted() === $form['submitAndContinue']) {
                 $id = $values->id ?: $this->newsRepository->findLastId(); // todo: nahradit
diff --git a/app/AdminModule/CmsModule/Presenters/PagesPresenter.php b/app/AdminModule/CmsModule/Presenters/PagesPresenter.php
index f562d857c..adc83440d 100644
--- a/app/AdminModule/CmsModule/Presenters/PagesPresenter.php
+++ b/app/AdminModule/CmsModule/Presenters/PagesPresenter.php
@@ -50,7 +50,7 @@ protected function createComponentPageForm(): PageForm
         $control = $this->pageFormFactory->create($id, $area);
 
         $control->onPageSave[] = function (PageForm $control, $submitName): void {
-            $this->flashMessage('admin.cms.pages_content_saved', 'success');
+            $this->flashMessage('admin.cms.pages.content.message.save_success', 'success');
 
             switch ($submitName) {
                 case 'submitAndContinue':
@@ -69,7 +69,7 @@ protected function createComponentPageForm(): PageForm
         };
 
         $control->onPageSaveError[] = function (PageForm $control): void {
-            $this->flashMessage('admin.cms.pages_content_save_error', 'danger');
+            $this->flashMessage('admin.cms.pages.content.message.save_failed', 'danger');
             $this->redirect('Pages:content', ['id' => $control->id, 'area' => $control->area]);
         };
 
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Documents/default.latte b/app/AdminModule/CmsModule/Presenters/templates/Documents/default.latte
index e02b67b0e..d3b281df5 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Documents/default.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Documents/default.latte
@@ -1,10 +1,10 @@
 {block main}
-    <h2>{_admin.cms.documents_heading}</h2>
+    <h2>{_admin.cms.documents.heading}</h2>
     {snippet documentsGrid}
         {control documentsGrid}
     {/snippet}
 
-    <h2>{_admin.cms.tags_heading}</h2>
+    <h2>{_admin.cms.documents.tags.heading}</h2>
     {snippet documentTagsGrid}
         {control documentTagsGrid}
     {/snippet}
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Faq/add.latte b/app/AdminModule/CmsModule/Presenters/templates/Faq/add.latte
index 7f98cd553..ab0ebc190 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Faq/add.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Faq/add.latte
@@ -3,7 +3,7 @@
 {/block}
 
 {block main}
-    <h2>{_admin.cms.faq_add_heading}</h2>
+    <h2>{_admin.cms.faq.form.add_heading}</h2>
     <div class="card card-body bg-light pb-1 mb-3">
         {control faqForm}
     </div>
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Faq/default.latte b/app/AdminModule/CmsModule/Presenters/templates/Faq/default.latte
index 4834aa755..979a83360 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Faq/default.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Faq/default.latte
@@ -1,4 +1,4 @@
 {block main}
-    <h2>{_admin.cms.faq_heading}</h2>
+    <h2>{_admin.cms.faq.heading}</h2>
     {control faqGrid}
 {/block}
\ No newline at end of file
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Faq/edit.latte b/app/AdminModule/CmsModule/Presenters/templates/Faq/edit.latte
index 6049e28da..b1d2c01d6 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Faq/edit.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Faq/edit.latte
@@ -3,7 +3,7 @@
 {/block}
 
 {block main}
-    <h2>{_admin.cms.faq_edit_heading}</h2>
+    <h2>{_admin.cms.faq.form.edit_heading}</h2>
     <div class="card card-body bg-light pb-1 mb-3">
         {control faqForm}
     </div>
diff --git a/app/AdminModule/CmsModule/Presenters/templates/News/add.latte b/app/AdminModule/CmsModule/Presenters/templates/News/add.latte
index 221cca21f..0e86a921c 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/News/add.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/News/add.latte
@@ -3,7 +3,7 @@
 {/block}
 
 {block main}
-    <h2>{_admin.cms.news_add_heading}</h2>
+    <h2>{_admin.cms.news.form.add_heading}</h2>
     <div class="card card-body bg-light pb-1 mb-3">
         {control newsForm}
     </div>
diff --git a/app/AdminModule/CmsModule/Presenters/templates/News/default.latte b/app/AdminModule/CmsModule/Presenters/templates/News/default.latte
index 279ca0a8f..da363b4bf 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/News/default.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/News/default.latte
@@ -1,4 +1,4 @@
 {block main}
-    <h2>{_admin.cms.news_heading}</h2>
+    <h2>{_admin.cms.news.heading}</h2>
     {control newsGrid}
 {/block}
\ No newline at end of file
diff --git a/app/AdminModule/CmsModule/Presenters/templates/News/edit.latte b/app/AdminModule/CmsModule/Presenters/templates/News/edit.latte
index 165ab990f..53cd75635 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/News/edit.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/News/edit.latte
@@ -3,7 +3,7 @@
 {/block}
 
 {block main}
-    <h2>{_admin.cms.news_edit_heading}</h2>
+    <h2>{_admin.cms.news.form.edit_heading}</h2>
     <div class="card card-body bg-light pb-1 mb-3">
         {control newsForm}
     </div>
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Pages/content.latte b/app/AdminModule/CmsModule/Presenters/templates/Pages/content.latte
index 293f2ffcc..a075bd9f0 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Pages/content.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Pages/content.latte
@@ -1,4 +1,4 @@
 {block main}
-    <h2>{_admin.cms.pages_edit_heading, ['name' => $page->getName()]}</h2>
+    <h2>{_admin.cms.pages.content.heading, ['name' => $page->getName()]}</h2>
     {control pageForm}
 {/block}
\ No newline at end of file
diff --git a/app/AdminModule/CmsModule/Presenters/templates/Pages/default.latte b/app/AdminModule/CmsModule/Presenters/templates/Pages/default.latte
index e48c9eea1..a52dfffbc 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/Pages/default.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/Pages/default.latte
@@ -14,6 +14,6 @@
 {/block}
 
 {block main}
-    <h2>{_admin.cms.pages_heading}</h2>
+    <h2>{_admin.cms.pages.heading}</h2>
     {control pagesGrid}
 {/block}
\ No newline at end of file
diff --git a/app/AdminModule/CmsModule/Presenters/templates/sidebar.latte b/app/AdminModule/CmsModule/Presenters/templates/sidebar.latte
index 42c0b8339..c13eaee3b 100644
--- a/app/AdminModule/CmsModule/Presenters/templates/sidebar.latte
+++ b/app/AdminModule/CmsModule/Presenters/templates/sidebar.latte
@@ -2,16 +2,16 @@
     <div class="card card-body bg-light mb-3">
         <div class="nav flex-column nav-pills">
             <a n:href="Pages:default" n:class="nav-link, $presenter->isLinkCurrent(':Admin:Cms:Pages:*') ? active">
-                {_admin.cms.menu_pages}
+                {_admin.cms.menu.pages}
             </a>
             <a n:href="News:default" n:class="nav-link, $presenter->isLinkCurrent(':Admin:Cms:News:*') ? active">
-                {_admin.cms.menu_news}
+                {_admin.cms.menu.news}
             </a>
             <a n:href="Documents:default" n:class="nav-link, $presenter->isLinkCurrent(':Admin:Cms:Documents:*') ? active">
-                {_admin.cms.menu_documents}
+                {_admin.cms.menu.documents}
             </a>
             <a n:href="Faq:default" n:class="nav-link, $presenter->isLinkCurrent(':Admin:Cms:Faq:*') ? active">
-                {_admin.cms.menu_faq}
+                {_admin.cms.menu.faq}
             </a>
         </div>
     </div>
diff --git a/app/AdminModule/Components/ApplicationsGridControl.php b/app/AdminModule/Components/ApplicationsGridControl.php
index e06ecb63d..496486f76 100644
--- a/app/AdminModule/Components/ApplicationsGridControl.php
+++ b/app/AdminModule/Components/ApplicationsGridControl.php
@@ -6,6 +6,7 @@
 
 use App\Model\Application\Application;
 use App\Model\Application\Repositories\ApplicationRepository;
+use App\Model\Application\RolesApplication;
 use App\Model\Application\SubeventsApplication;
 use App\Model\Enums\ApplicationState;
 use App\Model\Enums\PaymentType;
@@ -214,8 +215,8 @@ public function createComponentApplicationsGrid(string $name): void
                     'data-toggle' => 'confirmation',
                     'data-content' => $this->translator->translate('admin.users.users_applications_cancel_application_confirm'),
                 ])->setClass('btn btn-xs btn-danger');
-            $grid->allowRowsAction('cancelApplication', static function (Application $item) {
-                return $item->getType() === Application::SUBEVENTS && ! $item->isCanceled();
+            $grid->allowRowsAction('cancelApplication', static function (Application $application) {
+                return $application instanceof SubeventsApplication && ! $application->isCanceled();
             });
         }
 
@@ -274,7 +275,7 @@ public function edit(string $id, stdClass $values): void
 
         $p = $this->getPresenter();
 
-        if ($application->getType() === Application::ROLES) {
+        if ($application instanceof RolesApplication) {
             if (! $selectedSubevents->isEmpty()) {
                 $p->flashMessage('admin.users.users_applications_subevents_not_empty', 'danger');
                 $this->redirect('this');
diff --git a/app/AdminModule/Components/RolesGridControl.php b/app/AdminModule/Components/RolesGridControl.php
index 82090c6c9..c84ccac87 100644
--- a/app/AdminModule/Components/RolesGridControl.php
+++ b/app/AdminModule/Components/RolesGridControl.php
@@ -53,7 +53,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentRolesGrid(string $name): void
+    public function createComponentRolesGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -113,6 +113,8 @@ public function createComponentRolesGrid(string $name): void
         $grid->allowRowsAction('delete', static function (Role $item) {
             return ! $item->isSystemRole();
         });
+
+        return $grid;
     }
 
     /**
@@ -154,8 +156,7 @@ public function changeRegisterable(string $id, string $registerable): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $rolesGrid */
-            $rolesGrid = $this['rolesGrid'];
+            $rolesGrid = $this->getComponent('rolesGrid');
             $rolesGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/Components/UsersGridControl.php b/app/AdminModule/Components/UsersGridControl.php
index dba4d3b8d..ef20c3e8f 100644
--- a/app/AdminModule/Components/UsersGridControl.php
+++ b/app/AdminModule/Components/UsersGridControl.php
@@ -50,9 +50,7 @@
 use Ublaboo\DataGrid\Exception\DataGridColumnStatusException;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
-use function array_slice;
-use function array_values;
-use function explode;
+use function basename;
 
 /**
  * Komponenta pro správu rolí.
@@ -143,7 +141,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentUsersGrid(string $name): void
+    public function createComponentUsersGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -357,14 +355,11 @@ public function createComponentUsersGrid(string $name): void
                             case $customInputValue instanceof CustomFileValue:
                                 return $customInputValue->getValue()
                                     ? Html::el('a')
-                                        ->setAttribute('href', $this->getPresenter()->getTemplate()->basePath
-                                            . '/files' . $customInputValue->getValue())
-                                        ->setAttribute('title', array_values(array_slice(explode('/', $customInputValue->getValue()), -1))[0])
+                                        ->setAttribute('href', $customInputValue->getValue())
+                                        ->setAttribute('title', basename($customInputValue->getValue()))
                                         ->setAttribute('target', '_blank')
                                         ->setAttribute('class', 'btn btn-xs btn-secondary')
-                                        ->addHtml(
-                                            Html::el('span')->setAttribute('class', 'fa fa-download')
-                                        )
+                                        ->addHtml(Html::el('span')->setAttribute('class', 'fa fa-download'))
                                     : '';
 
                             default:
@@ -483,6 +478,8 @@ public function createComponentUsersGrid(string $name): void
         });
 
         $grid->setColumnsSummary(['fee', 'feeRemaining']);
+
+        return $grid;
     }
 
     /**
@@ -519,8 +516,7 @@ public function changeApproved(string $id, string $approved): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $usersGrid */
-            $usersGrid = $this['usersGrid'];
+            $usersGrid = $this->getComponent('usersGrid');
             $usersGrid->redrawItem($id);
         } else {
             $this->redirect('this');
@@ -544,8 +540,7 @@ public function changeAttended(string $id, string $attended): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $usersGrid */
-            $usersGrid = $this['usersGrid'];
+            $usersGrid = $this->getComponent('usersGrid');
             $usersGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/ConfigurationModule/Components/CustomInputsGridControl.php b/app/AdminModule/ConfigurationModule/Components/CustomInputsGridControl.php
index 2ee0bf2fd..27f53a8a7 100644
--- a/app/AdminModule/ConfigurationModule/Components/CustomInputsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/Components/CustomInputsGridControl.php
@@ -59,7 +59,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentCustomInputsGrid(string $name): void
+    public function createComponentCustomInputsGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -111,6 +111,8 @@ public function createComponentCustomInputsGrid(string $name): void
                 'data-toggle' => 'confirmation',
                 'data-content' => $this->translator->translate('admin.configuration.custom_inputs_delete_confirm'),
             ]);
+
+        return $grid;
     }
 
     /**
@@ -144,8 +146,7 @@ public function handleSort(?string $item_id, ?string $prev_id, ?string $next_id)
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $customInputsGrid */
-            $customInputsGrid = $this['customInputsGrid'];
+            $customInputsGrid = $this->getComponent('customInputsGrid');
             $customInputsGrid->reload();
         } else {
             $this->redirect('this');
@@ -170,8 +171,7 @@ public function changeMandatory(string $id, string $mandatory): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $customInputsGrid */
-            $customInputsGrid = $this['customInputsGrid'];
+            $customInputsGrid = $this->getComponent('customInputsGrid');
             $customInputsGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
index 17b5105a8..84fd80579 100644
--- a/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/BankFormFactory.php
@@ -13,13 +13,16 @@
 use FioApi\Exceptions\InternalErrorException;
 use Nette;
 use Nette\Application\UI\Form;
+use Nette\Forms\Controls\TextInput;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 use Tracy\Debugger;
 use Tracy\ILogger;
 
+use function assert;
+
 /**
  * Formulár pro nastavení párování plateb.
  *
@@ -54,8 +57,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
@@ -93,8 +96,8 @@ public function processForm(Form $form, stdClass $values): void
             $this->settingsService->setValue(Settings::BANK_TOKEN, $token);
         } catch (InternalErrorException $ex) {
             Debugger::log($ex, ILogger::WARNING);
-            /** @var Nette\Forms\Controls\TextInput $bankTokenInput */
             $bankTokenInput = $form['bankToken'];
+            assert($bankTokenInput instanceof TextInput);
             $bankTokenInput->addError('admin.configuration.payment.bank.invalid_token');
         }
     }
diff --git a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
index a7b05cdd5..1fb4a0872 100644
--- a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
@@ -17,12 +17,13 @@
 use Nette\Application\LinkGenerator;
 use Nette\Application\UI\Form;
 use Nette\Forms\Controls\TextInput;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 use Ublaboo\Mailing\Exception\MailingMailCreationException;
 
 use function array_map;
+use function assert;
 use function explode;
 use function implode;
 use function md5;
@@ -75,8 +76,8 @@ public function create(int $id): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php b/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
index e280f22ea..29a2f7f64 100644
--- a/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
+++ b/app/AdminModule/ConfigurationModule/Forms/PaymentForm.php
@@ -13,10 +13,11 @@
 use Nette\Application\UI;
 use Nette\Application\UI\Form;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
 use function property_exists;
 
 /**
@@ -64,8 +65,8 @@ public function createComponentForm(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
index ddbbe6de0..31650cb37 100644
--- a/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/PaymentProofFormFactory.php
@@ -10,10 +10,12 @@
 use App\Services\ISettingsService;
 use Nette;
 use Nette\Application\UI\Form;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
+
 /**
  * Formulář pro nastavení dokladů.
  *
@@ -44,8 +46,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
index b8869f785..af57b2592 100644
--- a/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/ProgramFormFactory.php
@@ -14,10 +14,12 @@
 use Nette\Application\UI\Form;
 use Nette\Utils\DateTime;
 use Nextras\FormComponents\Controls\DateTimeControl;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
+
 /**
  * Formulář pro nastavení programu.
  *
@@ -48,8 +50,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
index 091f2b7fa..101507263 100644
--- a/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/SeminarFormFactory.php
@@ -15,10 +15,12 @@
 use Nette\Application\UI\Form;
 use Nette\Utils\DateTime;
 use Nextras\FormComponents\Controls\DateControl;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
+
 /**
  * Formulář pro nastavení semináře.
  *
@@ -55,8 +57,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
index cbbc6a8aa..4c60570de 100644
--- a/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/SkautIsEventFormFactory.php
@@ -19,10 +19,11 @@
 use Doctrine\ORM\ORMException;
 use Nette;
 use Nette\Application\UI\Form;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
 use function count;
 
 /**
@@ -73,8 +74,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
index ffe21d54f..1c8cc745f 100644
--- a/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/TicketsFormFactory.php
@@ -10,10 +10,12 @@
 use App\Services\ISettingsService;
 use Nette\Application\UI\Form;
 use Nextras\FormComponents\Controls\DateTimeControl;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
+use function assert;
+
 /**
  * Formulář pro nastavení vstupenek.
  *
@@ -41,8 +43,8 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
diff --git a/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
index 5a0657bab..4fb420703 100644
--- a/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/WebFormFactory.php
@@ -13,12 +13,14 @@
 use Nette;
 use Nette\Application\UI\Form;
 use Nette\Http\FileUpload;
-use Nette\Utils\Strings;
-use Nextras\FormsRendering\Renderers\Bs3FormRenderer;
+use Nextras\FormsRendering\Renderers\Bs4FormRenderer;
 use stdClass;
 use Throwable;
 
 use function array_key_exists;
+use function assert;
+use function basename;
+use function json_encode;
 
 use const UPLOAD_ERR_OK;
 
@@ -62,15 +64,19 @@ public function create(): Form
     {
         $form = $this->baseFormFactory->create();
 
-        /** @var Bs3FormRenderer $renderer */
-        $renderer                                   = $form->getRenderer();
+        $renderer = $form->getRenderer();
+        assert($renderer instanceof Bs4FormRenderer);
         $renderer->wrappers['control']['container'] = 'div class="col-7"';
         $renderer->wrappers['label']['container']   = 'div class="col-5 col-form-label"';
 
-        $form->addUpload('logo', 'admin.configuration.web_new_logo')
+        $logo = $this->settingsService->getValue(Settings::LOGO);
+        $form->addUpload('logo', 'admin.configuration.web_logo')
             ->setHtmlAttribute('accept', 'image/*')
+            ->setHtmlAttribute('data-show-preview', 'true')
+            ->setHtmlAttribute('data-initial-preview', json_encode([$logo]))
+            ->setHtmlAttribute('data-initial-preview-config', json_encode([['caption' => basename($logo)]]))
             ->addCondition(Form::FILLED)
-            ->addRule(Form::IMAGE, 'admin.configuration.web_new_logo_format');
+            ->addRule(Form::IMAGE, 'admin.configuration.web_logo_format');
 
         $form->addText('footer', 'admin.configuration.web_footer');
 
@@ -104,15 +110,13 @@ public function create(): Form
      */
     public function processForm(Form $form, stdClass $values): void
     {
-        /** @var FileUpload $logo */
         $logo = $values->logo;
+        assert($logo instanceof FileUpload);
         if ($logo->getError() == UPLOAD_ERR_OK) {
-//            $this->filesService->delete('/logo/' . $this->settingsService->getValue(Settings::LOGO));
-            $logoName = Strings::webalize($logo->name, '.');
-            $this->filesService->save($logo, '/logo/' . $logoName);
-            $this->filesService->resizeImage('/logo/' . $logoName, null, 100);
-
-            $this->settingsService->setValue(Settings::LOGO, $logoName);
+            $this->filesService->delete($this->settingsService->getValue(Settings::LOGO));
+            $path = $this->filesService->save($logo, 'logo', false, $logo->name);
+            $this->filesService->resizeImage($path, null, 100);
+            $this->settingsService->setValue(Settings::LOGO, $path);
         }
 
         $this->settingsService->setValue(Settings::FOOTER, $values->footer);
diff --git a/app/AdminModule/ConfigurationModule/Presenters/templates/Web/default.latte b/app/AdminModule/ConfigurationModule/Presenters/templates/Web/default.latte
index 75531cf83..c0ebd54b8 100644
--- a/app/AdminModule/ConfigurationModule/Presenters/templates/Web/default.latte
+++ b/app/AdminModule/ConfigurationModule/Presenters/templates/Web/default.latte
@@ -1,15 +1,6 @@
 {block main}
     <h2>{_admin.configuration.web_heading}</h2>
     <div class="card card-body bg-light pb-1 mb-3">
-        <div class="form-group row">
-            <div class="col-5">
-                {_admin.configuration.web_current_logo}
-            </div>
-            <div class="col-7">
-                <img src="{$basePath}/files/logo/{$logo}"/>
-            </div>
-        </div>
-
         {control settingsForm}
     </div>
 {/block}
\ No newline at end of file
diff --git a/app/AdminModule/Forms/AddLectorFormFactory.php b/app/AdminModule/Forms/AddLectorFormFactory.php
index 3169234c1..4654cd3d9 100644
--- a/app/AdminModule/Forms/AddLectorFormFactory.php
+++ b/app/AdminModule/Forms/AddLectorFormFactory.php
@@ -17,6 +17,7 @@
 use Nextras\FormComponents\Controls\DateControl;
 use stdClass;
 
+use function assert;
 use function getimagesizefromstring;
 use function image_type_to_extension;
 
@@ -60,6 +61,7 @@ public function create(): Form
 
         $form->addUpload('photo', 'admin.users.users_photo')
             ->setHtmlAttribute('accept', 'image/*')
+            ->setHtmlAttribute('data-show-preview', 'true')
             ->addCondition(Form::FILLED)
             ->addRule(Form::IMAGE, 'admin.users.users_photo_format');
 
@@ -140,16 +142,16 @@ public function processForm(Form $form, stdClass $values): void
 
         $this->userRepository->save($user);
 
-        /** @var FileUpload $photo */
         $photo = $values->photo;
+        assert($photo instanceof FileUpload);
         if ($photo->getError() == UPLOAD_ERR_OK) {
             $photoExtension = image_type_to_extension(getimagesizefromstring($photo->getContents())[2]);
             $photoName      = 'ext_' . $user->getId() . $photoExtension;
 
-            $this->filesService->save($photo, User::PHOTO_PATH . '/' . $photoName);
-            $this->filesService->resizeAndCropImage(User::PHOTO_PATH . '/' . $photoName, 135, 180);
+            $path = $this->filesService->save($photo, User::PHOTO_PATH, false, $photoName);
+            $this->filesService->resizeAndCropImage($path, 135, 180);
 
-            $user->setPhoto($photoName);
+            $user->setPhoto($path);
         }
 
         $this->userRepository->save($user);
diff --git a/app/AdminModule/Forms/EditUserPersonalDetailsFormFactory.php b/app/AdminModule/Forms/EditUserPersonalDetailsFormFactory.php
index 105cd9b52..7f3fae76f 100644
--- a/app/AdminModule/Forms/EditUserPersonalDetailsFormFactory.php
+++ b/app/AdminModule/Forms/EditUserPersonalDetailsFormFactory.php
@@ -10,14 +10,14 @@
 use Doctrine\ORM\ORMException;
 use Nette;
 use Nette\Application\UI\Form;
-use Nette\Http\FileUpload;
 use Nette\Utils\ImageException;
 use Nextras\FormComponents\Controls\DateControl;
 use stdClass;
 
+use function basename;
 use function getimagesizefromstring;
 use function image_type_to_extension;
-use function property_exists;
+use function json_encode;
 
 use const UPLOAD_ERR_OK;
 
@@ -59,18 +59,18 @@ public function create(int $id): Form
 
         $form->addHidden('id');
 
-        $form->addUpload('newPhoto', 'admin.users.users_new_photo')
-            ->setHtmlAttribute('accept', 'image/*')
-            ->setOption('id', 'new-photo')
+        $photoUpload = $form->addUpload('photo', 'admin.users.users_photo');
+        $photoUpload->setHtmlAttribute('accept', 'image/*')
+            ->setHtmlAttribute('data-show-preview', 'true')
             ->addCondition(Form::FILLED)
-            ->addRule(Form::IMAGE, 'admin.users.users_photo_format')
-            ->toggle('remove-photo', false);
+            ->addRule(Form::IMAGE, 'admin.users.users_photo_format');
 
-        $form->addCheckbox('removePhoto', 'admin.users.users_remove_photo')
-            ->setOption('id', 'remove-photo')
-            ->setDisabled($this->user->getPhoto() === null)
-            ->addCondition(Form::FILLED)
-            ->toggle('new-photo', false);
+        if ($this->user->getPhoto() !== null) {
+            $photoUpload->setHtmlAttribute('data-delete-url', '?do=removePhoto')
+                ->setHtmlAttribute('data-initial-preview', json_encode([$this->user->getPhoto()]))
+                ->setHtmlAttribute('data-initial-preview-show-delete', 'true')
+                ->setHtmlAttribute('data-initial-preview-config', json_encode([['caption' => basename($this->user->getPhoto())]]));
+        }
 
         $form->addText('firstName', 'admin.users.users_firstname')
             ->addRule(Form::FILLED, 'admin.users.users_firstname_empty');
@@ -150,20 +150,15 @@ public function processForm(Form $form, stdClass $values): void
         $this->user->setCity($values->city);
         $this->user->setPostcode($values->postcode);
 
-        if (property_exists($values, 'removePhoto') && $values->removePhoto) {
-            $this->user->setPhoto(null);
-        } elseif (property_exists($values, 'newPhoto')) {
-            /** @var FileUpload $photo */
-            $photo = $values->newPhoto;
-            if ($photo->getError() == UPLOAD_ERR_OK) {
-                $photoExtension = image_type_to_extension(getimagesizefromstring($photo->getContents())[2]);
-                $photoName      = 'ext_' . $this->user->getId() . $photoExtension;
+        $photo = $values->photo;
+        if ($photo->getError() == UPLOAD_ERR_OK) {
+            $photoExtension = image_type_to_extension(getimagesizefromstring($photo->getContents())[2]);
+            $photoName      = 'ext_' . $this->user->getId() . $photoExtension;
 
-                $this->filesService->save($photo, User::PHOTO_PATH . '/' . $photoName);
-                $this->filesService->resizeAndCropImage(User::PHOTO_PATH . '/' . $photoName, 135, 180);
+            $path = $this->filesService->save($photo, User::PHOTO_PATH, false, $photoName);
+            $this->filesService->resizeAndCropImage($path, 135, 180);
 
-                $this->user->setPhoto($photoName);
-            }
+            $this->user->setPhoto($path);
         }
 
         $this->userRepository->save($this->user);
diff --git a/app/AdminModule/Forms/EditUserSeminarFormFactory.php b/app/AdminModule/Forms/EditUserSeminarFormFactory.php
index 0fbeb4d4f..de4f83232 100644
--- a/app/AdminModule/Forms/EditUserSeminarFormFactory.php
+++ b/app/AdminModule/Forms/EditUserSeminarFormFactory.php
@@ -42,8 +42,6 @@
 use Nette\Application\UI\Form;
 use Nette\Forms\Controls\MultiSelectBox;
 use Nette\Http\FileUpload;
-use Nette\Utils\Random;
-use Nette\Utils\Strings;
 use Nextras\FormComponents\Controls\DateControl;
 use Nextras\FormComponents\Controls\DateTimeControl;
 use stdClass;
@@ -51,6 +49,8 @@
 
 use function array_key_exists;
 use function assert;
+use function basename;
+use function json_encode;
 
 use const UPLOAD_ERR_OK;
 
@@ -157,9 +157,10 @@ public function create(int $id): Form
                 switch (true) {
                     case $customInput instanceof CustomText:
                         $custom = $form->addText($customInputId, $customInput->getName());
-                        /** @var ?CustomTextValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
                         if ($customInputValue) {
+                            assert($customInputValue instanceof CustomTextValue);
                             $custom->setDefaultValue($customInputValue->getValue());
                         }
 
@@ -167,9 +168,10 @@ public function create(int $id): Form
 
                     case $customInput instanceof CustomCheckbox:
                         $custom = $form->addCheckbox($customInputId, $customInput->getName());
-                        /** @var ?CustomCheckboxValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
                         if ($customInputValue) {
+                            assert($customInputValue instanceof CustomCheckboxValue);
                             $custom->setDefaultValue($customInputValue->getValue());
                         }
 
@@ -178,19 +180,23 @@ public function create(int $id): Form
                     case $customInput instanceof CustomSelect:
                         $selectOptions = $customInput->getSelectOptions();
                         $custom        = $form->addSelect($customInputId, $customInput->getName(), $selectOptions);
-                        /** @var ?CustomSelectValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
-                        if ($customInputValue && array_key_exists($customInputValue->getValue(), $selectOptions)) {
-                            $custom->setDefaultValue($customInputValue->getValue());
+                        if ($customInputValue) {
+                            assert($customInputValue instanceof CustomSelectValue);
+                            if (array_key_exists($customInputValue->getValue(), $selectOptions)) {
+                                $custom->setDefaultValue($customInputValue->getValue());
+                            }
                         }
 
                         break;
 
                     case $customInput instanceof CustomMultiSelect:
                         $custom = $form->addMultiSelect($customInputId, $customInput->getName(), $customInput->getSelectOptions());
-                        /** @var ?CustomMultiSelectValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
                         if ($customInputValue) {
+                            assert($customInputValue instanceof CustomMultiSelectValue);
                             $custom->setDefaultValue($customInputValue->getValue());
                         }
 
@@ -198,13 +204,30 @@ public function create(int $id): Form
 
                     case $customInput instanceof CustomFile:
                         $custom = $form->addUpload($customInputId, $customInput->getName());
+                        $custom->setHtmlAttribute('data-show-preview', 'true');
+
+                        $customInputValue = $this->user->getCustomInputValue($customInput);
+                        if ($customInputValue) {
+                            assert($customInputValue instanceof CustomFileValue);
+                            $file = $customInputValue->getValue();
+                            $custom->setHtmlAttribute('data-initial-preview', json_encode([$file]))
+                                ->setHtmlAttribute('data-initial-preview-file-type', 'other')
+                                ->setHtmlAttribute('data-initial-preview-config', json_encode([
+                                    [
+                                        'caption' => basename($file),
+                                        'downloadUrl' => $file,
+                                    ],
+                                ]));
+                        }
+
                         break;
 
                     case $customInput instanceof CustomDate:
                         $custom = new DateControl($customInput->getName());
-                        /** @var ?CustomDateValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
                         if ($customInputValue) {
+                            assert($customInputValue instanceof CustomDateValue);
                             $custom->setDefaultValue($customInputValue->getValue());
                         }
 
@@ -213,9 +236,10 @@ public function create(int $id): Form
 
                     case $customInput instanceof CustomDateTime:
                         $custom = new DateTimeControl($customInput->getName());
-                        /** @var ?CustomDateTimeValue $customInputValue */
+
                         $customInputValue = $this->user->getCustomInputValue($customInput);
                         if ($customInputValue) {
+                            assert($customInputValue instanceof CustomDateTimeValue);
                             $custom->setDefaultValue($customInputValue->getValue());
                         }
 
@@ -287,45 +311,48 @@ public function processForm(Form $form, stdClass $values): void
                     $newValue         = $values->$customInputId;
 
                     if ($customInput instanceof CustomText) {
-                        /** @var CustomTextValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomTextValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomTextValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomCheckbox) {
-                        /** @var CustomCheckboxValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomCheckboxValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomCheckboxValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomSelect) {
-                        /** @var CustomSelectValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomSelectValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomSelectValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomMultiSelect) {
-                        /** @var CustomMultiSelectValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomMultiSelectValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomMultiSelectValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomFile) {
-                        /** @var CustomFileValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomFileValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
-                        /** @var FileUpload $newValue */
+                        assert($customInputValue instanceof CustomFileValue);
+                        $oldValue = $customInputValue->getValue();
                         $newValue = $values->$customInputId;
+                        assert($newValue instanceof FileUpload);
                         if ($newValue->getError() == UPLOAD_ERR_OK) {
-                            $path = $this->generatePath($newValue);
-                            $this->filesService->save($newValue, $path);
+                            if ($oldValue !== null) {
+                                $this->filesService->delete($oldValue);
+                            }
+
+                            $path = $this->filesService->save($newValue, CustomFile::PATH, true, $newValue->name);
                             $customInputValue->setValue($path);
                         }
                     } elseif ($customInput instanceof CustomDate) {
-                        /** @var CustomDateValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomDateValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomDateValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomDateTime) {
-                        /** @var CustomDateTimeValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomDateTimeValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomDateTimeValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     }
 
@@ -383,12 +410,4 @@ public static function toggleCustomInputVisibility(MultiSelectBox $field, array
     {
         return false;
     }
-
-    /**
-     * Vygeneruje cestu souboru.
-     */
-    private function generatePath(FileUpload $file): string
-    {
-        return CustomFile::PATH . '/' . Random::generate(5) . '/' . Strings::webalize($file->name, '.');
-    }
 }
diff --git a/app/AdminModule/MailingModule/Components/MailTemplatesGridControl.php b/app/AdminModule/MailingModule/Components/MailTemplatesGridControl.php
index ed2888e65..46f0fcf79 100644
--- a/app/AdminModule/MailingModule/Components/MailTemplatesGridControl.php
+++ b/app/AdminModule/MailingModule/Components/MailTemplatesGridControl.php
@@ -45,7 +45,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentMailTemplatesGrid(string $name): void
+    public function createComponentMailTemplatesGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -69,6 +69,8 @@ public function createComponentMailTemplatesGrid(string $name): void
             ->onChange[] = [$this, 'changeActive'];
 
         $grid->addAction('edit', 'admin.common.edit', 'Templates:edit');
+
+        return $grid;
     }
 
     /**
@@ -94,8 +96,7 @@ public function changeActive(string $id, string $active): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $mailTemplatesGrid */
-            $mailTemplatesGrid = $this['mailTemplatesGrid'];
+            $mailTemplatesGrid = $this->getComponent('mailTemplatesGrid');
             $mailTemplatesGrid->redrawItem($id);
         } else {
             $this->redirect('this');
diff --git a/app/AdminModule/Presenters/UsersPresenter.php b/app/AdminModule/Presenters/UsersPresenter.php
index c15838088..9199ce38f 100644
--- a/app/AdminModule/Presenters/UsersPresenter.php
+++ b/app/AdminModule/Presenters/UsersPresenter.php
@@ -170,6 +170,16 @@ public function handleCancelRegistration(): void
         $this->redirect('this');
     }
 
+    public function handleRemovePhoto(): void
+    {
+        $user = $this->userRepository->findById((int) $this->getParameter('id'));
+
+        $user->setPhoto(null);
+        $this->userRepository->save($user);
+
+        $this->redirect('this');
+    }
+
     protected function createComponentUsersGrid(): UsersGridControl
     {
         return $this->usersGridControlFactory->create();
diff --git a/app/AdminModule/Presenters/templates/Dashboard/default.latte b/app/AdminModule/Presenters/templates/Dashboard/default.latte
index aa730a3c0..487b65f65 100644
--- a/app/AdminModule/Presenters/templates/Dashboard/default.latte
+++ b/app/AdminModule/Presenters/templates/Dashboard/default.latte
@@ -8,22 +8,22 @@
                         <div class="row">
                             <div class="col-6 mb-3">
                                 <a href="{plink Cms:Pages:default}" class="btn btn-secondary btn-sm btn-block">
-                                    <span class="fa fa-2x fa-file-text-o"></span><br>{_admin.cms.menu_pages}
+                                    <span class="fa fa-2x fa-file-text-o"></span><br>{_admin.cms.menu.pages}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
                                 <a href="{plink Cms:News:default}" class="btn btn-secondary btn-sm btn-block">
-                                    <span class="fa fa-2x fa-newspaper-o"></span><br>{_admin.cms.menu_news}
+                                    <span class="fa fa-2x fa-newspaper-o"></span><br>{_admin.cms.menu.news}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
                                 <a href="{plink Cms:Documents:default}" class="btn btn-secondary btn-sm btn-block">
-                                    <span class="fa fa-2x fa-files-o"></span><br>{_admin.cms.menu_documents}
+                                    <span class="fa fa-2x fa-files-o"></span><br>{_admin.cms.menu.documents}
                                 </a>
                             </div>
                             <div class="col-6 mb-3">
                                 <a href="{plink Cms:Faq:default}" class="btn btn-secondary btn-sm btn-block">
-                                    <span class="fa fa-2x fa-comment-o"></span><br>{_admin.cms.menu_faq}
+                                    <span class="fa fa-2x fa-comment-o"></span><br>{_admin.cms.menu.faq}
                                 </a>
                             </div>
                         </div>
diff --git a/app/AdminModule/Presenters/templates/Users/detail.latte b/app/AdminModule/Presenters/templates/Users/detail.latte
index 7b6dd3e3c..3a1809927 100644
--- a/app/AdminModule/Presenters/templates/Users/detail.latte
+++ b/app/AdminModule/Presenters/templates/Users/detail.latte
@@ -9,7 +9,7 @@
             {if !$editPersonalDetails}
                 <div class="form-group row" n:if="$detailUser->getPhoto()">
                     <div class="col-3">{_admin.users.users_photo}</div>
-                    <div class="col-9"><img src="{$basePath}/files/user_photos/{$detailUser->getPhoto()}"/></div>
+                    <div class="col-9"><img src="{$detailUser->getPhoto()}"/></div>
                 </div>
 
                 <div class="form-group row" n:if="!$detailUser->isExternalLector()">
@@ -119,8 +119,9 @@
                                             {_admin.common.no}
                                         {/if}
                                     {case $customInputTypeFile}
-                                        <a href="{$basePath}/files{$customInputValue->getValue()}" target="_blank" n:if="$customInputValue->getValue() !== null">
-                                            {array_values(array_slice(explode('/', $customInputValue->getValue()), -1))[0]}
+                                        <a href="{$customInputValue->getValue()}" target="_blank" class="btn btn-sm btn-secondary" n:if="$customInputValue->getValue() !== null">
+                                            <span class="fa fa-download"></span>
+                                            {basename($customInputValue->getValue())}
                                         </a>
                                     {default}
                                         {$customInputValue->getValueText()}
diff --git a/app/AdminModule/ProgramModule/Components/ProgramBlocksGridControl.php b/app/AdminModule/ProgramModule/Components/ProgramBlocksGridControl.php
index f65d7a7dd..824083ee7 100644
--- a/app/AdminModule/ProgramModule/Components/ProgramBlocksGridControl.php
+++ b/app/AdminModule/ProgramModule/Components/ProgramBlocksGridControl.php
@@ -36,6 +36,8 @@
 use Ublaboo\DataGrid\Exception\DataGridColumnStatusException;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
+use function assert;
+
 /**
  * Komponenta pro správu programových bloků.
  *
@@ -108,7 +110,7 @@ public function render(): void
      * @throws DataGridColumnStatusException
      * @throws DataGridException
      */
-    public function createComponentProgramBlocksGrid(string $name): void
+    public function createComponentProgramBlocksGrid(string $name): DataGrid
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
@@ -217,6 +219,8 @@ public function createComponentProgramBlocksGrid(string $name): void
 
         $grid->addGroupAction('admin.program.blocks.action.export_blocks_attendees')
             ->onSelect[] = [$this, 'groupExportBlocksAttendees'];
+
+        return $grid;
     }
 
     /**
@@ -270,8 +274,7 @@ public function changeMandatory(string $id, string $mandatory): void
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
-            /** @var DataGrid $programBlocksGrid */
-            $programBlocksGrid = $this['programBlocksGrid'];
+            $programBlocksGrid = $this->getComponent('programBlocksGrid');
             $programBlocksGrid->redrawItem($id);
         } else {
             $this->redirect('this');
@@ -313,8 +316,8 @@ public function handleExportBlocksAttendees(): void
      */
     public function isAllowedModifyBlock(Block $block): bool
     {
-        /** @var AdminBasePresenter $presenter */
         $presenter = $this->getPresenter();
+        assert($presenter instanceof AdminBasePresenter);
 
         return $presenter->dbuser->isAllowedModifyBlock($block);
     }
diff --git a/app/AdminModule/ProgramModule/Components/ProgramCategoriesGridControl.php b/app/AdminModule/ProgramModule/Components/ProgramCategoriesGridControl.php
index d421ff80f..1de034acd 100644
--- a/app/AdminModule/ProgramModule/Components/ProgramCategoriesGridControl.php
+++ b/app/AdminModule/ProgramModule/Components/ProgramCategoriesGridControl.php
@@ -24,6 +24,8 @@
 use Ublaboo\DataGrid\DataGrid;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
+use function assert;
+
 /**
  * Komponenta pro správu kategorií.
  *
@@ -101,8 +103,8 @@ public function createComponentProgramCategoriesGrid(string $name): void
                 ->addRule(Form::FILLED, 'admin.program.categories.column.registerable_roles_empty');
         };
         $grid->getInlineEdit()->onSetDefaults[] = function (Container $container, Category $item): void {
-            /** @var TextInput $nameText */
             $nameText = $container['name'];
+            assert($nameText instanceof TextInput);
             $nameText->addRule(Form::IS_NOT_IN, 'admin.program.categories.column.name_exists', $this->categoryRepository->findOthersNames($item->getId()));
 
             $container->setDefaults([
diff --git a/app/AdminModule/ProgramModule/Components/RoomsGridControl.php b/app/AdminModule/ProgramModule/Components/RoomsGridControl.php
index 6166057d4..d98d3058c 100644
--- a/app/AdminModule/ProgramModule/Components/RoomsGridControl.php
+++ b/app/AdminModule/ProgramModule/Components/RoomsGridControl.php
@@ -24,6 +24,8 @@
 use Ublaboo\DataGrid\DataGrid;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
+use function assert;
+
 /**
  * Komponenta pro správu místností.
  *
@@ -113,8 +115,8 @@ public function createComponentRoomsGrid(string $name): void
                 ->addRule(Form::INTEGER, 'admin.program.rooms.column.capacity_format');
         };
         $grid->getInlineEdit()->onSetDefaults[] = function (Container $container, Room $item): void {
-            /** @var TextInput $nameText */
             $nameText = $container['name'];
+            assert($nameText instanceof TextInput);
             $nameText->addRule(Form::IS_NOT_IN, 'admin.program.rooms.column.name_exists', $this->roomRepository->findOthersNames($item->getId()));
 
             $container->setDefaults([
diff --git a/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php b/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php
index 8a5f36eaf..755015ffd 100644
--- a/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php
+++ b/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php
@@ -35,6 +35,8 @@
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Throwable;
 
+use function assert;
+
 /**
  * Formulář pro úpravu programového bloku.
  *
@@ -198,8 +200,8 @@ public function create(int $id, int $userId): Form
             ->setValidationScope([])
             ->setHtmlAttribute('class', 'btn btn-warning');
 
-        /** @var TextInput $nameText */
         $nameText = $form['name'];
+        assert($nameText instanceof TextInput);
 
         if ($this->block) {
             $nameText->addRule(Form::IS_NOT_IN, 'admin.program.blocks.form.name_exists', $this->blockRepository->findOthersNames($id));
@@ -228,8 +230,8 @@ public function create(int $id, int $userId): Form
             $nameText->addRule(Form::IS_NOT_IN, 'admin.program.blocks.form.name_exists', $this->blockRepository->findAllNames());
 
             if (! $userIsAllowedManageAllPrograms) {
-                /** @var MultiSelectBox $lectorsMultiSelect */
                 $lectorsMultiSelect = $form['lectors'];
+                assert($lectorsMultiSelect instanceof MultiSelectBox);
                 $lectorsMultiSelect->setDefaultValue([$this->user->getId()]);
             }
         }
diff --git a/app/ApiModule/Presenters/SchedulePresenter.php b/app/ApiModule/Presenters/SchedulePresenter.php
index dc0ed6713..2706322ce 100644
--- a/app/ApiModule/Presenters/SchedulePresenter.php
+++ b/app/ApiModule/Presenters/SchedulePresenter.php
@@ -16,6 +16,7 @@
 use Nette\Application\Responses\JsonResponse;
 use Throwable;
 
+use function assert;
 use function file_get_contents;
 
 /**
@@ -136,8 +137,8 @@ public function actionGetCalendarConfig(): void
      */
     public function actionSaveProgram(): void
     {
-        /** @var ProgramSaveDto $programSaveDto */
         $programSaveDto = $this->serializer->deserialize(file_get_contents('php://input'), ProgramSaveDto::class, 'json');
+        assert($programSaveDto instanceof ProgramSaveDto);
 
         try {
             $data = $this->scheduleService->saveProgram($programSaveDto);
diff --git a/app/ApiModule/Services/ScheduleService.php b/app/ApiModule/Services/ScheduleService.php
index 93602bc74..503d2c948 100644
--- a/app/ApiModule/Services/ScheduleService.php
+++ b/app/ApiModule/Services/ScheduleService.php
@@ -140,7 +140,6 @@ public function getProgramsWeb(): array
         $userAllowedPrograms              = $this->queryBus->handle(new UserAllowedProgramsQuery($this->user, ! $registrationBeforePaymentAllowed));
         $userAllowedProgramsWithNotPaid   = $this->queryBus->handle(new UserAllowedProgramsQuery($this->user, false));
 
-        /** @var ProgramDetailDto[] $programDetailDtos */
         $programDetailDtos = [];
         foreach ($userAllowedProgramsWithNotPaid as $program) {
             $programAttendees  = $this->queryBus->handle(new ProgramAttendeesQuery($program));
diff --git a/app/ExportModule/Presenters/IncomeProofPresenter.php b/app/ExportModule/Presenters/IncomeProofPresenter.php
index 5f2098715..6d43d5239 100644
--- a/app/ExportModule/Presenters/IncomeProofPresenter.php
+++ b/app/ExportModule/Presenters/IncomeProofPresenter.php
@@ -24,6 +24,7 @@
 use Nette\Bridges\ApplicationLatte\Template;
 use Throwable;
 
+use function assert;
 use function random_bytes;
 
 /**
@@ -137,8 +138,8 @@ private function generateIncomeProofs(Collection $applications): void
             }
         }
 
-        /** @var Template $template */
         $template = $this->createTemplate();
+        assert($template instanceof Template);
         $template->setFile(__DIR__ . '/templates/IncomeProof/pdf.latte');
 
         $template->applications      = $updatedApplications;
diff --git a/app/ExportModule/Presenters/TicketPresenter.php b/app/ExportModule/Presenters/TicketPresenter.php
index 4d0da5961..6a8073258 100644
--- a/app/ExportModule/Presenters/TicketPresenter.php
+++ b/app/ExportModule/Presenters/TicketPresenter.php
@@ -17,6 +17,7 @@
 use Nette\Bridges\ApplicationLatte\Template;
 use Throwable;
 
+use function assert;
 use function random_bytes;
 
 /**
@@ -57,8 +58,8 @@ public function actionPdf(): void
         $user         = $this->userRepository->findById($this->user->id);
         $userPrograms = $this->queryBus->handle(new UserAttendsProgramsQuery($user));
 
-        /** @var Template $template */
         $template = $this->createTemplate();
+        assert($template instanceof Template);
         $template->setFile(__DIR__ . '/templates/Ticket/pdf.latte');
 
         $template->logo                    = $this->settingsService->getValue(Settings::LOGO);
diff --git a/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte b/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
index 4018006ff..f272f8c4b 100644
--- a/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
+++ b/app/ExportModule/Presenters/templates/IncomeProof/pdf.latte
@@ -6,7 +6,7 @@
                     <h1 style="padding-top: 24px">{_export.income_proof.cash.heading}</h1>
                 </div>
                 <div class="col-4 text-right">
-                    <img src="{$basePath}/files/logo/{$logo}" style="max-height: 60px"/>
+                    <img src="{$basePath}{$logo}" style="max-height: 60px"/>
                 </div>
             </div>
 
@@ -57,7 +57,7 @@
                     <h1 style="padding-top: 24px">{_export.income_proof.bank.heading}</h1>
                 </div>
                 <div class="col-4 text-right">
-                    <img src="{$basePath}/files/logo/{$logo}" style="max-height: 60px"/>
+                    <img src="{$basePath}{$logo}" style="max-height: 60px"/>
                 </div>
             </div>
 
diff --git a/app/ExportModule/Presenters/templates/Ticket/pdf.latte b/app/ExportModule/Presenters/templates/Ticket/pdf.latte
index b1b898984..f722c8652 100644
--- a/app/ExportModule/Presenters/templates/Ticket/pdf.latte
+++ b/app/ExportModule/Presenters/templates/Ticket/pdf.latte
@@ -1,7 +1,7 @@
 {block content}
     <div class="row mb-4">
         <div class="col-5">
-            <img src="{$basePath}/files/logo/{$logo}"/>
+            <img src="{$basePath}{$logo}"/>
         </div>
         <div class="col-7 text-right">
             <h1>{$seminarName}</h1>
diff --git a/app/Model/Application/Application.php b/app/Model/Application/Application.php
index 04f1913f0..058cb3d1a 100644
--- a/app/Model/Application/Application.php
+++ b/app/Model/Application/Application.php
@@ -199,11 +199,6 @@ public function setApplicationId(int $applicationId): void
         $this->applicationId = $applicationId;
     }
 
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
     public function getUser(): User
     {
         return $this->user;
diff --git a/app/Model/Cms/CapacitiesContent.php b/app/Model/Cms/CapacitiesContent.php
index f302b243b..550127b75 100644
--- a/app/Model/Cms/CapacitiesContent.php
+++ b/app/Model/Cms/CapacitiesContent.php
@@ -18,6 +18,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s přehledem kapacit rolí.
  *
@@ -88,11 +90,11 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
+        assert($formContainer instanceof Container);
         $formContainer->addMultiSelect(
             'roles',
-            'admin.cms.pages_content_capacities_roles',
+            'admin.cms.pages.content.form.capacities_roles',
             $this->aclService->getRolesWithoutRolesOptions([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED])
         )
             ->setDefaultValue($this->roleRepository->findRolesIds($this->roles));
diff --git a/app/Model/Cms/Content.php b/app/Model/Cms/Content.php
index f350f6f87..e90fb9863 100644
--- a/app/Model/Cms/Content.php
+++ b/app/Model/Cms/Content.php
@@ -37,7 +37,8 @@
  *     "blocks_content" = "BlocksContent",
  *     "capacities_content" = "CapacitiesContent",
  *     "organizer_content" = "OrganizerContent",
- *     "contact_form_content" = "ContactFormContent"
+ *     "contact_form_content" = "ContactFormContent",
+ *     "slideshow_content" = "SlideshowContent"
  * })
  *
  * @author Michal Májský
@@ -120,6 +121,10 @@ abstract class Content implements IContent
      */
     public const CONTACT_FORM = 'contact_form';
 
+    /**
+     * SlideshowContent
+     */
+    public const SLIDESHOW = 'slideshow';
 
     /**
      * Hlavní oblast stránky.
@@ -137,6 +142,7 @@ abstract class Content implements IContent
         self::TEXT,
         self::IMAGE,
         self::HTML,
+        self::SLIDESHOW,
         self::NEWS,
         self::DOCUMENT,
         self::APPLICATION,
@@ -266,7 +272,7 @@ public function addContentForm(Form $form): Form
         $formContainer->addHidden('delete')
             ->setHtmlAttribute('class', 'delete');
 
-        $formContainer->addText('heading', 'admin.cms.pages_content_heading');
+        $formContainer->addText('heading', 'admin.cms.pages.content.form.heading');
 
         $formContainer->setDefaults([
             'id' => $this->id,
diff --git a/app/Model/Cms/Document.php b/app/Model/Cms/Document.php
index 716eae257..c1e329bd1 100644
--- a/app/Model/Cms/Document.php
+++ b/app/Model/Cms/Document.php
@@ -24,7 +24,7 @@ class Document
     /**
      * Adresář pro ukládání dokumentů.
      */
-    public const PATH = '/documents';
+    public const PATH = 'documents';
     use Id;
 
     /**
diff --git a/app/Model/Cms/DocumentContent.php b/app/Model/Cms/DocumentContent.php
index 45693e6bf..497cb2fa6 100644
--- a/app/Model/Cms/DocumentContent.php
+++ b/app/Model/Cms/DocumentContent.php
@@ -16,6 +16,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s dokumenty.
  *
@@ -80,9 +82,9 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
-        $formContainer->addMultiSelect('tags', 'admin.cms.pages_content_tags', $this->tagRepository->getTagsOptions())
+        assert($formContainer instanceof Container);
+        $formContainer->addMultiSelect('tags', 'admin.cms.pages.content.form.tags', $this->tagRepository->getTagsOptions())
             ->setDefaultValue($this->tagRepository->findTagsIds($this->tags));
 
         return $form;
diff --git a/app/Model/Cms/Dto/SlideshowContentDto.php b/app/Model/Cms/Dto/SlideshowContentDto.php
new file mode 100644
index 000000000..937c098a6
--- /dev/null
+++ b/app/Model/Cms/Dto/SlideshowContentDto.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\Cms\Dto;
+
+/**
+ * DTO obsahu se slideshow.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class SlideshowContentDto extends ContentDto
+{
+    /**
+     * Adresy obrázků.
+     *
+     * @var string[]
+     */
+    protected array $images;
+
+    /**
+     * @param string[] $images
+     */
+    public function __construct(string $type, string $heading, array $images)
+    {
+        parent::__construct($type, $heading);
+        $this->images = $images;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getImages(): array
+    {
+        return $this->images;
+    }
+}
diff --git a/app/Model/Cms/HtmlContent.php b/app/Model/Cms/HtmlContent.php
index 29fcff7fc..51c5efbc6 100644
--- a/app/Model/Cms/HtmlContent.php
+++ b/app/Model/Cms/HtmlContent.php
@@ -11,6 +11,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s HTML.
  *
@@ -48,9 +50,9 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
-        $formContainer->addTextArea('text', 'admin.cms.pages_content_html')
+        assert($formContainer instanceof Container);
+        $formContainer->addTextArea('text', 'admin.cms.pages.content.form.html')
             ->setDefaultValue($this->text)
             ->setHtmlAttribute('rows', 5);
 
diff --git a/app/Model/Cms/ImageContent.php b/app/Model/Cms/ImageContent.php
index b2b02d684..a8ff5e7bf 100644
--- a/app/Model/Cms/ImageContent.php
+++ b/app/Model/Cms/ImageContent.php
@@ -11,14 +11,13 @@
 use Nette\Application\UI\Form;
 use Nette\Forms\Container;
 use Nette\Http\FileUpload;
-use Nette\Utils\Image;
 use Nette\Utils\ImageException;
-use Nette\Utils\Random;
-use Nette\Utils\Strings;
 use Nette\Utils\UnknownImageFileException;
 use stdClass;
 
-use function file_exists;
+use function assert;
+use function basename;
+use function json_encode;
 
 use const UPLOAD_ERR_OK;
 
@@ -155,29 +154,28 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
+        assert($formContainer instanceof Container);
 
-        $formContainer->addText('currentImage', 'admin.cms.pages_content_image_current_file')
-            ->setHtmlAttribute('data-type', 'image')
-            ->setHtmlAttribute('data-image', $this->image)
-            ->setHtmlAttribute('data-width', $this->width)
-            ->setHtmlAttribute('data-height', $this->height);
-
-        $formContainer->addUpload('image', 'admin.cms.pages_content_image_new_file')
-            ->setHtmlAttribute('accept', 'image/*')
+        $imageUpload = $formContainer->addUpload('image', 'admin.cms.pages.content.form.image');
+        $imageUpload->setHtmlAttribute('accept', 'image/*')
+            ->setHtmlAttribute('data-show-preview', 'true')
             ->addCondition(Form::FILLED)
-            ->addRule(Form::IMAGE, 'admin.cms.pages_content_image_new_file_format');
+            ->addRule(Form::IMAGE, 'admin.cms.pages.content.form.image_format');
+        if ($this->image !== null) {
+            $imageUpload->setHtmlAttribute('data-initial-preview', json_encode([$this->image]))
+                ->setHtmlAttribute('data-initial-preview-config', json_encode([['caption' => basename($this->image)]]));
+        }
 
-        $formContainer->addSelect('align', 'admin.cms.pages_content_image_align', $this->prepareAlignOptions());
+        $formContainer->addSelect('align', 'admin.cms.pages.content.form.image_align', $this->prepareAlignOptions());
 
-        $formContainer->addText('width', 'admin.cms.pages_content_image_width')
+        $formContainer->addText('width', 'admin.cms.pages.content.form.image_width')
             ->setHtmlAttribute('data-toggle', 'tooltip')
             ->setHtmlAttribute('data-placement', 'bottom')
             ->setHtmlAttribute('title', $form->getTranslator()->translate('admin.cms.pages_content_image_size_note'))
             ->addCondition(Form::FILLED)->addRule(Form::INTEGER, 'admin.cms.pages_content_image_width_format');
 
-        $formContainer->addText('height', 'admin.cms.pages_content_image_height')
+        $formContainer->addText('height', 'admin.cms.pages.content.form.image_height')
             ->setHtmlAttribute('data-toggle', 'tooltip')
             ->setHtmlAttribute('data-placement', 'bottom')
             ->setHtmlAttribute('title', $form->getTranslator()->translate('admin.cms.pages_content_image_size_note'))
@@ -204,41 +202,38 @@ public function contentFormSucceeded(Form $form, stdClass $values): void
 
         $formName = $this->getContentFormName();
         $values   = $values->$formName;
-        /** @var FileUpload $file */
-        $file   = $values->image;
+
+        $file = $values->image;
+        assert($file instanceof FileUpload);
+
         $width  = $values->width !== '' ? $values->width : null;
         $height = $values->height !== '' ? $values->height : null;
 
-        $image = null;
-
-        $exists = false;
+        $imageData = null;
 
         if ($file->getError() == UPLOAD_ERR_OK) {
-            $path        = $this->generatePath($file);
-            $this->image = $path;
-            $this->filesService->save($file, $path);
-            $image  = $file->toImage();
-            $exists = true;
-        } elseif ($this->image) {
-            $path   = $this->filesService->getDir() . $this->image;
-            $exists = file_exists($path);
-            if ($exists) {
-                $image = Image::fromFile($path);
+            if ($this->image !== null) {
+                $this->filesService->delete($this->image);
             }
+
+            $this->image = $this->filesService->save($file, 'images', true, $file->name);
+            $imageData   = $file->toImage();
+        } elseif ($this->image !== null) {
+            $imageData = $this->filesService->openImage($this->image);
         }
 
-        if ($exists) {
+        if ($imageData !== null) {
             if ($width && $height) {
                 $this->width  = $width;
                 $this->height = $height;
             } elseif (! $width && ! $height) {
-                $this->width  = $image->getWidth();
-                $this->height = $image->getHeight();
+                $this->width  = $imageData->getWidth();
+                $this->height = $imageData->getHeight();
             } elseif ($width) {
                 $this->width  = $width;
-                $this->height = (int) ($image->getHeight() * $width / $image->getWidth());
+                $this->height = (int) ($imageData->getHeight() * $width / $imageData->getWidth());
             } else {
-                $this->width  = (int) ($image->getWidth() * $height / $image->getHeight());
+                $this->width  = (int) ($imageData->getWidth() * $height / $imageData->getHeight());
                 $this->height = $height;
             }
         } else {
@@ -264,14 +259,6 @@ private function prepareAlignOptions(): array
         return $options;
     }
 
-    /**
-     * Vygeneruje cestu pro uložení obrázku.
-     */
-    private function generatePath(FileUpload $file): string
-    {
-        return '/images/' . Random::generate(5) . '/' . Strings::webalize($file->name, '.');
-    }
-
     public function convertToDto(): ContentDto
     {
         return new ImageContentDto($this->getComponentName(), $this->heading, $this->image, $this->align, $this->width, $this->height);
diff --git a/app/Model/Cms/NewsContent.php b/app/Model/Cms/NewsContent.php
index a47906639..a09f5f82e 100644
--- a/app/Model/Cms/NewsContent.php
+++ b/app/Model/Cms/NewsContent.php
@@ -11,6 +11,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s aktualitami.
  *
@@ -48,14 +50,14 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
-        $formContainer->addText('count', 'admin.cms.pages_content_news_count')
+        assert($formContainer instanceof Container);
+        $formContainer->addText('count', 'admin.cms.pages.content.form.news_count')
             ->setDefaultValue($this->count)
             ->setHtmlAttribute('data-toggle', 'tooltip')
             ->setHtmlAttribute('data-placement', 'bottom')
-            ->setHtmlAttribute('title', $form->getTranslator()->translate('admin.cms.pages_content_news_count_note'))
-            ->addCondition(Form::FILLED)->addRule(Form::INTEGER, 'admin.cms.pages_content_news_count_format');
+            ->setHtmlAttribute('title', $form->getTranslator()->translate('admin.cms.pages.content.form.news_count_note'))
+            ->addCondition(Form::FILLED)->addRule(Form::INTEGER, 'admin.cms.pages.content.form.news_count_format');
 
         return $form;
     }
diff --git a/app/Model/Cms/OrganizerContent.php b/app/Model/Cms/OrganizerContent.php
index 51b4006aa..9d72a5118 100644
--- a/app/Model/Cms/OrganizerContent.php
+++ b/app/Model/Cms/OrganizerContent.php
@@ -11,6 +11,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s informací o pořadateli.
  *
@@ -47,9 +49,9 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
-        $formContainer->addText('organizer', 'admin.cms.pages_content_organizer')
+        assert($formContainer instanceof Container);
+        $formContainer->addText('organizer', 'admin.cms.pages.content.form.organizer')
             ->setDefaultValue($this->organizer);
 
         return $form;
diff --git a/app/Model/Cms/SlideshowContent.php b/app/Model/Cms/SlideshowContent.php
new file mode 100644
index 000000000..981e5384d
--- /dev/null
+++ b/app/Model/Cms/SlideshowContent.php
@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\Cms;
+
+use App\Model\Cms\Dto\ContentDto;
+use App\Model\Cms\Dto\SlideshowContentDto;
+use App\Services\FilesService;
+use Doctrine\ORM\Mapping as ORM;
+use Nette\Application\UI\Form;
+use Nette\Forms\Container;
+use Nette\Http\FileUpload;
+use Nette\Utils\ImageException;
+use Nette\Utils\UnknownImageFileException;
+use stdClass;
+
+use function array_map;
+use function assert;
+use function basename;
+use function json_encode;
+
+use const UPLOAD_ERR_OK;
+
+/**
+ * Entita obsahu se slideshow.
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="slideshow_content")
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class SlideshowContent extends Content implements IContent
+{
+    protected string $type = Content::SLIDESHOW;
+
+    /**
+     * Adresy obrázků.
+     *
+     * @ORM\Column(type="simple_array", nullable=true)
+     *
+     * @var string[]|null
+     */
+    protected ?array $images;
+
+    private FilesService $filesService;
+
+    public function injectFilesService(FilesService $filesService): void
+    {
+        $this->filesService = $filesService;
+    }
+
+    /**
+     * @return string[]|null
+     */
+    public function getImages(): ?array
+    {
+        return $this->images;
+    }
+
+    /**
+     * @param string[]|null $images
+     */
+    public function setImages(?array $images): void
+    {
+        $this->images = $images;
+    }
+
+    /**
+     * Přidá do formuláře pro editaci stránky formulář pro úpravu obsahu.
+     */
+    public function addContentForm(Form $form): Form
+    {
+        parent::addContentForm($form);
+
+        $formContainer = $form[$this->getContentFormName()];
+        assert($formContainer instanceof Container);
+
+        $formContainer->addMultiUpload('images', 'admin.cms.pages.content.form.slideshow_images')
+            ->setHtmlAttribute('accept', 'image/*')
+            ->setHtmlAttribute('data-show-preview', 'true')
+            ->setHtmlAttribute('data-initial-preview', json_encode($this->images))
+            ->setHtmlAttribute('data-initial-preview-config', json_encode(array_map(static function (string $image) {
+                return ['caption' => basename($image)];
+            }, $this->images)))
+            ->addCondition(Form::FILLED)
+            ->addRule(Form::IMAGE, 'admin.cms.pages.content.form.slideshow_images_format');
+
+        return $form;
+    }
+
+    /**
+     * Zpracuje při uložení stránky část formuláře týkající se obsahu.
+     *
+     * @throws UnknownImageFileException
+     * @throws ImageException
+     */
+    public function contentFormSucceeded(Form $form, stdClass $values): void
+    {
+        parent::contentFormSucceeded($form, $values);
+
+        $formName = $this->getContentFormName();
+        $values   = $values->$formName;
+
+        if (! empty($values->images)) {
+            foreach ($this->images as $image) {
+                $this->filesService->delete($image);
+            }
+
+            $this->images = [];
+
+            foreach ($values->images as $image) {
+                assert($image instanceof FileUpload);
+                if ($image->getError() == UPLOAD_ERR_OK) {
+                    $this->images[] = $this->filesService->save($image, 'images', true, $image->name);
+                }
+            }
+        }
+    }
+
+    public function convertToDto(): ContentDto
+    {
+        return new SlideshowContentDto($this->getComponentName(), $this->heading, $this->images);
+    }
+}
diff --git a/app/Model/Cms/TextContent.php b/app/Model/Cms/TextContent.php
index 4449d5ea7..ea69e60c5 100644
--- a/app/Model/Cms/TextContent.php
+++ b/app/Model/Cms/TextContent.php
@@ -11,6 +11,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu s textem.
  *
@@ -48,9 +50,9 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
-        $formContainer->addTextArea('text', 'admin.cms.pages_content_text')
+        assert($formContainer instanceof Container);
+        $formContainer->addTextArea('text', 'admin.cms.pages.content.form.text')
             ->setDefaultValue($this->text)
             ->setHtmlAttribute('class', 'tinymce');
 
diff --git a/app/Model/Cms/UsersContent.php b/app/Model/Cms/UsersContent.php
index 371ecb79e..198a8d806 100644
--- a/app/Model/Cms/UsersContent.php
+++ b/app/Model/Cms/UsersContent.php
@@ -18,6 +18,8 @@
 use Nette\Forms\Container;
 use stdClass;
 
+use function assert;
+
 /**
  * Entita obsahu se seznamem uživatelů.
  *
@@ -88,11 +90,11 @@ public function addContentForm(Form $form): Form
     {
         parent::addContentForm($form);
 
-        /** @var Container $formContainer */
         $formContainer = $form[$this->getContentFormName()];
+        assert($formContainer instanceof Container);
         $formContainer->addMultiSelect(
             'roles',
-            'admin.cms.pages_content_users_roles',
+            'admin.cms.pages.content.form.users_roles',
             $this->aclService->getRolesWithoutRolesOptions([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED])
         )
             ->setDefaultValue($this->roleRepository->findRolesIds($this->roles));
diff --git a/app/Model/CustomInput/CustomFile.php b/app/Model/CustomInput/CustomFile.php
index 5a898461d..1540373dd 100644
--- a/app/Model/CustomInput/CustomFile.php
+++ b/app/Model/CustomInput/CustomFile.php
@@ -19,7 +19,7 @@ class CustomFile extends CustomInput
     /**
      * Adresář pro ukládání souborů.
      */
-    public const PATH = '/custom_input';
+    public const PATH = 'custom_input';
 
     protected string $type = CustomInput::FILE;
 }
diff --git a/app/Model/CustomInput/CustomMultiSelectValue.php b/app/Model/CustomInput/CustomMultiSelectValue.php
index f98512df2..a7da4dd26 100644
--- a/app/Model/CustomInput/CustomMultiSelectValue.php
+++ b/app/Model/CustomInput/CustomMultiSelectValue.php
@@ -6,6 +6,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
+use function assert;
 use function implode;
 
 /**
@@ -48,8 +49,8 @@ public function setValue(array $value): void
      */
     public function getValueText(): string
     {
-        /** @var CustomMultiSelect $input */
         $input = $this->getInput();
+        assert($input instanceof CustomMultiSelect);
 
         if (empty($this->value)) {
             return '';
diff --git a/app/Model/CustomInput/CustomSelectValue.php b/app/Model/CustomInput/CustomSelectValue.php
index 4588664ff..032528bfd 100644
--- a/app/Model/CustomInput/CustomSelectValue.php
+++ b/app/Model/CustomInput/CustomSelectValue.php
@@ -6,6 +6,8 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
+use function assert;
+
 /**
  * Entita hodnota vlastního výběrového pole přihlášky.
  *
@@ -38,8 +40,8 @@ public function setValue(int $value): void
      */
     public function getValueText(): string
     {
-        /** @var CustomSelect $input */
         $input = $this->getInput();
+        assert($input instanceof CustomSelect);
 
         return $this->value !== 0 ? $input->getSelectOptions()[$this->value] : '';
     }
diff --git a/app/Model/Program/Repositories/BlockRepository.php b/app/Model/Program/Repositories/BlockRepository.php
index dc1706064..51546b4ee 100644
--- a/app/Model/Program/Repositories/BlockRepository.php
+++ b/app/Model/Program/Repositories/BlockRepository.php
@@ -185,7 +185,7 @@ public function getMinBlockAllowedCapacity(Block $block): ?int
             ->getQuery()
             ->getResult();
 
-        return $result === null ? null : $result[0]['c'];
+        return empty($result) ? null : $result[0]['c'];
     }
 
     /**
diff --git a/app/Model/User/User.php b/app/Model/User/User.php
index 894b5884e..d64b6f49e 100644
--- a/app/Model/User/User.php
+++ b/app/Model/User/User.php
@@ -40,7 +40,7 @@ class User
     /**
      * Adresář pro ukládání profilových fotek.
      */
-    public const PHOTO_PATH = '/user_photos';
+    public const PHOTO_PATH = 'user_photos';
     use Id;
 
     /**
@@ -797,7 +797,7 @@ public function getNotCanceledApplications(): Collection
     public function getNotCanceledRolesApplications(): Collection
     {
         return $this->getNotCanceledApplications()->filter(static function (Application $application) {
-            return $application->getType() === Application::ROLES;
+            return $application instanceof RolesApplication;
         });
     }
 
@@ -809,7 +809,7 @@ public function getNotCanceledRolesApplications(): Collection
     public function getNotCanceledSubeventsApplications(): Collection
     {
         return $this->getNotCanceledApplications()->filter(static function (Application $application) {
-            return $application->getType() === Application::SUBEVENTS;
+            return $application instanceof SubeventsApplication;
         });
     }
 
@@ -867,7 +867,7 @@ public function getWaitingForPaymentApplications(): Collection
     public function getWaitingForPaymentRolesApplications(): Collection
     {
         return $this->getWaitingForPaymentApplications()->filter(static function (Application $application) {
-            return $application->getType() === Application::ROLES;
+            return $application instanceof RolesApplication;
         });
     }
 
@@ -891,7 +891,7 @@ public function getRolesApplication(): ?RolesApplication
     public function getWaitingForPaymentSubeventsApplications(): Collection
     {
         return $this->getWaitingForPaymentApplications()->filter(static function (Application $application) {
-            return $application->getType() === Application::SUBEVENTS;
+            return $application instanceof SubeventsApplication;
         });
     }
 
@@ -1140,7 +1140,7 @@ public function hasSubevent(Subevent $subevent): bool
     public function hasPaidSubevent(Subevent $subevent): bool
     {
         foreach ($this->getPaidAndFreeApplications() as $application) {
-            if ($application->getType() === Application::SUBEVENTS && $application->getSubevents()->contains($subevent)) {
+            if ($application instanceof SubeventsApplication && $application->getSubevents()->contains($subevent)) {
                 return true;
             }
         }
diff --git a/app/Presenters/AuthPresenter.php b/app/Presenters/AuthPresenter.php
index 67eabf1cd..4687b4755 100644
--- a/app/Presenters/AuthPresenter.php
+++ b/app/Presenters/AuthPresenter.php
@@ -63,8 +63,8 @@ public function actionLogin(string $backlink = ''): void
         $this->user->login('');
         $this->user->setExpiration('+30 minutes');
 
-        /** @var Identity $userIdentity */
         $userIdentity = $this->user->identity;
+        assert($userIdentity instanceof Identity);
         if ($userIdentity->data['firstLogin']) {
             $user = $this->userRepository->findById($this->user->id);
 
diff --git a/app/Services/ApplicationService.php b/app/Services/ApplicationService.php
index 02042584a..6c26255d8 100644
--- a/app/Services/ApplicationService.php
+++ b/app/Services/ApplicationService.php
@@ -227,8 +227,7 @@ public function updateRoles(User $user, Collection $roles, ?User $createdBy, boo
                 }
 
                 foreach ($user->getNotCanceledApplications() as $application) {
-                    if ($application->getType() === Application::ROLES) {
-                        /** @var RolesApplication $newApplication */
+                    if ($application instanceof RolesApplication) {
                         $newApplication = clone $application;
                         $newApplication->setRoles($roles);
                         $newApplication->setFee($this->countRolesFee($roles));
@@ -679,7 +678,7 @@ public function isAllowedEditRegistration(User $user): bool
      */
     public function isAllowedEditApplication(Application $application): bool
     {
-        return $application->getType() === Application::SUBEVENTS && ! $application->isCanceled()
+        return $application instanceof SubeventsApplication && ! $application->isCanceled()
             && $application->getState() !== ApplicationState::PAID
             && $this->settingsService->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new DateTimeImmutable())->setTime(0, 0);
     }
diff --git a/app/Services/Authenticator.php b/app/Services/Authenticator.php
index 77019e56b..d6866b11b 100644
--- a/app/Services/Authenticator.php
+++ b/app/Services/Authenticator.php
@@ -20,6 +20,8 @@
 use Nette\Security\IIdentity;
 use stdClass;
 
+use function assert;
+
 /**
  * Služba starající se o autentizaci uživatelů.
  *
@@ -137,9 +139,8 @@ private function updateUserFromSkautIS(User $user, stdClass $skautISUser): void
             $photo = $this->skautIsService->getPersonPhoto($skautISUser->ID_Person, 'normal');
             if ($photo->ID_PersonPhotoNormal) {
                 $fileName = $photo->ID . $photo->PhotoExtension;
-                $path     = User::PHOTO_PATH . '/' . $fileName;
-                $this->filesService->create($path, $photo->PhotoNormalContent);
-                $user->setPhoto($fileName);
+                $path     = $this->filesService->create($photo->PhotoNormalContent, User::PHOTO_PATH, false, $fileName);
+                $user->setPhoto($path);
             } else {
                 $user->setPhoto(null);
             }
@@ -171,8 +172,8 @@ public function updateRoles(NS\User $user, ?Role $testedRole = null): void
             $netteRoles[$testedRole->getId()] = $testedRole->getName();
         }
 
-        /** @var Identity $identity */
         $identity = $user->identity;
+        assert($identity instanceof Identity);
         $identity->setRoles($netteRoles);
     }
 }
diff --git a/app/Services/DatabaseService.php b/app/Services/DatabaseService.php
index 4ccd7815e..6122b8681 100644
--- a/app/Services/DatabaseService.php
+++ b/app/Services/DatabaseService.php
@@ -100,6 +100,6 @@ public function backup(): void
 
         $timestamp = (new DateTimeImmutable())->format('YmdHi');
 
-        $dump->save($this->dir . '/backup/' . $dbname . '-' . $timestamp . '.sql.gz');
+        $dump->save($this->dir . '/' . $dbname . '-' . $timestamp . '.sql.gz');
     }
 }
diff --git a/app/Services/FilesService.php b/app/Services/FilesService.php
index 5053a78a5..0d66d899a 100644
--- a/app/Services/FilesService.php
+++ b/app/Services/FilesService.php
@@ -8,15 +8,14 @@
 use Nette\Http\FileUpload;
 use Nette\Utils\Image;
 use Nette\Utils\ImageException;
+use Nette\Utils\Random;
+use Nette\Utils\Strings;
 use Nette\Utils\UnknownImageFileException;
 
-use function dirname;
 use function fclose;
 use function file_exists;
 use function fopen;
 use function fwrite;
-use function is_dir;
-use function mkdir;
 use function unlink;
 
 /**
@@ -36,11 +35,16 @@ public function __construct(string $dir)
     }
 
     /**
-     * Uloží soubor.
+     * Uloží soubor z formuláře.
      */
-    public function save(FileUpload $file, string $path): void
+    public function save(FileUpload $file, string $directory, bool $randomSubDir, string $fileName): string
     {
-        $file->move($this->dir . $path);
+        $path         = $this->generatePath($directory, $randomSubDir, $fileName);
+        $absolutePath = $this->getAbsolutePath($path);
+
+        $file->move($absolutePath);
+
+        return $path;
     }
 
     /**
@@ -48,27 +52,41 @@ public function save(FileUpload $file, string $path): void
      */
     public function delete(string $path): void
     {
-        $file = $this->dir . $path;
-        if (file_exists($file)) {
-            unlink($file);
+        $absolutePath = $this->getAbsolutePath($path);
+        if (file_exists($absolutePath)) {
+            unlink($absolutePath);
         }
     }
 
     /**
-     * Vytvoří soubor s daným obsahem.
+     * Zapíše obsah do souboru.
      */
-    public function create(string $path, string $content): void
+    public function create(string $content, string $directory, bool $randomSubDir, string $fileName): string
     {
-        $absPath = $this->dir . $path;
-        $dirname = dirname($absPath);
-
-        if (! is_dir($dirname)) {
-            mkdir($dirname, 0755, true);
-        }
+        $path         = $this->generatePath($directory, $randomSubDir, $fileName);
+        $absolutePath = $this->getAbsolutePath($path);
 
-        $file = fopen($absPath, 'wb');
+        $file = fopen($absolutePath, 'wb');
         fwrite($file, $content);
         fclose($file);
+
+        return $path;
+    }
+
+    /**
+     * Načte obrázek ze souboru.
+     *
+     * @throws UnknownImageFileException
+     */
+    public function openImage(string $path): ?Image
+    {
+        $absolutePath = $this->getAbsolutePath($path);
+
+        if (file_exists($absolutePath)) {
+            return Image::fromFile($absolutePath);
+        }
+
+        return null;
     }
 
     /**
@@ -79,10 +97,12 @@ public function create(string $path, string $content): void
      */
     public function resizeImage(string $path, ?int $width, ?int $height): void
     {
-        $image = Image::fromFile($this->dir . $path);
+        $absolutePath = $this->getAbsolutePath($path);
+
+        $image = Image::fromFile($absolutePath);
         $image->resize($width, $height);
         $image->sharpen();
-        $image->save($this->dir . $path);
+        $image->save($absolutePath);
     }
 
     /**
@@ -93,7 +113,9 @@ public function resizeImage(string $path, ?int $width, ?int $height): void
      */
     public function resizeAndCropImage(string $path, ?int $width, ?int $height): void
     {
-        $image = Image::fromFile($this->dir . $path);
+        $absolutePath = $this->getAbsolutePath($path);
+
+        $image = Image::fromFile($absolutePath);
 
         if ($image->getWidth() / $width > $image->getHeight() / $height) {
             $image->resize(null, $height);
@@ -103,14 +125,28 @@ public function resizeAndCropImage(string $path, ?int $width, ?int $height): voi
 
         $image->sharpen();
         $image->crop('50%', '50%', $width, $height);
-        $image->save($this->dir . $path);
+        $image->save($absolutePath);
+    }
+
+    /**
+     * Vrací celou cestu k souboru.
+     */
+    private function getAbsolutePath(string $path): string
+    {
+        return $this->dir . $path;
     }
 
     /**
-     * Vrací cestu ke složce pro nahrávání souborů.
+     * Vygeneruje relativní cestu.
      */
-    public function getDir(): string
+    private function generatePath(string $directory, bool $randomSubDir, string $fileName): string
     {
-        return $this->dir;
+        $path = '/files/' . $directory;
+
+        if ($randomSubDir) {
+            $path .= '/' . Random::generate(5);
+        }
+
+        return $path . '/' . Strings::webalize($fileName, '.');
     }
 }
diff --git a/app/WebModule/Components/ISlideshowContentControlFactory.php b/app/WebModule/Components/ISlideshowContentControlFactory.php
new file mode 100644
index 000000000..ddd64e8e9
--- /dev/null
+++ b/app/WebModule/Components/ISlideshowContentControlFactory.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\WebModule\Components;
+
+/**
+ * Factory komponenty se slideshow.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+interface ISlideshowContentControlFactory
+{
+    public function create(): SlideshowContentControl;
+}
diff --git a/app/WebModule/Components/SlideshowContentControl.php b/app/WebModule/Components/SlideshowContentControl.php
new file mode 100644
index 000000000..13e21ac26
--- /dev/null
+++ b/app/WebModule/Components/SlideshowContentControl.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\WebModule\Components;
+
+use App\Model\Cms\Dto\SlideshowContentDto;
+use Nette\Application\UI\Control;
+
+/**
+ * Komponenta se slideshow.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class SlideshowContentControl extends Control
+{
+    public function render(SlideshowContentDto $content): void
+    {
+        $template = $this->template;
+        $template->setFile(__DIR__ . '/templates/slideshow_content.latte');
+
+        $template->heading = $content->getHeading();
+        $template->images  = $content->getImages();
+
+        $template->render();
+    }
+}
diff --git a/app/WebModule/Components/templates/blocks_content.latte b/app/WebModule/Components/templates/blocks_content.latte
index 22e3cf6ba..096d3ecad 100644
--- a/app/WebModule/Components/templates/blocks_content.latte
+++ b/app/WebModule/Components/templates/blocks_content.latte
@@ -68,7 +68,7 @@
                         {foreach $selectedBlock->getLectors() as $lector}
                             <h6>{$lector->getLectorName()}</h6>
                             <p>
-                                <img src="{$basePath}/files/user_photos/{$lector->getPhoto()}" class="pull-left mr-3 mb-3" n:if="$lector->getPhoto()"/>
+                                <img src="{$basePath}{$lector->getPhoto()}" class="pull-left mr-3 mb-3" n:if="$lector->getPhoto()"/>
                                 {$lector->getAbout()}
                             </p>
                             <div class="clearfix"></div>
diff --git a/app/WebModule/Components/templates/document_content.latte b/app/WebModule/Components/templates/document_content.latte
index a926ffa17..4088704b1 100644
--- a/app/WebModule/Components/templates/document_content.latte
+++ b/app/WebModule/Components/templates/document_content.latte
@@ -14,8 +14,8 @@
             {else}
                 <ul class="list-unstyled">
                     <li class="mb-1" n:foreach="$documents as $document">
-                        <a class="btn btn-sm btn-secondary" href="{$basePath}/files{$document->getFile()}" target="_blank">
-                            <i class="fa fa-file"></i>
+                        <a class="btn btn-sm btn-secondary" href="{$basePath}{$document->getFile()}" target="_blank">
+                            <i class="fa fa-download"></i>
                             {$document->getName()}
                         </a>
                         <span n:if="$document->getDescription()">- {$document->getDescription()}</span>
diff --git a/app/WebModule/Components/templates/image_content.latte b/app/WebModule/Components/templates/image_content.latte
index f5afc7c1f..cd6b2e983 100644
--- a/app/WebModule/Components/templates/image_content.latte
+++ b/app/WebModule/Components/templates/image_content.latte
@@ -8,6 +8,6 @@
     </div>
 
     <div class="image-wrapper {$align}" style="width: {$width}px; height: {$height}px">
-        <img src="{$basePath}/files{$image}" style="max-width: {$width}px; max-height: {$height}px"/>
+        <img src="{$basePath}{$image}" style="max-width: {$width}px; max-height: {$height}px"/>
     </div>
 {/if}
\ No newline at end of file
diff --git a/app/WebModule/Components/templates/lectors_content.latte b/app/WebModule/Components/templates/lectors_content.latte
index 4944917bb..b4c3b5ccd 100644
--- a/app/WebModule/Components/templates/lectors_content.latte
+++ b/app/WebModule/Components/templates/lectors_content.latte
@@ -13,7 +13,7 @@
             <div class="card card-body bg-light pb-1">
                 <div class="row">
                     <div class="col-md-auto text-center mb-3" n:if="$lector->getPhoto()">
-                        <img src="{$basePath}/files/user_photos/{$lector->getPhoto()}"/>
+                        <img src="{$basePath}{$lector->getPhoto()}"/>
                     </div>
                     <div class="col">
                         <div class="row mb-3" n:if="$lector->getAbout()">
diff --git a/app/WebModule/Components/templates/slideshow_content.latte b/app/WebModule/Components/templates/slideshow_content.latte
new file mode 100644
index 000000000..ab40b11c0
--- /dev/null
+++ b/app/WebModule/Components/templates/slideshow_content.latte
@@ -0,0 +1,38 @@
+<div class="clearfix"></div>
+
+<div class="slideshow-content">
+    <div class="row" n:ifcontent>
+        <div class="col" n:ifcontent>
+            <h3 n:ifcontent>{$heading}</h3>
+        </div>
+    </div>
+
+    <div class="row mb-3">
+        <div class="col">
+            <div id="slideshow" class="carousel slide" data-ride="carousel">
+                <ol class="carousel-indicators">
+                    {foreach $images as $image}
+                        <li data-target="#carouselExampleIndicators" data-slide-to="{$iterator->counter0}" n:class="$iterator->first ? active"></li>
+                    {/foreach}
+                </ol>
+                <div class="carousel-inner">
+                    {foreach $images as $image}
+                        <div n:class="carousel-item, $iterator->first ? active">
+                            <img class="d-block w-100" src="{$basePath}{$image}">
+                        </div>
+                    {/foreach}
+                </div>
+                <a class="carousel-control-prev" href="#slideshow" data-slide="prev">
+                    <span class="carousel-control-prev-icon"></span>
+                </a>
+                <a class="carousel-control-next" href="#slideshow" data-slide="next">
+                    <span class="carousel-control-next-icon"></span>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
+
diff --git a/app/WebModule/Forms/AdditionalInformationForm.php b/app/WebModule/Forms/AdditionalInformationFormFactory.php
similarity index 73%
rename from app/WebModule/Forms/AdditionalInformationForm.php
rename to app/WebModule/Forms/AdditionalInformationFormFactory.php
index c30da3894..e490e9266 100644
--- a/app/WebModule/Forms/AdditionalInformationForm.php
+++ b/app/WebModule/Forms/AdditionalInformationFormFactory.php
@@ -33,21 +33,18 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
-use Nette\Application\UI;
+use Nette;
 use Nette\Application\UI\Form;
 use Nette\Http\FileUpload;
-use Nette\Utils\Random;
-use Nette\Utils\Strings;
 use Nextras\FormComponents\Controls\DateControl;
 use Nextras\FormComponents\Controls\DateTimeControl;
 use stdClass;
 use Throwable;
 
 use function array_key_exists;
-use function array_slice;
-use function array_values;
 use function assert;
-use function explode;
+use function basename;
+use function json_encode;
 
 use const UPLOAD_ERR_OK;
 
@@ -58,20 +55,15 @@
  * @author Jan Staněk <jan.stanek@skaut.cz>
  * @author Petr Parolek <petr.parolek@webnazakazku.cz>
  */
-class AdditionalInformationForm extends UI\Control
+class AdditionalInformationFormFactory
 {
+    use Nette\SmartObject;
+
     /**
      * Přihlášený uživatel.
      */
     private ?User $user = null;
 
-    /**
-     * Událost při uložení formuláře.
-     *
-     * @var callable[]
-     */
-    public array $onSave = [];
-
     private BaseFormFactory $baseFormFactory;
 
     private EntityManagerInterface $em;
@@ -112,24 +104,15 @@ public function __construct(
         $this->settingsService            = $settingsService;
     }
 
-    /**
-     * Vykreslí komponentu.
-     */
-    public function render(): void
-    {
-        $this->template->setFile(__DIR__ . '/templates/additional_information_form.latte');
-        $this->template->render();
-    }
-
     /**
      * Vytvoří formulář.
      *
      * @throws SettingsException
      * @throws Throwable
      */
-    public function createComponentForm(): Form
+    public function create(int $userId): Form
     {
-        $this->user                = $this->userRepository->findById($this->presenter->user->getId());
+        $this->user                = $this->userRepository->findById($userId);
         $isAllowedEditCustomInputs = $this->applicationService->isAllowedEditCustomInputs();
 
         $form = $this->baseFormFactory->create();
@@ -140,45 +123,43 @@ public function createComponentForm(): Form
 
             switch (true) {
                 case $customInput instanceof CustomText:
-                    $custom = $form->addText($customInputId, $customInput->getName());
-
-                    /** @var ?CustomTextValue $customInputValue */
+                    $custom           = $form->addText($customInputId, $customInput->getName());
                     $customInputValue = $this->user->getCustomInputValue($customInput);
                     if ($customInputValue) {
+                        assert($customInputValue instanceof CustomTextValue);
                         $custom->setDefaultValue($customInputValue->getValue());
                     }
 
                     break;
 
                 case $customInput instanceof CustomCheckbox:
-                    $custom = $form->addCheckbox($customInputId, $customInput->getName());
-
-                    /** @var ?CustomCheckboxValue $customInputValue */
+                    $custom           = $form->addCheckbox($customInputId, $customInput->getName());
                     $customInputValue = $this->user->getCustomInputValue($customInput);
                     if ($customInputValue) {
+                        assert($customInputValue instanceof CustomCheckboxValue);
                         $custom->setDefaultValue($customInputValue->getValue());
                     }
 
                     break;
 
                 case $customInput instanceof CustomSelect:
-                    $selectOptions = $customInput->getSelectOptions();
-                    $custom        = $form->addSelect($customInputId, $customInput->getName(), $selectOptions);
-
-                    /** @var ?CustomSelectValue $customInputValue */
+                    $selectOptions    = $customInput->getSelectOptions();
+                    $custom           = $form->addSelect($customInputId, $customInput->getName(), $selectOptions);
                     $customInputValue = $this->user->getCustomInputValue($customInput);
-                    if ($customInputValue && array_key_exists($customInputValue->getValue(), $selectOptions)) {
-                        $custom->setDefaultValue($customInputValue->getValue());
+                    if ($customInputValue) {
+                        assert($customInputValue instanceof CustomSelectValue);
+                        if (array_key_exists($customInputValue->getValue(), $selectOptions)) {
+                            $custom->setDefaultValue($customInputValue->getValue());
+                        }
                     }
 
                     break;
 
                 case $customInput instanceof CustomMultiSelect:
-                    $custom = $form->addMultiSelect($customInputId, $customInput->getName(), $customInput->getSelectOptions());
-
-                    /** @var ?CustomMultiSelectValue $customInputValue */
+                    $custom           = $form->addMultiSelect($customInputId, $customInput->getName(), $customInput->getSelectOptions());
                     $customInputValue = $this->user->getCustomInputValue($customInput);
                     if ($customInputValue) {
+                        assert($customInputValue instanceof CustomMultiSelectValue);
                         $custom->setDefaultValue($customInputValue->getValue());
                     }
 
@@ -186,22 +167,28 @@ public function createComponentForm(): Form
 
                 case $customInput instanceof CustomFile:
                     $custom = $form->addUpload($customInputId, $customInput->getName());
-
-                    /** @var ?CustomFileValue $customInputValue */
+                    $custom->setHtmlAttribute('data-show-preview', 'true');
                     $customInputValue = $this->user->getCustomInputValue($customInput);
-                    if ($customInputValue && $customInputValue->getValue()) {
-                        $custom->setHtmlAttribute('data-current-file-link', $customInputValue->getValue())
-                            ->setHtmlAttribute('data-current-file-name', array_values(array_slice(explode('/', $customInputValue->getValue()), -1))[0]);
+                    if ($customInputValue) {
+                        assert($customInputValue instanceof CustomFileValue);
+                        $file = $customInputValue->getValue();
+                        $custom->setHtmlAttribute('data-initial-preview', json_encode([$file]))
+                            ->setHtmlAttribute('data-initial-preview-file-type', 'other')
+                            ->setHtmlAttribute('data-initial-preview-config', json_encode([
+                                [
+                                    'caption' => basename($file),
+                                    'downloadUrl' => $file,
+                                ],
+                            ]));
                     }
 
                     break;
 
                 case $customInput instanceof CustomDate:
-                    $custom = new DateControl($customInput->getName());
-
-                    /** @var ?CustomDateValue $customInputValue */
+                    $custom           = new DateControl($customInput->getName());
                     $customInputValue = $this->user->getCustomInputValue($customInput);
                     if ($customInputValue) {
+                        assert($customInputValue instanceof CustomDateValue);
                         $custom->setDefaultValue($customInputValue->getValue());
                     }
 
@@ -209,11 +196,10 @@ public function createComponentForm(): Form
                     break;
 
                 case $customInput instanceof CustomDateTime:
-                    $custom = new DateTimeControl($customInput->getName());
-
-                    /** @var ?CustomDateTimeValue $customInputValue */
+                    $custom           = new DateTimeControl($customInput->getName());
                     $customInputValue = $this->user->getCustomInputValue($customInput);
                     if ($customInputValue) {
+                        assert($customInputValue instanceof CustomDateTimeValue);
                         $custom->setDefaultValue($customInputValue->getValue());
                     }
 
@@ -262,45 +248,48 @@ public function processForm(Form $form, stdClass $values): void
                     $newValue         = $values->$customInputId;
 
                     if ($customInput instanceof CustomText) {
-                        /** @var CustomTextValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomTextValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomTextValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomCheckbox) {
-                        /** @var CustomCheckboxValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomCheckboxValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomCheckboxValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomSelect) {
-                        /** @var CustomSelectValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomSelectValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomSelectValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomMultiSelect) {
-                        /** @var CustomMultiSelectValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomMultiSelectValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomMultiSelectValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomFile) {
-                        /** @var CustomFileValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomFileValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
-                        /** @var FileUpload $newValue */
+                        assert($customInputValue instanceof CustomFileValue);
+                        $oldValue = $customInputValue->getValue();
                         $newValue = $values->$customInputId;
+                        assert($newValue instanceof FileUpload);
                         if ($newValue->getError() == UPLOAD_ERR_OK) {
-                            $path = $this->generatePath($newValue);
-                            $this->filesService->save($newValue, $path);
+                            if ($oldValue !== null) {
+                                $this->filesService->delete($oldValue);
+                            }
+
+                            $path = $this->filesService->save($newValue, CustomFile::PATH, true, $newValue->name);
                             $customInputValue->setValue($path);
                         }
                     } elseif ($customInput instanceof CustomDate) {
-                        /** @var CustomDateValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomDateValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomDateValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     } elseif ($customInput instanceof CustomDateTime) {
-                        /** @var CustomDateTimeValue $customInputValue */
                         $customInputValue = $customInputValue ?: new CustomDateTimeValue($customInput, $this->user);
-                        $oldValue         = $customInputValue->getValue();
+                        assert($customInputValue instanceof CustomDateTimeValue);
+                        $oldValue = $customInputValue->getValue();
                         $customInputValue->setValue($newValue);
                     }
 
@@ -324,15 +313,5 @@ public function processForm(Form $form, stdClass $values): void
                 ]);
             }
         });
-
-        $this->onSave($this);
-    }
-
-    /**
-     * Vygeneruje cestu souboru.
-     */
-    private function generatePath(FileUpload $file): string
-    {
-        return CustomFile::PATH . '/' . Random::generate(5) . '/' . Strings::webalize($file->name, '.');
     }
 }
diff --git a/app/WebModule/Forms/ApplicationFormFactory.php b/app/WebModule/Forms/ApplicationFormFactory.php
index dfaa33edb..6ac27926b 100644
--- a/app/WebModule/Forms/ApplicationFormFactory.php
+++ b/app/WebModule/Forms/ApplicationFormFactory.php
@@ -47,8 +47,6 @@
 use Nette\Forms\Controls\MultiSelectBox;
 use Nette\Http\FileUpload;
 use Nette\Localization\ITranslator;
-use Nette\Utils\Random;
-use Nette\Utils\Strings;
 use Nextras\FormComponents\Controls\DateControl;
 use Nextras\FormComponents\Controls\DateTimeControl;
 use Skautis\Wsdl\WsdlException;
@@ -58,6 +56,7 @@
 use Tracy\ILogger;
 
 use function array_keys;
+use function assert;
 use function count;
 use function in_array;
 use function property_exists;
@@ -278,38 +277,37 @@ public function processForm(Form $form, stdClass $values): void
                 $customInputValue = $this->user->getCustomInputValue($customInput);
 
                 if ($customInput instanceof CustomText) {
-                    /** @var CustomTextValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomTextValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomTextValue);
                     $customInputValue->setValue($values->$customInputId);
                 } elseif ($customInput instanceof CustomCheckbox) {
-                    /** @var CustomCheckboxValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomCheckboxValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomCheckboxValue);
                     $customInputValue->setValue($values->$customInputId);
                 } elseif ($customInput instanceof CustomSelect) {
-                    /** @var CustomSelectValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomSelectValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomSelectValue);
                     $customInputValue->setValue($values->$customInputId);
                 } elseif ($customInput instanceof CustomMultiSelect) {
-                    /** @var CustomMultiSelectValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomMultiSelectValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomMultiSelectValue);
                     $customInputValue->setValue($values->$customInputId);
                 } elseif ($customInput instanceof CustomFile) {
-                    /** @var CustomFileValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomFileValue($customInput, $this->user);
-                    /** @var FileUpload $file */
+                    assert($customInputValue instanceof CustomFileValue);
                     $file = $values->$customInputId;
+                    assert($file instanceof FileUpload);
                     if ($file->getError() == UPLOAD_ERR_OK) {
-                        $path = $this->generatePath($file);
-                        $this->filesService->save($file, $path);
+                        $path = $this->filesService->save($file, CustomFile::PATH, true, $file->name);
                         $customInputValue->setValue($path);
                     }
                 } elseif ($customInput instanceof CustomDate) {
-                    /** @var CustomDateValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomDateValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomDateValue);
                     $customInputValue->setValue($values->$customInputId);
                 } elseif ($customInput instanceof CustomDateTime) {
-                    /** @var CustomDateTimeValue $customInputValue */
                     $customInputValue = $customInputValue ?: new CustomDateTimeValue($customInput, $this->user);
+                    assert($customInputValue instanceof CustomDateTimeValue);
                     $customInputValue->setValue($values->$customInputId);
                 }
 
@@ -377,6 +375,7 @@ private function addCustomInputs(Form $form): void
 
                 case $customInput instanceof CustomFile:
                     $custom = $form->addUpload($customInputId, $customInputName);
+                    $custom->setHtmlAttribute('data-show-preview', 'true');
                     break;
 
                 case $customInput instanceof CustomDate:
@@ -396,8 +395,8 @@ private function addCustomInputs(Form $form): void
             $custom->setOption('id', 'form-group-' . $customInputId);
 
             if ($customInput->isMandatory()) {
-                /** @var MultiSelectBox $rolesSelect */
                 $rolesSelect = $form['roles'];
+                assert($rolesSelect instanceof MultiSelectBox);
                 $custom->addConditionOn($rolesSelect, self::class . '::toggleCustomInputRequired', ['id' => $customInputId, 'roles' => Helpers::getIds($customInput->getRoles())])
                     ->addRule(Form::FILLED, 'web.application_content.custom_input_empty');
             }
@@ -426,8 +425,9 @@ private function addSubeventsSelect(Form $form): void
             ->setRequired(false)
             ->addRule([$this, 'validateSubeventsCapacities'], 'web.application_content.subevents_capacity_occupied');
 
-        /** @var MultiSelectBox $rolesSelect */
         $rolesSelect = $form['roles'];
+        assert($rolesSelect instanceof MultiSelectBox);
+
         $subeventsSelect->addConditionOn(
             $rolesSelect,
             self::class . '::toggleSubeventsRequired',
@@ -654,12 +654,4 @@ public static function toggleCustomInputVisibility(MultiSelectBox $field, array
     {
         return false;
     }
-
-    /**
-     * Vygeneruje cestu souboru.
-     */
-    private function generatePath(FileUpload $file): string
-    {
-        return CustomFile::PATH . '/' . Random::generate(5) . '/' . Strings::webalize($file->name, '.');
-    }
 }
diff --git a/app/WebModule/Forms/IAdditionalInformationFormFactory.php b/app/WebModule/Forms/IAdditionalInformationFormFactory.php
deleted file mode 100644
index 54fdad6b2..000000000
--- a/app/WebModule/Forms/IAdditionalInformationFormFactory.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\WebModule\Forms;
-
-/**
- * Factory komponenty s formulářem pro zadání doplňujících informací.
- *
- * @author Jan Staněk <jan.stanek@skaut.cz>
- */
-interface IAdditionalInformationFormFactory
-{
-    /**
-     * Vytvoří komponentu.
-     */
-    public function create(): AdditionalInformationForm;
-}
diff --git a/app/WebModule/Forms/templates/additional_information_form.latte b/app/WebModule/Forms/templates/additional_information_form.latte
deleted file mode 100644
index 236ee4638..000000000
--- a/app/WebModule/Forms/templates/additional_information_form.latte
+++ /dev/null
@@ -1,43 +0,0 @@
-{form form class => form-horizontal}
-    {foreach $form->getControls() as $c}
-        {if $c instanceof Nette\Forms\Controls\SubmitButton}
-            <div class="form-group row">
-                <div class="col-md-9 offset-md-3">
-                    {input $c class => 'btn btn-primary button'}
-                </div>
-            </div>
-        {elseif $c instanceof Nette\Forms\Controls\HiddenField}
-            {input $c}
-        {else}
-            <div class="form-group row">
-                <div class="col-md-3 col-form-label">
-                    <label for="{$c->htmlId}" class="{$c->required ? required}" n:if="!$c instanceof Nette\Forms\Controls\Checkbox">
-                        {_$c->caption}
-                    </label>
-                </div>
-
-                {if $c instanceof Nette\Forms\Controls\UploadControl && array_key_exists('data-current-file-link', $c->control->attrs)}
-                    <div class="col-md-9 mb-3">
-                        <a href="{$basePath}/files{$c->control->attrs['data-current-file-link']}" target="_blank" class="btn btn-secondary">
-                            <span class="fa fa-download"></span> {$c->control->attrs['data-current-file-name']}
-                        </a>
-                    </div>
-                    <div class="col-md-3 col-form-label"></div>
-                {/if}
-
-                <div class="col-md-9">
-                    {if !$c instanceof Nette\Forms\Controls\Checkbox}
-                        {input $c}
-                    {else}
-                        <div class="form-check">
-                            <label class="form-check-label" for="{$c->htmlId}">
-                                <input type="checkbox" n:name="$c->name" class="form-check-input">
-                                {_$c->caption}
-                            </label>
-                        </div>
-                    {/if}
-                </div>
-            </div>
-        {/if}
-    {/foreach}
-{/form}
diff --git a/app/WebModule/Presenters/PagePresenter.php b/app/WebModule/Presenters/PagePresenter.php
index ce04b27ae..735d1b745 100644
--- a/app/WebModule/Presenters/PagePresenter.php
+++ b/app/WebModule/Presenters/PagePresenter.php
@@ -25,6 +25,7 @@
 use App\WebModule\Components\IOrganizerContentControlFactory;
 use App\WebModule\Components\IPlaceContentControlFactory;
 use App\WebModule\Components\IProgramsContentControlFactory;
+use App\WebModule\Components\ISlideshowContentControlFactory;
 use App\WebModule\Components\ITextContentControlFactory;
 use App\WebModule\Components\IUsersContentControlFactory;
 use App\WebModule\Components\LectorsContentControl;
@@ -32,6 +33,7 @@
 use App\WebModule\Components\OrganizerContentControl;
 use App\WebModule\Components\PlaceContentControl;
 use App\WebModule\Components\ProgramsContentControl;
+use App\WebModule\Components\SlideshowContentControl;
 use App\WebModule\Components\TextContentControl;
 use App\WebModule\Components\UsersContentControl;
 use Nette\Application\BadRequestException;
@@ -90,6 +92,9 @@ class PagePresenter extends WebBasePresenter
     /** @inject */
     public IContactFormContentControlFactory $contactFormContentFactory;
 
+    /** @inject */
+    public ISlideshowContentControlFactory $slideshowContentFactory;
+
     /**
      * @throws BadRequestException
      * @throws Throwable
@@ -198,4 +203,9 @@ protected function createComponentContactFormContent(): ContactFormContentContro
     {
         return $this->contactFormContentFactory->create();
     }
+
+    protected function createComponentSlideshowContent(): SlideshowContentControl
+    {
+        return $this->slideshowContentFactory->create();
+    }
 }
diff --git a/app/WebModule/Presenters/ProfilePresenter.php b/app/WebModule/Presenters/ProfilePresenter.php
index bb8d16d07..a75012f35 100644
--- a/app/WebModule/Presenters/ProfilePresenter.php
+++ b/app/WebModule/Presenters/ProfilePresenter.php
@@ -15,8 +15,7 @@
 use App\Services\QueryBus;
 use App\WebModule\Components\ApplicationsGridControl;
 use App\WebModule\Components\IApplicationsGridControlFactory;
-use App\WebModule\Forms\AdditionalInformationForm;
-use App\WebModule\Forms\IAdditionalInformationFormFactory;
+use App\WebModule\Forms\AdditionalInformationFormFactory;
 use App\WebModule\Forms\PersonalDetailsFormFactory;
 use App\WebModule\Forms\RolesFormFactory;
 use Exception;
@@ -37,7 +36,7 @@ class ProfilePresenter extends WebBasePresenter
     public PersonalDetailsFormFactory $personalDetailsFormFactory;
 
     /** @inject */
-    public IAdditionalInformationFormFactory $additionalInformationFormFactory;
+    public AdditionalInformationFormFactory $additionalInformationFormFactory;
 
     /** @inject */
     public RolesFormFactory $rolesFormFactory;
@@ -119,16 +118,16 @@ protected function createComponentPersonalDetailsForm(): Form
         return $form;
     }
 
-    protected function createComponentAdditionalInformationForm(): AdditionalInformationForm
+    protected function createComponentAdditionalInformationForm(): Form
     {
-        $control = $this->additionalInformationFormFactory->create();
+        $form = $this->additionalInformationFormFactory->create($this->user->id);
 
-        $control->onSave[] = function (): void {
+        $form->onSuccess[] = function (): void {
             $this->flashMessage('web.profile.additional_information_update_successfull', 'success');
             $this->redirect('this#additional-information');
         };
 
-        return $control;
+        return $form;
     }
 
     /**
diff --git a/app/WebModule/Presenters/templates/@layout.latte b/app/WebModule/Presenters/templates/@layout.latte
index 7f2a011fb..cdef55502 100644
--- a/app/WebModule/Presenters/templates/@layout.latte
+++ b/app/WebModule/Presenters/templates/@layout.latte
@@ -45,7 +45,7 @@
         <div id="header" class="row mt-3">
             <div id="logo" class="col-md-6 text-center text-md-left">
                 <a href="{plink :Web:Page:default}">
-                    <img src="{$basePath}/files/logo/{$logo}" title="{$seminarName}" alt="logo">
+                    <img src="{$basePath}{$logo}" title="{$seminarName}" alt="logo">
                 </a>
             </div>
             <div id="user-menu" class="col-md-6 text-center text-md-right">
diff --git a/app/WebModule/Presenters/templates/Profile/default.latte b/app/WebModule/Presenters/templates/Profile/default.latte
index e30f51f8d..d9d31375c 100644
--- a/app/WebModule/Presenters/templates/Profile/default.latte
+++ b/app/WebModule/Presenters/templates/Profile/default.latte
@@ -76,7 +76,7 @@
                                 {_web.profile.photo}
                             </div>
                             <div class="col-md-9 col-form-label">
-                                <img src="{$basePath}/files/user_photos/{$dbuser->getPhoto()}" alt="user photo"/>
+                                <img src="{$basePath}{$dbuser->getPhoto()}" alt="user photo"/>
                             </div>
                         </div>
                         <div class="row">
diff --git a/app/assets/web/schedule/Calendar.vue b/app/assets/web/schedule/Calendar.vue
index a3a2cf4ef..78da476b0 100644
--- a/app/assets/web/schedule/Calendar.vue
+++ b/app/assets/web/schedule/Calendar.vue
@@ -32,7 +32,7 @@
                             <div v-for="lector in selectedEventInfo.event.extendedProps.block.lectors">
                                 <b>{{ lector.name }}</b>
                                 <p>
-                                    <img :src="basePath + '/files/user_photos/' + lector.photo" v-if="lector.photo" class="pull-left mr-3 mb-3"/>
+                                    <img :src="basePath + lector.photo" v-if="lector.photo" class="pull-left mr-3 mb-3"/>
                                     {{ lector.about }}
                                 </p>
                                 <div class="clearfix"></div>
diff --git a/app/config/common.neon b/app/config/common.neon
index 476ddb029..63f3fe747 100644
--- a/app/config/common.neon
+++ b/app/config/common.neon
@@ -58,8 +58,8 @@ services:
             - $mpdfConfig([tempDir: %tempDir%/mpdf])
 
     - App\Services\Authorizator
-    - App\Services\DatabaseService(%appDir%/..)
-    - App\Services\FilesService(%wwwDir%/files)
+    - App\Services\DatabaseService(%appDir%/../backup)
+    - App\Services\FilesService(%wwwDir%)
 
     - App\Services\CommandBus(@messenger.commandBus.bus)
     - App\Services\QueryBus(@messenger.queryBus.bus)
@@ -115,6 +115,10 @@ latte:
     macros:
         - Nextras\FormsRendering\LatteMacros\Bs3InputMacros::install
 
+forms:
+    messages:
+        MAX_FILE_SIZE: 'Velikost nahraného souboru může být nejvýše %d bytů.'
+
 webloader:
     css:
         web:
diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon
index 73414c6b9..c28c8e0bf 100644
--- a/app/lang/admin.cs_CZ.neon
+++ b/app/lang/admin.cs_CZ.neon
@@ -44,114 +44,165 @@ menu:
     help: "Nápověda"
 
 cms:
-    menu_pages: "Stránky"
-    menu_news: "Aktuality"
-    menu_documents: "Dokumenty"
-    menu_faq: "FAQ"
-
-    pages_heading: "Stránky"
-    pages_name: "Název"
-    pages_name_empty: "Zadejte název."
-    pages_slug: "Cesta"
-    pages_slug_empty: "Zadejte cestu."
-    pages_slug_format: "Cesta může obsahovat pouze malá písmena, číslice a \"-\"."
-    pages_slug_exists: "Stránka s touto cestou již existuje."
-    pages_public: "Viditelnost"
-    pages_public_public: "Viditelná"
-    pages_public_private: "Skrytá"
-    pages_public_form: "viditelná"
-    pages_roles: "Viditelná pro role"
-    pages_roles_empty: "Vyberte alespoň jednu roli."
-    pages_roles_all: "Všechny role"
-    pages_edit_content: "Upravit obsah"
-    pages_saved: "Stránka byla úspěšně uložena."
-    pages_delete_confirm: "Opravdu chcete stránku odstranit?"
-    pages_deleted: "Stránka byla úspěšně odstraněna."
-    pages_order_saved: "Pořadí stránek bylo úspěšně upraveno."
-    pages_changed_public: "Viditelnost stránky byla úspěšně změněna."
-    pages_change_public_denied: "Úvodní stránka nemůže být skryta."
-    pages_edit_heading: "Úprava obsahu stránky: %name%"
-    pages_content_type: "Typ obsahu"
-    pages_content_heading: "Nadpis"
-    pages_content_saved: "Stránka byla úspěšně uložena."
-    pages_content_save_error: "Při ukládání stránky došlo k chybě."
-    pages_content_capacities_roles: "Zobrazované role"
-    pages_content_tags: "Zobrazované kategorie"
-    pages_content_html: "HTML"
-    pages_content_image_current_file: "Stávající obrázek"
-    pages_content_image_new_file: "Nový obrázek"
-    pages_content_image_new_file_format: "Obrázek musí být ve formátu JPG, PNG nebo GIF."
-    pages_content_image_align: "Zarovnání"
-    pages_content_image_width: "Šířka"
-    pages_content_image_width_format: "Zadejte číslo."
-    pages_content_image_height: "Výška"
-    pages_content_image_height_format: "Zadejte číslo."
-    pages_content_image_size_note: "Pokud zadáte jeden rozměr, druhý bude vypočten automaticky. Pokud nezadáte žádný, použije se velikost obrázku."
-    pages_content_news_count: "Zobrazovaný počet"
-    pages_content_news_count_format: "Zadejte číslo."
-    pages_content_news_count_note: "Pokud necháte počet prázdný, zobrazí se všechny aktuality."
-    pages_content_text: "Text"
-    pages_content_users_roles: "Zobrazované role"
-    pages_content_organizer: "Pořadatel"
-
-    news_heading: "Aktuality"
-    news_published: "Zveřejnit"
-    news_published_empty: "Zadejte čas zveřejnění."
-    news_pinned: "Připnutí nahoru"
-    news_pinned_unpinned: "Nepřipnutá"
-    news_pinned_pinned: "Připnutá"
-    news_changed_pinned: "Připnutí aktuality bylo úspěšně změněno."
-    news_edit_pinned: "připnout nahoru"
-    news_text: "Text"
-    news_text_empty: "Zadejte text aktuality."
-    news_saved: "Aktualita byla úspěšně uložena."
-    news_delete_confirm: "Opravdu chcete aktualitu odstranit?"
-    news_deleted: "Aktualita byla úspěšně odstraněna."
-    news_add_heading: "Nová aktualita"
-    news_edit_heading: "Úprava aktuality"
-
-    documents_heading: "Dokumenty"
-    documents_name: "Název"
-    documents_name_empty: "Zadejte název dokumentu."
-    documents_tags: "Kategorie"
-    documents_tags_empty: "Dokument musí být alespoň v jedné kategorii."
-    documents_file: "Soubor"
-    documents_download: "Stáhnout"
-    documents_file_empty: "Vyberte soubor."
-    documents_description: "Popis"
-    documents_timestamp: "Upraven"
-    documents_saved: "Dokument byl úspěšně uložen."
-    documents_delete_confirm: "Opravdu chcete dokument odstranit?"
-    documents_deleted: "Dokument byl úspěšně odstraněn."
-
-    tags_heading: "Kategorie dokumentů"
-    tags_name: "Název"
-    tags_name_empty: "Zadejte název kategorie."
-    tags_name_exists: "Kategorie s tímto názvem již existuje."
-    tags_roles: "Oprávněné role"
-    tags_roles_empty: "Vyberte alespoň jednu roli."
-    tags_roles_all: "Všechny role"
-    tags_saved: "Kategorie byla úspěšně uložena."
-    tags_delete_confirm: "Odstraněním kategorie odeberete kategorii všem dokumentům. Opravdu chcete kategorii odstranit?"
-    tags_deleted: "Kategorie byla úspěšně odstraněna."
-
-    faq_heading: "FAQ"
-    faq_question: "Otázka"
-    faq_question_empty: "Zadejte otázku."
-    faq_author: "Autor"
-    faq_public: "Viditelnost"
-    faq_public_public: "Viditelná"
-    faq_public_private: "Skrytá"
-    faq_public_form: "viditelná"
-    faq_answer: "Odpověď"
-    faq_answered: "Zodpovězena"
-    faq_saved: "Otázka byla úspěšně uložena."
-    faq_delete_confirm: "Opravdu chcete otázku odstranit?"
-    faq_deleted: "Otázka byla úspěšně odstraněna."
-    faq_order_saved: "Pořadí otázek bylo úspěšně upraveno."
-    faq_changed_public: "Viditelnost otázky byla úspěšně změněna."
-    faq_add_heading: "Nová otázka"
-    faq_edit_heading: "Úprava otázky"
+    menu:
+        pages: "Stránky"
+        news: "Aktuality"
+        documents: "Dokumenty"
+        faq: "FAQ"
+
+    pages:
+        heading: "Stránky"
+
+        column:
+            name: "Název"
+            name_empty: "Zadejte název."
+            slug: "Cesta"
+            slug_empty: "Zadejte cestu."
+            slug_format: "Cesta může obsahovat pouze malá písmena, číslice a \"-\"."
+            slug_exists: "Stránka s touto cestou již existuje."
+            public: "Viditelnost"
+            public_public: "Viditelná"
+            public_private: "Skrytá"
+            public_form: "viditelná"
+            roles: "Viditelná pro role"
+            roles_empty: "Vyberte alespoň jednu roli."
+            roles_all: "Všechny role"
+
+        action:
+            edit_content: "Upravit obsah"
+            delete_confirm: "Opravdu chcete stránku odstranit?"
+
+        message:
+            save_success: "Stránka byla úspěšně uložena."
+            delete_success: "Stránka byla úspěšně odstraněna."
+            order_save_success: "Pořadí stránek bylo úspěšně upraveno."
+            public_change_success: "Viditelnost stránky byla úspěšně změněna."
+            public_change_denied: "Úvodní stránka nemůže být skryta."
+
+        content:
+            heading: "Úprava obsahu stránky: %name%"
+
+            form:
+                type: "Typ obsahu"
+                heading: "Nadpis"
+                capacities_roles: "Zobrazované role"
+                tags: "Zobrazované kategorie"
+                html: "HTML"
+                image: "Obrázek"
+                image_format: "Obrázek musí být ve formátu JPG, PNG nebo GIF."
+                image_align: "Zarovnání"
+                image_width: "Šířka"
+                image_width_format: "Zadejte číslo."
+                image_height: "Výška"
+                image_height_format: "Zadejte číslo."
+                image_size_note: "Pokud zadáte jeden rozměr, druhý bude vypočten automaticky. Pokud nezadáte žádný, použije se velikost obrázku."
+                news_count: "Zobrazovaný počet"
+                news_count_format: "Zadejte číslo."
+                news_count_note: "Pokud necháte počet prázdný, zobrazí se všechny aktuality."
+                text: "Text"
+                users_roles: "Zobrazované role"
+                organizer: "Pořadatel"
+                slideshow_images: "Obrázky"
+                slideshow_images_forma: "Obrázky musí být ve formátu JPG nebo PNG."
+
+            message:
+                save_success: "Stránka byla úspěšně uložena."
+                save_failed: "Při ukládání stránky došlo k chybě."
+
+    news:
+        heading: "Aktuality"
+
+        common:
+            published: "Zveřejnit"
+            text: "Text"
+
+        column:
+            pinned: "Připnutí nahoru"
+            pinned_unpinned: "Nepřipnutá"
+            pinned_pinned: "Připnutá"
+
+        form:
+            add_heading: "Nová aktualita"
+            edit_heading: "Úprava aktuality"
+            published_empty: "Zadejte čas zveřejnění."
+            pinned: "připnout nahoru"
+            text_empty: "Zadejte text aktuality."
+
+        action:
+            delete_confirm: "Opravdu chcete aktualitu odstranit?"
+
+        message:
+            pinned_change_success: "Připnutí aktuality bylo úspěšně změněno."
+            save_success: "Aktualita byla úspěšně uložena."
+            delete_success: "Aktualita byla úspěšně odstraněna."
+
+    documents:
+        heading: "Dokumenty"
+
+        column:
+            name: "Název"
+            name_empty: "Zadejte název dokumentu."
+            tags: "Kategorie"
+            tags_empty: "Dokument musí být alespoň v jedné kategorii."
+            file: "Soubor"
+            file_download: "Stáhnout"
+            file_empty: "Vyberte soubor."
+            description: "Popis"
+            timestamp: "Upraven"
+
+        action:
+            delete_confirm: "Opravdu chcete dokument odstranit?"
+
+        message:
+            save_success: "Dokument byl úspěšně uložen."
+            delete_success: "Dokument byl úspěšně odstraněn."
+
+        tags:
+            heading: "Kategorie dokumentů"
+
+            column:
+                name: "Název"
+                name_empty: "Zadejte název kategorie."
+                name_exists: "Kategorie s tímto názvem již existuje."
+                roles: "Oprávněné role"
+                roles_empty: "Vyberte alespoň jednu roli."
+                roles_all: "Všechny role"
+
+            action:
+                delete_confirm: "Odstraněním kategorie odeberete kategorii všem dokumentům. Opravdu chcete kategorii odstranit?"
+
+            message:
+                save_success: "Kategorie byla úspěšně uložena."
+                delete_success: "Kategorie byla úspěšně odstraněna."
+
+    faq:
+        heading: "FAQ"
+
+        common:
+            question: "Otázka"
+
+        column:
+            author: "Autor"
+            public: "Viditelnost"
+            public_public: "Viditelná"
+            public_private: "Skrytá"
+            answered: "Zodpovězena"
+
+        form:
+            add_heading: "Nová otázka"
+            edit_heading: "Úprava otázky"
+            question_empty: "Zadejte otázku."
+            public: "viditelná"
+            answer: "Odpověď"
+
+        action:
+            delete_confirm: "Opravdu chcete otázku odstranit?"
+
+        message:
+            save_success: "Otázka byla úspěšně uložena."
+            delete_success: "Otázka byla úspěšně odstraněna."
+            order_save_success: "Pořadí otázek bylo úspěšně upraveno."
+            public_change_success: "Viditelnost otázky byla úspěšně změněna."
 
 program:
     menu:
@@ -333,8 +384,6 @@ users:
     users_heading: "Uživatelé"
     users_name: "Jméno"
     users_photo: "Fotka"
-    users_new_photo: "Nová fotka"
-    users_remove_photo: "odstranit fotku"
     users_photo_format: "Fotka musí být ve formátu JPG, PNG nebo GIF."
     users_username: "Uživatelské jméno"
     users_firstname: "Jméno"
@@ -775,9 +824,8 @@ configuration:
     skautis_event_education_connection_saved: "Propojení se skautIS kurzy bylo úspěšně uloženo."
 
     web_heading: "Web"
-    web_current_logo: "Stávající logo"
-    web_new_logo: "Nové logo"
-    web_new_logo_format: "Logo musí být ve formátu JPG, PNG nebo GIF."
+    web_logo: "Logo"
+    web_logo_format: "Logo musí být ve formátu JPG, PNG nebo GIF."
     web_footer: "Text v patičce"
     web_ga_id: "Google Analytics číslo pro měření"
     web_redirect_after_login: "Po přihlášení přesměrovat na"
diff --git a/app/lang/common.cs_CZ.neon b/app/lang/common.cs_CZ.neon
index 78f25e140..d145ad652 100644
--- a/app/lang/common.cs_CZ.neon
+++ b/app/lang/common.cs_CZ.neon
@@ -45,6 +45,7 @@ content:
         capacities: "Kapacita semináře"
         organizer: "Pořadatel"
         contact_form: "Kontaktní formulář"
+        slideshow: "Slideshow"
 
     default_heading:
         text: ""
@@ -62,6 +63,7 @@ content:
         capacities: "Kapacita semináře"
         organizer: "Pořadatel"
         contact_form: "Kontaktní formulář"
+        slideshow: ""
 
 area:
     main: "Hlavní oblast"
diff --git a/composer.json b/composer.json
index 7d27500e7..6bd3a0b3a 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "nette/security": "^3.0",
         "nette/utils": "^3.1",
         "latte/latte": "^2.8",
-        "tracy/tracy": "2.8.1",
+        "tracy/tracy": "^2.8",
 
         "contributte/console": "^0.8",
         "contributte/translation": "0.7",
diff --git a/composer.lock b/composer.lock
index ff6615449..5e4f7ca22 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8515af7bba23c260ce093e3e95b96b0a",
+    "content-hash": "a109b08feb31df0c685aa9eb08cd6082",
     "packages": [
         {
             "name": "azuyalabs/yasumi",
@@ -581,16 +581,16 @@
         },
         {
             "name": "contributte/pdf",
-            "version": "v6.0.1",
+            "version": "v6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/contributte/pdf.git",
-                "reference": "79d2b8a14211152d5ad9c9b11893f31bed8b76a3"
+                "reference": "1e746334a36fbcdd2337484a39f4ee5520024a90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/contributte/pdf/zipball/79d2b8a14211152d5ad9c9b11893f31bed8b76a3",
-                "reference": "79d2b8a14211152d5ad9c9b11893f31bed8b76a3",
+                "url": "https://api.github.com/repos/contributte/pdf/zipball/1e746334a36fbcdd2337484a39f4ee5520024a90",
+                "reference": "1e746334a36fbcdd2337484a39f4ee5520024a90",
                 "shasum": ""
             },
             "require": {
@@ -598,12 +598,17 @@
                 "php": ">=7.1"
             },
             "require-dev": {
-                "latte/latte": "~2.5",
-                "nette/application": "~3.0",
-                "nette/di": "^3.0",
-                "nette/tester": "~2.2",
-                "symfony/css-selector": "~2.5",
-                "symfony/dom-crawler": "~2.5"
+                "latte/latte": "~2.10.0",
+                "nette/application": "~3.0.0",
+                "nette/di": "^3.0.0",
+                "ninjify/nunjuck": "^0.3.0",
+                "ninjify/qa": "^0.12",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.12",
+                "phpstan/phpstan-nette": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "symfony/css-selector": "~4.4.0",
+                "symfony/dom-crawler": "~4.4.0"
             },
             "suggest": {
                 "nette/nette": "PHP framework to which this extension belongs to.",
@@ -650,7 +655,17 @@
                 }
             ],
             "description": "Pdf response extension for Nette Framework",
-            "time": "2020-12-08T10:05:18+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/f3l1x",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/petrparolek",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-01-27T21:41:35+00:00"
         },
         {
             "name": "contributte/recaptcha",
@@ -6092,16 +6107,16 @@
         },
         {
             "name": "symfony/amqp-messenger",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/amqp-messenger.git",
-                "reference": "a7f681b022f9cfb88febc12face05b12a47232c1"
+                "reference": "cf309a35ed08caa77886ee6a352b8491c7681424"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/amqp-messenger/zipball/a7f681b022f9cfb88febc12face05b12a47232c1",
-                "reference": "a7f681b022f9cfb88febc12face05b12a47232c1",
+                "url": "https://api.github.com/repos/symfony/amqp-messenger/zipball/cf309a35ed08caa77886ee6a352b8491c7681424",
+                "reference": "cf309a35ed08caa77886ee6a352b8491c7681424",
                 "shasum": ""
             },
             "require": {
@@ -6154,20 +6169,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-15T11:52:46+00:00"
+            "time": "2021-01-27T11:19:04+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "d0a82d965296083fe463d655a3644cbe49cbaa80"
+                "reference": "50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/d0a82d965296083fe463d655a3644cbe49cbaa80",
-                "reference": "d0a82d965296083fe463d655a3644cbe49cbaa80",
+                "url": "https://api.github.com/repos/symfony/config/zipball/50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab",
+                "reference": "50e0e1314a3b2609d32b6a5a0d0fb5342494c4ab",
                 "shasum": ""
             },
             "require": {
@@ -6213,7 +6228,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Config Component",
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -6229,20 +6244,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-09T18:54:12+00:00"
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "47c02526c532fb381374dab26df05e7313978976"
+                "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/47c02526c532fb381374dab26df05e7313978976",
-                "reference": "47c02526c532fb381374dab26df05e7313978976",
+                "url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a",
+                "reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a",
                 "shasum": ""
             },
             "require": {
@@ -6301,7 +6316,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
@@ -6323,7 +6338,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-18T08:03:05+00:00"
+            "time": "2021-01-28T22:06:19+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -6391,16 +6406,16 @@
         },
         {
             "name": "symfony/doctrine-messenger",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/doctrine-messenger.git",
-                "reference": "8ad222fc5abce88f2b7c9cb91aa53b9f445a5889"
+                "reference": "012895a6e4ae1874dd466b39695a2821d31d6309"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/8ad222fc5abce88f2b7c9cb91aa53b9f445a5889",
-                "reference": "8ad222fc5abce88f2b7c9cb91aa53b9f445a5889",
+                "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/012895a6e4ae1874dd466b39695a2821d31d6309",
+                "reference": "012895a6e4ae1874dd466b39695a2821d31d6309",
                 "shasum": ""
             },
             "require": {
@@ -6457,20 +6472,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-10T19:16:15+00:00"
+            "time": "2021-02-01T14:36:03+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "1c93f7a1dff592c252574c79a8635a8a80856042"
+                "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1c93f7a1dff592c252574c79a8635a8a80856042",
-                "reference": "1c93f7a1dff592c252574c79a8635a8a80856042",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4f9760f8074978ad82e2ce854dff79a71fe45367",
+                "reference": "4f9760f8074978ad82e2ce854dff79a71fe45367",
                 "shasum": ""
             },
             "require": {
@@ -6523,7 +6538,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony EventDispatcher Component",
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -6539,7 +6554,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-18T08:03:05+00:00"
+            "time": "2021-01-27T10:36:42+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -6619,16 +6634,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d"
+                "reference": "262d033b57c73e8b59cd6e68a45c528318b15038"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
-                "reference": "fa8f8cab6b65e2d99a118e082935344c5ba8c60d",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038",
+                "reference": "262d033b57c73e8b59cd6e68a45c528318b15038",
                 "shasum": ""
             },
             "require": {
@@ -6658,7 +6673,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Filesystem Component",
+            "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -6674,20 +6689,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-30T17:05:38+00:00"
+            "time": "2021-01-27T10:01:46+00:00"
         },
         {
             "name": "symfony/messenger",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/messenger.git",
-                "reference": "3fc7766f5fa6c21096fa962a01684868b68f1f3c"
+                "reference": "ce658034cd7884428a8c6f50c2d4f8cf66348c40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/messenger/zipball/3fc7766f5fa6c21096fa962a01684868b68f1f3c",
-                "reference": "3fc7766f5fa6c21096fa962a01684868b68f1f3c",
+                "url": "https://api.github.com/repos/symfony/messenger/zipball/ce658034cd7884428a8c6f50c2d4f8cf66348c40",
+                "reference": "ce658034cd7884428a8c6f50c2d4f8cf66348c40",
                 "shasum": ""
             },
             "require": {
@@ -6743,7 +6758,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Messenger Component",
+            "description": "Helps applications send and receive messages to/from other applications or via message queues",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -6759,20 +6774,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-18T07:27:35+00:00"
+            "time": "2021-01-27T11:24:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986"
+                "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/87a2a4a766244e796dd9cb9d6f58c123358cd986",
-                "reference": "87a2a4a766244e796dd9cb9d6f58c123358cd986",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce",
+                "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce",
                 "shasum": ""
             },
             "require": {
@@ -6804,7 +6819,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony OptionsResolver Component",
+            "description": "Provides an improved replacement for the array_replace PHP function",
             "homepage": "https://symfony.com",
             "keywords": [
                 "config",
@@ -6825,7 +6840,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-24T12:08:07+00:00"
+            "time": "2021-01-27T12:56:27+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7297,16 +7312,16 @@
         },
         {
             "name": "symfony/property-access",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "243dcdda2f276cb31efa31a015d0fdb5076931ce"
+                "reference": "3af8ed262bd3217512a13b023981fe68f36ad5f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/243dcdda2f276cb31efa31a015d0fdb5076931ce",
-                "reference": "243dcdda2f276cb31efa31a015d0fdb5076931ce",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/3af8ed262bd3217512a13b023981fe68f36ad5f3",
+                "reference": "3af8ed262bd3217512a13b023981fe68f36ad5f3",
                 "shasum": ""
             },
             "require": {
@@ -7344,7 +7359,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony PropertyAccess Component",
+            "description": "Provides functions to read and write from/to an object or array using a simple string notation",
             "homepage": "https://symfony.com",
             "keywords": [
                 "access",
@@ -7371,20 +7386,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-10T19:16:15+00:00"
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/property-info",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-info.git",
-                "reference": "f65694a05eb7742c5f2951f20676de367ffaaaea"
+                "reference": "4e4f368c3737b1c175d66f4fc0b99a5bcd161a77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-info/zipball/f65694a05eb7742c5f2951f20676de367ffaaaea",
-                "reference": "f65694a05eb7742c5f2951f20676de367ffaaaea",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/4e4f368c3737b1c175d66f4fc0b99a5bcd161a77",
+                "reference": "4e4f368c3737b1c175d66f4fc0b99a5bcd161a77",
                 "shasum": ""
             },
             "require": {
@@ -7395,11 +7410,11 @@
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<0.3.0",
+                "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/dependency-injection": "<4.4"
             },
             "require-dev": {
-                "doctrine/annotations": "~1.7",
+                "doctrine/annotations": "^1.10.4",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/cache": "^4.4|^5.0",
                 "symfony/dependency-injection": "^4.4|^5.0",
@@ -7434,7 +7449,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Property Info Component",
+            "description": "Extracts information about PHP class' properties using metadata of popular sources",
             "homepage": "https://symfony.com",
             "keywords": [
                 "doctrine",
@@ -7458,20 +7473,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-11T23:40:07+00:00"
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/redis-messenger",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/redis-messenger.git",
-                "reference": "c9ab1c7467657661554e7010a59f47f723f69c93"
+                "reference": "7e68914bf35cda948ee4d9081b8eaed9fd783fe5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/redis-messenger/zipball/c9ab1c7467657661554e7010a59f47f723f69c93",
-                "reference": "c9ab1c7467657661554e7010a59f47f723f69c93",
+                "url": "https://api.github.com/repos/symfony/redis-messenger/zipball/7e68914bf35cda948ee4d9081b8eaed9fd783fe5",
+                "reference": "7e68914bf35cda948ee4d9081b8eaed9fd783fe5",
                 "shasum": ""
             },
             "require": {
@@ -7522,7 +7537,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-15T11:52:46+00:00"
+            "time": "2021-01-27T11:24:50+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7602,16 +7617,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "2b105c0354f39a63038a1d8bf776ee92852813af"
+                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2b105c0354f39a63038a1d8bf776ee92852813af",
-                "reference": "2b105c0354f39a63038a1d8bf776ee92852813af",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b12274acfab9d9850c52583d136a24398cdf1a0c",
+                "reference": "b12274acfab9d9850c52583d136a24398cdf1a0c",
                 "shasum": ""
             },
             "require": {
@@ -7641,7 +7656,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Stopwatch Component",
+            "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -7657,20 +7672,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-01T16:14:45+00:00"
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed"
+                "reference": "c95468897f408dd0aca2ff582074423dd0455122"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
-                "reference": "5bd67751d2e3f7d6f770c9154b8fbcb2aa05f7ed",
+                "url": "https://api.github.com/repos/symfony/string/zipball/c95468897f408dd0aca2ff582074423dd0455122",
+                "reference": "c95468897f408dd0aca2ff582074423dd0455122",
                 "shasum": ""
             },
             "require": {
@@ -7713,7 +7728,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony String component",
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
             "homepage": "https://symfony.com",
             "keywords": [
                 "grapheme",
@@ -7737,20 +7752,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-05T07:33:16+00:00"
+            "time": "2021-01-25T15:14:59+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a04209ba0d1391c828e5b2373181dac63c52ee70"
+                "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a04209ba0d1391c828e5b2373181dac63c52ee70",
-                "reference": "a04209ba0d1391c828e5b2373181dac63c52ee70",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/c021864d4354ee55160ddcfd31dc477a1bc77949",
+                "reference": "c021864d4354ee55160ddcfd31dc477a1bc77949",
                 "shasum": ""
             },
             "require": {
@@ -7811,7 +7826,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Translation Component",
+            "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -7827,7 +7842,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-08T17:03:37+00:00"
+            "time": "2021-01-27T10:15:41+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -7906,16 +7921,16 @@
         },
         {
             "name": "tracy/tracy",
-            "version": "v2.8.1",
+            "version": "v2.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/tracy.git",
-                "reference": "37c238d08db44f2cd6f21f7d97e5cea11d631fae"
+                "reference": "342674bbf72365e8456de9855a8cd839ca695933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/tracy/zipball/37c238d08db44f2cd6f21f7d97e5cea11d631fae",
-                "reference": "37c238d08db44f2cd6f21f7d97e5cea11d631fae",
+                "url": "https://api.github.com/repos/nette/tracy/zipball/342674bbf72365e8456de9855a8cd839ca695933",
+                "reference": "342674bbf72365e8456de9855a8cd839ca695933",
                 "shasum": ""
             },
             "require": {
@@ -7972,7 +7987,7 @@
                 "nette",
                 "profiler"
             ],
-            "time": "2021-01-01T22:21:23+00:00"
+            "time": "2021-01-31T23:07:09+00:00"
         },
         {
             "name": "twbs/bootstrap",
@@ -8204,25 +8219,26 @@
     "packages-dev": [
         {
             "name": "behat/gherkin",
-            "version": "v4.7.1",
+            "version": "v4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd"
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
-                "reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd",
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": "~7.2|~8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7|~6|~7",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
+                "cucumber/cucumber": "dev-gherkin-16.0.0",
+                "phpunit/phpunit": "~8|~9",
+                "symfony/phpunit-bridge": "~3|~4|~5",
+                "symfony/yaml": "~3|~4|~5"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -8259,20 +8275,20 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2021-01-26T16:24:32+00:00"
+            "time": "2021-02-04T12:44:21+00:00"
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.16",
+            "version": "4.1.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "daf4fe110b33855252009a0dcab87ce8bcf7c009"
+                "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/daf4fe110b33855252009a0dcab87ce8bcf7c009",
-                "reference": "daf4fe110b33855252009a0dcab87ce8bcf7c009",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c153b1ab289b3e3109e685379aa8847c54ac2b68",
+                "reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68",
                 "shasum": ""
             },
             "require": {
@@ -8350,7 +8366,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2021-01-26T07:25:32+00:00"
+            "time": "2021-02-01T07:30:47+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -8404,16 +8420,16 @@
         },
         {
             "name": "codeception/lib-innerbrowser",
-            "version": "1.3.6",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-innerbrowser.git",
-                "reference": "41b79ba6761001bdb1f373a347400180693ad4e7"
+                "reference": "b7406c710684c255d9b067d7795269a5585a0406"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/41b79ba6761001bdb1f373a347400180693ad4e7",
-                "reference": "41b79ba6761001bdb1f373a347400180693ad4e7",
+                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/b7406c710684c255d9b067d7795269a5585a0406",
+                "reference": "b7406c710684c255d9b067d7795269a5585a0406",
                 "shasum": ""
             },
             "require": {
@@ -8456,7 +8472,7 @@
             "keywords": [
                 "codeception"
             ],
-            "time": "2021-01-17T11:21:09+00:00"
+            "time": "2021-01-29T18:17:25+00:00"
         },
         {
             "name": "codeception/mockery-module",
@@ -8878,16 +8894,16 @@
         },
         {
             "name": "nette/tester",
-            "version": "v2.3.4",
+            "version": "v2.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/tester.git",
-                "reference": "81b37035240d5c41b71ff4016ad9f8d532fb54be"
+                "reference": "86d0e32ac2011c734d8def8e90ec65522b644bc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/tester/zipball/81b37035240d5c41b71ff4016ad9f8d532fb54be",
-                "reference": "81b37035240d5c41b71ff4016ad9f8d532fb54be",
+                "url": "https://api.github.com/repos/nette/tester/zipball/86d0e32ac2011c734d8def8e90ec65522b644bc4",
+                "reference": "86d0e32ac2011c734d8def8e90ec65522b644bc4",
                 "shasum": ""
             },
             "require": {
@@ -8903,7 +8919,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -8941,7 +8957,7 @@
                 "testing",
                 "unit"
             ],
-            "time": "2020-11-02T17:30:29+00:00"
+            "time": "2021-01-31T22:45:55+00:00"
         },
         {
             "name": "nextras/mail-panel",
@@ -9376,16 +9392,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.69",
+            "version": "0.12.71",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8"
+                "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f436ea35241da33487fd0d38b4bc3e6dfe30ea8",
-                "reference": "8f436ea35241da33487fd0d38b4bc3e6dfe30ea8",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5",
+                "reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5",
                 "shasum": ""
             },
             "require": {
@@ -9428,7 +9444,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-24T14:55:37+00:00"
+            "time": "2021-02-01T18:24:00+00:00"
         },
         {
             "name": "phpstan/phpstan-doctrine",
@@ -9854,16 +9870,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.1",
+            "version": "9.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360"
+                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7bdf4085de85a825f4424eae52c99a1cec2f360",
-                "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f661659747f2f87f9e72095bb207bceb0f151cb4",
+                "reference": "f661659747f2f87f9e72095bb207bceb0f151cb4",
                 "shasum": ""
             },
             "require": {
@@ -9949,7 +9965,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-01-17T07:42:25+00:00"
+            "time": "2021-02-02T14:45:58+00:00"
         },
         {
             "name": "roave/security-advisories",
@@ -9957,12 +9973,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "db043e108edc5065662fec040aedea5bf30f8a12"
+                "reference": "f7d723a10c7cb36e11430182f5813ecb1b887da0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/db043e108edc5065662fec040aedea5bf30f8a12",
-                "reference": "db043e108edc5065662fec040aedea5bf30f8a12",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f7d723a10c7cb36e11430182f5813ecb1b887da0",
+                "reference": "f7d723a10c7cb36e11430182f5813ecb1b887da0",
                 "shasum": ""
             },
             "conflict": {
@@ -10028,6 +10044,8 @@
                 "ezsystems/repository-forms": ">=2.3,<2.3.2.1",
                 "ezyang/htmlpurifier": "<4.1.1",
                 "firebase/php-jwt": "<2",
+                "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15",
+                "flarum/tags": "<=0.1-beta.13",
                 "fooman/tcpdf": "<6.2.22",
                 "fossar/tcpdf-parser": "<6.2.22",
                 "friendsofsymfony/oauth2-php": "<1.3",
@@ -10044,7 +10062,7 @@
                 "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1",
                 "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
                 "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
-                "illuminate/database": "<6.20.12|>=7,<7.30.3|>=8,<8.22.1",
+                "illuminate/database": "<6.20.14|>=7,<7.30.4|>=8,<8.24",
                 "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
                 "illuminate/view": ">=7,<7.1.2",
                 "ivankristianto/phpwhois": "<=4.3",
@@ -10055,7 +10073,7 @@
                 "kitodo/presentation": "<3.1.2",
                 "kreait/firebase-php": ">=3.2,<3.8.1",
                 "la-haute-societe/tcpdf": "<6.2.22",
-                "laravel/framework": "<6.20.12|>=7,<7.30.3|>=8,<8.22.1",
+                "laravel/framework": "<6.20.14|>=7,<7.30.4|>=8,<8.24",
                 "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
                 "league/commonmark": "<0.18.3",
                 "librenms/librenms": "<1.53",
@@ -10143,6 +10161,7 @@
                 "slim/slim": "<2.6",
                 "smarty/smarty": "<3.1.33",
                 "socalnick/scn-social-auth": "<1.15.2",
+                "socialiteproviders/steam": "<1.1",
                 "spoonity/tcpdf": "<6.2.22",
                 "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
                 "ssddanbrown/bookstack": "<0.29.2",
@@ -10267,7 +10286,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-20T22:18:29+00:00"
+            "time": "2021-02-02T10:05:32+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -11279,16 +11298,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a"
+                "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a",
-                "reference": "87d6f0a7436b03a57d4cf9a6a9cd0c83a355c49a",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
+                "reference": "b03b2057ed53ee4eab2e8f372084d7722b7b8ffd",
                 "shasum": ""
             },
             "require": {
@@ -11327,7 +11346,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony BrowserKit Component",
+            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -11343,20 +11362,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-18T08:03:05+00:00"
+            "time": "2021-01-27T12:56:27+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054"
+                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
-                "reference": "f789e7ead4c79e04ca9a6d6162fc629c89bd8054",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f",
+                "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f",
                 "shasum": ""
             },
             "require": {
@@ -11389,7 +11408,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony CssSelector Component",
+            "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -11405,20 +11424,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-08T17:02:38+00:00"
+            "time": "2021-01-27T10:01:46+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea"
+                "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ee7cf316fb0de786cfe5ae32ee79502b290c81ea",
-                "reference": "ee7cf316fb0de786cfe5ae32ee79502b290c81ea",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5d89ceb53ec65e1973a555072fac8ed5ecad3384",
+                "reference": "5d89ceb53ec65e1973a555072fac8ed5ecad3384",
                 "shasum": ""
             },
             "require": {
@@ -11460,7 +11479,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony DomCrawler Component",
+            "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -11476,20 +11495,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-18T08:02:46+00:00"
+            "time": "2021-01-27T10:01:46+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba"
+                "reference": "4adc8d172d602008c204c2e16956f99257248e03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
-                "reference": "0b9231a5922fd7287ba5b411893c0ecd2733e5ba",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4adc8d172d602008c204c2e16956f99257248e03",
+                "reference": "4adc8d172d602008c204c2e16956f99257248e03",
                 "shasum": ""
             },
             "require": {
@@ -11518,7 +11537,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -11534,20 +11553,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-08T17:02:38+00:00"
+            "time": "2021-01-28T22:06:19+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.2.1",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "290ea5e03b8cf9b42c783163123f54441fb06939"
+                "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/290ea5e03b8cf9b42c783163123f54441fb06939",
-                "reference": "290ea5e03b8cf9b42c783163123f54441fb06939",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/338cddc6d74929f6adf19ca5682ac4b8e109cdb0",
+                "reference": "338cddc6d74929f6adf19ca5682ac4b8e109cdb0",
                 "shasum": ""
             },
             "require": {
@@ -11590,7 +11609,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "funding": [
                 {
@@ -11606,7 +11625,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-08T17:02:38+00:00"
+            "time": "2021-02-03T04:42:09+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/migrations/Version20210203221708.php b/migrations/Version20210203221708.php
new file mode 100644
index 000000000..38c800fe1
--- /dev/null
+++ b/migrations/Version20210203221708.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210203221708 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE slideshow_content (id INT NOT NULL, images LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:simple_array)\', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE slideshow_content ADD CONSTRAINT FK_3001DAD3BF396750 FOREIGN KEY (id) REFERENCES content (id) ON DELETE CASCADE');
+        $this->addSql('UPDATE `settings` SET value=concat("/files/logo/", value) WHERE item="logo"');
+        $this->addSql('UPDATE `user` SET photo=concat("/files/user_photos/", photo) WHERE photo IS NOT NULL');
+        $this->addSql('UPDATE `custom_file_value` SET value=concat("/files", value) WHERE value IS NOT NULL');
+        $this->addSql('UPDATE `document` SET file=concat("/files", file) WHERE file IS NOT NULL');
+        $this->addSql('UPDATE `image_content` SET image=concat("/files", image) WHERE image IS NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+}
diff --git a/phpcs.xml b/phpcs.xml
index 550aec881..d41ed910e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -35,9 +35,6 @@
         <!-- Docasne ignorovano - problem ve foreach, pokud je potreba jen key -->
         <exclude name="SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable"/>
 
-        <!-- Rozpor s phpstan -->
-        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion"/>
-
         <!-- skautIS property -->
         <exclude name="Squiz.NamingConventions.ValidVariableName.NotCamelCaps"/>
     </rule>
diff --git a/www/css/admin/style.css b/www/css/admin/style.css
index ef40f8840..78dbb10c2 100644
--- a/www/css/admin/style.css
+++ b/www/css/admin/style.css
@@ -121,6 +121,11 @@ div.mce-fullscreen {
     border-left: none !important;
 }
 
+/* uprava fileinput */
+.file-drag-handle {
+    display: none;
+}
+
 /* vyber role */
 #role-menu-text {
     max-width: 220px;
diff --git a/www/css/web/layout.css b/www/css/web/layout.css
index 652262f63..f0a47ac47 100644
--- a/www/css/web/layout.css
+++ b/www/css/web/layout.css
@@ -164,4 +164,9 @@ p {
 /* neaktivni zaznamy */
 .datagrid .disabled {
     color: #70757D !important;
+}
+
+/* uprava fileinput */
+.file-drag-handle {
+    display: none;
 }
\ No newline at end of file
diff --git a/www/files/logo/logo.png b/www/files/logo/logo.png
index 0c5b33d32..ed7f98d90 100644
Binary files a/www/files/logo/logo.png and b/www/files/logo/logo.png differ
diff --git a/www/js/main.js b/www/js/main.js
index 1981d30e3..92eb46eaf 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -61,13 +61,20 @@ function initFileInputs() {
     $('input[type="file"]').fileinput({
         language: 'cs',
         theme: 'fa',
-        browseLabel: 'Vybrat',
-        msgPlaceholder: 'Vybrat soubor...',
         showPreview: false,
         showRemove: false,
         showUpload: false,
         showCancel: false,
-        browseClass: 'btn btn-secondary'
+        showClose: false,
+        showDrag: false, // nefunguje, opraveno v CSS
+        initialPreviewShowDelete: false,
+        initialPreviewAsData: true,
+        browseClass: 'btn btn-secondary',
+        browseLabel: 'Vybrat',
+        msgPlaceholder: 'Vybrat soubor...',
+        dropZoneTitle: 'Přetáhněte soubory sem &hellip;',
+        fileSingle: 'souborů',
+        filePlural: 'souborů'
     });
 }