diff --git a/composer.json b/composer.json
index 8a6a031c6..62864986e 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
 		"nette/forms": "^3.2",
 		"nette/robot-loader": "^4.0",
 		"nette/security": "^3.2",
-		"latte/latte": "^2.10.2 || ^3.0.12",
+		"latte/latte": "^3.0.12",
 		"tracy/tracy": "^2.9",
 		"mockery/mockery": "^1.6",
 		"phpstan/phpstan-nette": "^1.0",
@@ -42,7 +42,7 @@
 		"nette/di": "<3.2",
 		"nette/forms": "<3.2",
 		"nette/schema": "<1.3",
-		"latte/latte": "<2.7.1 || >=3.0.0 <3.0.12 || >=3.1",
+		"latte/latte": "<3.0.12",
 		"tracy/tracy": "<2.9"
 	},
 	"autoload": {
@@ -55,7 +55,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.2-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }
diff --git a/readme.md b/readme.md
index d8e52ef86..b4b61840e 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@ Nette Application MVC
 =====================
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/application.svg)](https://packagist.org/packages/nette/application)
-[![Tests](https://github.com/nette/application/actions/workflows/tests.yml/badge.svg?branch=v3.2)](https://github.com/nette/application/actions)
+[![Tests](https://github.com/nette/application/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/nette/application/actions)
 [![Latest Stable Version](https://poser.pugx.org/nette/application/v/stable)](https://github.com/nette/application/releases)
 [![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/application/blob/master/license.md)
 
diff --git a/src/Application/Request.php b/src/Application/Request.php
index 5c9985ce3..10b5f2782 100644
--- a/src/Application/Request.php
+++ b/src/Application/Request.php
@@ -15,11 +15,11 @@
 /**
  * Presenter request.
  *
- * @property string $presenterName
- * @property array $parameters
- * @property array $post
- * @property array $files
- * @property string|null $method
+ * @property-deprecated string $presenterName
+ * @property-deprecated array $parameters
+ * @property-deprecated array $post
+ * @property-deprecated array $files
+ * @property-deprecated string|null $method
  */
 final class Request
 {
diff --git a/src/Application/Routers/Route.php b/src/Application/Routers/Route.php
index ba611da0e..2e22d9679 100644
--- a/src/Application/Routers/Route.php
+++ b/src/Application/Routers/Route.php
@@ -187,6 +187,3 @@ public static function path2presenter(string $s): string
 		return $s;
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);
diff --git a/src/Application/Routers/RouteList.php b/src/Application/Routers/RouteList.php
index 99e2a6d17..6ed3d079c 100644
--- a/src/Application/Routers/RouteList.php
+++ b/src/Application/Routers/RouteList.php
@@ -65,10 +65,10 @@ public function addRoute(
 		#[Language('TEXT')]
 		string $mask,
 		array|string|\Closure $metadata = [],
-		int|bool $oneWay = 0,
+		bool $oneWay = false,
 	): static
 	{
-		$this->add(new Route($mask, $metadata), (int) $oneWay);
+		$this->add(new Route($mask, $metadata), $oneWay);
 		return $this;
 	}
 
@@ -95,6 +95,13 @@ public function getModule(): ?string
 	 */
 	public function offsetSet($index, $router): void
 	{
+		if ($router instanceof Route) {
+			trigger_error('Usage `$router[] = new Route(...)` is deprecated, use `$router->addRoute(...)`.', E_USER_DEPRECATED);
+		} else {
+			$class = getclass($router);
+			trigger_error("Usage `\$router[] = new $class` is deprecated, use `\$router->add(new $class)`.", E_USER_DEPRECATED);
+		}
+
 		if ($index === null) {
 			$this->add($router);
 		} else {
@@ -109,6 +116,7 @@ public function offsetSet($index, $router): void
 	 */
 	public function offsetGet($index): Nette\Routing\Router
 	{
+		trigger_error('Usage `$route = $router[...]` is deprecated, use `$router->getRouters()`.', E_USER_DEPRECATED);
 		if (!$this->offsetExists($index)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
@@ -122,6 +130,7 @@ public function offsetGet($index): Nette\Routing\Router
 	 */
 	public function offsetExists($index): bool
 	{
+		trigger_error('Usage `isset($router[...])` is deprecated.', E_USER_DEPRECATED);
 		return is_int($index) && $index >= 0 && $index < count($this->getRouters());
 	}
 
@@ -132,6 +141,7 @@ public function offsetExists($index): bool
 	 */
 	public function offsetUnset($index): void
 	{
+		trigger_error('Usage `unset($router[$index])` is deprecated, use `$router->modify($index, null)`.', E_USER_DEPRECATED);
 		if (!$this->offsetExists($index)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
@@ -139,6 +149,3 @@ public function offsetUnset($index): void
 		$this->modify($index, null);
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);
diff --git a/src/Application/Routers/SimpleRouter.php b/src/Application/Routers/SimpleRouter.php
index 35d2c8ad9..2f99c51ba 100644
--- a/src/Application/Routers/SimpleRouter.php
+++ b/src/Application/Routers/SimpleRouter.php
@@ -38,6 +38,3 @@ public function __construct(array|string $defaults = [])
 		parent::__construct($defaults);
 	}
 }
-
-
-interface_exists(Nette\Application\IRouter::class);
diff --git a/src/Application/UI/Component.php b/src/Application/UI/Component.php
index 73111c884..eb1242cca 100644
--- a/src/Application/UI/Component.php
+++ b/src/Application/UI/Component.php
@@ -19,8 +19,8 @@
  * other child components, and interact with user. Components have properties
  * for storing their status, and responds to user command.
  *
- * @property-read Presenter $presenter
- * @property-read bool $linkCurrent
+ * @property-deprecated Presenter $presenter
+ * @property-deprecated bool $linkCurrent
  */
 abstract class Component extends Nette\ComponentModel\Container implements SignalReceiver, StatePersistent, \ArrayAccess
 {
@@ -71,15 +71,17 @@ public function getUniqueId(): string
 	}
 
 
-	protected function createComponent(string $name): ?Nette\ComponentModel\IComponent
+	public function addComponent(
+		Nette\ComponentModel\IComponent $component,
+		?string $name,
+		?string $insertBefore = null,
+	): static
 	{
-		$res = parent::createComponent($name);
-		if ($res && !$res instanceof SignalReceiver && !$res instanceof StatePersistent) {
-			$type = $res::class;
-			trigger_error("It seems that component '$name' of type $type is not intended to be used in the Presenter.");
+		if (!$component instanceof SignalReceiver && !$component instanceof StatePersistent) {
+			throw new Nette\InvalidStateException("Component '$name' of type " . get_debug_type($component) . ' is not intended to be used in the Presenter.');
 		}
 
-		return $res;
+		return parent::addComponent($component, $name, $insertBefore = null);
 	}
 
 
@@ -165,9 +167,9 @@ public function loadState(array $params): void
 					));
 				}
 
-				$this->$name = $params[$name];
+				$this->$name = &$params[$name];
 			} else {
-				$params[$name] = $this->$name ?? null;
+				$params[$name] = &$this->$name;
 			}
 		}
 
@@ -190,6 +192,7 @@ public function saveState(array &$params): void
 	final public function getParameter(string $name): mixed
 	{
 		if (func_num_args() > 1) {
+			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
 			$default = func_get_arg(1);
 		}
 		return $this->params[$name] ?? $default ?? null;
@@ -201,7 +204,7 @@ final public function getParameter(string $name): mixed
 	 */
 	final public function getParameters(): array
 	{
-		return $this->params;
+		return array_map(fn($item) => $item, $this->params);
 	}
 
 
@@ -246,15 +249,15 @@ public static function formatSignalMethod(string $signal): string
 	/**
 	 * Generates URL to presenter, action or signal.
 	 * @param  string   $destination in format "[//] [[[module:]presenter:]action | signal! | this] [#fragment]"
-	 * @param  array|mixed  $args
+	 * @param  mixed  ...$args
 	 * @throws InvalidLinkException
 	 */
-	public function link(string $destination, $args = []): string
+	public function link(string $destination, ...$args): string
 	{
 		try {
-			$args = func_num_args() < 3 && is_array($args)
-				? $args
-				: array_slice(func_get_args(), 1);
+			$args = count($args) === 1 && is_array($args[0] ?? null)
+				? $args[0]
+				: $args;
 			return $this->getPresenter()->createRequest($this, $destination, $args, 'link');
 
 		} catch (InvalidLinkException $e) {
@@ -266,13 +269,13 @@ public function link(string $destination, $args = []): string
 	/**
 	 * Returns destination as Link object.
 	 * @param  string   $destination in format "[//] [[[module:]presenter:]action | signal! | this] [#fragment]"
-	 * @param  array|mixed  $args
+	 * @param  mixed  ...$args
 	 */
-	public function lazyLink(string $destination, $args = []): Link
+	public function lazyLink(string $destination, ...$args): Link
 	{
-		$args = func_num_args() < 3 && is_array($args)
-			? $args
-			: array_slice(func_get_args(), 1);
+		$args = count($args) === 1 && is_array($args[0] ?? null)
+			? $args[0]
+			: $args;
 		return new Link($this, $destination, $args);
 	}
 
@@ -280,15 +283,15 @@ public function lazyLink(string $destination, $args = []): Link
 	/**
 	 * Determines whether it links to the current page.
 	 * @param  string   $destination in format "[//] [[[module:]presenter:]action | signal! | this] [#fragment]"
-	 * @param  array|mixed  $args
+	 * @param  mixed  ...$args
 	 * @throws InvalidLinkException
 	 */
-	public function isLinkCurrent(?string $destination = null, $args = []): bool
+	public function isLinkCurrent(?string $destination = null, ...$args): bool
 	{
 		if ($destination !== null) {
-			$args = func_num_args() < 3 && is_array($args)
-				? $args
-				: array_slice(func_get_args(), 1);
+			$args = count($args) === 1 && is_array($args[0] ?? null)
+				? $args[0]
+				: $args;
 			$this->getPresenter()->createRequest($this, $destination, $args, 'test');
 		}
 
@@ -299,15 +302,15 @@ public function isLinkCurrent(?string $destination = null, $args = []): bool
 	/**
 	 * Redirect to another presenter, action or signal.
 	 * @param  string   $destination in format "[//] [[[module:]presenter:]action | signal! | this] [#fragment]"
-	 * @param  array|mixed  $args
+	 * @param  mixed  ...$args
 	 * @return never
 	 * @throws Nette\Application\AbortException
 	 */
-	public function redirect(string $destination, $args = []): void
+	public function redirect(string $destination, ...$args): void
 	{
-		$args = func_num_args() < 3 && is_array($args)
-			? $args
-			: array_slice(func_get_args(), 1);
+		$args = count($args) === 1 && is_array($args[0] ?? null)
+			? $args[0]
+			: $args;
 		$presenter = $this->getPresenter();
 		$presenter->redirectUrl($presenter->createRequest($this, $destination, $args, 'redirect'));
 	}
@@ -316,15 +319,15 @@ public function redirect(string $destination, $args = []): void
 	/**
 	 * Permanently redirects to presenter, action or signal.
 	 * @param  string   $destination in format "[//] [[[module:]presenter:]action | signal! | this] [#fragment]"
-	 * @param  array|mixed  $args
+	 * @param  mixed  ...$args
 	 * @return never
 	 * @throws Nette\Application\AbortException
 	 */
-	public function redirectPermanent(string $destination, $args = []): void
+	public function redirectPermanent(string $destination, ...$args): void
 	{
-		$args = func_num_args() < 3 && is_array($args)
-			? $args
-			: array_slice(func_get_args(), 1);
+		$args = count($args) === 1 && is_array($args[0] ?? null)
+			? $args[0]
+			: $args;
 		$presenter = $this->getPresenter();
 		$presenter->redirectUrl(
 			$presenter->createRequest($this, $destination, $args, 'redirect'),
@@ -342,6 +345,3 @@ public function error(string $message = '', int $httpCode = Nette\Http\IResponse
 		throw new Nette\Application\BadRequestException($message, $httpCode);
 	}
 }
-
-
-class_exists(PresenterComponent::class);
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
index 0c7d8b004..1dda9d57a 100644
--- a/src/Application/UI/ComponentReflection.php
+++ b/src/Application/UI/ComponentReflection.php
@@ -14,8 +14,8 @@
 
 /**
  * Helpers for Presenter & Component.
- * @property-read string $name
- * @property-read string $fileName
+ * @property-deprecated string $name
+ * @property-deprecated string $fileName
  * @internal
  */
 final class ComponentReflection extends \ReflectionClass
@@ -26,7 +26,7 @@ final class ComponentReflection extends \ReflectionClass
 
 
 	/**
-	 * Returns array of class properties that are public and have attribute #[Persistent] or #[Parameter] or annotation @persistent.
+	 * Returns array of class properties that are public and have attribute #[Persistent] or #[Parameter].
 	 */
 	public function getParameters(): array
 	{
@@ -72,7 +72,7 @@ public function getParameters(): array
 
 
 	/**
-	 * Returns array of persistent properties. They are public and have attribute #[Persistent] or annotation @persistent.
+	 * Returns array of persistent properties. They are public and have attribute #[Persistent].
 	 */
 	public function getPersistentParams(): array
 	{
@@ -251,6 +251,7 @@ private static function castScalar(mixed &$val, string $type): bool
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public static function parseAnnotation(\Reflector $ref, string $name): ?array
 	{
@@ -268,6 +269,12 @@ public static function parseAnnotation(\Reflector $ref, string $name): ?array
 			}
 		}
 
+		$attr = match ($name) {
+			'persistent' => '#[Nette\Application\Attributes\Persistent]',
+			'deprecated' => '#[Nette\Application\Attributes\Deprecated]',
+			'crossOrigin' => '#[Nette\Application\Attributes\Request(sameOrigin: false)]',
+		};
+		trigger_error("Annotation @$name is deprecated, use $attr (used in " . Nette\Utils\Reflection::toString($ref) . ')', E_USER_DEPRECATED);
 		return $res;
 	}
 
@@ -286,6 +293,7 @@ public static function getType(\ReflectionParameter|\ReflectionProperty $item):
 
 	/**
 	 * Has class specified annotation?
+	 * @deprecated
 	 */
 	public function hasAnnotation(string $name): bool
 	{
@@ -295,6 +303,7 @@ public function hasAnnotation(string $name): bool
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public function getAnnotation(string $name): mixed
 	{
@@ -341,6 +350,3 @@ public static function getClassesAndTraits(string $class): array
 		return $res;
 	}
 }
-
-
-class_exists(PresenterComponentReflection::class);
diff --git a/src/Application/UI/Control.php b/src/Application/UI/Control.php
index 7c1141a09..a768fa550 100644
--- a/src/Application/UI/Control.php
+++ b/src/Application/UI/Control.php
@@ -90,7 +90,7 @@ public function templatePrepareFilters(Template $template): void
 	/**
 	 * Saves the message to template, that can be displayed after redirect.
 	 */
-	public function flashMessage(string|\stdClass|Nette\HtmlStringable $message, string $type = 'info'): \stdClass
+	public function flashMessage(string|\stdClass|\Stringable $message, string $type = 'info'): \stdClass
 	{
 		$id = $this->getParameterId('flash');
 		$flash = $message instanceof \stdClass ? $message : (object) [
diff --git a/src/Application/UI/MethodReflection.php b/src/Application/UI/MethodReflection.php
index f576deeaf..f84687356 100644
--- a/src/Application/UI/MethodReflection.php
+++ b/src/Application/UI/MethodReflection.php
@@ -17,18 +17,22 @@ final class MethodReflection extends \ReflectionMethod
 {
 	/**
 	 * Has method specified annotation?
+	 * @deprecated
 	 */
 	public function hasAnnotation(string $name): bool
 	{
+		trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
 		return (bool) ComponentReflection::parseAnnotation($this, $name);
 	}
 
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public function getAnnotation(string $name): mixed
 	{
+		trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
 		$res = ComponentReflection::parseAnnotation($this, $name);
 		return $res ? end($res) : null;
 	}
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
index 23f57f178..1adca3b9b 100644
--- a/src/Application/UI/Presenter.php
+++ b/src/Application/UI/Presenter.php
@@ -20,13 +20,13 @@
 /**
  * Presenter component represents a webpage instance. It converts Request to Response.
  *
- * @property-read Nette\Application\Request $request
- * @property-read string $action
- * @property      string $view
- * @property      string|bool $layout
+ * @property-deprecated Nette\Application\Request $request
+ * @property-deprecated string $action
+ * @property-deprecated      string $view
+ * @property-deprecated      string|bool $layout
  * @property-read \stdClass $payload
- * @property-read Nette\Http\Session $session
- * @property-read Nette\Security\User $user
+ * @property-deprecated Nette\Http\Session $session
+ * @property-deprecated Nette\Security\User $user
  */
 abstract class Presenter extends Control implements Application\IPresenter
 {
@@ -114,11 +114,6 @@ abstract class Presenter extends Control implements Application\IPresenter
 	private Nette\Http\UrlScript $refUrlCache;
 
 
-	public function __construct()
-	{
-	}
-
-
 	final public function getRequest(): ?Application\Request
 	{
 		return $this->request;
@@ -1145,7 +1140,7 @@ public function restoreRequest(string $key): void
 
 	/**
 	 * Returns array of persistent components.
-	 * This default implementation detects components by class-level annotation @persistent(cmp1, cmp2).
+	 * This default implementation detects components by class-level attribute #[Persistent(cmp1, cmp2)].
 	 */
 	public static function getPersistentComponents(): array
 	{
diff --git a/src/Bridges/ApplicationDI/ApplicationExtension.php b/src/Bridges/ApplicationDI/ApplicationExtension.php
index fcf8ce463..4591cef68 100644
--- a/src/Bridges/ApplicationDI/ApplicationExtension.php
+++ b/src/Bridges/ApplicationDI/ApplicationExtension.php
@@ -47,7 +47,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 				])->castTo('array'),
 				Expect::string()->dynamic(),
 			)->firstIsDefault(),
-			'catchExceptions' => Expect::anyOf('4xx', true, false)->firstIsDefault()->dynamic(),
+			'catchExceptions' => Expect::bool(false)->dynamic(),
 			'mapping' => Expect::anyOf(
 				Expect::string(),
 				Expect::arrayOf('string|array'),
@@ -77,8 +77,6 @@ public function loadConfiguration(): void
 			->setFactory(Nette\Application\Application::class);
 		if ($config->catchExceptions || !$this->debugMode) {
 			$application->addSetup('$error4xxPresenter', [is_array($config->errorPresenter) ? $config->errorPresenter['4xx'] : $config->errorPresenter]);
-		}
-		if ($config->catchExceptions === true || !$this->debugMode) {
 			$application->addSetup('$errorPresenter', [is_array($config->errorPresenter) ? $config->errorPresenter['5xx'] : $config->errorPresenter]);
 		}
 
diff --git a/src/Bridges/ApplicationDI/LatteExtension.php b/src/Bridges/ApplicationDI/LatteExtension.php
index 6fffe737a..7751b8904 100644
--- a/src/Bridges/ApplicationDI/LatteExtension.php
+++ b/src/Bridges/ApplicationDI/LatteExtension.php
@@ -12,6 +12,7 @@
 use Latte;
 use Nette;
 use Nette\Bridges\ApplicationLatte;
+use Nette\DI\Definitions\Statement;
 use Nette\Schema\Expect;
 use Tracy;
 
@@ -32,12 +33,12 @@ public function getConfigSchema(): Nette\Schema\Schema
 	{
 		return Expect::structure([
 			'debugger' => Expect::anyOf(true, false, 'all'),
-			'macros' => Expect::arrayOf('string'),
 			'extensions' => Expect::arrayOf('string|Nette\DI\Definitions\Statement'),
 			'templateClass' => Expect::string(),
 			'strictTypes' => Expect::bool(false),
 			'strictParsing' => Expect::bool(false),
 			'phpLinter' => Expect::string(),
+			'variables' => Expect::array([]),
 		]);
 	}
 
@@ -51,30 +52,34 @@ public function loadConfiguration(): void
 		$config = $this->config;
 		$builder = $this->getContainerBuilder();
 
-		$latteFactory = $builder->addFactoryDefinition($this->prefix('latteFactory'))
+		$builder->addFactoryDefinition($this->prefix('latteFactory'))
 			->setImplement(ApplicationLatte\LatteFactory::class)
 			->getResultDefinition()
 				->setFactory(Latte\Engine::class)
 				->addSetup('setTempDirectory', [$this->tempDir])
 				->addSetup('setAutoRefresh', [$this->debugMode])
-				->addSetup('setStrictTypes', [$config->strictTypes]);
-
-		if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-			foreach ($config->macros as $macro) {
-				$this->addMacro($macro);
-			}
-		} else {
-			$latteFactory->addSetup('setStrictParsing', [$config->strictParsing])
+				->addSetup('setStrictTypes', [$config->strictTypes])
+				->addSetup('setStrictParsing', [$config->strictParsing])
 				->addSetup('enablePhpLinter', [$config->phpLinter]);
 
-			foreach ($config->extensions as $extension) {
-				$this->addExtension($extension);
-			}
+		$this->addExtension(new Statement(ApplicationLatte\UIExtension::class, [$builder::literal('$control')]));
+
+		if ($cache = $builder->getByType(Nette\Caching\Storage::class)) {
+			$this->addExtension(new Statement(Nette\Bridges\CacheLatte\CacheExtension::class, [$builder->getDefinition($cache)]));
+		}
+		if (class_exists(Nette\Bridges\FormsLatte\FormsExtension::class)) {
+			$this->addExtension(new Statement(Nette\Bridges\FormsLatte\FormsExtension::class));
+		}
+
+		foreach ($config->extensions as $extension) {
+			$this->addExtension($extension);
 		}
 
 		$builder->addDefinition($this->prefix('templateFactory'))
-			->setFactory(ApplicationLatte\TemplateFactory::class)
-			->setArguments(['templateClass' => $config->templateClass]);
+			->setFactory(ApplicationLatte\TemplateFactory::class, [
+				'templateClass' => $config->templateClass,
+				'configVars' => $config->variables,
+			]);
 
 		if ($this->name === 'latte') {
 			$builder->addAlias('nette.latteFactory', $this->prefix('latteFactory'));
@@ -112,44 +117,16 @@ public static function initLattePanel(
 			$control = $template->getLatte()->getProviders()['uiControl'] ?? null;
 			if ($all || $control instanceof Nette\Application\UI\Presenter) {
 				$name = $all && $control ? (new \ReflectionObject($control))->getShortName() : '';
-				if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-					$bar->addPanel(new Latte\Bridges\Tracy\LattePanel($template->getLatte(), $name));
-				} else {
-					$template->getLatte()->addExtension(new Latte\Bridges\Tracy\TracyExtension($name));
-				}
+				$template->getLatte()->addExtension(new Latte\Bridges\Tracy\TracyExtension($name));
 			}
 		};
 	}
 
 
-	public function addMacro(string $macro): void
-	{
-		$builder = $this->getContainerBuilder();
-		$definition = $builder->getDefinition($this->prefix('latteFactory'))->getResultDefinition();
-
-		if (($macro[0] ?? null) === '@') {
-			if (str_contains($macro, '::')) {
-				[$macro, $method] = explode('::', $macro);
-			} else {
-				$method = 'install';
-			}
-
-			$definition->addSetup('?->onCompile[] = function ($engine) { ?->' . $method . '($engine->getCompiler()); }', ['@self', $macro]);
-
-		} else {
-			if (!str_contains($macro, '::') && class_exists($macro)) {
-				$macro .= '::install';
-			}
-
-			$definition->addSetup('?->onCompile[] = function ($engine) { ' . $macro . '($engine->getCompiler()); }', ['@self']);
-		}
-	}
-
-
-	public function addExtension(Nette\DI\Definitions\Statement|string $extension): void
+	public function addExtension(Statement|string $extension): void
 	{
 		$extension = is_string($extension)
-			? new Nette\DI\Definitions\Statement($extension)
+			? new Statement($extension)
 			: $extension;
 
 		$builder = $this->getContainerBuilder();
diff --git a/src/Bridges/ApplicationLatte/DefaultTemplate.php b/src/Bridges/ApplicationLatte/DefaultTemplate.php
index 29d761663..85eae9c6d 100644
--- a/src/Bridges/ApplicationLatte/DefaultTemplate.php
+++ b/src/Bridges/ApplicationLatte/DefaultTemplate.php
@@ -29,6 +29,7 @@ final class DefaultTemplate extends Template
 
 	/** @var \stdClass[] */
 	public array $flashes = [];
+	public \stdClass $config;
 
 
 	/**
diff --git a/src/Bridges/ApplicationLatte/LatteFactory.php b/src/Bridges/ApplicationLatte/LatteFactory.php
index a215f3261..71e1ced0c 100644
--- a/src/Bridges/ApplicationLatte/LatteFactory.php
+++ b/src/Bridges/ApplicationLatte/LatteFactory.php
@@ -10,11 +10,12 @@
 namespace Nette\Bridges\ApplicationLatte;
 
 use Latte;
+use Nette\Application\UI\Control;
 
 
 interface LatteFactory
 {
-	function create(): Latte\Engine;
+	function create(?Control $control = null): Latte\Engine;
 }
 
 
diff --git a/src/Bridges/ApplicationLatte/SnippetBridge.php b/src/Bridges/ApplicationLatte/SnippetBridge.php
deleted file mode 100644
index f5d62ef80..000000000
--- a/src/Bridges/ApplicationLatte/SnippetBridge.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Nette\Bridges\ApplicationLatte;
-
-use Latte\Runtime\ISnippetBridge;
-use Nette;
-use Nette\Application\UI\Control;
-use Nette\Application\UI\Renderable;
-
-
-/**
- * Latte v2 snippet bridge
- * @internal
- */
-class SnippetBridge implements ISnippetBridge
-{
-	use Nette\SmartObject;
-
-	private Control $control;
-	private ?\stdClass $payload = null;
-
-
-	public function __construct(Control $control)
-	{
-		$this->control = $control;
-	}
-
-
-	public function isSnippetMode(): bool
-	{
-		return (bool) $this->control->snippetMode;
-	}
-
-
-	public function setSnippetMode($snippetMode)
-	{
-		$this->control->snippetMode = $snippetMode;
-	}
-
-
-	public function needsRedraw($name): bool
-	{
-		return $this->control->isControlInvalid($name);
-	}
-
-
-	public function markRedrawn($name): void
-	{
-		if ($name !== '') {
-			$this->control->redrawControl($name, false);
-		}
-	}
-
-
-	public function getHtmlId($name): string
-	{
-		return $this->control->getSnippetId($name);
-	}
-
-
-	public function addSnippet($name, $content): void
-	{
-		if (!isset($this->payload)) {
-			$this->payload = $this->control->getPresenter()->getPayload();
-		}
-
-		$this->payload->snippets[$this->control->getSnippetId($name)] = $content;
-	}
-
-
-	public function renderChildren(): void
-	{
-		$queue = [$this->control];
-		do {
-			foreach (array_shift($queue)->getComponents() as $child) {
-				if ($child instanceof Renderable) {
-					if ($child->isControlInvalid()) {
-						$child->snippetMode = true;
-						$child->render();
-						$child->snippetMode = false;
-					}
-				} elseif ($child instanceof Nette\ComponentModel\IContainer) {
-					$queue[] = $child;
-				}
-			}
-		} while ($queue);
-	}
-}
diff --git a/src/Bridges/ApplicationLatte/Template.php b/src/Bridges/ApplicationLatte/Template.php
index 4912b27c2..abdd41d89 100644
--- a/src/Bridges/ApplicationLatte/Template.php
+++ b/src/Bridges/ApplicationLatte/Template.php
@@ -36,20 +36,20 @@ final public function getLatte(): Latte\Engine
 	/**
 	 * Renders template to output.
 	 */
-	public function render(?string $file = null, array $params = []): void
+	public function render(?string $file = null, array $params = [], ?string $block = null): void
 	{
 		Nette\Utils\Arrays::toObject($params, $this);
-		$this->latte->render($file ?: $this->file, $this);
+		$this->latte->render($file ?: $this->file, $this, $block);
 	}
 
 
 	/**
 	 * Renders template to output.
 	 */
-	public function renderToString(?string $file = null, array $params = []): string
+	public function renderToString(?string $file = null, array $params = [], ?string $block = null): string
 	{
 		Nette\Utils\Arrays::toObject($params, $this);
-		return $this->latte->renderToString($file ?: $this->file, $this);
+		return $this->latte->renderToString($file ?: $this->file, $this, $block);
 	}
 
 
@@ -90,16 +90,7 @@ public function addFunction(string $name, callable $callback): static
 	 */
 	public function setTranslator(?Nette\Localization\Translator $translator, ?string $language = null): static
 	{
-		if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-			$this->latte->addFilter(
-				'translate',
-				fn(Latte\Runtime\FilterInfo $fi, ...$args): string => $translator === null
-						? $args[0]
-						: $translator->translate(...$args),
-			);
-		} else {
-			$this->latte->addExtension(new Latte\Essential\TranslatorExtension($translator, $language));
-		}
+		$this->latte->addExtension(new Latte\Essential\TranslatorExtension($translator, $language));
 		return $this;
 	}
 
diff --git a/src/Bridges/ApplicationLatte/TemplateFactory.php b/src/Bridges/ApplicationLatte/TemplateFactory.php
index bc7b0c042..5dc9cf50f 100644
--- a/src/Bridges/ApplicationLatte/TemplateFactory.php
+++ b/src/Bridges/ApplicationLatte/TemplateFactory.php
@@ -9,7 +9,6 @@
 
 namespace Nette\Bridges\ApplicationLatte;
 
-use Latte;
 use Nette;
 use Nette\Application\UI;
 
@@ -28,8 +27,8 @@ public function __construct(
 		private readonly LatteFactory $latteFactory,
 		private readonly ?Nette\Http\IRequest $httpRequest = null,
 		private readonly ?Nette\Security\User $user = null,
-		private readonly ?Nette\Caching\Storage $cacheStorage = null,
 		$templateClass = null,
+		private array $configVars = [],
 	) {
 		if ($templateClass && (!class_exists($templateClass) || !is_a($templateClass, Template::class, true))) {
 			throw new Nette\InvalidArgumentException("Class $templateClass does not implement " . Template::class . ' or it does not exist.');
@@ -39,43 +38,17 @@ public function __construct(
 	}
 
 
-	/** @return Template */
-	public function createTemplate(?UI\Control $control = null, ?string $class = null): UI\Template
+	public function createTemplate(?UI\Control $control = null, ?string $class = null): Template
 	{
 		$class ??= $this->templateClass;
 		if (!is_a($class, Template::class, allow_string: true)) {
 			throw new Nette\InvalidArgumentException("Class $class does not implement " . Template::class . ' or it does not exist.');
 		}
 
-		$latte = $this->latteFactory->create();
+		$latte = $this->latteFactory->create($control);
 		$template = new $class($latte);
 		$presenter = $control?->getPresenterIfExists();
 
-		if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-			$this->setupLatte2($latte, $control, $presenter, $template);
-
-		} else {
-			$latte->addExtension(new UIExtension($control));
-
-			if ($this->cacheStorage && class_exists(Nette\Bridges\CacheLatte\CacheExtension::class)) {
-				$latte->addExtension(new Nette\Bridges\CacheLatte\CacheExtension($this->cacheStorage));
-			}
-
-			if (class_exists(Nette\Bridges\FormsLatte\FormsExtension::class)) {
-				$latte->addExtension(new Nette\Bridges\FormsLatte\FormsExtension);
-			}
-		}
-
-		$latte->addFilter('modifyDate', fn($time, $delta, $unit = null) => $time
-				? Nette\Utils\DateTime::from($time)->modify($delta . $unit)
-				: null);
-
-		if (!isset($latte->getFilters()['translate'])) {
-			$latte->addFilter('translate', function (Latte\Runtime\FilterInfo $fi): void {
-				throw new Nette\InvalidStateException('Translator has not been set. Set translator using $template->setTranslator().');
-			});
-		}
-
 		// default parameters
 		$baseUrl = $this->httpRequest
 			? rtrim($this->httpRequest->getUrl()->withoutUserInfo()->getBaseUrl(), '/')
@@ -91,6 +64,7 @@ public function createTemplate(?UI\Control $control = null, ?string $class = nul
 			'flashes' => $flashes,
 			'control' => $control,
 			'presenter' => $presenter,
+			'config' => $control instanceof UI\Presenter && $this->configVars ? (object) $this->configVars : null,
 		];
 
 		foreach ($params as $key => $value) {
@@ -103,50 +77,4 @@ public function createTemplate(?UI\Control $control = null, ?string $class = nul
 
 		return $template;
 	}
-
-
-	private function setupLatte2(
-		Latte\Engine $latte,
-		?UI\Control $control,
-		?UI\Presenter $presenter,
-		Template $template,
-	): void
-	{
-		if ($latte->onCompile instanceof \Traversable) {
-			$latte->onCompile = iterator_to_array($latte->onCompile);
-		}
-
-		array_unshift($latte->onCompile, function (Latte\Engine $latte) use ($control, $template): void {
-			if ($this->cacheStorage) {
-				$latte->getCompiler()->addMacro('cache', new Nette\Bridges\CacheLatte\CacheMacro);
-			}
-
-			UIMacros::install($latte->getCompiler());
-			if (class_exists(Nette\Bridges\FormsLatte\FormMacros::class)) {
-				Nette\Bridges\FormsLatte\FormMacros::install($latte->getCompiler());
-			}
-
-			$control?->templatePrepareFilters($template);
-		});
-
-		$latte->addProvider('cacheStorage', $this->cacheStorage);
-
-		if ($control) {
-			$latte->addProvider('uiControl', $control);
-			$latte->addProvider('uiPresenter', $presenter);
-			$latte->addProvider('snippetBridge', new SnippetBridge($control));
-			if ($presenter) {
-				$header = $presenter->getHttpResponse()->getHeader('Content-Security-Policy')
-					?: $presenter->getHttpResponse()->getHeader('Content-Security-Policy-Report-Only');
-			}
-
-			$nonce = $presenter && preg_match('#\s\'nonce-([\w+/]+=*)\'#', (string) $header, $m) ? $m[1] : null;
-			$latte->addProvider('uiNonce', $nonce);
-		}
-
-		if ($presenter) {
-			$latte->addFunction('isLinkCurrent', [$presenter, 'isLinkCurrent']);
-			$latte->addFunction('isModuleCurrent', [$presenter, 'isModuleCurrent']);
-		}
-	}
 }
diff --git a/src/Bridges/ApplicationLatte/UIExtension.php b/src/Bridges/ApplicationLatte/UIExtension.php
index 2071a69fd..bc18af2bc 100644
--- a/src/Bridges/ApplicationLatte/UIExtension.php
+++ b/src/Bridges/ApplicationLatte/UIExtension.php
@@ -29,6 +29,16 @@ public function __construct(
 	}
 
 
+	public function getFilters(): array
+	{
+		return [
+			'modifyDate' => fn($time, $delta, $unit = null) => $time
+				? Nette\Utils\DateTime::from($time)->modify($delta . $unit)
+				: null,
+		];
+	}
+
+
 	public function getFunctions(): array
 	{
 		if ($presenter = $this->control?->getPresenterIfExists()) {
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
deleted file mode 100644
index 131c30075..000000000
--- a/src/Bridges/ApplicationLatte/UIMacros.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Nette\Bridges\ApplicationLatte;
-
-use Latte;
-use Latte\CompileException;
-use Latte\MacroNode;
-use Latte\PhpWriter;
-use Nette\Utils\Strings;
-
-
-/**
- * Latte v2 tags for Nette\Application\UI.
- *
- * - {link destination ...} control link
- * - {plink destination ...} presenter link
- * - {snippet ?} ... {/snippet ?} control snippet
- * - n:nonce
- */
-final class UIMacros extends Latte\Macros\MacroSet
-{
-	private bool|string $extends;
-	private ?string $printTemplate = null;
-
-
-	public static function install(Latte\Compiler $compiler): void
-	{
-		$me = new static($compiler);
-		$me->addMacro('control', [$me, 'macroControl']);
-
-		$me->addMacro('href', null, null, fn(MacroNode $node, PhpWriter $writer): string => ' ?> href="<?php ' . $me->macroLink($node, $writer) . ' ?>"<?php ');
-		$me->addMacro('plink', [$me, 'macroLink']);
-		$me->addMacro('link', [$me, 'macroLink']);
-		$me->addMacro('ifCurrent', [$me, 'macroIfCurrent'], '}'); // deprecated; use n:class="$presenter->linkCurrent ? ..."
-		$me->addMacro('extends', [$me, 'macroExtends']);
-		$me->addMacro('layout', [$me, 'macroExtends']);
-		$me->addMacro('nonce', null, null, 'echo $this->global->uiNonce ? " nonce=\"{$this->global->uiNonce}\"" : "";');
-		$me->addMacro('templatePrint', [$me, 'macroTemplatePrint'], null, null, self::ALLOWED_IN_HEAD);
-	}
-
-
-	/**
-	 * Initializes before template parsing.
-	 */
-	public function initialize(): void
-	{
-		$this->extends = false;
-	}
-
-
-	/**
-	 * Finishes template parsing.
-	 * @return array(prolog, epilog)
-	 */
-	public function finalize()
-	{
-		if ($this->printTemplate) {
-			return ["Nette\\Bridges\\ApplicationLatte\\UIRuntime::printClass(\$this, $this->printTemplate); exit;"];
-		}
-
-		return [$this->extends . 'Nette\Bridges\ApplicationLatte\UIRuntime::initialize($this, $this->parentName, $this->blocks);'];
-	}
-
-
-	/********************* macros ****************d*g**/
-
-
-	/**
-	 * {control name[:method] [params]}
-	 */
-	public function macroControl(MacroNode $node, PhpWriter $writer)
-	{
-		if ($node->context !== [Latte\Compiler::CONTENT_HTML, Latte\Compiler::CONTEXT_HTML_TEXT]) {
-			$escapeMod = Latte\Helpers::removeFilter($node->modifiers, 'noescape') ? '' : '|escape';
-		}
-
-		if ($node->modifiers) {
-			trigger_error('Modifiers are deprecated in ' . $node->getNotation(), E_USER_DEPRECATED);
-		}
-
-		$node->modifiers .= $escapeMod ?? '';
-
-		$words = $node->tokenizer->fetchWords();
-		if (!$words) {
-			throw new CompileException('Missing control name in {control}');
-		}
-
-		$name = $writer->formatWord($words[0]);
-		$method = ucfirst($words[1] ?? '');
-		$method = Strings::match($method, '#^\w*$#D')
-			? "render$method"
-			: "{\"render$method\"}";
-
-		$tokens = $node->tokenizer;
-		$pos = $tokens->position;
-		$wrap = false;
-		while ($tokens->nextToken()) {
-			if ($tokens->isCurrent('=>', '(expand)') && !$tokens->depth) {
-				$wrap = true;
-				break;
-			}
-		}
-
-		$tokens->position = $pos;
-		$param = $wrap ? $writer->formatArray() : $writer->formatArgs();
-
-		return "/* line $node->startLine */ "
-			. ($name[0] === '$' ? "if (is_object($name)) \$_tmp = $name; else " : '')
-			. '$_tmp = $this->global->uiControl->getComponent(' . $name . '); '
-			. 'if ($_tmp instanceof Nette\Application\UI\Renderable) $_tmp->redrawControl(null, false); '
-			. ($node->modifiers === ''
-				? "\$_tmp->$method($param);"
-				: $writer->write(
-					"ob_start(fn() => null); \$_tmp->$method($param); \$ʟ_fi = new LR\\FilterInfo(%var); echo %modifyContent(ob_get_clean());",
-					Latte\Engine::CONTENT_HTML,
-				)
-			);
-	}
-
-
-	/**
-	 * {link destination [,] [params]}
-	 * {plink destination [,] [params]}
-	 * n:href="destination [,] [params]"
-	 */
-	public function macroLink(MacroNode $node, PhpWriter $writer)
-	{
-		$node->modifiers = preg_replace('#\|safeurl\s*(?=\||$)#Di', '', $node->modifiers);
-		return $writer->using($node, $this->getCompiler())
-			->write(
-				'echo %escape(%modify('
-				. ($node->name === 'plink' ? '$this->global->uiPresenter' : '$this->global->uiControl')
-				. '->link(%node.word, %node.array?)))'
-				. ($node->startLine ? " /* line $node->startLine */;" : ';'),
-			);
-	}
-
-
-	/**
-	 * {ifCurrent destination [,] [params]}
-	 */
-	public function macroIfCurrent(MacroNode $node, PhpWriter $writer)
-	{
-		if ($node->modifiers) {
-			throw new CompileException('Modifiers are not allowed in ' . $node->getNotation());
-		}
-
-		return $writer->write(
-			$node->args
-				? 'if ($this->global->uiPresenter->isLinkCurrent(%node.word, %node.array?)) {'
-				: 'if ($this->global->uiPresenter->getLastCreatedRequestFlag("current")) {',
-		);
-	}
-
-
-	/**
-	 * {extends auto}
-	 */
-	public function macroExtends(MacroNode $node, PhpWriter $writer)
-	{
-		if ($node->modifiers || $node->parentNode || $node->args !== 'auto') {
-			return $this->extends = false;
-		}
-
-		$this->extends = $writer->write('$this->parentName = $this->global->uiPresenter->findLayoutTemplateFile();');
-	}
-
-
-	/**
-	 * {templatePrint [parentClass | default]}
-	 */
-	public function macroTemplatePrint(MacroNode $node): void
-	{
-		if ($node->modifiers) {
-			throw new CompileException('Modifiers are not allowed in ' . $node->getNotation());
-		}
-
-		$this->printTemplate = var_export($node->tokenizer->fetchWord() ?: null, true);
-	}
-}
diff --git a/src/Bridges/ApplicationLatte/UIRuntime.php b/src/Bridges/ApplicationLatte/UIRuntime.php
deleted file mode 100644
index ace3af72d..000000000
--- a/src/Bridges/ApplicationLatte/UIRuntime.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Nette\Bridges\ApplicationLatte;
-
-use Latte;
-use Nette;
-use Nette\Application\UI\Presenter;
-use Nette\PhpGenerator as Php;
-
-
-/**
- * Latte v2 helpers for UI macros.
- * @internal
- */
-final class UIRuntime
-{
-	use Nette\StaticClass;
-
-	public static function initialize(Latte\Runtime\Template $template, &$parentName, array $blocks): void
-	{
-		$providers = $template->global;
-		$blocks = array_filter(array_keys($blocks), fn(string $s): bool => $s[0] !== '_');
-		if (
-			$parentName === null
-			&& $blocks
-			&& !$template->getReferringTemplate()
-			&& ($providers->uiControl ?? null) instanceof Nette\Application\UI\Presenter
-		) {
-			$parentName = $providers->uiControl->findLayoutTemplateFile();
-		}
-	}
-
-
-	public static function printClass(Latte\Runtime\Template $template, ?string $parent = null): void
-	{
-		$blueprint = new Latte\Runtime\Blueprint;
-		$name = 'Template';
-		$params = $template->getParameters();
-		$control = $params['control'] ?? $params['presenter'] ?? null;
-		if ($control) {
-			$name = preg_replace('#(Control|Presenter)$#', '', $control::class) . 'Template';
-			unset($params[$control instanceof Presenter ? 'control' : 'presenter']);
-		}
-
-		if ($parent) {
-			if (!class_exists($parent)) {
-				$blueprint->printHeader("{templatePrint}: Class '$parent' doesn't exist.");
-				return;
-			}
-
-			$params = array_diff_key($params, get_class_vars($parent));
-		}
-
-		$funcs = array_diff_key((array) $template->global->fn, (new Latte\Runtime\Defaults)->getFunctions());
-		unset($funcs['isLinkCurrent'], $funcs['isModuleCurrent']);
-
-		$namespace = new Php\PhpNamespace(Php\Helpers::extractNamespace($name));
-		$class = $namespace->addClass(Php\Helpers::extractShortName($name));
-		$class->setExtends($parent ?: Template::class);
-		if (!$parent) {
-			$class->addTrait(Nette\SmartObject::class);
-		}
-
-		$blueprint->addProperties($class, $params, true);
-		$blueprint->addFunctions($class, $funcs);
-
-		$end = $blueprint->printCanvas();
-		$blueprint->printHeader('Native types');
-		$blueprint->printCode((string) $namespace);
-
-		$blueprint->addProperties($class, $params, false);
-
-		$blueprint->printHeader('phpDoc types');
-		$blueprint->printCode((string) $namespace);
-		echo $end;
-	}
-}
diff --git a/src/Bridges/ApplicationTracy/RoutingPanel.php b/src/Bridges/ApplicationTracy/RoutingPanel.php
index fa0209b46..39e4fee73 100644
--- a/src/Bridges/ApplicationTracy/RoutingPanel.php
+++ b/src/Bridges/ApplicationTracy/RoutingPanel.php
@@ -85,7 +85,7 @@ private function analyse(Routing\RouteList $router, ?Nette\Http\IRequest $httpRe
 				continue;
 			}
 
-			$matched = $flags[$i] & $router::ONE_WAY ? 'oneway' : 'no';
+			$matched = empty($flags[$i]['oneWay']) ? 'no' : 'oneway';
 			$params = $e = null;
 			try {
 				if (
diff --git a/src/compatibility-intf.php b/src/compatibility-intf.php
index 5bee25bb1..0d5b2f8ff 100644
--- a/src/compatibility-intf.php
+++ b/src/compatibility-intf.php
@@ -9,17 +9,6 @@
 
 namespace Nette\Application;
 
-use Nette;
-
-if (false) {
-	/** @deprecated use Nette\Routing\Router */
-	interface IRouter extends Nette\Routing\Router
-	{
-	}
-} elseif (!interface_exists(IRouter::class)) {
-	class_alias(Nette\Routing\Router::class, IRouter::class);
-}
-
 if (false) {
 	/** @deprecated use Nette\Application\Response */
 	interface IResponse extends Response
diff --git a/src/compatibility.php b/src/compatibility.php
deleted file mode 100644
index cf55aa4bc..000000000
--- a/src/compatibility.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Nette\Application\UI;
-
-if (false) {
-	/** @deprecated use Nette\Application\UI\Component */
-	class PresenterComponent
-	{
-	}
-} elseif (!class_exists(PresenterComponent::class)) {
-	class_alias(Component::class, PresenterComponent::class);
-}
-
-if (false) {
-	/** @deprecated use Nette\Application\UI\ComponentReflection */
-	class PresenterComponentReflection
-	{
-	}
-} elseif (!class_exists(PresenterComponentReflection::class)) {
-	class_alias(ComponentReflection::class, PresenterComponentReflection::class);
-}
diff --git a/tests/Bridges.DI/LatteExtension.2.phpt b/tests/Bridges.DI/LatteExtension.2.phpt
deleted file mode 100644
index 8144950b6..000000000
--- a/tests/Bridges.DI/LatteExtension.2.phpt
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Test: LatteExtension v2
- */
-
-declare(strict_types=1);
-
-use Nette\DI;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class LoremIpsumMacros extends Latte\Macros\MacroSet
-{
-	public static function install(Latte\Compiler $compiler)
-	{
-		$me = new static($compiler);
-		$me->addMacro('lorem', 'lorem');
-		Notes::add($me::class);
-	}
-}
-
-
-class IpsumLoremMacros extends Latte\Macros\MacroSet
-{
-	public static function install(Latte\Compiler $compiler)
-	{
-		$me = new static($compiler);
-		$me->addMacro('ipsum', 'ipsum');
-		Notes::add($me::class);
-	}
-}
-
-
-class FooMacros extends Latte\Macros\MacroSet
-{
-	public static function install(Latte\Compiler $compiler)
-	{
-		$me = new static($compiler);
-		$me->addMacro('foo', 'foo');
-		Notes::add($me::class);
-	}
-}
-
-
-class NonStaticMacrosFactory
-{
-	private string $parameter;
-
-
-	public function __construct($parameter)
-	{
-		$this->parameter = $parameter;
-	}
-
-
-	public function install(Latte\Compiler $compiler)
-	{
-		$macros = new Latte\Macros\MacroSet($compiler);
-		$macros->addMacro('foo', 'foo ' . $this->parameter);
-		Notes::add(static::class . '::install');
-	}
-
-
-	public function create(Latte\Compiler $compiler)
-	{
-		$macros = new Latte\Macros\MacroSet($compiler);
-		$macros->addMacro('foo2', 'foo ' . $this->parameter);
-		Notes::add(static::class . '::create');
-	}
-}
-
-
-class AnotherExtension extends Nette\DI\CompilerExtension
-{
-	public function beforeCompile()
-	{
-		foreach ($this->compiler->getExtensions(Nette\Bridges\ApplicationDI\LatteExtension::class) as $extension) {
-			$extension->addMacro('FooMacros::install');
-		}
-	}
-}
-
-
-$loader = new DI\Config\Loader;
-$config = $loader->load(Tester\FileMock::create('
-latte:
-	macros:
-		- LoremIpsumMacros
-		- IpsumLoremMacros::install
-		- @macroFactory
-		- @macroFactory::create
-
-services:
-	macroFactory: NonStaticMacrosFactory(foo)
-', 'neon'));
-
-$compiler = new DI\Compiler;
-$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension('', false));
-$compiler->addExtension('another', new AnotherExtension);
-$code = $compiler->addConfig($config)->compile();
-eval($code);
-
-$container = new Container;
-
-
-Assert::type(Nette\Bridges\ApplicationLatte\LatteFactory::class, $container->getService('nette.latteFactory'));
-$container->getService('nette.latteFactory')->create()->setLoader(new Latte\Loaders\StringLoader)->compile('');
-
-Assert::same([
-	'LoremIpsumMacros',
-	'IpsumLoremMacros',
-	'NonStaticMacrosFactory::install',
-	'NonStaticMacrosFactory::create',
-	'FooMacros',
-], Notes::fetch());
diff --git a/tests/Bridges.DI/LatteExtension.basic.phpt b/tests/Bridges.DI/LatteExtension.basic.phpt
index 1ee2f1416..a3a13d48f 100644
--- a/tests/Bridges.DI/LatteExtension.basic.phpt
+++ b/tests/Bridges.DI/LatteExtension.basic.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class MyExtension extends Latte\Extension
 {
@@ -66,6 +62,8 @@ $extensions = Assert::with($latte, fn() => $this->extensions);
 Assert::equal([
 	new Latte\Essential\CoreExtension,
 	new Latte\Sandbox\SandboxExtension,
+	new Nette\Bridges\ApplicationLatte\UIExtension(null),
+	new Nette\Bridges\FormsLatte\FormsExtension,
 	new MyExtension,
 	new MyExtension(1),
 	new MyExtension(2),
diff --git a/tests/Bridges.DI/LatteExtension.variables.phpt b/tests/Bridges.DI/LatteExtension.variables.phpt
new file mode 100644
index 000000000..c7051e5d8
--- /dev/null
+++ b/tests/Bridges.DI/LatteExtension.variables.phpt
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Test: LatteExtension v3
+ */
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+Tester\Environment::bypassFinals();
+
+
+test('no variables', function () {
+	$loader = new DI\Config\Loader;
+	$config = $loader->load(Tester\FileMock::create('
+	latte:
+		variables:
+	', 'neon'));
+
+	$compiler = new DI\Compiler;
+	$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension('', false));
+	$code = $compiler
+		->addConfig($config)
+		->setClassName('Container1')
+		->compile();
+	eval($code);
+
+	$container = new Container1;
+	$latteFactory = $container->getService('latte.templateFactory');
+	$presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
+	$presenter->shouldReceive('getHttpResponse')->andReturn(Mockery::mock(Nette\Http\IResponse::class)->shouldIgnoreMissing());
+	$presenter->shouldIgnoreMissing();
+
+	$template = $latteFactory->createTemplate($presenter);
+	Assert::notContains('config', $template->getParameters());
+});
+
+
+test('presenter presence', function () {
+	$loader = new DI\Config\Loader;
+	$config = $loader->load(Tester\FileMock::create('
+	latte:
+		variables:
+			foo: bar
+	', 'neon'));
+
+	$compiler = new DI\Compiler;
+	$compiler->addExtension('latte', new Nette\Bridges\ApplicationDI\LatteExtension('', false));
+	$code = $compiler
+		->addConfig($config)
+		->setClassName('Container2')
+		->compile();
+	eval($code);
+
+	$container = new Container2;
+	$latteFactory = $container->getService('latte.templateFactory');
+	$template = $latteFactory->createTemplate();
+	Assert::notContains('config', $template->getParameters());
+
+
+	$presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
+	$presenter->shouldReceive('getHttpResponse')->andReturn(Mockery::mock(Nette\Http\IResponse::class)->shouldIgnoreMissing());
+	$presenter->shouldIgnoreMissing();
+
+	$template = $latteFactory->createTemplate($presenter);
+	Assert::equal(
+		(object) ['foo' => 'bar'],
+		$template->getParameters()['config'],
+	);
+});
diff --git a/tests/Bridges.DI/RoutingExtension.basic.phpt b/tests/Bridges.DI/RoutingExtension.basic.phpt
index a8e13d1a6..0b6f57a72 100644
--- a/tests/Bridges.DI/RoutingExtension.basic.phpt
+++ b/tests/Bridges.DI/RoutingExtension.basic.phpt
@@ -31,9 +31,10 @@ test('', function () {
 	$container = new Container1;
 	$router = $container->getService('router');
 	Assert::type(Nette\Application\Routers\RouteList::class, $router);
-	Assert::same('index.php', $router[0]->getMask());
-	Assert::same('item/<id>', $router[1]->getMask());
+	$routes = $router->getRouters();
+	Assert::same('index.php', $routes[0]->getMask());
+	Assert::same('item/<id>', $routes[1]->getMask());
 
 	Assert::type(Nette\Application\Routers\RouteList::class, $router);
-	Assert::type(Nette\Application\Routers\Route::class, $router[0]);
+	Assert::type(Nette\Application\Routers\Route::class, $routes[0]);
 });
diff --git a/tests/Bridges.Latte2/Template.getParentName().phpt b/tests/Bridges.Latte2/Template.getParentName().phpt
deleted file mode 100644
index 1253c4a4e..000000000
--- a/tests/Bridges.Latte2/Template.getParentName().phpt
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-$presenter = Mockery::mock(Nette\Application\UI\Presenter::class)
-	->shouldReceive('findLayoutTemplateFile')->andReturn('layout.latte')
-	->mock();
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-$latte->addProvider('uiControl', $presenter);
-UIMacros::install($latte->getCompiler());
-
-$template = $latte->createTemplate('');
-$template->prepare();
-Assert::null($template->getParentName());
-
-$template = $latte->createTemplate('{block}...{/block}');
-$template->prepare();
-Assert::null($template->getParentName());
-
-$template = $latte->createTemplate('{block name}...{/block}');
-$template->prepare();
-Assert::same('layout.latte', $template->getParentName());
-
-$template = $latte->createTemplate('{extends "file.latte"} {block name}...{/block}');
-$template->prepare();
-Assert::same('file.latte', $template->getParentName());
-
-$template = $latte->createTemplate('{extends "file.latte"}');
-$template->prepare();
-Assert::same('file.latte', $template->getParentName());
-
-$template = $latte->createTemplate(
-	'{extends $file} {block name}...{/block}',
-	['file' => 'file.latte'],
-);
-$template->prepare();
-Assert::same('file.latte', $template->getParentName());
-
-$template = $latte->createTemplate('{extends none}');
-$template->prepare();
-Assert::null($template->getParentName());
-
-$latte->addProvider('uiPresenter', $presenter);
-$template = $latte->createTemplate('{extends auto}');
-$template->prepare();
-Assert::same('layout.latte', $template->getParentName());
diff --git a/tests/Bridges.Latte2/TemplateFactory.customTemplate.phpt b/tests/Bridges.Latte2/TemplateFactory.customTemplate.phpt
deleted file mode 100644
index 011d5b52f..000000000
--- a/tests/Bridges.Latte2/TemplateFactory.customTemplate.phpt
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory custom template
- */
-
-declare(strict_types=1);
-
-use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte\LatteFactory;
-use Nette\Bridges\ApplicationLatte\Template;
-use Nette\Bridges\ApplicationLatte\TemplateFactory;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-Tester\Environment::bypassFinals();
-
-
-class TemplateMock extends Template
-{
-	private $file = 'ko';
-
-
-	public function render(?string $file = null, array $params = []): void
-	{
-		echo strrev($this->file);
-	}
-
-
-	public function setFile(string $file): static
-	{
-		$this->file = $file;
-		return $this;
-	}
-
-
-	public function getFile(): string
-	{
-		return $this->file;
-	}
-}
-
-
-test('', function () {
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn(new Latte\Engine);
-	$factory = new TemplateFactory($latteFactory);
-	Assert::type(Template::class, $factory->createTemplate());
-});
-
-Assert::exception(function () {
-	$factory = new TemplateFactory(Mockery::mock(LatteFactory::class), null, null, null, stdClass::class);
-}, Nette\InvalidArgumentException::class, 'Class stdClass does not implement Nette\Bridges\ApplicationLatte\Template or it does not exist.');
-
-
-test('', function () {
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn(new Latte\Engine);
-	$factory = new TemplateFactory($latteFactory, null, null, null, TemplateMock::class);
-	$template = $factory->createTemplate();
-	Assert::type(TemplateMock::class, $template);
-	Assert::type(UI\Template::class, $template);
-	ob_start();
-	$template->render();
-	Assert::same('ok', ob_get_clean());
-	$template->setFile('bla');
-	ob_start();
-	$template->render();
-	Assert::same('alb', ob_get_clean());
-});
diff --git a/tests/Bridges.Latte2/TemplateFactory.nonce.control.phpt b/tests/Bridges.Latte2/TemplateFactory.nonce.control.phpt
deleted file mode 100644
index 850629b36..000000000
--- a/tests/Bridges.Latte2/TemplateFactory.nonce.control.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory nonce
- */
-
-declare(strict_types=1);
-
-use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
-$response = Mockery::mock(Nette\Http\IResponse::class);
-$response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
-
-$control = Mockery::mock(UI\Control::class);
-$control->shouldReceive('getPresenter')->andReturn(null);
-$control->shouldIgnoreMissing();
-
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($control);
-
-$latte->setLoader(new Latte\Loaders\StringLoader);
-
-Assert::match(
-	'<script></script>',
-	$latte->renderToString('<script n:nonce></script>'),
-);
diff --git a/tests/Bridges.Latte2/TemplateFactory.nonce.presenter.phpt b/tests/Bridges.Latte2/TemplateFactory.nonce.presenter.phpt
deleted file mode 100644
index 1ef2df0e8..000000000
--- a/tests/Bridges.Latte2/TemplateFactory.nonce.presenter.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory nonce
- */
-
-declare(strict_types=1);
-
-use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-Tester\Environment::bypassFinals();
-
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
-$response = Mockery::mock(Nette\Http\IResponse::class);
-$response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
-
-$presenter = Mockery::mock(UI\Presenter::class);
-$presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
-$presenter->shouldReceive('getHttpResponse')->andReturn($response);
-$presenter->shouldIgnoreMissing();
-
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
-$latte->setLoader(new Latte\Loaders\StringLoader);
-
-Assert::match(
-	'<script nonce="abcd123=="></script>',
-	$latte->renderToString('<script n:nonce></script>'),
-);
diff --git a/tests/Bridges.Latte2/TemplateFactory.onCompile.phpt b/tests/Bridges.Latte2/TemplateFactory.onCompile.phpt
deleted file mode 100644
index b60ebd8e1..000000000
--- a/tests/Bridges.Latte2/TemplateFactory.onCompile.phpt
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory in Bridge properly handles Latte::onCompile
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\LatteFactory;
-use Nette\Bridges\ApplicationLatte\TemplateFactory;
-use Nette\Http;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-test('', function () {
-	$engine = new Latte\Engine;
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn($engine);
-	$factory = new TemplateFactory($latteFactory, new Http\Request(new Http\UrlScript('http://nette.org')));
-	$engine->onCompile[] = $callback = function () {};
-
-	$factory->createTemplate();
-
-	Assert::type('array', $engine->onCompile);
-	Assert::type(Closure::class, $engine->onCompile[0]); // prepended by TemplateFactory
-	Assert::same($callback, $engine->onCompile[1]); // our callback
-});
-
-
-test('', function () {
-	$engine = new Latte\Engine;
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn($engine);
-	$factory = new TemplateFactory($latteFactory, new Http\Request(new Http\UrlScript('http://nette.org')));
-	$engine->onCompile = new ArrayIterator([$callback = function () {}]);
-
-	$factory->createTemplate();
-
-	Assert::type('array', $engine->onCompile);
-	Assert::type(Closure::class, $engine->onCompile[0]); // prepended by TemplateFactory
-	Assert::same($callback, $engine->onCompile[1]); // our callback
-});
-
-
-test('', function () {
-	class Event implements IteratorAggregate
-	{
-		public $events;
-
-
-		public function __construct($events)
-		{
-			$this->events = $events;
-		}
-
-
-		public function getIterator(): ArrayIterator
-		{
-			return new ArrayIterator($this->events);
-		}
-	}
-
-	$engine = new Latte\Engine;
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn($engine);
-	$factory = new TemplateFactory($latteFactory, new Http\Request(new Http\UrlScript('http://nette.org')));
-	$engine->onCompile = new Event([$callback = function () {}]);
-
-	$factory->createTemplate();
-
-	Assert::type('array', $engine->onCompile);
-	Assert::type(Closure::class, $engine->onCompile[0]); // prepended by TemplateFactory
-	Assert::same($callback, $engine->onCompile[1]); // our callback
-});
diff --git a/tests/Bridges.Latte2/TemplateFactory.onCreate.phpt b/tests/Bridges.Latte2/TemplateFactory.onCreate.phpt
deleted file mode 100644
index 8f86ef42d..000000000
--- a/tests/Bridges.Latte2/TemplateFactory.onCreate.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory in Bridge properly handles TemplateFactory::onCreate
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\LatteFactory;
-use Nette\Bridges\ApplicationLatte\Template;
-use Nette\Bridges\ApplicationLatte\TemplateFactory;
-use Nette\Http;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-test('', function () {
-	$engine = new Latte\Engine;
-	$latteFactory = Mockery::mock(LatteFactory::class);
-	$latteFactory->shouldReceive('create')->andReturn($engine);
-	$factory = new TemplateFactory($latteFactory, new Http\Request(new Http\UrlScript('http://nette.org')));
-	$factory->onCreate[] = $callback = function (Template $template) {
-		$template->add('foo', 'bar');
-	};
-
-	$template = $factory->createTemplate();
-
-	Assert::type('array', $factory->onCreate);
-	Assert::same($callback, $factory->onCreate[0]); // our callback
-	Assert::equal('bar', $template->foo);
-});
diff --git a/tests/Bridges.Latte2/UIMacros.control.2.phpt b/tests/Bridges.Latte2/UIMacros.control.2.phpt
deleted file mode 100644
index 9449e00e3..000000000
--- a/tests/Bridges.Latte2/UIMacros.control.2.phpt
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Test: {control ...}
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class MockComponent
-{
-	public function getComponent($name)
-	{
-		Notes::add(__METHOD__);
-		Notes::add(func_get_args());
-		return new MockControl;
-	}
-}
-
-
-class MockControl
-{
-	public function __call($name, $args)
-	{
-		Notes::add(__METHOD__);
-		Notes::add(func_get_args());
-	}
-}
-
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-UIMacros::install($latte->getCompiler());
-
-$latte->addProvider('uiControl', new MockComponent);
-$params['form'] = new MockControl;
-$params['name'] = 'form';
-
-$latte->renderToString('
-{control \'name\'}
-
-{control form}
-
-{control form:test}
-
-{control $form:test}
-
-{control $name:test}
-
-{control $name:$name}
-
-{control form var1}
-
-{control form var1, 1, 2}
-
-{control form var1 => 5, 1, 2}
-', $params);
-
-Assert::same([
-	'MockComponent::getComponent', ['name'],
-	'MockControl::__call', ['render', []],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['render', []],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['renderTest', []],
-	'MockControl::__call', ['renderTest', []],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['renderTest', []],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['renderform', []],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['render', ['var1']],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['render', ['var1', 1, 2]],
-	'MockComponent::getComponent', ['form'],
-	'MockControl::__call', ['render', [['var1' => 5, 0 => 1, 1 => 2]]],
-], Notes::fetch());
diff --git a/tests/Bridges.Latte2/UIMacros.control.3.phpt b/tests/Bridges.Latte2/UIMacros.control.3.phpt
deleted file mode 100644
index f5d6e23d2..000000000
--- a/tests/Bridges.Latte2/UIMacros.control.3.phpt
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Test: {control ...}
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-UIMacros::install($latte->getCompiler());
-$latte->addProvider('uiControl', new class {
-	public function render()
-	{
-		echo '<>&amp;';
-	}
-
-
-	public function __call($name, $args)
-	{
-		return new self;
-	}
-});
-
-Assert::exception(function () use ($latte) {
-	$latte->renderToString('<div {control x}');
-}, Latte\RuntimeException::class, 'Filters: unable to convert content type HTML to HTMLTAG');
-
-Assert::same(
-	'<div <>&amp;',
-	$latte->renderToString('<div {control x|noescape}'),
-);
-
-Assert::same(
-	'<div title="&lt;&gt;&amp;">',
-	$latte->renderToString('<div title="{control x}">'),
-);
-
-Assert::exception(function () use ($latte) {
-	$latte->renderToString('<style> {control x} </style>');
-}, Latte\RuntimeException::class, 'Filters: unable to convert content type HTML to HTMLCSS');
diff --git a/tests/Bridges.Latte2/UIMacros.control.phpt b/tests/Bridges.Latte2/UIMacros.control.phpt
deleted file mode 100644
index 559895322..000000000
--- a/tests/Bridges.Latte2/UIMacros.control.phpt
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros: {control ...}
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-UIMacros::install($latte->getCompiler());
-
-// {control ...}
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->render();%A%',
-	$latte->compile('{control form}'),
-);
-
-@Assert::match(
-	<<<'XX'
-		%A%
-				/* line 1 */ $_tmp = $this->global->uiControl->getComponent("form");
-				if ($_tmp instanceof Nette\Application\UI\Renderable) $_tmp->redrawControl(null, false);
-				ob_start(fn() => null);
-				$_tmp->render();
-				$ʟ_fi = new LR\FilterInfo('html');
-				echo $this->filters->filterContent('filter', $ʟ_fi, ob_get_clean());
-		%A%
-		XX,
-	$latte->compile('{control form|filter}'),
-); // @deprecated
-
-Assert::match(
-	<<<'XX'
-		%A%
-				/* line 1 */ if (is_object($form)) $_tmp = $form;
-				else $_tmp = $this->global->uiControl->getComponent($form);
-				if ($_tmp instanceof Nette\Application\UI\Renderable) $_tmp->redrawControl(null, false);
-				$_tmp->render();
-		%A%
-		XX,
-	$latte->compile('{control $form}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->renderType();%A%',
-	$latte->compile('{control form:type}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->{"render$type"}();%A%',
-	$latte->compile('{control form:$type}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->renderType(\'param\');%A%',
-	$latte->compile('{control form:type param}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->render(array_merge([], $params, []));%A%',
-	$latte->compile('{control form (expand) $params}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->renderType([\'param\' => 123]);%A%',
-	$latte->compile('{control form:type param => 123}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->renderType([\'param\' => 123]);%A%',
-	$latte->compile('{control form:type, param => 123}'),
-);
-
-Assert::match(
-	'%A% $this->global->uiControl->getComponent("form");%A%->renderType(param: 123);%A%',
-	$latte->compile('{control form:type, param: 123}'),
-);
diff --git a/tests/Bridges.Latte2/UIMacros.isLinkCurrent.phpt b/tests/Bridges.Latte2/UIMacros.isLinkCurrent.phpt
deleted file mode 100644
index 579a8fd4b..000000000
--- a/tests/Bridges.Latte2/UIMacros.isLinkCurrent.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Test: isLinkCurrent()
- */
-
-declare(strict_types=1);
-
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-Tester\Environment::bypassFinals();
-
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(Nette\Bridges\ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
-$presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
-$presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
-$presenter->shouldReceive('getHttpResponse')->andReturn((Mockery::mock(Nette\Http\IResponse::class))->shouldIgnoreMissing());
-$presenter->shouldIgnoreMissing();
-
-$factory = new Nette\Bridges\ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
-$latte->setLoader(new Latte\Loaders\StringLoader);
-
-Assert::matchFile(
-	__DIR__ . '/expected/UIMacros.isLinkCurrent.php',
-	$latte->compile(
-		<<<'XX'
-			<a n:href="default" n:class="$presenter->isLinkCurrent() ? current">n:href before n:class</a>
-
-			<a n:class="$presenter->isLinkCurrent() ? current" n:href="default">n:href after n:class</a>
-
-			<a href="{link default}" n:class="$presenter->isLinkCurrent() ? current">href before n:class</a>
-
-			<a n:class="$presenter->isLinkCurrent() ? current" href="{link default}">href after n:class</a>
-
-			{ifCurrent}empty{/ifCurrent}
-
-			{ifCurrent default}default{/ifCurrent}
-
-			<a n:class="isLinkCurrent(default) ? current" n:href="default">custom function</a>
-
-			XX,
-	),
-);
diff --git a/tests/Bridges.Latte2/UIMacros.link.2.phpt b/tests/Bridges.Latte2/UIMacros.link.2.phpt
deleted file mode 100644
index 83a441c31..000000000
--- a/tests/Bridges.Latte2/UIMacros.link.2.phpt
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Test: {link ...}, {plink ...}
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class MockControl
-{
-	public function link($destination, $args = [])
-	{
-		if (!is_array($args)) {
-			$args = array_slice(func_get_args(), 1);
-		}
-
-		array_unshift($args, $destination);
-		return 'link:' . strtr(json_encode($args), '"', "'");
-	}
-}
-
-
-class MockPresenter extends MockControl
-{
-	public function link($destination, $args = [])
-	{
-		if (!is_array($args)) {
-			$args = array_slice(func_get_args(), 1);
-		}
-
-		array_unshift($args, $destination);
-		return 'plink:' . strtr(json_encode($args), '"', "'");
-	}
-
-
-	public function isAjax()
-	{
-		return false;
-	}
-}
-
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-UIMacros::install($latte->getCompiler());
-
-$latte->addProvider('uiControl', new MockControl);
-$latte->addProvider('uiPresenter', new MockPresenter);
-$params['action'] = 'login';
-$params['arr'] = ['link' => 'login', 'param' => 123];
-
-Assert::match(<<<'EOD'
-	plink:['Homepage:']
-
-	plink:['Homepage:']
-
-	plink:['Homepage:action']
-
-	plink:['Homepage:action']
-
-	plink:['Homepage:action',10,20,'{one}&amp;two']
-
-	plink:['Homepage:action#hash',10,20,'{one}&amp;two']
-
-	plink:['#hash']
-
-	plink:[':',10]
-
-	plink:{'0':'default','1':10,'a':20,'b':30}
-
-	link:['login']
-
-	<a href="plink:['login',123]"></a>
-
-	<a href="link:{'0':'default!','1':10,'a':20,'b':30}"></a>
-
-	<a href="link:['Homepage:']"></a>
-
-	<a href="link:{'0':'default!','1':10,'a':20,'b':30}"></a>
-
-	<a href="link:['default!#hash',10,20]"></a>
-	EOD, strtr($latte->renderToString(<<<'EOD'
-	{plink Homepage:}
-
-	{plink  Homepage: }
-
-	{plink Homepage:action }
-
-	{plink 'Homepage:action' }
-
-	{plink Homepage:action 10, 20, '{one}&two'}
-
-	{plink Homepage:action#hash 10, 20, '{one}&two'}
-
-	{plink #hash}
-
-	{plink : 10 }
-
-	{plink default 10, 'a' => 20, 'b' => 30}
-
-	{link  $action}
-
-	<a href="{plink $arr['link'], $arr['param']}"></a>
-
-	<a href="{link default! 10, 'a' => 20, 'b' => 30}"></a>
-
-	<a n:href="Homepage:"></a>
-
-	<a n:href="default! 10, 'a' => 20, 'b' => 30"></a>
-
-	<a n:href="default!#hash 10, 20"></a>
-	EOD, $params), ['&#039;' => "'", '&apos;' => "'", '&#123;' => '{']));
diff --git a/tests/Bridges.Latte2/UIMacros.link.phpt b/tests/Bridges.Latte2/UIMacros.link.phpt
deleted file mode 100644
index 52fda3fb0..000000000
--- a/tests/Bridges.Latte2/UIMacros.link.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros: {link ...}
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-$latte = new Latte\Engine;
-$latte->setLoader(new Latte\Loaders\StringLoader);
-UIMacros::install($latte->getCompiler());
-
-// {link ...}
-Assert::contains(
-	'$this->global->uiControl->link("p")',
-	$latte->compile('{link p}'),
-);
-Assert::contains(
-	'($this->filters->filter)($this->global->uiControl->link("p"))',
-	$latte->compile('{link p|filter}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link("p:a")',
-	$latte->compile('{link p:a}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link($dest)',
-	$latte->compile('{link $dest}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link($p:$a)',
-	$latte->compile('{link $p:$a}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link("$p:$a")',
-	$latte->compile('{link "$p:$a"}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link("p:a")',
-	$latte->compile('{link "p:a"}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link(\'p:a\')',
-	$latte->compile('{link \'p:a\'}'),
-);
-
-Assert::contains(
-	'$this->global->uiControl->link("p", [\'param\'])',
-	$latte->compile('{link p param}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link("p", [\'param\' => 123])',
-	$latte->compile('{link p param => 123}'),
-);
-Assert::contains(
-	'$this->global->uiControl->link("p", [\'param\' => 123])',
-	$latte->compile('{link p, param => 123}'),
-);
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets.phpt
deleted file mode 100644
index 71c354140..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets.phpt
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros and renderSnippets.
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class InnerControl extends Nette\Application\UI\Control
-{
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
-		$params['say'] = 'Hello';
-		$latte->render(__DIR__ . '/templates/snippet-included.latte', $params);
-	}
-}
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function createComponentMulti()
-	{
-		return new Nette\Application\UI\Multiplier(function () {
-			$control = new InnerControl;
-			$control->redrawControl();
-			return $control;
-		});
-	}
-
-
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
-		$latte->render(__DIR__ . '/templates/snippet-include.latte');
-	}
-}
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl();
-$presenter['multi-1']->redrawControl();
-$presenter->render();
-Assert::same([
-	'snippets' => [
-		'snippet--hello' => 'Hello',
-		'snippet--include' => "<p>Included file #3 (A, B)</p>\n",
-		'snippet--array-1' => 'Value 1',
-		'snippet--array-2' => 'Value 2',
-		'snippet--array-3' => 'Value 3',
-		'snippet--array2-1' => 'Value 1',
-		'snippet--array2-2' => 'Value 2',
-		'snippet--array2-3' => 'Value 3',
-		'snippet--includeSay' => 'Hello include snippet',
-		'snippet--nested1' => "\t<div id=\"snippet--nested2\">Foo</div>\n",
-		'snippet-multi-1-includeSay' => 'Hello',
-	],
-], (array) $presenter->payload);
-
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('hello');
-$presenter->redrawControl('array');
-$presenter->render();
-
-Assert::same([
-	'snippets' => [
-		'snippet--hello' => 'Hello',
-		'snippet--array-1' => 'Value 1',
-		'snippet--array-2' => 'Value 2',
-		'snippet--array-3' => 'Value 3',
-	],
-], (array) $presenter->payload);
-
-$presenter = new TestPresenter;
-ob_start();
-$presenter->render();
-$content = ob_get_clean();
-Assert::matchFile(__DIR__ . '/expected/UIMacros.renderSnippets.html', $content);
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets2.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets2.phpt
deleted file mode 100644
index 58a72d170..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets2.phpt
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros, renderSnippets and control with two templates.
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\SnippetBridge;
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class InnerControl extends Nette\Application\UI\Control
-{
-	public function render()
-	{
-		$this->renderA();
-		$this->renderB();
-	}
-
-
-	public function renderA()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$params['say'] = 'Hello';
-		$latte->render('{snippet testA}{$say}{/snippet}', $params);
-	}
-
-
-	public function renderB()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$params['say'] = 'world';
-		$latte->render('{snippet testB}{$say}{/snippet}', $params);
-	}
-}
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function createComponentMulti()
-	{
-		return new Nette\Application\UI\Multiplier(fn() => new InnerControl);
-	}
-
-
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$latte->render('');
-	}
-}
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter['multi-1']->redrawControl();
-$presenter->render();
-Assert::same([
-	'snippets' => [
-		'snippet-multi-1-testA' => 'Hello',
-		'snippet-multi-1-testB' => 'world',
-	],
-], (array) $presenter->payload);
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets3.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets3.phpt
deleted file mode 100644
index 3dc72672b..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets3.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros, renderSnippets and control wrapped in a snippet
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class TestControl extends Nette\Application\UI\Control
-{
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiPresenter', $this->getPresenter());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
-		$latte->render('{snippet foo}hello{/snippet}');
-	}
-}
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function createComponentTest()
-	{
-		return new TestControl;
-	}
-
-
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
-		$latte->render('{snippet foo}{control test}{/snippet}');
-	}
-}
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('foo');
-$presenter['test']->redrawControl('foo');
-$presenter->render();
-Assert::same([
-	'snippets' => [
-		'snippet--foo' => '<div id="snippet-test-foo">hello</div>',
-	],
-], (array) $presenter->payload);
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter['test']->redrawControl('foo');
-$presenter->render();
-Assert::same([
-	'snippets' => [
-		'snippet-test-foo' => 'hello',
-	],
-], (array) $presenter->payload);
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets4.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets4.phpt
deleted file mode 100644
index 917404369..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets4.phpt
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros, renderSnippets and template rendered from another template
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\SnippetBridge;
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function render()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$latte->render('{snippet foo}{php $presenter->renderFoo()}{/snippet}', ['presenter' => $this]);
-	}
-
-
-	public function renderFoo()
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$latte->render('Hello');
-	}
-}
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('foo');
-$presenter->render();
-Assert::same([
-	'snippets' => [
-		'snippet--foo' => 'Hello',
-	],
-], (array) $presenter->payload);
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets5.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets5.phpt
deleted file mode 100644
index a915657fe..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets5.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros, n:snippet
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\SnippetBridge;
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function render(string $template)
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('uiControl', $this);
-		$latte->addProvider('snippetBridge', new SnippetBridge($this));
-		$latte->render($template, ['presenter' => $this]);
-	}
-}
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('foo');
-$presenter->render('<div n:snippet=foo>Hello</div>');
-Assert::same([
-	'snippets' => [
-		'snippet--foo' => 'Hello',
-	],
-], (array) $presenter->payload);
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('foo');
-Assert::exception(function () use ($presenter) {
-	$presenter->render('<div id="x" n:snippet=foo>Hello</div>');
-}, Latte\CompileException::class, 'Cannot combine HTML attribute id with n:snippet.');
-
-
-$presenter = new TestPresenter;
-$presenter->snippetMode = true;
-$presenter->redrawControl('foo');
-Assert::exception(function () use ($presenter) {
-	$presenter->render('<div n:snippet="foo"><div id="x" n:snippet="$foo">Hello</div></div>');
-}, Latte\CompileException::class, 'Cannot combine HTML attribute id with n:snippet.');
diff --git a/tests/Bridges.Latte2/UIMacros.renderSnippets6.phpt b/tests/Bridges.Latte2/UIMacros.renderSnippets6.phpt
deleted file mode 100644
index dc4e32a25..000000000
--- a/tests/Bridges.Latte2/UIMacros.renderSnippets6.phpt
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Test: UIMacros and n:snippet and custom HTML attribute.
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\UIMacros;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class TestPresenter extends Nette\Application\UI\Presenter
-{
-	public function render(string $template)
-	{
-		$latte = new Latte\Engine;
-		$latte->setLoader(new Latte\Loaders\StringLoader);
-		UIMacros::install($latte->getCompiler());
-		$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($this));
-		$latte->onCompile[] = function ($latte) {
-			$latte->getCompiler()->getMacros()['snippet'][0]->snippetAttribute = 'data-snippet';
-		};
-		$latte->render($template);
-	}
-}
-
-
-$presenter = new TestPresenter;
-ob_start();
-$presenter->render('<div n:snippet=test>hello</div>');
-$content = ob_get_clean();
-Assert::same('<div data-snippet="snippet--test">hello</div>', $content);
-
-
-$presenter = new TestPresenter;
-Assert::exception(function () use ($presenter) {
-	$presenter->render('<div n:snippet=test data-snippet>hello</div>');
-}, Latte\CompileException::class, 'Cannot combine HTML attribute data-snippet with n:snippet.');
diff --git a/tests/Bridges.Latte2/expected/UIMacros.isLinkCurrent.php b/tests/Bridges.Latte2/expected/UIMacros.isLinkCurrent.php
deleted file mode 100644
index 15ef390af..000000000
--- a/tests/Bridges.Latte2/expected/UIMacros.isLinkCurrent.php
+++ /dev/null
@@ -1,22 +0,0 @@
-%A%<a href="%A%"%A%>n:href before n:class</a>
-
-<a href="%A%"%A%>n:href after n:class</a>
-
-<a href="%A%"%A%>href before n:class</a>
-
-<a href="%A%"%A%>href after n:class</a>
-
-';
-		if ($this->global->uiPresenter->getLastCreatedRequestFlag("current")) {
-			echo 'empty';
-		}
-		echo '
-
-';
-		if ($this->global->uiPresenter->isLinkCurrent("default")) {
-			echo 'default';
-		}
-		echo '
-
-<a href="%A%"%A%($this->global->fn->isLinkCurrent)('default') ? 'current' : null%A%>custom function</a>
-%A%
diff --git a/tests/Bridges.Latte2/expected/UIMacros.renderSnippets.html b/tests/Bridges.Latte2/expected/UIMacros.renderSnippets.html
deleted file mode 100644
index 3ff3683ed..000000000
--- a/tests/Bridges.Latte2/expected/UIMacros.renderSnippets.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="snippet--hello">Hello</div> world!
-
-<div id="snippet--include"><p>Included file #3 (A, B)</p>
-</div>
-
-<div id="snippet--array">		<div id="snippet--array-1">Value 1</div>
-		<div id="snippet--array-2">Value 2</div>
-		<div id="snippet--array-3">Value 3</div>
-</div>
-
-		<div id="snippet--array2-1">Value 1</div>
-		<div id="snippet--array2-2">Value 2</div>
-		<div id="snippet--array2-3">Value 3</div>
-
-
-<div id="snippet--includeSay">Hello include snippet</div>
-
-
-<div id="snippet--nested1">	<div id="snippet--nested2">Foo</div>
-</div>
diff --git a/tests/Bridges.Latte2/templates/include3.latte b/tests/Bridges.Latte2/templates/include3.latte
deleted file mode 100644
index 14caf4cb4..000000000
--- a/tests/Bridges.Latte2/templates/include3.latte
+++ /dev/null
@@ -1 +0,0 @@
-<p>Included file #3 ({$localvar}, {$hello})</p>
diff --git a/tests/Bridges.Latte2/templates/snippet-include.latte b/tests/Bridges.Latte2/templates/snippet-include.latte
deleted file mode 100644
index 8a1ec964d..000000000
--- a/tests/Bridges.Latte2/templates/snippet-include.latte
+++ /dev/null
@@ -1,25 +0,0 @@
-{snippet hello}Hello{/snippet} world!
-
-{snippet include}
-	{include include3.latte localvar => 'A', hello => 'B'}
-{/snippet}
-
-{snippet array}
-	{foreach [1, 2, 3] as $id}
-		{snippet "array-$id"}Value {$id}{/snippet}
-	{/foreach}
-{/snippet}
-
-{snippetArea array2}
-	{foreach [1, 2, 3] as $id}
-		{snippet "array2-$id"}Value {$id}{/snippet}
-	{/foreach}
-{/snippetArea}
-
-{snippetArea foo}
-	{include snippet-included.latte say => 'Hello include snippet'}
-{/snippetArea}
-
-{snippet nested1}
-	{snippet nested2}Foo{/snippet}
-{/snippet}
diff --git a/tests/Bridges.Latte2/templates/snippet-included.latte b/tests/Bridges.Latte2/templates/snippet-included.latte
deleted file mode 100644
index a392b6227..000000000
--- a/tests/Bridges.Latte2/templates/snippet-included.latte
+++ /dev/null
@@ -1 +0,0 @@
-{snippet includeSay}{$say}{/snippet}
diff --git a/tests/Bridges.Latte3/Template.getParentName().phpt b/tests/Bridges.Latte3/Template.getParentName().phpt
index b354ad1ee..e63f523eb 100644
--- a/tests/Bridges.Latte3/Template.getParentName().phpt
+++ b/tests/Bridges.Latte3/Template.getParentName().phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 Tester\Environment::bypassFinals();
 
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class)
diff --git a/tests/Bridges.Latte3/TemplateFactory.customTemplate.phpt b/tests/Bridges.Latte3/TemplateFactory.customTemplate.phpt
index 976f99b78..a76c9d50e 100644
--- a/tests/Bridges.Latte3/TemplateFactory.customTemplate.phpt
+++ b/tests/Bridges.Latte3/TemplateFactory.customTemplate.phpt
@@ -14,10 +14,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 Tester\Environment::bypassFinals();
 
 
diff --git a/tests/Bridges.Latte3/TemplateFactory.filters.phpt b/tests/Bridges.Latte3/TemplateFactory.filters.phpt
deleted file mode 100644
index 27d45ba94..000000000
--- a/tests/Bridges.Latte3/TemplateFactory.filters.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Test: TemplateFactory filters
- */
-
-declare(strict_types=1);
-
-use Nette\Bridges\ApplicationLatte\TemplateFactory;
-use Tester\Assert;
-
-require __DIR__ . '/../bootstrap.php';
-
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
-
-class LatteFactory implements Nette\Bridges\ApplicationLatte\LatteFactory
-{
-	private $engine;
-
-
-	public function __construct(Latte\Engine $engine)
-	{
-		$this->engine = $engine;
-	}
-
-
-	public function create(): Latte\Engine
-	{
-		return $this->engine;
-	}
-}
-
-$factory = new TemplateFactory(new LatteFactory(new Latte\Engine));
-$latte = $factory->createTemplate()->getLatte();
-
-
-setlocale(LC_TIME, 'C');
-date_default_timezone_set('Europe/Prague');
-
-Assert::null($latte->invokeFilter('modifyDate', [null, null]));
-Assert::same('1978-01-24 11:40:00', (string) $latte->invokeFilter('modifyDate', [254_400_000, '+1 day']));
-Assert::same('1978-05-06 00:00:00', (string) $latte->invokeFilter('modifyDate', ['1978-05-05', '+1 day']));
-Assert::same('1978-05-06 00:00:00', (string) $latte->invokeFilter('modifyDate', [new DateTime('1978-05-05'), '1day']));
-Assert::same('1978-01-22 11:40:00', (string) $latte->invokeFilter('modifyDate', [254_400_000, -1, 'day']));
diff --git a/tests/Bridges.Latte3/TemplateFactory.onCreate.phpt b/tests/Bridges.Latte3/TemplateFactory.onCreate.phpt
index ed6e9b61c..987e86aea 100644
--- a/tests/Bridges.Latte3/TemplateFactory.onCreate.phpt
+++ b/tests/Bridges.Latte3/TemplateFactory.onCreate.phpt
@@ -14,10 +14,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 test('', function () {
 	$engine = new Latte\Engine;
diff --git a/tests/Bridges.Latte2/TemplateFactory.filters.phpt b/tests/Bridges.Latte3/UIExtension.filters.phpt
similarity index 54%
rename from tests/Bridges.Latte2/TemplateFactory.filters.phpt
rename to tests/Bridges.Latte3/UIExtension.filters.phpt
index 57e879543..0dc89f8cd 100644
--- a/tests/Bridges.Latte2/TemplateFactory.filters.phpt
+++ b/tests/Bridges.Latte3/UIExtension.filters.phpt
@@ -1,41 +1,18 @@
 <?php
 
 /**
- * Test: TemplateFactory filters
+ * Test: UIExtension filters
  */
 
 declare(strict_types=1);
 
-use Nette\Bridges\ApplicationLatte\TemplateFactory;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '>')) {
-	Tester\Environment::skip('Test for Latte 2');
-}
-
-
-class LatteFactory implements Nette\Bridges\ApplicationLatte\LatteFactory
-{
-	private $engine;
-
-
-	public function __construct(Latte\Engine $engine)
-	{
-		$this->engine = $engine;
-	}
-
-
-	public function create(): Latte\Engine
-	{
-		return $this->engine;
-	}
-}
-
-$factory = new TemplateFactory(new LatteFactory(new Latte\Engine));
-$latte = $factory->createTemplate()->getLatte();
 
+$latte = new Latte\Engine;
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension(null));
 
 setlocale(LC_TIME, 'C');
 date_default_timezone_set('Europe/Prague');
diff --git a/tests/Bridges.Latte3/TemplateFactory.nonce.control.phpt b/tests/Bridges.Latte3/UIExtension.nonce.control.phpt
similarity index 60%
rename from tests/Bridges.Latte3/TemplateFactory.nonce.control.phpt
rename to tests/Bridges.Latte3/UIExtension.nonce.control.phpt
index 2a7c94cb2..cf822c0ab 100644
--- a/tests/Bridges.Latte3/TemplateFactory.nonce.control.phpt
+++ b/tests/Bridges.Latte3/UIExtension.nonce.control.phpt
@@ -1,26 +1,16 @@
 <?php
 
 /**
- * Test: TemplateFactory nonce
+ * Test: UIExtension nonce
  */
 
 declare(strict_types=1);
 
 use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
@@ -28,10 +18,9 @@ $control = Mockery::mock(UI\Control::class);
 $control->shouldReceive('getPresenterIfExists')->andReturn(null);
 $control->shouldIgnoreMissing();
 
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($control);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($control));
 
 Assert::match(
 	'<script></script>',
diff --git a/tests/Bridges.Latte3/TemplateFactory.nonce.presenter.phpt b/tests/Bridges.Latte3/UIExtension.nonce.presenter.phpt
similarity index 65%
rename from tests/Bridges.Latte3/TemplateFactory.nonce.presenter.phpt
rename to tests/Bridges.Latte3/UIExtension.nonce.presenter.phpt
index 23297efce..15f0d212d 100644
--- a/tests/Bridges.Latte3/TemplateFactory.nonce.presenter.phpt
+++ b/tests/Bridges.Latte3/UIExtension.nonce.presenter.phpt
@@ -1,28 +1,18 @@
 <?php
 
 /**
- * Test: TemplateFactory nonce
+ * Test: UIExtension nonce
  */
 
 declare(strict_types=1);
 
 use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 Tester\Environment::bypassFinals();
 
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
@@ -31,10 +21,9 @@ $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn($response);
 $presenter->shouldIgnoreMissing();
 
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::match(
 	'<script nonce="abcd123=="></script>',
diff --git a/tests/Bridges.Latte3/expected/isLinkCurrent.php b/tests/Bridges.Latte3/expected/isLinkCurrent.php
index 3871205c8..a86390a52 100644
--- a/tests/Bridges.Latte3/expected/isLinkCurrent.php
+++ b/tests/Bridges.Latte3/expected/isLinkCurrent.php
@@ -26,7 +26,7 @@
 <a href="';
 		echo LR\Filters::escapeHtmlAttr($this->global->uiControl->link('default')) /* line 9 */;
 		echo '"';
-		echo ($ʟ_tmp = array_filter([($this->global->fn->isLinkCurrent)('default') ? 'current' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line 9 */;
+		echo ($ʟ_tmp = array_filter([($this->global->fn->isLinkCurrent)(%a%'default') ? 'current' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line 9 */;
 		echo '>custom function</a>
 ';
 %A%
diff --git a/tests/Bridges.Latte3/isLinkCurrent().phpt b/tests/Bridges.Latte3/isLinkCurrent().phpt
index b297db9bd..277027dc9 100644
--- a/tests/Bridges.Latte3/isLinkCurrent().phpt
+++ b/tests/Bridges.Latte3/isLinkCurrent().phpt
@@ -10,26 +10,16 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 Tester\Environment::bypassFinals();
 
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(Nette\Bridges\ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
 $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn((Mockery::mock(Nette\Http\IResponse::class))->shouldIgnoreMissing());
 $presenter->shouldIgnoreMissing();
 
-$factory = new Nette\Bridges\ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::matchFile(
 	__DIR__ . '/expected/isLinkCurrent.php',
diff --git a/tests/Bridges.Latte3/n-snippet.2.phpt b/tests/Bridges.Latte3/n-snippet.2.phpt
index 983c46ce5..a5cfc2a20 100644
--- a/tests/Bridges.Latte3/n-snippet.2.phpt
+++ b/tests/Bridges.Latte3/n-snippet.2.phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
 $latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension(null));
diff --git a/tests/Bridges.Latte3/n-snippet.block.phpt b/tests/Bridges.Latte3/n-snippet.block.phpt
index 107dd6ebc..27a83c2f7 100644
--- a/tests/Bridges.Latte3/n-snippet.block.phpt
+++ b/tests/Bridges.Latte3/n-snippet.block.phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Bridges.Latte3/n-snippet.dynamic.phpt b/tests/Bridges.Latte3/n-snippet.dynamic.phpt
index ab2827bca..a794e2d0c 100644
--- a/tests/Bridges.Latte3/n-snippet.dynamic.phpt
+++ b/tests/Bridges.Latte3/n-snippet.dynamic.phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Bridges.Latte3/n-snippet.phpt b/tests/Bridges.Latte3/n-snippet.phpt
index c9ff1b893..ac2247eec 100644
--- a/tests/Bridges.Latte3/n-snippet.phpt
+++ b/tests/Bridges.Latte3/n-snippet.phpt
@@ -6,9 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
 
 class Test
 {
diff --git a/tests/Bridges.Latte3/renderSnippets.phpt b/tests/Bridges.Latte3/renderSnippets.phpt
index 675995784..4d113171f 100644
--- a/tests/Bridges.Latte3/renderSnippets.phpt
+++ b/tests/Bridges.Latte3/renderSnippets.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class InnerControl extends Nette\Application\UI\Control
 {
diff --git a/tests/Bridges.Latte3/renderSnippets2.phpt b/tests/Bridges.Latte3/renderSnippets2.phpt
index 31522dbee..1a092d470 100644
--- a/tests/Bridges.Latte3/renderSnippets2.phpt
+++ b/tests/Bridges.Latte3/renderSnippets2.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class InnerControl extends Nette\Application\UI\Control
 {
diff --git a/tests/Bridges.Latte3/renderSnippets3.phpt b/tests/Bridges.Latte3/renderSnippets3.phpt
index dd11322d4..65a621014 100644
--- a/tests/Bridges.Latte3/renderSnippets3.phpt
+++ b/tests/Bridges.Latte3/renderSnippets3.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class TestControl extends Nette\Application\UI\Control
 {
diff --git a/tests/Bridges.Latte3/renderSnippets4.phpt b/tests/Bridges.Latte3/renderSnippets4.phpt
index 3bf12a6e5..c209301c6 100644
--- a/tests/Bridges.Latte3/renderSnippets4.phpt
+++ b/tests/Bridges.Latte3/renderSnippets4.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class TestPresenter extends Nette\Application\UI\Presenter
 {
diff --git a/tests/Bridges.Latte3/renderSnippets5.phpt b/tests/Bridges.Latte3/renderSnippets5.phpt
index fdbd86159..340e36cf6 100644
--- a/tests/Bridges.Latte3/renderSnippets5.phpt
+++ b/tests/Bridges.Latte3/renderSnippets5.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class TestPresenter extends Nette\Application\UI\Presenter
 {
diff --git a/tests/Bridges.Latte3/renderSnippets6.phpt b/tests/Bridges.Latte3/renderSnippets6.phpt
index f264135e7..a9cda7417 100644
--- a/tests/Bridges.Latte3/renderSnippets6.phpt
+++ b/tests/Bridges.Latte3/renderSnippets6.phpt
@@ -11,10 +11,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class TestPresenter extends Nette\Application\UI\Presenter
 {
diff --git a/tests/Bridges.Latte3/renderSnippets7.phpt b/tests/Bridges.Latte3/renderSnippets7.phpt
index 63f3cb635..a7689c434 100644
--- a/tests/Bridges.Latte3/renderSnippets7.phpt
+++ b/tests/Bridges.Latte3/renderSnippets7.phpt
@@ -9,10 +9,6 @@ Tester\Environment::bypassFinals();
 
 require __DIR__ . '/ControlMock.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $dataSets = [
 
diff --git a/tests/Bridges.Latte3/{control}.2.phpt b/tests/Bridges.Latte3/{control}.2.phpt
index bb2cb9171..7086c7fd1 100644
--- a/tests/Bridges.Latte3/{control}.2.phpt
+++ b/tests/Bridges.Latte3/{control}.2.phpt
@@ -10,10 +10,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class MockComponent
 {
diff --git a/tests/Bridges.Latte3/{control}.3.phpt b/tests/Bridges.Latte3/{control}.3.phpt
index 7a270383f..d9317b057 100644
--- a/tests/Bridges.Latte3/{control}.3.phpt
+++ b/tests/Bridges.Latte3/{control}.3.phpt
@@ -10,9 +10,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
 
 $control = new class {
 	public function render()
diff --git a/tests/Bridges.Latte3/{control}.phpt b/tests/Bridges.Latte3/{control}.phpt
index a1ba85e15..8d78e3546 100644
--- a/tests/Bridges.Latte3/{control}.phpt
+++ b/tests/Bridges.Latte3/{control}.phpt
@@ -10,10 +10,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Bridges.Latte3/{ifCurrent}.phpt b/tests/Bridges.Latte3/{ifCurrent}.phpt
index 2d2451c50..0be5f05e2 100644
--- a/tests/Bridges.Latte3/{ifCurrent}.phpt
+++ b/tests/Bridges.Latte3/{ifCurrent}.phpt
@@ -6,26 +6,18 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 Tester\Environment::bypassFinals();
 
 $latte = new Latte\Engine;
 
-$latteFactory = Mockery::mock(Nette\Bridges\ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
 $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn((Mockery::mock(Nette\Http\IResponse::class))->shouldIgnoreMissing());
 $presenter->shouldIgnoreMissing();
 
-$factory = new Nette\Bridges\ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::matchFile(
 	__DIR__ . '/expected/ifCurrent.php',
diff --git a/tests/Bridges.Latte3/{link}.2.phpt b/tests/Bridges.Latte3/{link}.2.phpt
index 816283b42..7fc270038 100644
--- a/tests/Bridges.Latte3/{link}.2.phpt
+++ b/tests/Bridges.Latte3/{link}.2.phpt
@@ -10,10 +10,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 class MockControl
 {
diff --git a/tests/Bridges.Latte3/{link}.phpt b/tests/Bridges.Latte3/{link}.phpt
index e2457c9a7..9d8e296e6 100644
--- a/tests/Bridges.Latte3/{link}.phpt
+++ b/tests/Bridges.Latte3/{link}.phpt
@@ -10,10 +10,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Bridges.Latte3/{snippet}.dynamic.phpt b/tests/Bridges.Latte3/{snippet}.dynamic.phpt
index 3b2068ed0..1eb5aacdd 100644
--- a/tests/Bridges.Latte3/{snippet}.dynamic.phpt
+++ b/tests/Bridges.Latte3/{snippet}.dynamic.phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Bridges.Latte3/{snippet}.phpt b/tests/Bridges.Latte3/{snippet}.phpt
index bf9022dce..5afa062ef 100644
--- a/tests/Bridges.Latte3/{snippet}.phpt
+++ b/tests/Bridges.Latte3/{snippet}.phpt
@@ -6,10 +6,6 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-if (version_compare(Latte\Engine::VERSION, '3', '<')) {
-	Tester\Environment::skip('Test for Latte 3');
-}
-
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
diff --git a/tests/Routers/RouteList.addRoute.phpt b/tests/Routers/RouteList.addRoute.phpt
index fd6ab423a..068f66805 100644
--- a/tests/Routers/RouteList.addRoute.phpt
+++ b/tests/Routers/RouteList.addRoute.phpt
@@ -12,7 +12,7 @@ require __DIR__ . '/Route.php';
 
 $list = new RouteList;
 $list->addRoute('foo', ['presenter' => 'foo'], RouteList::ONE_WAY);
-$list->addRoute('bar', ['presenter' => 'bar'], RouteList::ONE_WAY);
+$list->addRoute('bar', ['presenter' => 'bar'], oneWay: true);
 $list->addRoute('hello', ['presenter' => 'hello']);
 
 
diff --git a/tests/Routers/RouteList.basic.phpt b/tests/Routers/RouteList.basic.phpt
index 22afeda6c..b4783db95 100644
--- a/tests/Routers/RouteList.basic.phpt
+++ b/tests/Routers/RouteList.basic.phpt
@@ -6,7 +6,6 @@
 
 declare(strict_types=1);
 
-use Nette\Application\Routers\Route;
 use Nette\Application\Routers\RouteList;
 use Tester\Assert;
 
@@ -17,7 +16,7 @@ require __DIR__ . '/Route.php';
 
 
 $list = new RouteList;
-$list[] = new Route('<presenter>/<action=default>/<id= \d{1,3}>');
+$list->addRoute('<presenter>/<action=default>/<id= \d{1,3}>');
 
 
 Assert::same('http://example.com/front.homepage/', testRouteOut($list, ['presenter' => 'Front:Homepage']));
diff --git a/tests/Routers/RouteList.modules.phpt b/tests/Routers/RouteList.modules.phpt
index db2aff0d2..ff1e15193 100644
--- a/tests/Routers/RouteList.modules.phpt
+++ b/tests/Routers/RouteList.modules.phpt
@@ -6,7 +6,6 @@
 
 declare(strict_types=1);
 
-use Nette\Application\Routers\Route;
 use Nette\Application\Routers\RouteList;
 
 
@@ -16,12 +15,12 @@ require __DIR__ . '/Route.php';
 
 
 $list = new RouteList;
-$list[] = new Route('auth/<presenter>[/<action>]', [
+$list->addRoute('auth/<presenter>[/<action>]', [
 	'module' => 'Auth',
 	'presenter' => 'Homepage',
 	'action' => 'default',
 ]);
-$list[] = new Route('<presenter>[/<action>]', [
+$list->addRoute('<presenter>[/<action>]', [
 	'module' => 'Default',
 	'presenter' => 'Homepage',
 	'action' => 'default',
diff --git a/tests/UI/ComponentReflection.parseAnnotation.phpt b/tests/UI/ComponentReflection.parseAnnotation.phpt
deleted file mode 100644
index 278b5e7d1..000000000
--- a/tests/UI/ComponentReflection.parseAnnotation.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Test: ComponentReflection annotation parser.
- */
-
-declare(strict_types=1);
-
-use Nette\Application\UI\ComponentReflection as Reflection;
-use Tester\Assert;
-
-
-require __DIR__ . '/../bootstrap.php';
-
-
-/**
- * @title(value ="Johno's addendum", mode=True,) , out
- * @title
- * @title()
- * @publi - 'c' is missing intentionally
- * @privatex
- * @components(item 1)
- * @persistent(true)
- * @persistent(FALSE)
- * @persistent(null)
- * @renderable
- * @secured(role = "admin", level = 2)
- * @Secured\User(loggedIn)
- */
-class TestClass
-{
-}
-
-
-$rc = new ReflectionClass('TestClass');
-
-Assert::same(['value ="Johno\'s addendum"', 'mode=True', true, true], Reflection::parseAnnotation($rc, 'title'));
-Assert::null(Reflection::parseAnnotation($rc, 'public'));
-Assert::null(Reflection::parseAnnotation($rc, 'private'));
-Assert::same(['item 1'], Reflection::parseAnnotation($rc, 'components'));
-Assert::same([true, false, null], Reflection::parseAnnotation($rc, 'persistent'));
-Assert::same([true], Reflection::parseAnnotation($rc, 'renderable'));
-Assert::same(['loggedIn'], Reflection::parseAnnotation($rc, 'Secured\User'));
-Assert::null(Reflection::parseAnnotation($rc, 'missing'));
diff --git a/tests/UI/Presenter.getParameters.phpt b/tests/UI/Presenter.getParameters.phpt
index a0c48fbd4..76eb71602 100644
--- a/tests/UI/Presenter.getParameters.phpt
+++ b/tests/UI/Presenter.getParameters.phpt
@@ -20,7 +20,7 @@ class OnePresenter extends Presenter
 	public static $no1;
 	public $no2;
 
-	/** @persistent */
+	#[Persistent]
 	public $yes1;
 
 	#[Persistent, Parameter]
diff --git a/tests/UI/Presenter.getPersistentComponents.phpt b/tests/UI/Presenter.getPersistentComponents.phpt
index 98d96be11..71c52afbe 100644
--- a/tests/UI/Presenter.getPersistentComponents.phpt
+++ b/tests/UI/Presenter.getPersistentComponents.phpt
@@ -19,16 +19,8 @@ class OnePresenter extends Presenter
 }
 
 
-/**
- * @persistent(a, b)
- */
-class TwoPresenter extends Presenter
-{
-}
-
-
 #[Persistent('a', 'b')]
-class ThreePresenter extends Presenter
+class TwoPresenter extends Presenter
 {
 }
 
@@ -36,5 +28,3 @@ class ThreePresenter extends Presenter
 Assert::same([], OnePresenter::getPersistentComponents());
 
 Assert::same(['a', 'b'], TwoPresenter::getPersistentComponents());
-
-Assert::same(['a', 'b'], ThreePresenter::getPersistentComponents());
diff --git a/tests/UI/Presenter.link().persistent.phpt b/tests/UI/Presenter.link().persistent.phpt
index 8866f892c..e26932c76 100644
--- a/tests/UI/Presenter.link().persistent.phpt
+++ b/tests/UI/Presenter.link().persistent.phpt
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Application;
+use Nette\Application\Attributes\Persistent;
 use Nette\Http;
 use Tester\Assert;
 
@@ -16,13 +17,13 @@ require __DIR__ . '/../bootstrap.php';
 
 trait PersistentParam1
 {
-	/** @persistent */
+	#[Persistent]
 	public $t1;
 }
 
 trait PersistentParam2A
 {
-	/** @persistent */
+	#[Persistent]
 	public $t2;
 }
 
@@ -33,7 +34,7 @@ trait PersistentParam2B
 
 trait PersistentParam3
 {
-	/** @persistent */
+	#[Persistent]
 	public $t3;
 }
 
@@ -41,7 +42,7 @@ class BasePresenter extends Application\UI\Presenter
 {
 	use PersistentParam1;
 
-	/** @persistent */
+	#[Persistent]
 	public $p1;
 }
 
@@ -50,7 +51,7 @@ class TestPresenter extends BasePresenter
 {
 	use PersistentParam2B;
 
-	/** @persistent */
+	#[Persistent]
 	public $p2;
 
 
@@ -81,10 +82,10 @@ class SecondPresenter extends BasePresenter
 {
 	use PersistentParam3;
 
-	/** @persistent */
+	#[Persistent]
 	public $p1 = 20;
 
-	/** @persistent */
+	#[Persistent]
 	public $p3;
 }
 
@@ -97,7 +98,7 @@ class ThirdPresenter extends BasePresenter
 
 class FourthPresenter extends BasePresenter
 {
-	#[Application\Attributes\Persistent]
+	#[Persistent]
 	public $p1;
 }
 
diff --git a/tests/UI/Presenter.link().phpt b/tests/UI/Presenter.link().phpt
index 6b98062db..19e32272c 100644
--- a/tests/UI/Presenter.link().phpt
+++ b/tests/UI/Presenter.link().phpt
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Application;
+use Nette\Application\Attributes\Persistent;
 use Nette\Http;
 use Tester\Assert;
 
@@ -16,11 +17,11 @@ require __DIR__ . '/../bootstrap.php';
 
 class TestControl extends Application\UI\Control
 {
-	/** @persistent array */
-	public $order = [];
+	#[Persistent]
+	public array $order = [];
 
-	/** @persistent int */
-	public $round = 0;
+	#[Persistent]
+	public int $round = 0;
 
 
 	public function handleClick($x, $y)
@@ -50,22 +51,22 @@ class TestControl extends Application\UI\Control
 
 class TestPresenter extends Application\UI\Presenter
 {
-	/** @persistent */
+	#[Persistent]
 	public $p;
 
-	/** @persistent */
+	#[Persistent]
 	public $pint = 10;
 
-	/** @persistent */
+	#[Persistent]
 	public $parr = [];
 
-	/** @persistent */
+	#[Persistent]
 	public $pbool = true;
 
-	/** @persistent */
+	#[Persistent]
 	public array $parrn;
 
-	/** @persistent */
+	#[Persistent]
 	public ?bool $pbooln = null;
 
 
@@ -294,7 +295,7 @@ class TestPresenter extends Application\UI\Presenter
 
 class OtherPresenter extends TestPresenter
 {
-	/** @persistent */
+	#[Persistent]
 	public $p = 20;
 }
 
diff --git a/tests/UI/fixtures/ParamPresenter.php b/tests/UI/fixtures/ParamPresenter.php
index 453a78c34..21e04cca4 100644
--- a/tests/UI/fixtures/ParamPresenter.php
+++ b/tests/UI/fixtures/ParamPresenter.php
@@ -4,7 +4,7 @@
 
 class ParamPresenter extends Nette\Application\UI\Presenter
 {
-	/** @persistent */
+	#[Nette\Application\Attributes\Persistent]
 	public $bool = true;