diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5ff28e28..2f20b5b4 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -8,8 +8,8 @@ jobs:
       matrix:
         # operating-systems: ubuntu-latest, windows-latest, macos-latest
         operating-system: [ubuntu-latest]
-        # php-versions: 7.4, 8.0, 8.1
-        php-versions: ['7.4', '8.0', '8.1']
+        # php-versions: 8.0, 8.1, 8.2
+        php-versions: ['8.0', '8.1', '8.2']
     runs-on: ${{ matrix.operating-system }}
     steps:
       - name: Checkout
@@ -61,7 +61,7 @@ jobs:
       - name: Setup PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           tools: composer:v2
 
       - name: Install PHP dependencies
diff --git a/README.md b/README.md
index 462c5f6d..7005725e 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ TBD
 The easiest way to install Herbie is through Composer.
 Run the following commands in your terminal to create a new project and install all dependent libraries.
 
-For the upcoming 2.x version (PHP 7.4, 8.0, 8.1):
+For the upcoming 2.x version (PHP 8.x):
 
     composer create-project getherbie/start-website:dev-master mywebsite
 
diff --git a/composer.json b/composer.json
index c478d249..b5b3b203 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         }
     },
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "ext-json": "*",
         "composer-runtime-api": "^2.0",
         "ausi/slug-generator": "^1.1",
diff --git a/plugins/imagine/ImagineSysPlugin.php b/plugins/imagine/ImagineSysPlugin.php
index bf1bd170..728ab080 100755
--- a/plugins/imagine/ImagineSysPlugin.php
+++ b/plugins/imagine/ImagineSysPlugin.php
@@ -50,13 +50,13 @@ public function twigFunctions(): array
         ];
     }
 
-    public function imagineFunction(string $path, string $filterSet = 'default', array $attribs = []): string
+    public function imagineFunction(string $path, string $collection = 'default', array $attribs = []): string
     {
-        $abspath = $this->alias->get('@media/' . $path);
+        $absolutePath = $this->alias->get('@media/' . $path);
 
         $attribs['class'] = $attribs['class'] ?? 'imagine';
 
-        if (!is_file($abspath)) {
+        if (!is_file($absolutePath)) {
             $attribs['class'] = trim($attribs['class'] . ' imagine--file-not-found');
             return sprintf(
                 '<img src="%s"%s>',
@@ -65,7 +65,7 @@ public function imagineFunction(string $path, string $filterSet = 'default', arr
             );
         }
 
-        $sanitizedFilter = $this->sanitizeFilterName($filterSet);
+        $sanitizedFilter = $this->sanitizeFilterName($collection);
 
         $attribs['class'] = trim($attribs['class'] . ' imagine--filter-' . $sanitizedFilter);
 
@@ -98,16 +98,16 @@ private function getTransparentOnePixelSrc(): string
     /**
      * Gets the browser path for the image and filter to apply.
      */
-    public function imagineFilter(string $path, string $filterSet = 'default'): Markup
+    public function imagineFilter(string $path, string $collection = 'default'): Markup
     {
-        $abspath = $this->alias->get('@media/' . $path);
+        $absolutePath = $this->alias->get('@media/' . $path);
 
-        if (!is_file($abspath)) {
+        if (!is_file($absolutePath)) {
             $dataSrc = $this->getTransparentOnePixelSrc();
             return new Markup($dataSrc, 'utf8');
         }
 
-        $sanitizedFilterSet = $this->sanitizeFilterName($filterSet);
+        $sanitizedFilterSet = $this->sanitizeFilterName($collection);
 
         return new Markup(
             $this->basePath . $this->applyFilterSet($path, $sanitizedFilterSet),
@@ -118,7 +118,7 @@ public function imagineFilter(string $path, string $filterSet = 'default'): Mark
     private function sanitizeFilterName(string $filterSet): string
     {
         if ($filterSet !== 'default') {
-            if ($this->config->check("plugins.imagine.filterSets.{$filterSet}") === false) {
+            if ($this->config->check("plugins.imagine.collections.{$filterSet}") === false) {
                 $filterSet = 'default';
             }
         }
@@ -141,7 +141,7 @@ protected function applyFilterSet(string $relpath, string $filterSet): string
     {
         $path = $this->alias->get('@media/' . $relpath);
 
-        $filterConfig = $this->config->getAsArray("plugins.imagine.filterSets.{$filterSet}");
+        $filterConfig = $this->config->getAsArray("plugins.imagine.collections.{$filterSet}");
         $cachePath = $this->resolveCachePath($relpath, $filterSet);
 
         if (!empty($filterConfig['test'])) {
diff --git a/plugins/imagine/README.md b/plugins/imagine/README.md
index b87155a4..1f1fae22 100644
--- a/plugins/imagine/README.md
+++ b/plugins/imagine/README.md
@@ -27,7 +27,7 @@ return [
     'plugins' => [
         'imagine' => [
             'cachePath' => 'cache/imagine',
-            'filterSets' => []
+            'collections' => []
         ]
     ]
 ];
@@ -35,14 +35,14 @@ return [
 
 ## Filter sets
 
-To use Imagine in Herbie, Filter sets must be defined, each containing one or more filters.
+To use Imagine in Herbie, one or more filter collections must be defined, each containing one or more filters.
 
-The following default filter set is always enabled.
+The following default collection is always enabled.
 
 ~~~php
 return [
     // ...
-    'filterSets' => [
+    'collections' => [
         'default' => [
             'test' => true,
             'filters' => [
@@ -57,11 +57,11 @@ return [
 ];
 ~~~
 
-In the following configuration example, we see two simple filter sets for scaling and cropping an image.
+In the following configuration example, we see two simple collections for scaling and cropping an image.
 
 ~~~php
 'imagine'
-    'filterSets' => [
+    'collections' => [
         'resize' => [
             'filters' => [
                 'thumbnail' => [
@@ -82,10 +82,10 @@ In the following configuration example, we see two simple filter sets for scalin
 ],
 ~~~
 
-With the above configuration you set two Imagine filters `resize` and `crop` that can be applied to images in your project.
+With the above configuration you set two Imagine collections `resize` and `crop` that can be applied to images in your project.
 
-- A resize filterSet to resize an image to a size of 280 x 280 pixels
-- A crop filterSet to crop an image to a size of 560 x 560 pixels
+- A resize collection to resize an image to a size of 280 x 280 pixels
+- A crop collection to crop an image to a size of 560 x 560 pixels
 
 ## Usage
 
@@ -107,9 +107,9 @@ With the activation of the system plugin, one Twig filter and one Twig function
         <td></td>
     </tr>
     <tr class="param">
-        <td>filterSet</td>
+        <td>collection</td>
         <td>string</td>
-        <td>The filter set to be applied.</td>
+        <td>The filter collection to be applied.</td>
         <td>default</td>
     </tr>
     <tr class="return">
diff --git a/plugins/imagine/config.php b/plugins/imagine/config.php
index 7e9761ed..d25f0fce 100644
--- a/plugins/imagine/config.php
+++ b/plugins/imagine/config.php
@@ -8,7 +8,7 @@
     'pluginClass' => ImagineSysPlugin::class,
     'pluginPath' => __DIR__,
     'cachePath' => 'cache/imagine',
-    'filterSets' => [
+    'collections' => [
         'default' => [
             'test' => true,
             'filters' => [
diff --git a/plugins/twig/README.md b/plugins/twig/README.md
new file mode 100644
index 00000000..11e1b89f
--- /dev/null
+++ b/plugins/twig/README.md
@@ -0,0 +1,19 @@
+# Twig System Plugin
+
+`Twig` is a [Herbie](http://github.com/getherbie) system plugin that brings support for several Twig filters, functions and tests.
+
+## Installation
+
+The plugin is installed already.
+
+To activate it, add `twig` to the `enabledSysPlugins` configuration option.
+
+~~~php
+return [
+    'enabledSysPlugins' => 'twig'
+];
+~~~
+
+## More Information
+
+For more information, see <https://herbie.tebe.ch>.
diff --git a/plugins/twig/TwigExtension.php b/plugins/twig/TwigExtension.php
new file mode 100644
index 00000000..57576999
--- /dev/null
+++ b/plugins/twig/TwigExtension.php
@@ -0,0 +1,665 @@
+<?php
+
+declare(strict_types=1);
+
+namespace herbie\sysplugin\twig;
+
+use Ausi\SlugGenerator\SlugGenerator;
+use herbie\Alias;
+use herbie\Assets;
+use herbie\Config;
+use herbie\Page;
+use herbie\PageList;
+use herbie\PageRepositoryInterface;
+use herbie\PageTree;
+use herbie\PageTreeFilterIterator;
+use herbie\PageTreeHtmlRenderer;
+use herbie\PageTreeIterator;
+use herbie\PageTreeTextRenderer;
+use herbie\Pagination;
+use herbie\QueryBuilder;
+use herbie\Site;
+use herbie\Translator;
+use herbie\UrlManager;
+use Traversable;
+use Twig\Environment;
+use Twig\Error\Error;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use Twig\TwigTest;
+
+use function herbie\date_format;
+use function herbie\file_size;
+use function herbie\str_trailing_slash;
+use function herbie\time_format;
+
+final class TwigExtension extends AbstractExtension
+{
+    private Alias $alias;
+    private Assets $assets;
+    private Config $config;
+    private Environment $environment;
+    private PageRepositoryInterface $pageRepository;
+    private SlugGenerator $slugGenerator;
+    private Translator $translator;
+    private UrlManager $urlManager;
+
+    /**
+     * TwigExtension constructor.
+     */
+    public function __construct(
+        Alias $alias,
+        Assets $assets,
+        Config $config,
+        Environment $environment,
+        PageRepositoryInterface $pageRepository,
+        SlugGenerator $slugGenerator,
+        Translator $translator,
+        UrlManager $urlManager
+    ) {
+        $this->alias = $alias;
+        $this->assets = $assets;
+        $this->config = $config;
+        $this->environment = $environment;
+        $this->pageRepository = $pageRepository;
+        $this->slugGenerator = $slugGenerator;
+        $this->translator = $translator;
+        $this->urlManager = $urlManager;
+    }
+
+    /**
+     * @return TwigFilter[]
+     */
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('format_size', [$this, 'filterFilesize']),
+            new TwigFilter('slugify', [$this, 'filterSlugify']),
+            new TwigFilter('visible', [$this, 'filterVisible'], ['deprecated' => true]) // doesn't work properly
+        ];
+    }
+
+    /**
+     * @return TwigFunction[]
+     */
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('css_add', [$this, 'cssAdd']),
+            new TwigFunction('css_classes', [$this, 'cssClasses'], ['needs_context' => true]),
+            new TwigFunction('css_out', [$this, 'cssOut'], ['is_safe' => ['html']]),
+            new TwigFunction('file', [$this, 'file'], ['is_safe' => ['html']]),
+            new TwigFunction('image', [$this, 'image'], ['is_safe' => ['html']]),
+            new TwigFunction('js_add', [$this, 'jsAdd']),
+            new TwigFunction('js_out', [$this, 'jsOut'], ['is_safe' => ['html']]),
+            new TwigFunction('link_file', [$this, 'linkFile'], ['is_safe' => ['html']]),
+            new TwigFunction('link_mail', [$this, 'linkMail'], ['is_safe' => ['html']]),
+            new TwigFunction('link_page', [$this, 'linkPage'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_ascii_tree', [$this, 'menuAsciiTree'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_breadcrumb', [$this, 'menuBreadcrumb'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_list', [$this, 'menuList'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_pager', [$this, 'menuPager'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_sitemap', [$this, 'menuSitemap'], ['is_safe' => ['html']]),
+            new TwigFunction('menu_tree', [$this, 'menuTree'], ['is_safe' => ['html']]),
+            new TwigFunction('page_title', [$this, 'pageTitle'], ['needs_context' => true]),
+            new TwigFunction('query', [$this, 'query']),
+            new TwigFunction('snippet', [$this, 'snippet'], ['is_safe' => ['all']]),
+            new TwigFunction('translate', [$this, 'translate']),
+            new TwigFunction('url_rel', [$this, 'urlRelative']),
+            new TwigFunction('url_abs', [$this, 'urlAbsolute']),
+        ];
+    }
+
+    /**
+     * @return TwigTest[]
+     */
+    public function getTests(): array
+    {
+        return [
+            new TwigTest('file_readable', [$this, 'testIsReadable']),
+            new TwigTest('file_writable', [$this, 'testIsWritable'])
+        ];
+    }
+
+    /**
+     * @param array<string, string> $attribs
+     */
+    private function buildHtmlAttributes(array $attribs = []): string
+    {
+        $attribsAsString = '';
+        foreach ($attribs as $key => $value) {
+            $attribsAsString .= $key . '="' . $value . '" ';
+        }
+        return trim($attribsAsString);
+    }
+
+    public function filterFilesize(int $size): string
+    {
+        if ($size <= 0) {
+            return '0';
+        }
+        if ($size === 1) {
+            return '1 Byte';
+        }
+        $mod = 1024;
+        $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+        for ($i = 0; $size > $mod && $i < count($units) - 1; ++$i) {
+            $size /= $mod;
+        }
+        return str_replace(',', '.', (string)round($size, 1)) . ' ' . $units[$i];
+    }
+
+    /**
+     * Creates a web friendly URL (slug) from a string.
+     */
+    public function filterSlugify(string $url): string
+    {
+        return $this->slugGenerator->generate($url);
+    }
+
+    public function filterVisible(PageTree $tree): PageTreeFilterIterator
+    {
+        $treeIterator = new PageTreeIterator($tree);
+        return new PageTreeFilterIterator($treeIterator);
+    }
+
+    public function cssAdd(
+        array|string $paths,
+        array $attr = [],
+        ?string $group = null,
+        bool $raw = false,
+        int $pos = 1
+    ): void {
+        $this->assets->addCss($paths, $attr, $group, $raw, $pos);
+    }
+
+    public function jsAdd(
+        array|string $paths,
+        array $attr = [],
+        ?string $group = null,
+        bool $raw = false,
+        int $pos = 1
+    ): void {
+        $this->assets->addJs($paths, $attr, $group, $raw, $pos);
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     * @return string
+     */
+    public function cssClasses(array $context): string
+    {
+        $page = 'error';
+        if (isset($context['page'])) {
+            $route = $context['page']->getRoute();
+            $page = !empty($route) ? $route : 'index';
+        }
+
+        $layout = 'default';
+        if (isset($context['page'])) {
+            $layout = $context['page']->getLayout();
+        }
+
+        $theme = 'default';
+        if (!empty($context['theme'])) {
+            $theme = $context['theme'];
+        }
+
+        $language = 'en';
+        if (isset($context['site'])) {
+            $language = $context['site']->getLanguage();
+        }
+
+        $class = sprintf('page-%s theme-%s layout-%s language-%s', $page, $theme, $layout, $language);
+        return str_replace(['/', '.'], '-', $class);
+    }
+
+    public function linkFile(
+        string $path,
+        string $label = '',
+        bool $info = false,
+        array $attribs = []
+    ): string {
+        $attribs['alt'] = $attribs['alt'] ?? '';
+        $attribs['class'] = $attribs['class'] ?? 'link__label';
+
+        $baseUrl = str_trailing_slash($this->config->getAsString('components.downloadMiddleware.route'));
+        $storagePath = str_trailing_slash($this->config->getAsString('components.downloadMiddleware.storagePath'));
+
+        // combine url and path
+        $href = $this->urlManager->createUrl($baseUrl . $path);
+        $path = $this->alias->get($storagePath . $path);
+
+        if (!empty($info)) {
+            $fileInfo = $this->getFileInfo($path);
+        }
+
+        $replace = [
+            '{href}' => $href,
+            '{attribs}' => $this->buildHtmlAttributes($attribs),
+            '{label}' => empty($label) ? basename($path) : $label,
+            '{info}' => empty($fileInfo) ? '' : sprintf('<span class="link__info">%s</span>', $fileInfo)
+        ];
+        return strtr('<span class="link link--download"><a href="{href}" {attribs}>{label}</a>{info}</span>', $replace);
+    }
+
+    public function linkMail(
+        string $email,
+        ?string $label = null,
+        array $attribs = [],
+        string $template = '@snippet/link_mail.twig'
+    ): string {
+        $attribs['href'] = 'mailto:' . $email;
+        $attribs['class'] = $attribs['class'] ?? 'link__label';
+
+        ksort($attribs);
+
+        $context = [
+            'attribs' => $attribs,
+            'label' => $label ?? $email,
+        ];
+
+        try {
+            return $this->environment->render($template, $context);
+        } catch (Error $e) {
+            return $email;
+        }
+    }
+
+    public function menuAsciiTree(
+        string $route = '',
+        int $depth = -1,
+        bool $hidden = false
+    ): string {
+        // TODO use $class parameter
+        $branch = $this->pageRepository->findAll()->getPageTree()->findByRoute($route);
+        if ($branch === null) {
+            return '';
+        }
+
+        $treeIterator = new PageTreeIterator($branch);
+        $filterIterator = new PageTreeFilterIterator($treeIterator, !$hidden);
+
+        $asciiTree = new PageTreeTextRenderer($filterIterator);
+        $asciiTree->setMaxDepth($depth);
+        return $asciiTree->render();
+    }
+
+    /**
+     * @param array{0: string, 1?: string}|string $home
+     */
+    public function menuBreadcrumb(
+        string $delim = '',
+        array|string $home = '',
+        bool $reverse = false
+    ): string {
+        // TODO use string type for param $homeLink (like "route|label")
+
+        $links = [];
+
+        if (!empty($home)) {
+            if (is_array($home)) {
+                $route = reset($home);
+                $label = isset($home[1]) ? $home[1] : 'Home';
+            } else {
+                $route = $home;
+                $label = 'Home';
+            }
+            $links[] = $this->createLink($route, $label);
+        }
+
+        [$route] = $this->urlManager->parseRequest();
+        $pageTrail = $this->pageRepository->findAll()->getPageTrail($route);
+        foreach ($pageTrail as $item) {
+            $links[] = $this->createLink($item->getRoute(), $item->getMenuTitle());
+        }
+
+        if (!empty($reverse)) {
+            $links = array_reverse($links);
+        }
+
+        $html = '<ul class="breadcrumb">';
+        foreach ($links as $i => $link) {
+            if ($i > 0 && !empty($delim)) {
+                $html .= '<li class="delim">' . $delim . '</li>';
+            }
+            $html .= '<li>' . $link . '</li>';
+        }
+        $html .= '</ul>';
+
+        return $html;
+    }
+
+    /**
+     * @throws LoaderError
+     * @throws RuntimeError
+     * @throws SyntaxError
+     */
+    public function menuList(
+        ?PageList $page_list = null,
+        string $filter = '',
+        string $sort = '',
+        bool $shuffle = false,
+        int $limit = 10,
+        string $template = '@snippet/listing.twig'
+    ): string {
+        if ($page_list === null) {
+            $page_list = $this->pageRepository->findAll();
+        }
+
+        if (!empty($filter)) {
+            [$field, $value] = explode('|', $filter);
+            $page_list = $page_list->filter($field, $value);
+        }
+
+        if (!empty($sort)) {
+            [$field, $direction] = explode('|', $sort);
+            $page_list = $page_list->sort($field, $direction);
+        }
+
+        if ($shuffle) {
+            $page_list = $page_list->shuffle();
+        }
+
+        // filter pages with empty title
+        $page_list = $page_list->filter(function (Page $page) {
+            return !empty($page->getTitle());
+        });
+
+        $pagination = new Pagination($page_list);
+        $pagination->setLimit($limit);
+
+        return $this->environment->render($template, ['pagination' => $pagination]);
+    }
+
+    public function menuTree(
+        string $route = '',
+        int $depth = -1,
+        bool $hidden = false,
+        string $class = 'menu'
+    ): string {
+        // NOTE duplicated code, see function sitemap
+        $branch = $this->pageRepository->findAll()->getPageTree()->findByRoute($route);
+        if ($branch === null) {
+            return '';
+        }
+
+        $treeIterator = new PageTreeIterator($branch);
+        $filterIterator = new PageTreeFilterIterator($treeIterator, !$hidden);
+
+        $htmlTree = new PageTreeHtmlRenderer($filterIterator);
+        $htmlTree->setMaxDepth($depth);
+        $htmlTree->setClass($class);
+        $htmlTree->setItemCallback(function (PageTree $node) {
+            $menuItem = $node->getMenuItem();
+            $href = $this->urlManager->createUrl($menuItem->getRoute());
+            return sprintf('<a href="%s">%s</a>', $href, $menuItem->getMenuTitle());
+        });
+
+        [$currenRoute] = $this->urlManager->parseRequest();
+        return $htmlTree->render($currenRoute);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function menuPager(
+        string $limit = '',
+        string $prev_label = '',
+        string $next_label = '',
+        string $prev_icon = '',
+        string $next_icon = '',
+        string $class = 'pager',
+        string $template = '<div class="{class}">{prev}{next}</div>'
+    ): string {
+        [$route] = $this->urlManager->parseRequest();
+        $pageList = $this->pageRepository->findAll();
+
+        if ($limit !== '') {
+            $pageList = $pageList->filter(function ($page) use ($limit) {
+                return strpos($page->getRoute(), $limit) === 0;
+            });
+        }
+
+        $prevPage = null;
+        $currentPage = null;
+        $nextPage = null;
+        $lastPage = null;
+        foreach ($pageList as $key => $page) {
+            if ($currentPage) {
+                $nextPage = $page;
+                break;
+            }
+            if ($key === $route) {
+                $prevPage = $lastPage;
+                $currentPage = $page;
+                continue;
+            }
+            $lastPage = $page;
+        }
+
+        $replacements = [
+            '{class}' => $class,
+            '{prev}' => '',
+            '{next}' => ''
+        ];
+
+        if (isset($prevPage)) {
+            $label = empty($prev_label) ? $prevPage->getMenuTitle() : $prev_label;
+            $label = sprintf('<span class="%s-label-prev">%s</span>', $class, $label);
+            if ($prev_icon) {
+                $label = sprintf('<span class="%s-icon-prev">%s</span>%s', $class, $prev_icon, $label);
+            }
+            $attribs = ['class' => $class . '-link-prev'];
+            $replacements['{prev}'] = $this->createLink($prevPage->getRoute(), $label, $attribs);
+        }
+
+        if (isset($nextPage)) {
+            $label = empty($next_label) ? $nextPage->getMenuTitle() : $next_label;
+            $label = sprintf('<span class="%s-label-next">%s</span>', $class, $label);
+            if ($next_icon) {
+                $label = sprintf('%s<span class="%s-icon-next">%s</span>', $label, $class, $next_icon);
+            }
+            $attribs = ['class' => $class . '-link-next'];
+            $replacements['{next}'] = $this->createLink($nextPage->getRoute(), $label, $attribs);
+        }
+
+        return strtr($template, $replacements);
+    }
+
+    public function menuSitemap(
+        string $route = '',
+        int $depth = -1,
+        bool $hidden = false,
+        string $class = 'sitemap'
+    ): string {
+        return $this->menuTree($route, $depth, $hidden, $class);
+    }
+
+    public function cssOut(?string $group = null, bool $timestamp = false): string
+    {
+        return $this->assets->outputCss($group, $timestamp);
+    }
+
+    public function jsOut(?string $group = null, bool $timestamp = false): string
+    {
+        return $this->assets->outputJs($group, $timestamp);
+    }
+
+    /**
+     * @param array<string, mixed> $context
+     * @throws LoaderError
+     * @throws RuntimeError
+     * @throws SyntaxError
+     */
+    public function snippet(string $path, array $context = []): string
+    {
+        return $this->environment->render($path, $context);
+    }
+
+    public function image(
+        string $src,
+        int $width = 0,
+        int $height = 0,
+        string $alt = '',
+        string $class = ''
+    ): string {
+        $attribs = [];
+        $attribs['src'] = $this->urlManager->createUrl('/') . $src;
+        $attribs['alt'] = $alt;
+        if (!empty($width)) {
+            $attribs['width'] = (string)$width;
+        }
+        if (!empty($height)) {
+            $attribs['height'] = (string)$height;
+        }
+        if (!empty($class)) {
+            $attribs['class'] = $class;
+        }
+        return sprintf('<img %s>', $this->buildHtmlAttributes($attribs));
+    }
+
+    public function linkPage(string $route, string $label, array $attribs = []): string
+    {
+        $scheme = parse_url($route, PHP_URL_SCHEME);
+        if ($scheme === null) {
+            $class = 'link--internal';
+            $href = $this->urlManager->createUrl($route);
+        } else {
+            $class = 'link--external';
+            $href = $route;
+        }
+
+        $attribs['class'] = $attribs['class'] ?? '';
+        $attribs['class'] = trim($attribs['class'] . ' link__label');
+
+        $replace = [
+            '{class}' => $class,
+            '{href}' => $href,
+            '{attribs}' => $this->buildHtmlAttributes($attribs),
+            '{label}' => $label,
+        ];
+
+        $template = '<span class="link {class}"><a href="{href}" {attribs}>{label}</a></span>';
+        return strtr($template, $replace);
+    }
+
+    /**
+     * @param array{site: Site} $context
+     */
+    public function pageTitle(
+        array $context,
+        string $delim = ' / ',
+        string $site_title = '',
+        string $root_title = '',
+        bool $reverse = false
+    ): string {
+        $pageTrail = $context['site']->getPageTrail();
+        $count = count($pageTrail);
+
+        $titles = [];
+
+        if (!empty($site_title)) {
+            $titles[] = $site_title;
+        }
+
+        foreach ($pageTrail as $item) {
+            if ((1 === $count) && $item->isStartPage() && !empty($root_title)) {
+                return $root_title;
+            }
+            $titles[] = $item->getTitle();
+        }
+
+        if (!empty($reverse)) {
+            $titles = array_reverse($titles);
+        }
+
+        return implode($delim, $titles);
+    }
+
+    public function query(iterable $iterator): QueryBuilder
+    {
+        if ($iterator instanceof Traversable) {
+            $data = iterator_to_array($iterator);
+        } else {
+            $data = (array)$iterator;
+        }
+        return (new QueryBuilder())->from($data);
+    }
+
+    public function translate(string $category = '', string $message = '', array $params = []): string
+    {
+        return $this->translator->translate($category, $message, $params);
+    }
+
+    public function urlRelative(string $route = ''): string
+    {
+        return $this->urlManager->createUrl($route);
+    }
+
+    public function urlAbsolute(string $route = ''): string
+    {
+        return $this->urlManager->createAbsoluteUrl($route);
+    }
+
+    public function file(string $path, string $label = '', bool $info = false, array $attribs = []): string
+    {
+        $attribs['class'] = $attribs['class'] ?? 'link__label';
+
+        if (!empty($info)) {
+            $fileInfo = $this->getFileInfo($path);
+        }
+
+        $replace = [
+            '{href}' => $path,
+            '{attribs}' => $this->buildHtmlAttributes($attribs),
+            '{label}' => empty($label) ? basename($path) : $label,
+            '{info}' => empty($fileInfo) ? '' : sprintf('<span class="link__info">%s</span>', $fileInfo)
+        ];
+        return strtr('<span class="link link--file"><a href="{href}" {attribs}>{label}</a>{info}</span>', $replace);
+    }
+
+    private function getFileInfo(string $path): string
+    {
+        if (!is_readable($path)) {
+            return '';
+        }
+        $replace = [
+            '{size}' => $this->filterFilesize(file_size($path)),
+            '{extension}' => strtoupper(pathinfo($path, PATHINFO_EXTENSION))
+        ];
+        return strtr(' ({extension}, {size})', $replace);
+    }
+
+    public function testIsReadable(string $alias): bool
+    {
+        if ($alias === '') {
+            return false;
+        }
+        $filename = $this->alias->get($alias);
+        return is_readable($filename);
+    }
+
+    public function testIsWritable(string $alias): bool
+    {
+        if ($alias === '') {
+            return false;
+        }
+        $filename = $this->alias->get($alias);
+        return is_writable($filename);
+    }
+
+    /**
+     * @param array<string, string> $attribs
+     */
+    protected function createLink(string $route, string $label, array $attribs = []): string
+    {
+        $url = $this->urlManager->createUrl($route);
+        $attribsAsString = $this->buildHtmlAttributes($attribs);
+        return sprintf('<a href="%s"%s>%s</a>', $url, $attribsAsString, $label);
+    }
+}
diff --git a/plugins/twig_core/TwigCorePlugin.php b/plugins/twig/TwigPlugin.php
similarity index 71%
rename from plugins/twig_core/TwigCorePlugin.php
rename to plugins/twig/TwigPlugin.php
index 981c2374..8fdcd61f 100644
--- a/plugins/twig_core/TwigCorePlugin.php
+++ b/plugins/twig/TwigPlugin.php
@@ -2,20 +2,24 @@
 
 declare(strict_types=1);
 
-namespace herbie\sysplugin\twig_core;
+namespace herbie\sysplugin\twig;
 
 use Ausi\SlugGenerator\SlugGenerator;
 use herbie\Alias;
 use herbie\Assets;
+use herbie\Config;
 use herbie\event\TwigInitializedEvent;
+use herbie\PageRepositoryInterface;
 use herbie\Plugin;
 use herbie\Translator;
 use herbie\UrlManager;
 
-final class TwigCorePlugin extends Plugin
+final class TwigPlugin extends Plugin
 {
     private Alias $alias;
     private Assets $assets;
+    private Config $config;
+    private PageRepositoryInterface $pageRepository;
     private SlugGenerator $slugGenerator;
     private Translator $translator;
     private UrlManager $urlManager;
@@ -23,12 +27,16 @@ final class TwigCorePlugin extends Plugin
     public function __construct(
         Alias $alias,
         Assets $assets,
+        Config $config,
+        PageRepositoryInterface $pageRepository,
         SlugGenerator $slugGenerator,
         Translator $translator,
         UrlManager $urlManager
     ) {
         $this->alias = $alias;
         $this->assets = $assets;
+        $this->config = $config;
+        $this->pageRepository = $pageRepository;
         $this->slugGenerator = $slugGenerator;
         $this->translator = $translator;
         $this->urlManager = $urlManager;
@@ -43,10 +51,12 @@ public function eventListeners(): array
 
     public function onTwigInitialized(TwigInitializedEvent $event): void
     {
-        $event->getEnvironment()->addExtension(new TwigCoreExtension(
+        $event->getEnvironment()->addExtension(new TwigExtension(
             $this->alias,
             $this->assets,
+            $this->config,
             $event->getEnvironment(),
+            $this->pageRepository,
             $this->slugGenerator,
             $this->translator,
             $this->urlManager
diff --git a/plugins/twig/config.php b/plugins/twig/config.php
new file mode 100755
index 00000000..2744e481
--- /dev/null
+++ b/plugins/twig/config.php
@@ -0,0 +1,10 @@
+<?php
+
+use herbie\sysplugin\twig\TwigPlugin;
+
+return [
+    'apiVersion' => 2,
+    'pluginName' => 'twig',
+    'pluginClass' => TwigPlugin::class,
+    'pluginPath' => __DIR__,
+];
diff --git a/plugins/twig_core/README.md b/plugins/twig_core/README.md
deleted file mode 100644
index 01dc5e70..00000000
--- a/plugins/twig_core/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Twig Core System Plugin
-
-`Twig Core` is a [Herbie](http://github.com/getherbie) system plugin that brings support for several Twig filters, functions and tests.
-
-## Installation
-
-The plugin is installed already.
-
-To activate it, add `twig_core` to the `enabledSysPlugins` configuration option.
-
-~~~php
-return [
-    'enabledSysPlugins' => 'twig_core'
-];
-~~~
-
-## More Information
-
-For more information, see <https://herbie.tebe.ch>.
diff --git a/plugins/twig_core/TwigCoreExtension.php b/plugins/twig_core/TwigCoreExtension.php
deleted file mode 100644
index 76510806..00000000
--- a/plugins/twig_core/TwigCoreExtension.php
+++ /dev/null
@@ -1,466 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace herbie\sysplugin\twig_core;
-
-use Ausi\SlugGenerator\SlugGenerator;
-use herbie\Alias;
-use herbie\Assets;
-use herbie\Config;
-use herbie\PageTree;
-use herbie\PageTreeFilterIterator;
-use herbie\PageTreeIterator;
-use herbie\Selector;
-use herbie\Site;
-use herbie\Translator;
-use herbie\UrlManager;
-use Twig\Environment;
-use Twig\Error\Error;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
-use Twig\TwigTest;
-
-use function herbie\date_format;
-use function herbie\file_size;
-use function herbie\str_trailing_slash;
-use function herbie\time_format;
-
-final class TwigCoreExtension extends AbstractExtension
-{
-    private Alias $alias;
-
-    private Assets $assets;
-
-    private Environment $environment;
-
-    private SlugGenerator $slugGenerator;
-
-    private Translator $translator;
-
-    private UrlManager $urlManager;
-
-    /**
-     * TwigExtension constructor.
-     */
-    public function __construct(
-        Alias $alias,
-        Assets $assets,
-        Environment $environment,
-        SlugGenerator $slugGenerator,
-        Translator $translator,
-        UrlManager $urlManager
-    ) {
-        $this->alias = $alias;
-        $this->assets = $assets;
-        $this->environment = $environment;
-        $this->slugGenerator = $slugGenerator;
-        $this->translator = $translator;
-        $this->urlManager = $urlManager;
-    }
-
-    /**
-     * @return TwigFilter[]
-     */
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('filesize', [$this, 'filterFilesize']),
-            new TwigFilter('find', [$this, 'filterFind'], ['is_variadic' => true]),
-            new TwigFilter('slugify', [$this, 'filterSlugify']),
-            new TwigFilter('strftime', [$this, 'filterStrftime']),
-            new TwigFilter('visible', [$this, 'filterVisible'], ['deprecated' => true]) // doesn't work properly
-        ];
-    }
-
-    /**
-     * @return TwigFunction[]
-     */
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('add_css', [$this, 'functionAddCss']),
-            new TwigFunction('add_js', [$this, 'functionAddJs']),
-            new TwigFunction('css_classes', [$this, 'functionCssClasses'], ['needs_context' => true]),
-            new TwigFunction('file_link', [$this, 'functionFileLink'], [
-                'is_safe' => ['html'],
-                'needs_context' => true
-            ]),
-            new TwigFunction('file', [$this, 'functionFile'], ['is_safe' => ['html']]),
-            new TwigFunction('image', [$this, 'functionImage'], ['is_safe' => ['html']]),
-            new TwigFunction('page_link', [$this, 'functionPageLink'], ['is_safe' => ['html']]),
-            new TwigFunction('page_title', [$this, 'functionPageTitle'], ['needs_context' => true]),
-            new TwigFunction('output_css', [$this, 'functionOutputCss'], ['is_safe' => ['html']]),
-            new TwigFunction('output_js', [$this, 'functionOutputJs'], ['is_safe' => ['html']]),
-            new TwigFunction('snippet', [$this, 'functionSnippet'], ['is_safe' => ['all']]),
-            new TwigFunction('translate', [$this, 'functionTranslate']),
-            new TwigFunction('url', [$this, 'functionUrl']),
-            new TwigFunction('abs_url', [$this, 'functionAbsUrl']),
-            new TwigFunction('mail_link', [$this, 'functionMailLink'], ['is_safe' => ['html']])
-        ];
-    }
-
-    /**
-     * @return TwigTest[]
-     */
-    public function getTests(): array
-    {
-        return [
-            new TwigTest('readable', [$this, 'testIsReadable']),
-            new TwigTest('writable', [$this, 'testIsWritable'])
-        ];
-    }
-
-    /**
-     * @param array<string, string> $htmlOptions
-     */
-    private function buildHtmlAttributes(array $htmlOptions = []): string
-    {
-        $attributes = '';
-        foreach ($htmlOptions as $key => $value) {
-            $attributes .= $key . '="' . $value . '" ';
-        }
-        return trim($attributes);
-    }
-
-    public function filterFilesize(int $size): string
-    {
-        if ($size <= 0) {
-            return '0';
-        }
-        if ($size === 1) {
-            return '1 Byte';
-        }
-        $mod = 1024;
-        $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-        for ($i = 0; $size > $mod && $i < count($units) - 1; ++$i) {
-            $size /= $mod;
-        }
-        return str_replace(',', '.', (string)round($size, 1)) . ' ' . $units[$i];
-    }
-
-    /**
-     * @param string[] $selectors
-     * @throws \Exception
-     */
-    public function filterFind(iterable $iterator, array $selectors = []): iterable
-    {
-        if ($iterator instanceof \Traversable) {
-            $data = iterator_to_array($iterator);
-        } else {
-            $data = (array)$iterator;
-        }
-        $selector = new Selector();
-        return $selector->find($selectors, $data);
-    }
-
-    /**
-     * Creates a web friendly URL (slug) from a string.
-     */
-    public function filterSlugify(string $url): string
-    {
-        return $this->slugGenerator->generate($url);
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function filterStrftime(string $date, string $format = '%x'): string
-    {
-        // timestamp?
-        if (is_numeric($date)) {
-            $date = date_format('Y-m-d H:i:s', (int)$date);
-        }
-        try {
-            $dateTime = new \DateTime($date);
-        } catch (\Exception $e) {
-            return $date;
-        }
-        return time_format($format, $dateTime->getTimestamp());
-    }
-
-    public function filterVisible(PageTree $tree): PageTreeFilterIterator
-    {
-        $treeIterator = new PageTreeIterator($tree);
-        return new PageTreeFilterIterator($treeIterator);
-    }
-
-    /**
-     * @param array|string $paths
-     */
-    public function functionAddCss(
-        $paths,
-        array $attr = [],
-        ?string $group = null,
-        bool $raw = false,
-        int $pos = 1
-    ): void {
-        $this->assets->addCss($paths, $attr, $group, $raw, $pos);
-    }
-
-    /**
-     * @param array|string $paths
-     */
-    public function functionAddJs(
-        $paths,
-        array $attr = [],
-        ?string $group = null,
-        bool $raw = false,
-        int $pos = 1
-    ): void {
-        $this->assets->addJs($paths, $attr, $group, $raw, $pos);
-    }
-
-    /**
-     * @param array<string, mixed> $context
-     * @return string
-     */
-    public function functionCssClasses(array $context): string
-    {
-        $page = 'error';
-        if (isset($context['page'])) {
-            $route = $context['page']->getRoute();
-            $page = !empty($route) ? $route : 'index';
-        }
-
-        $layout = 'default';
-        if (isset($context['page'])) {
-            $layout = $context['page']->getLayout();
-        }
-
-        $theme = 'default';
-        if (!empty($context['theme'])) {
-            $theme = $context['theme'];
-        }
-
-        $language = 'en';
-        if (isset($context['site'])) {
-            $language = $context['site']->getLanguage();
-        }
-
-        $class = sprintf('page-%s theme-%s layout-%s language-%s', $page, $theme, $layout, $language);
-        return str_replace(['/', '.'], '-', $class);
-    }
-
-    public function functionFileLink(
-        array $context,
-        string $path,
-        string $label = '',
-        bool $info = false,
-        array $attribs = []
-    ): string {
-        $attribs['alt'] = $attribs['alt'] ?? '';
-        $attribs['class'] = $attribs['class'] ?? 'link__label';
-
-        /** @var Config $config from download middleware */
-        $config = $context['config'];
-        $baseUrl = str_trailing_slash($config->getAsString('components.downloadMiddleware.route'));
-        $storagePath = str_trailing_slash($config->getAsString('components.downloadMiddleware.storagePath'));
-
-        // combine url and path
-        $href = $this->urlManager->createUrl($baseUrl . $path);
-        $path = $this->alias->get($storagePath . $path);
-
-        if (!empty($info)) {
-            $fileInfo = $this->getFileInfo($path);
-        }
-
-        $replace = [
-            '{href}' => $href,
-            '{attribs}' => $this->buildHtmlAttributes($attribs),
-            '{label}' => empty($label) ? basename($path) : $label,
-            '{info}' => empty($fileInfo) ? '' : sprintf('<span class="link__info">%s</span>', $fileInfo)
-        ];
-        return strtr('<span class="link link--download"><a href="{href}" {attribs}>{label}</a>{info}</span>', $replace);
-    }
-
-    public function functionMailLink(
-        string $email,
-        ?string $label = null,
-        array $attribs = [],
-        string $template = '@snippet/mail_link.twig'
-    ): string {
-        $attribs['href'] = 'mailto:' . $email;
-        $attribs['class'] = $attribs['class'] ?? 'link__label';
-
-        ksort($attribs);
-
-        $context = [
-            'attribs' => $attribs,
-            'label' => $label ?? $email,
-        ];
-
-        try {
-            return $this->environment->render($template, $context);
-        } catch (Error $e) {
-            return $email;
-        }
-    }
-
-    public function functionOutputCss(?string $group = null, bool $addTimestamp = false): string
-    {
-        return $this->assets->outputCss($group, $addTimestamp);
-    }
-
-    public function functionOutputJs(?string $group = null, bool $addTimestamp = false): string
-    {
-        return $this->assets->outputJs($group, $addTimestamp);
-    }
-
-    /**
-     * @param array<string, mixed> $context
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionSnippet(string $path, array $context = []): string
-    {
-        return $this->environment->render($path, $context);
-    }
-
-    public function functionImage(
-        string $src,
-        int $width = 0,
-        int $height = 0,
-        string $alt = '',
-        string $class = ''
-    ): string {
-        $attribs = [];
-        $attribs['src'] = $this->urlManager->createUrl('/') . $src;
-        $attribs['alt'] = $alt;
-        if (!empty($width)) {
-            $attribs['width'] = (string)$width;
-        }
-        if (!empty($height)) {
-            $attribs['height'] = (string)$height;
-        }
-        if (!empty($class)) {
-            $attribs['class'] = $class;
-        }
-        return sprintf('<img %s>', $this->buildHtmlAttributes($attribs));
-    }
-
-    public function functionPageLink(string $route, string $label, array $attribs = []): string
-    {
-        $scheme = parse_url($route, PHP_URL_SCHEME);
-        if ($scheme === null) {
-            $class = 'link--internal';
-            $href = $this->urlManager->createUrl($route);
-        } else {
-            $class = 'link--external';
-            $href = $route;
-        }
-
-        $attribs['class'] = $attribs['class'] ?? '';
-        $attribs['class'] = trim($attribs['class'] . ' link__label');
-
-        $replace = [
-            '{class}' => $class,
-            '{href}' => $href,
-            '{attribs}' => $this->buildHtmlAttributes($attribs),
-            '{label}' => $label,
-        ];
-
-        $template = '<span class="link {class}"><a href="{href}" {attribs}>{label}</a></span>';
-        return strtr($template, $replace);
-    }
-
-    /**
-     * @param array{site: Site} $context
-     */
-    public function functionPageTitle(
-        array $context,
-        string $delim = ' / ',
-        string $siteTitle = '',
-        string $rootTitle = '',
-        bool $reverse = false
-    ): string {
-        $pageTrail = $context['site']->getPageTrail();
-        $count = count($pageTrail);
-
-        $titles = [];
-
-        if (!empty($siteTitle)) {
-            $titles[] = $siteTitle;
-        }
-
-        foreach ($pageTrail as $item) {
-            if ((1 === $count) && $item->isStartPage() && !empty($rootTitle)) {
-                return $rootTitle;
-            }
-            $titles[] = $item->getTitle();
-        }
-
-        if (!empty($reverse)) {
-            $titles = array_reverse($titles);
-        }
-
-        return implode($delim, $titles);
-    }
-
-    public function functionTranslate(string $category = '', string $message = '', array $params = []): string
-    {
-        return $this->translator->translate($category, $message, $params);
-    }
-
-    public function functionUrl(string $route = ''): string
-    {
-        return $this->urlManager->createUrl($route);
-    }
-
-    public function functionAbsUrl(string $route = ''): string
-    {
-        return $this->urlManager->createAbsoluteUrl($route);
-    }
-
-    public function functionFile(string $path, string $label = '', bool $info = false, array $attribs = []): string
-    {
-        $attribs['class'] = $attribs['class'] ?? 'link__label';
-
-        if (!empty($info)) {
-            $fileInfo = $this->getFileInfo($path);
-        }
-
-        $replace = [
-            '{href}' => $path,
-            '{attribs}' => $this->buildHtmlAttributes($attribs),
-            '{label}' => empty($label) ? basename($path) : $label,
-            '{info}' => empty($fileInfo) ? '' : sprintf('<span class="link__info">%s</span>', $fileInfo)
-        ];
-        return strtr('<span class="link link--file"><a href="{href}" {attribs}>{label}</a>{info}</span>', $replace);
-    }
-
-    private function getFileInfo(string $path): string
-    {
-        if (!is_readable($path)) {
-            return '';
-        }
-        $replace = [
-            '{size}' => $this->filterFilesize(file_size($path)),
-            '{extension}' => strtoupper(pathinfo($path, PATHINFO_EXTENSION))
-        ];
-        return strtr(' ({extension}, {size})', $replace);
-    }
-
-    public function testIsReadable(string $alias): bool
-    {
-        if (!is_string($alias) || empty($alias)) {
-            return false;
-        }
-        $filename = $this->alias->get($alias);
-        return is_readable($filename);
-    }
-
-    public function testIsWritable(string $alias): bool
-    {
-        if (!is_string($alias) || empty($alias)) {
-            return false;
-        }
-        $filename = $this->alias->get($alias);
-        return is_writable($filename);
-    }
-}
diff --git a/plugins/twig_core/config.php b/plugins/twig_core/config.php
deleted file mode 100755
index 6aefc3d5..00000000
--- a/plugins/twig_core/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use herbie\sysplugin\twig_core\TwigCorePlugin;
-
-return [
-    'apiVersion' => 2,
-    'pluginName' => 'twig_core',
-    'pluginClass' => TwigCorePlugin::class,
-    'pluginPath' => __DIR__,
-];
diff --git a/plugins/twig_plus/README.md b/plugins/twig_plus/README.md
deleted file mode 100644
index 80dedc14..00000000
--- a/plugins/twig_plus/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Twig Plus System Plugin
-
-`Twig Plus` is a [Herbie](http://github.com/getherbie) system plugin that brings support for several Twig functions.
-
-## Installation
-
-The plugin is installed already.
-
-To activate it, add `twig_plus` to the `enabledSysPlugins` configuration option.
-
-~~~php
-return [
-    'enabledSysPlugins' => 'twig_plus'
-];
-~~~
-
-## More Information
-
-For more information, see <https://herbie.tebe.ch>.
diff --git a/plugins/twig_plus/TwigPlusExtension.php b/plugins/twig_plus/TwigPlusExtension.php
deleted file mode 100644
index c09dafec..00000000
--- a/plugins/twig_plus/TwigPlusExtension.php
+++ /dev/null
@@ -1,466 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace herbie\sysplugin\twig_plus;
-
-use herbie\Page;
-use herbie\PageList;
-use herbie\PageRepositoryInterface;
-use herbie\PageTree;
-use herbie\PageTreeFilterCallback;
-use herbie\PageTreeFilterIterator;
-use herbie\PageTreeHtmlRenderer;
-use herbie\PageTreeIterator;
-use herbie\PageTreeTextRenderer;
-use herbie\Pagination;
-use herbie\UrlManager;
-use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
-
-final class TwigPlusExtension extends AbstractExtension
-{
-    private Environment $environment;
-    private PageRepositoryInterface $pageRepository;
-    private UrlManager $urlManager;
-
-    /**
-     * TwigPlusExtension constructor.
-     */
-    public function __construct(
-        Environment $environment,
-        PageRepositoryInterface $pageRepository,
-        UrlManager $urlManager
-    ) {
-        $this->environment = $environment;
-        $this->pageRepository = $pageRepository;
-        $this->urlManager = $urlManager;
-    }
-
-    /**
-     * @return TwigFunction[]
-     */
-    public function getFunctions(): array
-    {
-        $options = ['is_safe' => ['html']];
-        return [
-            new TwigFunction('menu_ascii_tree', [$this, 'functionAsciiTree'], $options),
-            new TwigFunction('menu_breadcrumb', [$this, 'functionBreadcrumb'], $options),
-            new TwigFunction('menu_list', [$this, 'functionListing'], $options),
-            new TwigFunction('menu_pager', [$this, 'functionPager'], $options),
-            new TwigFunction('menu_sitemap', [$this, 'functionSitemap'], $options),
-            new TwigFunction('menu_tree', [$this, 'functionMenu'], $options),
-            new TwigFunction('page_taxonomies', [$this, 'functionPageTaxonomies'], $options),
-            new TwigFunction('pages_filtered', [$this, 'functionPagesFiltered'], $options),
-            new TwigFunction('pages_recent', [$this, 'functionPagesRecent'], $options),
-            new TwigFunction('taxonomy_archive', [$this, 'functionTaxonomyArchive'], $options),
-            new TwigFunction('taxonomy_authors', [$this, 'functionTaxonomyAuthors'], $options),
-            new TwigFunction('taxonomy_categories', [$this, 'functionTaxonomyCategories'], $options),
-            new TwigFunction('taxonomy_tags', [$this, 'functionTaxonomyTags'], $options)
-        ];
-    }
-
-    public function functionAsciiTree(
-        string $route = '',
-        int $maxDepth = -1,
-        bool $showHidden = false
-    ): string {
-        // TODO use $class parameter
-        $branch = $this->pageRepository->findAll()->getPageTree()->findByRoute($route);
-        if ($branch === null) {
-            return '';
-        }
-
-        $treeIterator = new PageTreeIterator($branch);
-        $filterIterator = new PageTreeFilterIterator($treeIterator, !$showHidden);
-
-        $asciiTree = new PageTreeTextRenderer($filterIterator);
-        $asciiTree->setMaxDepth($maxDepth);
-        return $asciiTree->render();
-    }
-
-    /**
-     * @param array{0: string, 1?: string}|string $homeLink
-     */
-    public function functionBreadcrumb(
-        string $delim = '',
-        $homeLink = '',
-        bool $reverse = false
-    ): string {
-        // TODO use string type for param $homeLink (like "route|label")
-
-        $links = [];
-
-        if (!empty($homeLink)) {
-            if (is_array($homeLink)) {
-                $route = reset($homeLink);
-                $label = isset($homeLink[1]) ? $homeLink[1] : 'Home';
-            } else {
-                $route = $homeLink;
-                $label = 'Home';
-            }
-            $links[] = $this->createLink($route, $label);
-        }
-
-        [$route] = $this->urlManager->parseRequest();
-        $pageTrail = $this->pageRepository->findAll()->getPageTrail($route);
-        foreach ($pageTrail as $item) {
-            $links[] = $this->createLink($item->getRoute(), $item->getMenuTitle());
-        }
-
-        if (!empty($reverse)) {
-            $links = array_reverse($links);
-        }
-
-        $html = '<ul class="breadcrumb">';
-        foreach ($links as $i => $link) {
-            if ($i > 0 && !empty($delim)) {
-                $html .= '<li class="delim">' . $delim . '</li>';
-            }
-            $html .= '<li>' . $link . '</li>';
-        }
-        $html .= '</ul>';
-
-        return $html;
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionListing(
-        ?PageList $pageList = null,
-        string $filter = '',
-        string $sort = '',
-        bool $shuffle = false,
-        int $limit = 10,
-        string $template = '@snippet/listing.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-
-        if (!empty($filter)) {
-            [$field, $value] = explode('|', $filter);
-            $pageList = $pageList->filter($field, $value);
-        }
-
-        if (!empty($sort)) {
-            [$field, $direction] = explode('|', $sort);
-            $pageList = $pageList->sort($field, $direction);
-        }
-
-        if ($shuffle) {
-            $pageList = $pageList->shuffle();
-        }
-
-        // filter pages with empty title
-        $pageList = $pageList->filter(function (Page $page) {
-            return !empty($page->getTitle());
-        });
-
-        $pagination = new Pagination($pageList);
-        $pagination->setLimit($limit);
-
-        return $this->environment->render($template, ['pagination' => $pagination]);
-    }
-
-    public function functionMenu(
-        string $route = '',
-        int $maxDepth = -1,
-        bool $showHidden = false,
-        string $class = 'menu'
-    ): string {
-        // NOTE duplicated code, see function sitemap
-        $branch = $this->pageRepository->findAll()->getPageTree()->findByRoute($route);
-        if ($branch === null) {
-            return '';
-        }
-
-        $treeIterator = new PageTreeIterator($branch);
-        $filterIterator = new PageTreeFilterIterator($treeIterator, !$showHidden);
-
-        $htmlTree = new PageTreeHtmlRenderer($filterIterator);
-        $htmlTree->setMaxDepth($maxDepth);
-        $htmlTree->setClass($class);
-        $htmlTree->setItemCallback(function (PageTree $node) {
-            $menuItem = $node->getMenuItem();
-            $href = $this->urlManager->createUrl($menuItem->getRoute());
-            return sprintf('<a href="%s">%s</a>', $href, $menuItem->getMenuTitle());
-        });
-
-        [$currenRoute] = $this->urlManager->parseRequest();
-        return $htmlTree->render($currenRoute);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionPageTaxonomies(
-        ?Page $page = null,
-        string $pageRoute = '',
-        bool $renderAuthors = true,
-        bool $renderCategories = true,
-        bool $renderTags = true,
-        string $template = '@template/page/taxonomies.twig'
-    ): string {
-        return $this->environment->render($template, [
-            'page' => $page,
-            'pageRoute' => $pageRoute,
-            'renderAuthors' => $renderAuthors,
-            'renderCategories' => $renderCategories,
-            'renderTags' => $renderTags
-        ]);
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function functionPager(
-        string $limit = '',
-        string $prevPageLabel = '',
-        string $nextPageLabel = '',
-        string $prevPageIcon = '',
-        string $nextPageIcon = '',
-        string $cssClass = 'pager',
-        string $template = '<div class="{class}">{prev}{next}</div>'
-    ): string {
-        [$route] = $this->urlManager->parseRequest();
-        $pageList = $this->pageRepository->findAll();
-
-        if ($limit !== '') {
-            $pageList = $pageList->filter(function ($page) use ($limit) {
-                return strpos($page->getRoute(), $limit) === 0;
-            });
-        }
-
-        $prevPage = null;
-        $currentPage = null;
-        $nextPage = null;
-        $lastPage = null;
-        foreach ($pageList as $key => $page) {
-            if ($currentPage) {
-                $nextPage = $page;
-                break;
-            }
-            if ($key === $route) {
-                $prevPage = $lastPage;
-                $currentPage = $page;
-                continue;
-            }
-            $lastPage = $page;
-        }
-
-        $replacements = [
-            '{class}' => $cssClass,
-            '{prev}' => '',
-            '{next}' => ''
-        ];
-
-        if (isset($prevPage)) {
-            $label = empty($prevPageLabel) ? $prevPage->getMenuTitle() : $prevPageLabel;
-            $label = sprintf('<span class="%s-label-prev">%s</span>', $cssClass, $label);
-            if ($prevPageIcon) {
-                $label = sprintf('<span class="%s-icon-prev">%s</span>%s', $cssClass, $prevPageIcon, $label);
-            }
-            $attribs = ['class' => $cssClass . '-link-prev'];
-            $replacements['{prev}'] = $this->createLink($prevPage->getRoute(), $label, $attribs);
-        }
-
-        if (isset($nextPage)) {
-            $label = empty($nextPageLabel) ? $nextPage->getMenuTitle() : $nextPageLabel;
-            $label = sprintf('<span class="%s-label-next">%s</span>', $cssClass, $label);
-            if ($nextPageIcon) {
-                $label = sprintf('%s<span class="%s-icon-next">%s</span>', $label, $cssClass, $nextPageIcon);
-            }
-            $attribs = ['class' => $cssClass . '-link-next'];
-            $replacements['{next}'] = $this->createLink($nextPage->getRoute(), $label, $attribs);
-        }
-
-        return strtr($template, $replacements);
-    }
-
-    /**
-     * @param array<string, string> $routeParams
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionPagesFiltered(
-        array $routeParams,
-        string $template = '@template/pages/filtered.twig'
-    ): string {
-        return $this->environment->render($template, [
-            'routeParams' => $routeParams
-        ]);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionPagesRecent(
-        ?PageList $pageList = null,
-        string $dateFormat = '%e. %B %Y',
-        int $limit = 5,
-        ?string $pageType = null,
-        bool $showDate = false,
-        string $title = 'Recent posts',
-        string $template = '@template/pages/recent.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-        $recentPages = $pageList->getRecent($limit, $pageType);
-        return $this->environment->render($template, [
-            'recentPages' => $recentPages,
-            'dateFormat' => $dateFormat,
-            'pageType' => $pageType,
-            'showDate' => $showDate,
-            'title' => $title
-        ]);
-    }
-
-    public function functionSitemap(
-        string $route = '',
-        int $maxDepth = -1,
-        bool $showHidden = false,
-        string $class = 'sitemap'
-    ): string {
-        return $this->functionMenu($route, $maxDepth, $showHidden, $class);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionTaxonomyArchive(
-        ?PageList $pageList = null,
-        string $pageRoute = '',
-        string $pageType = '',
-        bool $showCount = false,
-        string $title = 'Archive',
-        string $template = '@template/taxonomy/archive.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-        $months = $pageList->getMonths($pageType);
-        return $this->environment->render($template, [
-            'months' => $months,
-            'pageRoute' => $pageRoute,
-            'pageType' => $pageType,
-            'showCount' => $showCount,
-            'title' => $title
-        ]);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionTaxonomyAuthors(
-        ?PageList $pageList = null,
-        string $pageRoute = '',
-        string $pageType = '',
-        bool $showCount = false,
-        string $title = 'Authors',
-        string $template = '@template/taxonomy/authors.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-        $authors = $pageList->getAuthors($pageType);
-        return $this->environment->render($template, [
-            'authors' => $authors,
-            'pageRoute' => $pageRoute,
-            'pageType' => $pageType,
-            'showCount' => $showCount,
-            'title' => $title
-        ]);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionTaxonomyCategories(
-        ?PageList $pageList = null,
-        string $pageRoute = '',
-        string $pageType = '',
-        bool $showCount = false,
-        string $title = 'Categories',
-        string $template = '@template/taxonomy/categories.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-        $categories = $pageList->getCategories($pageType);
-        return $this->environment->render($template, [
-            'categories' => $categories,
-            'pageRoute' => $pageRoute,
-            'pageType' => $pageType,
-            'showCount' => $showCount,
-            'title' => $title
-        ]);
-    }
-
-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
-    public function functionTaxonomyTags(
-        ?PageList $pageList = null,
-        string $pageRoute = '',
-        string $pageType = '',
-        bool $showCount = false,
-        string $title = 'Tags',
-        string $template = '@template/taxonomy/tags.twig'
-    ): string {
-        if ($pageList === null) {
-            $pageList = $this->pageRepository->findAll();
-        }
-        $tags = $pageList->getTags($pageType);
-        return $this->environment->render($template, [
-            'pageRoute' => $pageRoute,
-            'pageType' => $pageType,
-            'showCount' => $showCount,
-            'tags' => $tags,
-            'title' => $title
-        ]);
-    }
-
-    /**
-     * @param array<string, string> $htmlOptions
-     */
-    protected function buildHtmlAttributes(array $htmlOptions = []): string
-    {
-        $attributes = '';
-        foreach ($htmlOptions as $key => $value) {
-            $attributes .= $key . '="' . $value . '" ';
-        }
-        return trim($attributes);
-    }
-
-    /**
-     * @param array<string, string> $htmlAttributes
-     */
-    protected function createLink(string $route, string $label, array $htmlAttributes = []): string
-    {
-        $url = $this->urlManager->createUrl($route);
-        $attributesAsString = $this->buildHtmlAttributes($htmlAttributes);
-        return sprintf('<a href="%s"%s>%s</a>', $url, $attributesAsString, $label);
-    }
-}
diff --git a/plugins/twig_plus/TwigPlusPlugin.php b/plugins/twig_plus/TwigPlusPlugin.php
deleted file mode 100644
index 762b465c..00000000
--- a/plugins/twig_plus/TwigPlusPlugin.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace herbie\sysplugin\twig_plus;
-
-use herbie\event\TwigInitializedEvent;
-use herbie\PageRepositoryInterface;
-use herbie\Plugin;
-use herbie\UrlManager;
-
-final class TwigPlusPlugin extends Plugin
-{
-    private PageRepositoryInterface $pageRepository;
-    private UrlManager $urlManager;
-
-    public function __construct(
-        PageRepositoryInterface $pageRepository,
-        UrlManager $urlManager
-    ) {
-        $this->pageRepository = $pageRepository;
-        $this->urlManager = $urlManager;
-    }
-
-    public function eventListeners(): array
-    {
-        return [
-            [TwigInitializedEvent::class, [$this, 'onTwigInitialized']],
-        ];
-    }
-
-    public function onTwigInitialized(TwigInitializedEvent $event): void
-    {
-        $event->getEnvironment()->addExtension(new TwigPlusExtension(
-            $event->getEnvironment(),
-            $this->pageRepository,
-            $this->urlManager
-        ));
-    }
-}
diff --git a/plugins/twig_plus/config.php b/plugins/twig_plus/config.php
deleted file mode 100755
index 0c2ea3d8..00000000
--- a/plugins/twig_plus/config.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use herbie\sysplugin\twig_plus\TwigPlusPlugin;
-
-return [
-    'apiVersion' => 2,
-    'pluginName' => 'twig_plus',
-    'pluginClass' => TwigPlusPlugin::class,
-    'pluginPath' => __DIR__,
-];
diff --git a/system/Config.php b/system/Config.php
index 8f3e7bde..596d7f0a 100644
--- a/system/Config.php
+++ b/system/Config.php
@@ -133,4 +133,17 @@ public function flatten(): array
         ksort($flatten);
         return $flatten;
     }
+
+    /**
+     * This is for snake_case in twig only.
+     * @return null|mixed
+     */
+    public function __call(string $name, array $arguments)
+    {
+        $getter = 'get' . str_replace('_', '', $name);
+        if (method_exists($this, $getter)) {
+            return $this->$getter(...$arguments);
+        }
+        return null;
+    }
 }
diff --git a/system/ContainerBuilder.php b/system/ContainerBuilder.php
index a250b3a6..8b43de89 100644
--- a/system/ContainerBuilder.php
+++ b/system/ContainerBuilder.php
@@ -271,8 +271,6 @@ public function build(): ContainerInterface
                 $c->get(EventManager::class),
                 $c->get(LoggerInterface::class),
                 $c->get(Site::class),
-                $c->get(UrlManager::class),
-                $this->app->getBaseUrl()
             );
         });
 
diff --git a/system/CorePlugin.php b/system/CorePlugin.php
index 6a91cfea..896bfa32 100644
--- a/system/CorePlugin.php
+++ b/system/CorePlugin.php
@@ -60,8 +60,6 @@ public function onRenderPage(RenderPageEvent $event): void
     {
         $twig = $this->twigRenderer->getTwigEnvironment();
         $twig->addGlobal('page', $event->getPage());
-        $twig->addGlobal('route', $event->getRoute());
-        $twig->addGlobal('routeParams', $event->getRouteParams());
     }
 
     /**
diff --git a/system/PageList.php b/system/PageList.php
index 16cef103..f373ca33 100644
--- a/system/PageList.php
+++ b/system/PageList.php
@@ -76,6 +76,11 @@ public function find(string $value, string $key): ?Page
         return null;
     }
 
+    public function query(): QueryBuilder
+    {
+        return (new QueryBuilder())->from($this);
+    }
+
     /**
      * Run a filter over each of the items.
      *
diff --git a/system/QueryBuilder.php b/system/QueryBuilder.php
new file mode 100644
index 00000000..0e284d13
--- /dev/null
+++ b/system/QueryBuilder.php
@@ -0,0 +1,423 @@
+<?php
+
+declare(strict_types=1);
+
+namespace herbie;
+
+use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
+use Traversable;
+
+/**
+ * @see https://stackoverflow.com/a/17414042/6161354
+ * @see https://daylerees.com/code-happy-fluent-query-builder/
+ */
+final class QueryBuilder implements IteratorAggregate
+{
+    private const WHERE_CLAUSE_OPERATORS = ['AND', 'OR'];
+    // ordered by key string length
+    private const OPERATORS = [
+        "!=" => 'matchNotEqual',
+        ">=" => 'matchGreaterThanEqual',
+        "<=" => 'matchLessThanEqual',
+        "*=" => 'matchContains',
+        "^=" => 'matchStarts',
+        "~=" => 'matchContainsWords',
+        "$=" => 'matchEnds',
+        "?=" => 'matchRegex',
+        "=" => 'matchEqual',
+        ">" => 'matchGreaterThan',
+        "<" => 'matchLessThan',
+        "&" => 'matchBitwiseAnd',
+    ];
+    private array $where;
+    private int $limit;
+    private int $offset;
+    /** @var callable|string $order */
+    private $order;
+    private array $data;
+    private array $processed;
+
+    public function __construct()
+    {
+        $this->where = [];
+        $this->limit = 0;
+        $this->offset = 0;
+        $this->order = '';
+        $this->data = [];
+        $this->processed = [];
+    }
+
+    public function from(iterable $iterator): self
+    {
+        if ($iterator instanceof Traversable) {
+            $this->data = iterator_to_array($iterator);
+        } else {
+            $this->data = (array)$iterator;
+        }
+        return $this;
+    }
+
+    /**
+     * @param array|string ...$conditions
+     */
+    public function where(...$conditions): self
+    {
+        if (empty($conditions)) {
+            throw new \InvalidArgumentException('Empty where conditions');
+        }
+        foreach ($conditions as $condition) {
+            if (is_string($condition)) {
+                $parsedCondition = $this->parseCondition($condition);
+                $this->where[] = array_merge(['AND'], [$parsedCondition]);
+                continue;
+            }
+            if (is_array($condition)) {
+                if (isset($condition[0]) && in_array(strtoupper($condition[0]), self::WHERE_CLAUSE_OPERATORS)) {
+                    $this->where[] = $this->parseConditionsInOperatorFormat($condition);
+                    continue;
+                } elseif (array_is_assoc($condition)) {
+                    $this->where[] = $this->parseConditionsInHashFormat($condition);
+                    continue;
+                }
+            }
+            throw new \InvalidArgumentException('Unsupported where conditions');
+        }
+        return $this;
+    }
+
+    private function parseCondition(string $condition): array
+    {
+        foreach (self::OPERATORS as $syntax => $name) {
+            $position = stripos($condition, $syntax);
+            if ($position !== false) {
+                $syntaxLength = strlen($syntax);
+                $value1 = substr($condition, 0, $position);
+                $value2 = substr($condition, $position + $syntaxLength);
+                if (str_contains($value1, '|')) {
+                    $values1 = str_explode_filtered($value1, '|');
+                    $conditions = ['OR'];
+                    foreach ($values1 as $value1) {
+                        $conditions[] = [$name, $value1, $value2];
+                    }
+                    return $conditions;
+                }
+                if (str_contains($value2, '|')) {
+                    $values2 = str_explode_filtered($value2, '|');
+                    $conditions = ['OR'];
+                    foreach ($values2 as $value2) {
+                        $conditions[] = [$name, $value1, $value2];
+                    }
+                    return $conditions;
+                }
+                return [$name, $value1, $value2];
+            }
+        }
+        throw new \InvalidArgumentException('Unsupported operator');
+    }
+
+    private function convertType(mixed $value1, mixed $value2): mixed
+    {
+        if (is_bool($value1) && is_string($value2)) {
+            $lowered = strtolower($value2);
+            if ($lowered === 'true') {
+                return true;
+            }
+            if ($lowered === 'false') {
+                return false;
+            }
+            return $value2;
+        }
+        return $value2;
+    }
+
+    private function parseConditionsInOperatorFormat(array $conditions): array
+    {
+        if (!isset($conditions[0]) || !in_array(strtoupper($conditions[0]), self::WHERE_CLAUSE_OPERATORS)) {
+            throw new \InvalidArgumentException('Missing where clause operator');
+        }
+        $whereClauseOperator = [strtoupper(array_shift($conditions))];
+        $items = [];
+        foreach ($conditions as $condition) {
+            if (is_array($condition)) {
+                $items[] = $this->parseConditionsInOperatorFormat($condition);
+            } else {
+                $items[] = $this->parseCondition($condition);
+            }
+        }
+        return array_merge($whereClauseOperator, $items);
+    }
+
+    private function parseConditionsInHashFormat(array $conditions): array
+    {
+        $items = [];
+        foreach ($conditions as $key => $value) {
+            if (is_scalar($value)) {
+                $type = \herbie\get_type($value);
+                $items[] = ['match' . ucfirst($type), $key, $value];
+            }
+        }
+        return array_merge(['AND'], $items);
+    }
+
+    public function limit(int $limit): self
+    {
+        $this->limit = $limit;
+        return $this;
+    }
+
+    public function offset(int $offset): self
+    {
+        $this->offset = $offset;
+        return $this;
+    }
+
+    public function order(callable|string $order): self
+    {
+        $this->order = $order;
+        return $this;
+    }
+
+    public function count(): int
+    {
+        return count($this->processed);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function paginate(int $size): Pagination
+    {
+        $this->limit = $size;
+        $this->processData();
+        return new Pagination($this->processed, $this->limit);
+    }
+
+    public function all(): iterable
+    {
+        $this->processData();
+        return $this->processed;
+    }
+
+    public function one(): array|object|null
+    {
+        $this->limit = 1;
+        $this->processData();
+        $item = reset($this->processed);
+        if ($item === false) {
+            return null;
+        }
+        return $item;
+    }
+
+    public function getIterator(): Traversable
+    {
+        $this->processData();
+        return new ArrayIterator($this->processed);
+    }
+
+    private function processData(): void
+    {
+        $i = 0;
+        $j = 0;
+        $this->sort();
+        foreach ($this->data as $item) {
+            if (($this->offset > 0) && ($j < ($this->offset))) {
+                $j++;
+                continue;
+            }
+            $status = $this->processItem($item, array_merge(['AND'], $this->where));
+            if ($status === true) {
+                $this->processed[] = $item;
+                $i++;
+                if (($this->limit > 0) && ($i >= $this->limit)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    private function processItem(ArrayAccess|array|int|float|string|bool $item, array $conditions): bool
+    {
+        $whereClauseOperator = array_shift($conditions);
+
+        if (empty($conditions)) {
+            return true;
+        }
+
+        $status = [];
+        foreach ($conditions as $condition) {
+            if (isset($condition[0]) && in_array(strtoupper($condition[0]), self::WHERE_CLAUSE_OPERATORS)) {
+                $status[] = $this->processItem($item, $condition);
+                continue;
+            }
+
+            $itemIsScalar = is_scalar($item);
+            $itemIsArrayable = ($item instanceof ArrayAccess) || is_array($item);
+
+            [$operator, $field, $value2] = $condition;
+
+            if (!$itemIsScalar && !isset($item[$field])) {
+                $status[] = false;
+                continue;
+            }
+
+            /** @var callable $callable */
+            $callable = [$this, $operator];
+            if ($itemIsScalar && ($field === 'value')) {
+                $value2 = $this->convertType($item, $value2);
+                $status[] = call_user_func_array($callable, [$item, $value2]);
+            } elseif ($itemIsArrayable && isset($item[$field]) && is_array($item[$field])) {
+                $arrStatus = [];
+                foreach ($item[$field] as $value1) {
+                    $value2 = $this->convertType($value1, $value2);
+                    $arrStatus[] = call_user_func_array($callable, [$value1, $value2]);
+                }
+                $status[] = in_array(true, $arrStatus, true);
+            } elseif ($itemIsArrayable && isset($item[$field])) {
+                $value1 = $item[$field];
+                $value2 = $this->convertType($value1, $value2);
+                $status[] = call_user_func_array($callable, [$value1, $value2]);
+            }
+        }
+
+        if ($whereClauseOperator === 'OR') {
+            return in_array(true, $status, true);
+        }
+
+        $uniqueStatus = array_unique($status);
+        $uniqueStatusCount = count($uniqueStatus);
+        return $uniqueStatusCount === 1 && in_array(true, $uniqueStatus, true);
+    }
+
+    private function sort(): bool
+    {
+        if (is_callable($this->order)) {
+            return uasort($this->data, $this->order);
+        }
+
+        if (trim($this->order, '-+') === '') {
+            return false;
+        }
+
+        $field = '';
+        if (!empty($this->order)) {
+            $field = trim($this->order, '+');
+        }
+
+        $direction = 'asc';
+        if (str_starts_with($field, '-')) {
+            $field = substr($field, 1);
+            $direction = 'desc';
+        }
+
+        return uasort($this->data, function ($value1, $value2) use ($field, $direction) {
+            if (!isset($value1[$field]) || !isset($value2[$field])) {
+                return 0;
+            }
+            if ($value1[$field] === $value2[$field]) {
+                return 0;
+            }
+            if ($direction === 'asc') {
+                return ($value1[$field] < $value2[$field]) ? -1 : 1;
+            } else {
+                return ($value2[$field] < $value1[$field]) ? -1 : 1;
+            }
+        });
+    }
+
+    protected function matchString(string $value1, string $value2): bool
+    {
+        return $value1 === $value2;
+    }
+
+    protected function matchBoolean(bool $value1, bool $value2): bool
+    {
+        return $value1 === $value2;
+    }
+
+    protected function matchInteger(int $value1, int $value2): bool
+    {
+        return $value1 === $value2;
+    }
+
+    protected function matchFloat(float $value1, float $value2): bool
+    {
+        return $value1 === $value2;
+    }
+
+    protected function matchEqual(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 === $value2;
+    }
+
+    protected function matchNotEqual(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 !== $value2;
+    }
+
+    protected function matchGreaterThan(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 > $value2;
+    }
+
+    protected function matchLessThan(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 < $value2;
+    }
+
+    protected function matchGreaterThanEqual(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 >= $value2;
+    }
+
+    protected function matchLessThanEqual(string|float|int|bool $value1, string|float|int|bool $value2): bool
+    {
+        return $value1 <= $value2;
+    }
+
+    protected function matchBitwiseAnd(int $value1, int $value2): bool
+    {
+        return ($value1 & $value2) > 0;
+    }
+
+    protected function matchContains(string $value1, string $value2): bool
+    {
+        return stripos($value1, $value2) !== false;
+    }
+
+    protected function matchContainsWords(string $value1, string $value2): bool
+    {
+        $words = preg_split('/[-\s]/', $value2, -1, PREG_SPLIT_NO_EMPTY);
+        if (!is_array($words) || count($words) === 0) {
+            return false;
+        }
+        foreach ($words as $word) {
+            if (!preg_match('/\b' . preg_quote($word) . '\b/i', $value1)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    protected function matchStarts(string $value1, string $value2): bool
+    {
+        return stripos(trim($value1), $value2) === 0;
+    }
+
+    protected function matchEnds(string $value1, string $value2): bool
+    {
+        $value2 = trim($value2);
+        $value1 = substr($value1, -1 * strlen($value2));
+        return strcasecmp($value1, $value2) === 0;
+    }
+
+    protected function matchRegex(string $value1, string $value2): bool
+    {
+        if (preg_match($value2, $value1, $matches)) {
+            return count($matches) > 0;
+        }
+        return false;
+    }
+}
diff --git a/system/Selector.php b/system/Selector.php
deleted file mode 100644
index 0359b738..00000000
--- a/system/Selector.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace herbie;
-
-final class Selector
-{
-    protected array $operators = [
-        "!=" => 'matchNotEqual',
-        ">=" => 'matchGreaterThanEqual',
-        "<=" => 'matchLessThanEqual',
-        "*=" => 'matchContains',
-        "^=" => 'matchStarts',
-        "~=" => 'matchContainsWords',
-        "$=" => 'matchEnds',
-        "&"  => 'matchBitwiseAnd',
-        ">"  => 'matchGreaterThan',
-        "<"  => 'matchLessThan',
-        "="  => 'matchEqual',
-    ];
-
-    protected array $selectors = [];
-
-    /**
-     * Find and return all items matching the given selector string.
-     *
-     * =   Equal to
-     * !=  Not equal to
-     * <   Less than
-     * >   Greater than
-     * <=  Less than or equal to
-     * >=  Greater than or equal to
-     * *=  Contains the exact word or phrase
-     * ~=  Contains all the words
-     * ^=  Contains the exact word or phrase at the beginning of the field
-     * $=  Contains the exact word or phrase at the end of the field
-     * &   Bitwise and
-     *
-     * @param array|string $selector
-     * @return mixed
-     * @throws \Exception
-     */
-    public function find($selector, array $data)
-    {
-        $selectors = $this->getSelector($selector);
-        $sort = $this->extractSort($selectors);
-        $limit = $this->extractLimit($selectors);
-
-        unset($selector);
-
-        if (!empty($sort)) {
-            $this->sort($sort, $data);
-        }
-
-        if (empty($selectors)) {
-            return $data;
-        }
-
-        $return = [];
-        $i = 1;
-        foreach ($data as $item) {
-            if (($limit > 0) && ($i > $limit)) {
-                break;
-            }
-
-            $bool = true;
-            foreach ($selectors as $selector) {
-                [$field, $value, $function] = $selector;
-                if (!isset($item[$field])) {
-                    $bool = false;
-                    break;
-                }
-                /** @var callable $callable */
-                $callable = [$this, $function];
-                $bool &= call_user_func_array($callable, [$item[$field], $value]);
-            }
-
-            if ($bool) {
-                $return[] = $item;
-                $i++;
-            }
-        }
-
-        return $return;
-    }
-
-    protected function extractSort(array &$selectors): string
-    {
-        $sort = "";
-        foreach ($selectors as $index => $selector) {
-            if ($selector[0] === "sort") {
-                $sort = $selector[1];
-                unset($selectors[$index]);
-                break;
-            }
-        }
-        return $sort;
-    }
-
-    protected function extractLimit(array &$selectors): int
-    {
-        $limit = 0;
-        foreach ($selectors as $index => $selector) {
-            if ($selector[0] === "limit") {
-                $limit = abs((int)$selector[1]);
-                unset($selectors[$index]);
-                break;
-            }
-        }
-        return $limit;
-    }
-
-    /**
-     * @param string $selector
-     * @param array &$data
-     * @return mixed
-     * @throws \Exception
-     */
-    public function get($selector, &$data)
-    {
-        return $this->find($selector, $data)->first();
-    }
-
-    protected function matchEqual(string $value1, string $value2): bool
-    {
-        return $value1 === $value2;
-    }
-
-    protected function matchNotEqual(string $value1, string $value2): bool
-    {
-        return $value1 !== $value2;
-    }
-
-    protected function matchGreaterThan(string $value1, string $value2): bool
-    {
-        return $value1 > $value2;
-    }
-
-    protected function matchLessThan(string $value1, string $value2): bool
-    {
-        return $value1 < $value2;
-    }
-
-    protected function matchGreaterThanEqual(string $value1, string $value2): bool
-    {
-        return $value1 >= $value2;
-    }
-
-    protected function matchLessThanEqual(string $value1, string $value2): bool
-    {
-        return $value1 <= $value2;
-    }
-
-    protected function matchBitwiseAnd(string $value1, string $value2): bool
-    {
-        return ((int)$value1 & (int)$value2) > 0;
-    }
-
-    protected function matchContains(string $value1, string $value2): bool
-    {
-        return stripos($value1, $value2) !== false;
-    }
-
-    protected function matchContainsWords(string $value1, string $value2): bool
-    {
-        $words = preg_split('/[-\s]/', $value2, -1, PREG_SPLIT_NO_EMPTY);
-        if (!is_array($words) || count($words) === 0) {
-            return false;
-        }
-        foreach ($words as $word) {
-            if (!preg_match('/\b' . preg_quote($word) . '\b/i', $value1)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    protected function matchStarts(string $value1, string $value2): bool
-    {
-        return stripos(trim($value1), $value2) === 0;
-    }
-
-    protected function matchEnds(string $value1, string $value2): bool
-    {
-        $value2 = trim($value2);
-        $value1 = substr($value1, -1 * strlen($value2));
-        return strcasecmp($value1, $value2) === 0;
-    }
-
-    /**
-     * @param string|array $selector
-     * @return array
-     */
-    protected function getSelector($selector): array
-    {
-        if (is_array($selector)) {
-            $selectors = $selector;
-        } elseif (is_string($selector)) {
-            $selectors = [trim($selector)];
-        } else {
-            throw new \InvalidArgumentException("Selector has to be a string or an array.");
-        }
-        unset($selector);
-
-        $return = [];
-        foreach ($selectors as $selector) {
-            foreach ($this->operators as $op => $methodName) {
-                $pos = stripos($selector, $op);
-                if ($pos !== false) {
-                    $return[] = [
-                        substr($selector, 0, $pos),
-                        substr($selector, $pos + strlen($op)),
-                        $methodName
-                    ];
-                    break;
-                }
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param callable|string $sort
-     */
-    public function sort($sort, array &$items): bool
-    {
-        if (is_numeric($sort)) {
-            return false;
-        }
-
-        if (is_callable($sort)) {
-            $bool = uasort($items, $sort);
-            return $bool;
-        }
-
-        $field = "title";
-        if (!empty($sort)) {
-            $field = trim($sort, "+");
-        }
-
-        $direction = "asc";
-        if (substr($field, 0, 1) === "-") {
-            $field = substr($field, 1);
-            $direction = "desc";
-        }
-
-        return uasort($items, function ($value1, $value2) use ($field, $direction) {
-            if (!isset($value1[$field]) || !isset($value2[$field])) {
-                return 0;
-            }
-            if ($value1[$field] === $value2[$field]) {
-                return 0;
-            }
-            if ($direction === 'asc') {
-                return ($value1[$field] < $value2[$field]) ? -1 : 1;
-            } else {
-                return ($value2[$field] < $value1[$field]) ? -1 : 1;
-            }
-        });
-    }
-
-    /**
-     * @param array|string $selector1
-     * @param array|string $selector2
-     */
-    public static function mergeSelectors($selector1, $selector2): array
-    {
-        $selectors = [];
-        if (is_array($selector1)) {
-            $selectors = $selector1;
-        } else {
-            $selectors[] = $selector1;
-        }
-        if (is_array($selector2)) {
-            $selectors = array_merge($selectors, $selector2);
-        } else {
-            $selectors[] = $selector2;
-        }
-        return array_filter($selectors); // filter empty
-    }
-}
diff --git a/system/Site.php b/system/Site.php
index 5a501e04..a96ae8c9 100644
--- a/system/Site.php
+++ b/system/Site.php
@@ -4,8 +4,6 @@
 
 namespace herbie;
 
-use Psr\Http\Message\ServerRequestInterface;
-
 /**
  * Stores the site.
  */
@@ -91,4 +89,47 @@ public function getCharset(): string
     {
         return $this->config->getAsString('charset');
     }
+
+    public function getBaseUrl(): string
+    {
+        return $this->urlManager->createUrl('/');
+    }
+
+    public function getRoute(): string
+    {
+        return $this->urlManager->parseRequest()[0];
+    }
+
+    public function getRouteParams(): array
+    {
+        return $this->urlManager->parseRequest()[1];
+    }
+
+    public function getTheme(): string
+    {
+        return $this->config->getAsString('theme');
+    }
+
+    /**
+     * @return mixed
+     */
+    public function __get(string $name)
+    {
+        $getter = 'get' . str_replace('_', '', $name);
+        if (method_exists($this, $getter)) {
+            return $this->$getter();
+        } else {
+            throw new \InvalidArgumentException("Field {$name} does not exist.");
+        }
+    }
+
+    public function __isset(string $name): bool
+    {
+        $getter = 'get' . str_replace('_', '', $name);
+        if (method_exists($this, $getter)) {
+            return $this->$getter() !== null;
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/system/SystemInfoPlugin.php b/system/SystemInfoPlugin.php
index 0b14dfb6..dfb69b72 100644
--- a/system/SystemInfoPlugin.php
+++ b/system/SystemInfoPlugin.php
@@ -97,7 +97,7 @@ private function getConfig(): array
         foreach ($this->config->flatten() as $key => $value) {
             $configs[] = [
                 $key,
-                gettype($value),
+                \herbie\get_type($value),
                 $this->filterValue($value)
             ];
         }
@@ -187,13 +187,13 @@ private function getTwigGlobalsFromContext(array $context): array
         foreach ($context as $string => $mixed) {
             if (is_scalar($mixed)) {
                 $value = $mixed;
-                $type = gettype($mixed);
+                $type = \herbie\get_type($mixed);
             } elseif (is_object($mixed)) {
                 $value = get_class($mixed);
                 $type = 'class';
             } else {
                 $value = json_encode($mixed);
-                $type = gettype($mixed);
+                $type = \herbie\get_type($mixed);
             }
             $globals[] = [$string, $value, $type];
         }
diff --git a/system/Translator.php b/system/Translator.php
index 55fa57ac..fd2959cb 100644
--- a/system/Translator.php
+++ b/system/Translator.php
@@ -96,7 +96,7 @@ public function addPath(string $category, $path): void
         if (is_string($path)) {
             $path = [$path];
         } elseif (!is_array($path)) {
-            $message = sprintf('Argument $path has to be an array or a string, %s given.', gettype($path));
+            $message = sprintf('Argument $path has to be an array or a string, %s given.', \herbie\get_type($path));
             throw new \InvalidArgumentException($message);
         }
         $this->paths[$category] = array_merge($this->paths[$category], $path);
diff --git a/system/TwigRenderer.php b/system/TwigRenderer.php
index 7f5fd95e..4fbc72af 100644
--- a/system/TwigRenderer.php
+++ b/system/TwigRenderer.php
@@ -25,8 +25,6 @@ final class TwigRenderer
     private TwigEnvironment $twig;
     private LoggerInterface $logger;
     private Site $site;
-    private UrlManager $urlManager;
-    private string $baseUrl;
 
     /**
      * TwigRenderer constructor.
@@ -35,17 +33,13 @@ public function __construct(
         Config $config,
         EventManager $eventManager,
         LoggerInterface $logger,
-        Site $site,
-        UrlManager $urlManager,
-        string $baseUrl
+        Site $site
     ) {
         $this->initialized = false;
         $this->config = $config;
         $this->eventManager = $eventManager;
         $this->logger = $logger;
         $this->site = $site;
-        $this->urlManager = $urlManager;
-        $this->baseUrl = $baseUrl;
     }
 
     /**
@@ -84,9 +78,8 @@ public function init(): void
             $this->twig->addExtension(new DebugExtension());
         }
 
-        foreach ($this->getContext() as $key => $value) {
-            $this->twig->addGlobal($key, $value);
-        }
+        $this->twig->addGlobal('page', null); // will be set by page renderer middleware
+        $this->twig->addGlobal('site', $this->site);
 
         $this->initialized = true;
 
@@ -120,31 +113,6 @@ public function renderTemplate(string $name, array $context = []): string
         return $this->twig->render($name, $context);
     }
 
-    /**
-     * @return array{
-     *     route: string,
-     *     routeParams: array<string, string>,
-     *     baseUrl: string,
-     *     theme: string,
-     *     site: Site,
-     *     page: Page|null,
-     *     config: Config
-     * }
-     */
-    private function getContext(): array
-    {
-        [$route, $routeParams] = $this->urlManager->parseRequest();
-        return [
-            'route' => $route,
-            'routeParams' => $routeParams,
-            'baseUrl' => $this->baseUrl,
-            'theme' => $this->config->getAsString('theme'),
-            'site' => $this->site,
-            'page' => null, // will be set by page renderer middleware
-            'config' => $this->config
-        ];
-    }
-
     public function addFunction(TwigFunction $function): void
     {
         $this->twig->addFunction($function);
diff --git a/system/functions.php b/system/functions.php
index 4a70c245..af41e57e 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -469,3 +469,20 @@ function is_natural($value, bool $includingZero = false): bool
     }
     return false;
 }
+
+function array_is_assoc(array $array): bool
+{
+    $keys = array_keys($array);
+    return array_keys($keys) !== $keys;
+}
+
+function get_type(mixed $value): string
+{
+    $type = \gettype($value);
+    // for historical reasons "double" is returned in case of a float, and not simply "float"
+    // see https://www.php.net/manual/en/function.gettype
+    if ($type === 'double') {
+        $type = 'float';
+    }
+    return $type;
+}
diff --git a/templates/macros/page.twig b/templates/macros/page.twig
index bbca12fa..33afbbde 100644
--- a/templates/macros/page.twig
+++ b/templates/macros/page.twig
@@ -1,30 +1,30 @@
-{% macro filters(routeParams) %}
+{% macro filters(route_params) %}
 
-    {% if routeParams %}
+    {% if route_params %}
 
-        {% if routeParams.author %}
+        {% if route_params.author %}
 
-            <p>Filtered by Author "{{ routeParams.author }}"</p>
+            <p>Filtered by Author "{{ route_params.author }}"</p>
 
-        {% elseif routeParams.category %}
+        {% elseif route_params.category %}
 
-            <p>Filtered by Category "{{ routeParams.category }}"</p>
+            <p>Filtered by Category "{{ route_params.category }}"</p>
 
-        {% elseif routeParams.tag %}
+        {% elseif route_params.tag %}
 
-            <p>Filtered by Tag "{{ routeParams.tag }}"</p>
+            <p>Filtered by Tag "{{ route_params.tag }}"</p>
 
-        {% elseif routeParams.year and routeParams.month and routeParams.day %}
+        {% elseif route_params.year and route_params.month and route_params.day %}
 
-            <p>Filtered by Year/Month/Day "{{ routeParams.year }}-{{ routeParams.month }}-{{ routeParams.day }}"</p>
+            <p>Filtered by Year/Month/Day "{{ route_params.year }}-{{ route_params.month }}-{{ route_params.day }}"</p>
 
-        {% elseif routeParams.year and routeParams.month %}
+        {% elseif route_params.year and route_params.month %}
 
-            <p>Filtered by Year/Month "{{ routeParams.year }}-{{ routeParams.month }}"</p>
+            <p>Filtered by Year/Month "{{ route_params.year }}-{{ route_params.month }}"</p>
 
-        {% elseif routeParams.year %}
+        {% elseif route_params.year %}
 
-            <p>Filtered by Year "{{ routeParams.year }}"</p>
+            <p>Filtered by Year "{{ route_params.year }}"</p>
 
         {% endif %}
 
@@ -58,7 +58,7 @@
                 {% set delim = '' %}
                         {% for category in categories %}
                             {%- set route = options.pageRoute ~ '/category/' ~ category|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, category) }}
+                            {{ delim|raw }}{{ link_page(route, category) }}
                             {%- set delim = '<span class="delim">, </span>' -%}
                         {% endfor %}
                 </span>
@@ -75,7 +75,7 @@
                 {% set delim = '' %}
                         {% for tag in tags %}
                             {%- set route = options.pageRoute ~ '/tag/' ~ tag|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, tag) }}
+                            {{ delim|raw }}{{ link_page(route, tag) }}
                             {%- set delim = '<span class="delim">, </span>' -%}
                         {% endfor %}
                 </span>
@@ -92,7 +92,7 @@
                 {% set delim = '' %}
                         {% for author in authors %}
                             {%- set route = options.pageRoute ~ '/author/' ~ author|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, author) }}
+                            {{ delim|raw }}{{ link_page(route, author) }}
                             {%- set delim = '<span class="delim">, </span>' -%}
                         {% endfor %}
                 </span>
diff --git a/templates/macros/pages.twig b/templates/macros/pages.twig
index 0d93a02b..7cddf41b 100644
--- a/templates/macros/pages.twig
+++ b/templates/macros/pages.twig
@@ -22,8 +22,8 @@
             <ul>
                 {% for pageItem in recentPages %}
                     <li>
-                        {{ page_link(pageItem.route, pageItem.title) }}
-                        {% if options.showDate %}<br>{{ pageItem.date|strftime(options.dateFormat) }}{% endif %}
+                        {{ link_page(pageItem.route, pageItem.title) }}
+                        {% if options.showDate %}<br>{{ pageItem.date|date(options.dateFormat) }}{% endif %}
                     </li>
                 {% endfor %}
             </ul>
diff --git a/templates/macros/taxonomy.twig b/templates/macros/taxonomy.twig
index f4e903f0..675c4bfb 100644
--- a/templates/macros/taxonomy.twig
+++ b/templates/macros/taxonomy.twig
@@ -17,8 +17,8 @@
                 <ul>
                     {% for item in months %}
                         {% set route = pageRoute ~ '/' ~ item.year ~ '/' ~ item.month %}
-                        {% set label = item.date|strftime('%B %Y') %}
-                        <li>{{ page_link(route, label) }}{% if showCount %} ({{ item.count }}){% endif %}</li>
+                        {% set label = item.date|date('%B %Y') %}
+                        <li>{{ link_page(route, label) }}{% if showCount %} ({{ item.count }}){% endif %}</li>
                     {% endfor %}
                 </ul>
             </div>
@@ -47,7 +47,7 @@
                 <ul>
                     {% for author, count in authors %}
                         {% set route = pageRoute ~ '/author/' ~ author|slugify %}
-                        <li>{{ page_link(route, author) }}{% if showCount %} ({{ count }}){% endif %}</li>
+                        <li>{{ link_page(route, author) }}{% if showCount %} ({{ count }}){% endif %}</li>
                     {% endfor %}
                 </ul>
             </div>
@@ -76,7 +76,7 @@
                 <ul>
                     {% for category, count in categories %}
                         {% set route = pageRoute ~ '/category/' ~ category|slugify %}
-                        <li>{{ page_link(route, category) }}{% if showCount %} ({{ count }}){% endif %}</li>
+                        <li>{{ link_page(route, category) }}{% if showCount %} ({{ count }}){% endif %}</li>
                     {% endfor %}
                 </ul>
             </div>
@@ -105,7 +105,7 @@
                 <ul>
                     {% for tag, count in tags %}
                         {% set route = pageRoute ~ '/tag/' ~ tag|slugify %}
-                        <li>{{ page_link(route, tag) }}{% if showCount %} ({{ count }}){% endif %}</li>
+                        <li>{{ link_page(route, tag) }}{% if showCount %} ({{ count }}){% endif %}</li>
                     {% endfor %}
                 </ul>
             </div>
diff --git a/templates/page/taxonomies.twig b/templates/page/taxonomies.twig
deleted file mode 100644
index 4b6efc1a..00000000
--- a/templates/page/taxonomies.twig
+++ /dev/null
@@ -1,58 +0,0 @@
-{% apply spaceless %}
-    {% if renderCategories and renderTags and renderAuthors %}
-        <div class="blog-meta">
-
-            {# render markup for categories #}
-            {% if renderCategories %}
-                {% set categories = page.getCategories() %}
-                {% if categories %}
-                    <span class="links-categories">
-                <span class="label">Categories:</span>
-                <i class="fa fa-folder-open"></i>
-                {% set delim = '' %}
-                        {% for category in categories %}
-                            {%- set route = pageRoute ~ '/category/' ~ category|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, category) }}
-                            {%- set delim = '<span class="delim">, </span>' -%}
-                        {% endfor %}
-                </span>
-                {% endif %}
-            {% endif %}
-
-            {# render markup for tags #}
-            {% if renderTags %}
-                {% set tags = page.getTags() %}
-                {% if tags %}
-                    <span class="links-tags">
-                <span class="label">Tags:</span>
-                <i class="fa fa-tags"></i>
-                {% set delim = '' %}
-                        {% for tag in tags %}
-                            {%- set route = pageRoute ~ '/tag/' ~ tag|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, tag) }}
-                            {%- set delim = '<span class="delim">, </span>' -%}
-                        {% endfor %}
-                </span>
-                {% endif %}
-            {% endif %}
-
-            {# render markup for authors #}
-            {% if renderAuthors %}
-                {% set authors = page.getAuthors() %}
-                {% if authors %}
-                    <span class="links-authors">
-                <span class="label">Authors:</span>
-                <i class="fa fa-user"></i>
-                {% set delim = '' %}
-                        {% for author in authors %}
-                            {%- set route = pageRoute ~ '/author/' ~ author|slugify -%}
-                            {{ delim|raw }}{{ page_link(route, author) }}
-                            {%- set delim = '<span class="delim">, </span>' -%}
-                        {% endfor %}
-                </span>
-                {% endif %}
-            {% endif %}
-
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/pages/filtered.twig b/templates/pages/filtered.twig
deleted file mode 100644
index 8ca8bd60..00000000
--- a/templates/pages/filtered.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{% apply spaceless %}
-    {% if routeParams %}
-
-        {% if routeParams.author %}
-
-            <p>Filtered by Author "{{ routeParams.author }}"</p>
-
-        {% elseif routeParams.category %}
-
-            <p>Filtered by Category "{{ routeParams.category }}"</p>
-
-        {% elseif routeParams.tag %}
-
-            <p>Filtered by Tag "{{ routeParams.tag }}"</p>
-
-        {% elseif routeParams.year and routeParams.month and routeParams.day %}
-
-            <p>Filtered by Year/Month/Day "{{ routeParams.year }}-{{ routeParams.month }}-{{ routeParams.day }}"</p>
-
-        {% elseif routeParams.year and routeParams.month %}
-
-            <p>Filtered by Year/Month "{{ routeParams.year }}-{{ routeParams.month }}"</p>
-
-        {% elseif routeParams.year %}
-
-            <p>Filtered by Year "{{ routeParams.year }}"</p>
-
-        {% endif %}
-
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/pages/recent.twig b/templates/pages/recent.twig
deleted file mode 100644
index 0fa87f0c..00000000
--- a/templates/pages/recent.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{% apply spaceless %}
-    {% if recentPages|length > 0 %}
-        <div class="widget-blog widget-blog-recent-posts">
-            <h4>{{ title }}</h4>
-            <ul>
-                {% for pageItem in recentPages %}
-                    <li>
-                        {{ page_link(pageItem.route, pageItem.title) }}
-                        {% if showDate %}<br>{{ pageItem.date|strftime(dateFormat) }}{% endif %}
-                    </li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/snippets/herbie_info.twig b/templates/snippets/herbie_info.twig
index e090daa1..3df749e8 100644
--- a/templates/snippets/herbie_info.twig
+++ b/templates/snippets/herbie_info.twig
@@ -1,19 +1,19 @@
 <div class="herbie-info">
     <h1 class="herbie-info-h1">System Info</h1>
     <ul>
-        <li><a href="{{ route }}#herbie-php-classes">PHP Classes</a></li>
-        <li><a href="{{ route }}#herbie-php-functions">PHP Functions</a></li>
-        <li><a href="{{ route }}#herbie-aliases">Aliases</a></li>
-        <li><a href="{{ route }}#herbie-config">Configuration</a></li>
-        <li><a href="{{ route }}#herbie-translations">Translations</a></li>
-        <li><a href="{{ route }}#herbie-plugins">Plugins</a></li>
-        <li><a href="{{ route }}#herbie-commands">Console Commands</a></li>
-        <li><a href="{{ route }}#herbie-events">Event Listeners</a></li>
-        <li><a href="{{ route }}#herbie-middlewares">Middlewares</a></li>
-        <li><a href="{{ route }}#herbie-twig-filters">Twig Filters</a></li>
-        <li><a href="{{ route }}#herbie-twig-globals">Twig Globals</a></li>
-        <li><a href="{{ route }}#herbie-twig-functions">Twig Functions</a></li>
-        <li><a href="{{ route }}#herbie-twig-tests">Twig Tests</a></li>
+        <li><a href="{{ site.route }}#herbie-php-classes">PHP Classes</a></li>
+        <li><a href="{{ site.route }}#herbie-php-functions">PHP Functions</a></li>
+        <li><a href="{{ site.route }}#herbie-aliases">Aliases</a></li>
+        <li><a href="{{ site.route }}#herbie-config">Configuration</a></li>
+        <li><a href="{{ site.route }}#herbie-translations">Translations</a></li>
+        <li><a href="{{ site.route }}#herbie-plugins">Plugins</a></li>
+        <li><a href="{{ site.route }}#herbie-commands">Console Commands</a></li>
+        <li><a href="{{ site.route }}#herbie-events">Event Listeners</a></li>
+        <li><a href="{{ site.route }}#herbie-middlewares">Middlewares</a></li>
+        <li><a href="{{ site.route }}#herbie-twig-filters">Twig Filters</a></li>
+        <li><a href="{{ site.route }}#herbie-twig-globals">Twig Globals</a></li>
+        <li><a href="{{ site.route }}#herbie-twig-functions">Twig Functions</a></li>
+        <li><a href="{{ site.route }}#herbie-twig-tests">Twig Tests</a></li>
     </ul>
     
     {# <h2 class="herbie-info-h2">Constants ({{ constants|length }})</h2>
diff --git a/templates/snippets/mail_link.twig b/templates/snippets/link_mail.twig
similarity index 100%
rename from templates/snippets/mail_link.twig
rename to templates/snippets/link_mail.twig
diff --git a/templates/snippets/listing.twig b/templates/snippets/listing.twig
index 30df443e..5c36b4f2 100644
--- a/templates/snippets/listing.twig
+++ b/templates/snippets/listing.twig
@@ -3,10 +3,10 @@
         <section>
             {% for menuitem in pagination %}
                 <article>
-                    <h2>{{ page_link(menuitem.route, menuitem.getMenuTitle()) }}</h2>
+                    <h2>{{ link_page(menuitem.route, menuitem.getMenuTitle()) }}</h2>
                     {% if menuitem.image %}
                         <div class="page-image">
-                            <a href="{{ url(menuitem.route) }}"><img class="pure-img" src="{{ menuitem.image }}" alt=""/></a>
+                            <a href="{{ url_rel(menuitem.route) }}"><img class="pure-img" src="{{ menuitem.image }}" alt=""/></a>
                         </div>
                     {% endif %}
                     <p>{{ menuitem.excerpt }}</p>
@@ -17,10 +17,10 @@
         </section>
         <nav class="pagination">
             {% if pagination.hasPrevPage() %}
-                <a class="pure-button" href="{{ url(route) }}?page={{ pagination.getPrevPage() }}">&lt; Vorherige Seite</a>
+                <a class="pure-button" href="{{ url_rel(route) }}?page={{ pagination.getPrevPage() }}">&lt; Vorherige Seite</a>
             {% endif %}
             {% if pagination.hasNextPage() %}
-                <a class="pure-button" href="{{ url(route) }}?page={{ pagination.getNextPage() }}">Nächste Seite &gt;</a>
+                <a class="pure-button" href="{{ url_rel(route) }}?page={{ pagination.getNextPage() }}">Nächste Seite &gt;</a>
             {% endif %}
         </nav>
     </div>
diff --git a/templates/taxonomy/archive.twig b/templates/taxonomy/archive.twig
deleted file mode 100644
index 78a6abfe..00000000
--- a/templates/taxonomy/archive.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% apply spaceless %}
-    {% if months|length > 0 %}
-        <div class="widget-blog widget-blog-archives">
-            <h4>{{ title }}</h4>
-            <ul>
-                {% for item in months %}
-                    {% set route = pageRoute ~ '/' ~ item.year ~ '/' ~ item.month %}
-                    {% set label = item.date|strftime('%B %Y') %}
-                    <li>{{ page_link(route, label) }}{% if showCount %} ({{ item.count }}){% endif %}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/taxonomy/authors.twig b/templates/taxonomy/authors.twig
deleted file mode 100644
index 58183ad7..00000000
--- a/templates/taxonomy/authors.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% apply spaceless %}
-    {% if authors|length > 0 %}
-        <div class="widget-blog widget-blog-authors">
-            <h4>{{ title }}</h4>
-            <ul>
-                {% for author, count in authors %}
-                    {% set route = pageRoute ~ '/author/' ~ author|slugify %}
-                    <li>{{ page_link(route, author) }}{% if showCount %} ({{ count }}){% endif %}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/taxonomy/categories.twig b/templates/taxonomy/categories.twig
deleted file mode 100644
index 703b567e..00000000
--- a/templates/taxonomy/categories.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% apply spaceless %}
-    {% if categories|length > 0 %}
-        <div class="widget-blog widget-blog-categories">
-            <h4>{{ title }}</h4>
-            <ul>
-                {% for category, count in categories %}
-                    {% set route = pageRoute ~ '/category/' ~ category|slugify %}
-                    <li>{{ page_link(route, category) }}{% if showCount %} ({{ count }}){% endif %}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/templates/taxonomy/tags.twig b/templates/taxonomy/tags.twig
deleted file mode 100644
index 08a4a5c5..00000000
--- a/templates/taxonomy/tags.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% apply spaceless %}
-    {% if tags|length > 0 %}
-        <div class="widget-blog widget-blog-tags">
-            <h4>{{ title }}</h4>
-            <ul>
-                {% for tag, count in tags %}
-                    {% set route = pageRoute ~ '/tag/' ~ tag|slugify %}
-                    <li>{{ page_link(route, tag) }}{% if showCount %} ({{ count }}){% endif %}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    {% endif %}
-{% endapply %}
\ No newline at end of file
diff --git a/tests/_data/site/config/main.php b/tests/_data/site/config/main.php
index 5ec2dca7..125b9e90 100644
--- a/tests/_data/site/config/main.php
+++ b/tests/_data/site/config/main.php
@@ -18,11 +18,11 @@
         ]
     ],
     'enabledPlugins' => '',
-    'enabledSysPlugins' => 'twig_core,twig_plus,markdown,rest,textile,imagine,dummy',
+    'enabledSysPlugins' => 'twig,markdown,rest,textile,imagine,dummy',
     'plugins' => [
         'imagine' => [
             'test' => true,
-            'filterSets' => [
+            'collections' => [
                 'bsp1' => [
                     'filters' => [
                         'thumbnail' => [
diff --git a/tests/_data/site/pages/index.html b/tests/_data/site/pages/index.html
index 832c938e..94e41200 100644
--- a/tests/_data/site/pages/index.html
+++ b/tests/_data/site/pages/index.html
@@ -4,21 +4,21 @@
 
 <h1>Herbie Tests</h1>
 
-{{ 100000|filesize }}
+{{ 100000|format_size }}
 
-{{ sitemap() }}
+{{ menu_sitemap() }}
 
 <h2>Downloads</h2>
 
-{{ file_link('favicon.ico', 'File', true) }}
+{{ link_file('favicon.ico', 'File', true) }}
 
-<a href="{{ url('/download/dummy.pdf') }}">Download</a>
+<a href="{{ url_rel('/download/dummy.pdf') }}">Download</a>
 
 <ul>
-    <li>{{ file_link('dummy.pdf') }}</li>
-    <li>{{ file_link('dummy.pdf', 'Dummy', false) }}</li>
-    <li>{{ file_link('dummy.pdf', 'Dummy', true) }}</li>
-    <li>{{ file_link('dummy.pdf', 'Dummy', true, { target:"_blank"}) }}</li>
+    <li>{{ link_file('dummy.pdf') }}</li>
+    <li>{{ link_file('dummy.pdf', 'Dummy', false) }}</li>
+    <li>{{ link_file('dummy.pdf', 'Dummy', true) }}</li>
+    <li>{{ link_file('dummy.pdf', 'Dummy', true, { target:"_blank"}) }}</li>
 </ul>
 
 <h2>Imagine</h2>
@@ -36,13 +36,13 @@ <h2>Imagine</h2>
 <h2>Links</h2>
 
 <ul>
-    <li>{{ page_link('adfsafsdf', 'About') }}</li>
-    <li>{{ page_link('about', 'About') }}</li>
-    <li>{{ page_link('https://example.com/', 'About') }}</li>
+    <li>{{ link_page('adfsafsdf', 'About') }}</li>
+    <li>{{ link_page('about', 'About') }}</li>
+    <li>{{ link_page('https://example.com/', 'About') }}</li>
 </ul>
 
 <h2>Mailto-Links</h2>
 
 <ul>
-    <li>{{ mail_link('me@example.com', 'John Doe') }}</li>
+    <li>{{ link_mail('me@example.com', 'John Doe') }}</li>
 </ul>
diff --git a/tests/_data/site/pages/plugins/dummy.html b/tests/_data/site/pages/plugins/dummy.html
index 22dd0130..1cc9e53f 100644
--- a/tests/_data/site/pages/plugins/dummy.html
+++ b/tests/_data/site/pages/plugins/dummy.html
@@ -9,4 +9,4 @@ <h1>Dummy Plugin</h1>
 <p>{{ dummy("This is from") }}.</p>
 <p>{% if "dummy" is dummy %}This is from Dummy Test.{% endif %}</p>
 <p>{% apply dummy_dynamic %}This is from {% endapply %}.</p>
-<p>{{ file_link('dummy.pdf', 'Dummy', true) }}</p>
+<p>{{ link_file('dummy.pdf', 'Dummy', true) }}</p>
diff --git a/tests/_data/site/pages/plugins/twig-plus.html b/tests/_data/site/pages/plugins/twig-plus.html
deleted file mode 100644
index 53e1d20a..00000000
--- a/tests/_data/site/pages/plugins/twig-plus.html
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Twig Plus Plugin
-hidden: false
----
diff --git a/tests/_data/site/themes/default/main.twig b/tests/_data/site/themes/default/main.twig
index 166581fa..e0475242 100644
--- a/tests/_data/site/themes/default/main.twig
+++ b/tests/_data/site/themes/default/main.twig
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ page_title(delim=' / ', siteTitle='Herbie Tests') }}</title>
+    <title>{{ page_title(delim=' / ', site_title='Herbie Tests') }}</title>
     <base href="{{ baseUrl }}">
     <style>
         body { margin: 1rem; }
@@ -17,9 +17,9 @@
 
 <div class="page-trail">
 <a href="/">Herbie Tests</a>
-{%- for menu in site.pageTrail -%}
+{%- for menu in site.page_trail -%}
     {{- ' / ' -}}
-    <a href="{{ url(menu.route) }}">{{ menu.title }}</a>
+    <a href="{{ url_rel(menu.route) }}">{{ menu.title }}</a>
 {%- endfor -%}
 </div>
 
diff --git a/tests/acceptance/HerbieInfoCest.php b/tests/acceptance/HerbieInfoCest.php
index e5d46136..724a5c7e 100644
--- a/tests/acceptance/HerbieInfoCest.php
+++ b/tests/acceptance/HerbieInfoCest.php
@@ -19,6 +19,7 @@ public function testPageTitleAndResponseCode(AcceptanceTester $I)
     public function testNumberAndSortingOfPhpFunctions(AcceptanceTester $I)
     {
         $functions = [
+            'herbie\array_is_assoc',
             'herbie\date_format',
             'herbie\defined_classes',
             'herbie\defined_constants',
@@ -28,6 +29,7 @@ public function testNumberAndSortingOfPhpFunctions(AcceptanceTester $I)
             'herbie\file_size',
             'herbie\get_callable_name',
             'herbie\get_constructor_params_to_inject',
+            'herbie\get_type',
             'herbie\handle_internal_webserver_assets',
             'herbie\is_digit',
             'herbie\is_natural',
@@ -107,10 +109,8 @@ public function testNumberAndSortingOfPhpClasses(AcceptanceTester $I)
             'herbie\sysplugin\markdown\MarkdownSysPlugin',
             'herbie\sysplugin\rest\RestSysPlugin',
             'herbie\sysplugin\textile\TextileSysPlugin',
-            'herbie\sysplugin\twig_core\TwigCoreExtension',
-            'herbie\sysplugin\twig_core\TwigCorePlugin',
-            'herbie\sysplugin\twig_plus\TwigPlusExtension',
-            'herbie\sysplugin\twig_plus\TwigPlusPlugin',
+            'herbie\sysplugin\twig\TwigExtension',
+            'herbie\sysplugin\twig\TwigPlugin',
         ];
         $I->amOnPage('/herbie-info');
         $I->see('PHP Classes (' . count($classes) . ')', 'h2');
@@ -197,77 +197,77 @@ public function testNumberAndSortingOfConfig(AcceptanceTester $I)
             'plugins.dummy2.pluginPath',
             'plugins.imagine.apiVersion',
             'plugins.imagine.cachePath',
-            'plugins.imagine.filterSets.bsp1.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp1.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp1.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp10.filters.flipHorizontally',
-            'plugins.imagine.filterSets.bsp10.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp10.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp10.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp11.filters.resize.size.0',
-            'plugins.imagine.filterSets.bsp11.filters.resize.size.1',
-            'plugins.imagine.filterSets.bsp12.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp12.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp12.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp12.filters.upscale.min.0',
-            'plugins.imagine.filterSets.bsp12.filters.upscale.min.1',
-            'plugins.imagine.filterSets.bsp13.filters.relativeResize.method',
-            'plugins.imagine.filterSets.bsp13.filters.relativeResize.parameter',
-            'plugins.imagine.filterSets.bsp14.filters.relativeResize.method',
-            'plugins.imagine.filterSets.bsp14.filters.relativeResize.parameter',
-            'plugins.imagine.filterSets.bsp15.filters.relativeResize.method',
-            'plugins.imagine.filterSets.bsp15.filters.relativeResize.parameter',
-            'plugins.imagine.filterSets.bsp15.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp15.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp15.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp16.filters.relativeResize.method',
-            'plugins.imagine.filterSets.bsp16.filters.relativeResize.parameter',
-            'plugins.imagine.filterSets.bsp16.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp16.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp16.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp17.filters.blur.sigma',
-            'plugins.imagine.filterSets.bsp17.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp17.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp17.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp2.filters.crop.size.0',
-            'plugins.imagine.filterSets.bsp2.filters.crop.size.1',
-            'plugins.imagine.filterSets.bsp2.filters.crop.start.0',
-            'plugins.imagine.filterSets.bsp2.filters.crop.start.1',
-            'plugins.imagine.filterSets.bsp2.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp2.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp2.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp3.filters.grayscale',
-            'plugins.imagine.filterSets.bsp3.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp3.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp3.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp4.filters.colorize.color',
-            'plugins.imagine.filterSets.bsp4.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp4.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp4.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp5.filters.negative',
-            'plugins.imagine.filterSets.bsp5.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp5.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp5.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp6.filters.sharpen',
-            'plugins.imagine.filterSets.bsp6.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp6.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp6.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp7.filters.gamma.correction',
-            'plugins.imagine.filterSets.bsp7.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp7.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp7.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp8.filters.rotate.angle',
-            'plugins.imagine.filterSets.bsp8.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp8.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp8.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.bsp9.filters.flipVertically',
-            'plugins.imagine.filterSets.bsp9.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.bsp9.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.bsp9.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.default.filters.thumbnail.mode',
-            'plugins.imagine.filterSets.default.filters.thumbnail.size.0',
-            'plugins.imagine.filterSets.default.filters.thumbnail.size.1',
-            'plugins.imagine.filterSets.default.test',
+            'plugins.imagine.collections.bsp1.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp1.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp1.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp10.filters.flipHorizontally',
+            'plugins.imagine.collections.bsp10.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp10.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp10.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp11.filters.resize.size.0',
+            'plugins.imagine.collections.bsp11.filters.resize.size.1',
+            'plugins.imagine.collections.bsp12.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp12.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp12.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp12.filters.upscale.min.0',
+            'plugins.imagine.collections.bsp12.filters.upscale.min.1',
+            'plugins.imagine.collections.bsp13.filters.relativeResize.method',
+            'plugins.imagine.collections.bsp13.filters.relativeResize.parameter',
+            'plugins.imagine.collections.bsp14.filters.relativeResize.method',
+            'plugins.imagine.collections.bsp14.filters.relativeResize.parameter',
+            'plugins.imagine.collections.bsp15.filters.relativeResize.method',
+            'plugins.imagine.collections.bsp15.filters.relativeResize.parameter',
+            'plugins.imagine.collections.bsp15.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp15.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp15.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp16.filters.relativeResize.method',
+            'plugins.imagine.collections.bsp16.filters.relativeResize.parameter',
+            'plugins.imagine.collections.bsp16.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp16.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp16.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp17.filters.blur.sigma',
+            'plugins.imagine.collections.bsp17.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp17.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp17.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp2.filters.crop.size.0',
+            'plugins.imagine.collections.bsp2.filters.crop.size.1',
+            'plugins.imagine.collections.bsp2.filters.crop.start.0',
+            'plugins.imagine.collections.bsp2.filters.crop.start.1',
+            'plugins.imagine.collections.bsp2.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp2.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp2.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp3.filters.grayscale',
+            'plugins.imagine.collections.bsp3.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp3.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp3.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp4.filters.colorize.color',
+            'plugins.imagine.collections.bsp4.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp4.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp4.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp5.filters.negative',
+            'plugins.imagine.collections.bsp5.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp5.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp5.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp6.filters.sharpen',
+            'plugins.imagine.collections.bsp6.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp6.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp6.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp7.filters.gamma.correction',
+            'plugins.imagine.collections.bsp7.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp7.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp7.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp8.filters.rotate.angle',
+            'plugins.imagine.collections.bsp8.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp8.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp8.filters.thumbnail.size.1',
+            'plugins.imagine.collections.bsp9.filters.flipVertically',
+            'plugins.imagine.collections.bsp9.filters.thumbnail.mode',
+            'plugins.imagine.collections.bsp9.filters.thumbnail.size.0',
+            'plugins.imagine.collections.bsp9.filters.thumbnail.size.1',
+            'plugins.imagine.collections.default.filters.thumbnail.mode',
+            'plugins.imagine.collections.default.filters.thumbnail.size.0',
+            'plugins.imagine.collections.default.filters.thumbnail.size.1',
+            'plugins.imagine.collections.default.test',
             'plugins.imagine.location',
             'plugins.imagine.pluginClass',
             'plugins.imagine.pluginName',
@@ -309,16 +309,11 @@ public function testNumberAndSortingOfConfig(AcceptanceTester $I)
             'plugins.textile.pluginClass',
             'plugins.textile.pluginName',
             'plugins.textile.pluginPath',
-            'plugins.twig_core.apiVersion',
-            'plugins.twig_core.location',
-            'plugins.twig_core.pluginClass',
-            'plugins.twig_core.pluginName',
-            'plugins.twig_core.pluginPath',
-            'plugins.twig_plus.apiVersion',
-            'plugins.twig_plus.location',
-            'plugins.twig_plus.pluginClass',
-            'plugins.twig_plus.pluginName',
-            'plugins.twig_plus.pluginPath',
+            'plugins.twig.apiVersion',
+            'plugins.twig.location',
+            'plugins.twig.pluginClass',
+            'plugins.twig.pluginName',
+            'plugins.twig.pluginPath',
             'theme',
             'urls.media',
             'urls.web',
@@ -331,13 +326,8 @@ public function testNumberAndSortingOfConfig(AcceptanceTester $I)
     public function testNumberAndSortingOfTwigGlobals(AcceptanceTester $I)
     {
         $globals = [
-            'route',
-            'routeParams',
-            'baseUrl',
-            'theme',
-            'site',
             'page',
-            'config',
+            'site',
             'dummy',
             'timestamp'
         ];
@@ -386,10 +376,8 @@ public function testNumberAndSortingOfTwigFilters(AcceptanceTester $I)
             'escape',
             'e',
             'raw',
-            'filesize',
-            'find',
+            'format_size',
             'slugify',
-            'strftime',
             'visible',
             'markdown',
             'rest',
@@ -420,34 +408,28 @@ public function testNumberAndSortingOfTwigFunctions(AcceptanceTester $I)
             'include',
             'source',
             'dump',
-            'add_css',
-            'add_js',
+            'css_add',
             'css_classes',
-            'file_link',
+            'css_out',
             'file',
             'image',
-            'page_link',
-            'page_title',
-            'output_css',
-            'output_js',
-            'snippet',
-            'translate',
-            'url',
-            'abs_url',
-            'mail_link',
+            'js_add',
+            'js_out',
+            'link_file',
+            'link_mail',
+            'link_page',
             'menu_ascii_tree',
             'menu_breadcrumb',
             'menu_list',
             'menu_pager',
             'menu_sitemap',
             'menu_tree',
-            'page_taxonomies',
-            'pages_filtered',
-            'pages_recent',
-            'taxonomy_archive',
-            'taxonomy_authors',
-            'taxonomy_categories',
-            'taxonomy_tags',
+            'page_title',
+            'query',
+            'snippet',
+            'translate',
+            'url_rel',
+            'url_abs',
             'herbie_debug',
             'markdown',
             'rest',
@@ -476,8 +458,8 @@ public function testNumberAndSortingOfTwigTests(AcceptanceTester $I)
             'constant',
             'empty',
             'iterable',
-            'readable',
-            'writable',
+            'file_readable',
+            'file_writable',
             'dummy',
             'local_odd',
             'mytest',
@@ -516,7 +498,6 @@ public function testNumberAndSortingOfEvents(AcceptanceTester $I)
             'herbie\event\TwigInitializedEvent',
             'herbie\event\TwigInitializedEvent',
             'herbie\event\TwigInitializedEvent',
-            'herbie\event\TwigInitializedEvent',
             'herbie\event\RenderLayoutEvent',
             'herbie\event\RenderLayoutEvent',
             'herbie\event\RenderLayoutEvent',
@@ -544,8 +525,7 @@ public function testNumberAndSortingOfPlugins(AcceptanceTester $I)
     {
         $plugins = [
             'CORE',
-            'twig_core',
-            'twig_plus',
+            'twig',
             'markdown',
             'rest',
             'textile',
diff --git a/tests/integration/Fixtures/markdown/config/main.php b/tests/integration/Fixtures/markdown/config/main.php
index 3b9c9a25..66b6fc95 100644
--- a/tests/integration/Fixtures/markdown/config/main.php
+++ b/tests/integration/Fixtures/markdown/config/main.php
@@ -8,7 +8,7 @@
             'debug' => true,
         ],
     ],
-    'enabledSysPlugins' => 'twig_core,twig_plus,markdown',
+    'enabledSysPlugins' => 'twig,markdown',
     'plugins' => [
         'markdown' => [
             'enableTwigFilter' => false,
diff --git a/tests/integration/Fixtures/site/config/main.php b/tests/integration/Fixtures/site/config/main.php
index 79711259..3bc25558 100644
--- a/tests/integration/Fixtures/site/config/main.php
+++ b/tests/integration/Fixtures/site/config/main.php
@@ -9,5 +9,5 @@
             'cache' => false,
         ],
     ],
-    'enabledSysPlugins' => 'twig_core,twig_plus,dummy,imagine,markdown,textile',
+    'enabledSysPlugins' => 'twig,dummy,imagine,markdown,textile',
 ];
diff --git a/tests/integration/Fixtures/textile/config/main.php b/tests/integration/Fixtures/textile/config/main.php
index 233499d0..d88fe5ab 100644
--- a/tests/integration/Fixtures/textile/config/main.php
+++ b/tests/integration/Fixtures/textile/config/main.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'enabledSysPlugins' => 'twig_core,twig_plus,textile',
+    'enabledSysPlugins' => 'twig,textile',
     'components' => [
         'fileLogger' => null,
     ],
diff --git a/tests/integration/SysPlugins/TwigCore/Filters/FilesizeFilterTest.php b/tests/integration/SysPlugins/TwigCore/Filters/FilesizeFilterTest.php
index dca18ef3..55b408db 100644
--- a/tests/integration/SysPlugins/TwigCore/Filters/FilesizeFilterTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Filters/FilesizeFilterTest.php
@@ -29,33 +29,33 @@ protected function _setUp(): void
     public function testFilesizeWithWrongType(): void
     {
         $this->expectException(TypeError::class);
-        $twig = '{{ "string"|filesize }}'; // string
+        $twig = '{{ "string"|format_size }}'; // string
         $this->twigRenderer->renderString($twig);
-        $twig = '{{ {a:1}|filesize }}'; // object
+        $twig = '{{ {a:1}|format_size }}'; // object
         $this->twigRenderer->renderString($twig);
     }
 
     public function testFilesizeWithNegativeValue(): void
     {
-        $twig = '{{ "-1"|filesize }}';
+        $twig = '{{ "-1"|format_size }}';
         $actual = $this->twigRenderer->renderString($twig);
         $this->assertSame('0', $actual);
     }
 
     public function testFilesizeWithValidValues(): void
     {
-        $this->assertSame('0', $this->twigRenderer->renderString('{{ "0"|filesize }}'));
-        $this->assertSame('1 Byte', $this->twigRenderer->renderString('{{ "1"|filesize }}'));
-        $this->assertSame('2 B', $this->twigRenderer->renderString('{{ "2"|filesize }}'));
-        $this->assertSame('1024 B', $this->twigRenderer->renderString('{{ "1024"|filesize }}'));
-        $this->assertSame('1 KB', $this->twigRenderer->renderString('{{ "1025"|filesize }}')); // KB (* 1024)
-        $this->assertSame('1024 KB', $this->twigRenderer->renderString('{{ "1048576"|filesize }}'));
-        $this->assertSame('1 MB', $this->twigRenderer->renderString('{{ "1048577"|filesize }}')); // MB (* 1024)
-        $this->assertSame('1024 MB', $this->twigRenderer->renderString('{{ "1073741824"|filesize }}'));
-        $this->assertSame('1 GB', $this->twigRenderer->renderString('{{ "1073741825"|filesize }}')); // GB (* 1024)
-        $this->assertSame('1024 GB', $this->twigRenderer->renderString('{{ "1099511627776"|filesize }}'));
-        $this->assertSame('1 TB', $this->twigRenderer->renderString('{{ "1099511627777"|filesize }}')); // TB (* 1024)
-        $this->assertSame('1024 TB', $this->twigRenderer->renderString('{{ "1125899906842624"|filesize }}'));
-        $this->assertSame('1 PB', $this->twigRenderer->renderString('{{ "1125899906842625"|filesize }}')); // TB (* 1024)
+        $this->assertSame('0', $this->twigRenderer->renderString('{{ "0"|format_size }}'));
+        $this->assertSame('1 Byte', $this->twigRenderer->renderString('{{ "1"|format_size }}'));
+        $this->assertSame('2 B', $this->twigRenderer->renderString('{{ "2"|format_size }}'));
+        $this->assertSame('1024 B', $this->twigRenderer->renderString('{{ "1024"|format_size }}'));
+        $this->assertSame('1 KB', $this->twigRenderer->renderString('{{ "1025"|format_size }}')); // KB (* 1024)
+        $this->assertSame('1024 KB', $this->twigRenderer->renderString('{{ "1048576"|format_size }}'));
+        $this->assertSame('1 MB', $this->twigRenderer->renderString('{{ "1048577"|format_size }}')); // MB (* 1024)
+        $this->assertSame('1024 MB', $this->twigRenderer->renderString('{{ "1073741824"|format_size }}'));
+        $this->assertSame('1 GB', $this->twigRenderer->renderString('{{ "1073741825"|format_size }}')); // GB (* 1024)
+        $this->assertSame('1024 GB', $this->twigRenderer->renderString('{{ "1099511627776"|format_size }}'));
+        $this->assertSame('1 TB', $this->twigRenderer->renderString('{{ "1099511627777"|format_size }}')); // TB (* 1024)
+        $this->assertSame('1024 TB', $this->twigRenderer->renderString('{{ "1125899906842624"|format_size }}'));
+        $this->assertSame('1 PB', $this->twigRenderer->renderString('{{ "1125899906842625"|format_size }}')); // TB (* 1024)
     }
 }
diff --git a/tests/integration/SysPlugins/TwigCore/Filters/FindFilterTest.php b/tests/integration/SysPlugins/TwigCore/Filters/FindFilterTest.php
deleted file mode 100644
index 63434393..00000000
--- a/tests/integration/SysPlugins/TwigCore/Filters/FindFilterTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests\integration\SysPlugins\TwigCore\Filters;
-
-use herbie\Application;
-use herbie\ApplicationPaths;
-use herbie\TwigRenderer;
-
-final class FindFilterTest extends \Codeception\Test\Unit
-{
-    protected TwigRenderer $twigRenderer;
-
-    protected function _setUp(): void
-    {
-        $app = new Application(new ApplicationPaths(
-            dirname(__DIR__, 5),
-            dirname(__DIR__, 3) . '/Fixtures/site',
-            dirname(__DIR__, 5) . '/vendor',
-            dirname(__DIR__, 4) . '/_data/web'
-        ));
-        $app->getPluginManager()->init();
-        $app->getTwigRenderer()->init();
-        $this->twigRenderer = $app->getTwigRenderer();
-    }
-
-    public function testFilterPageListWithoutSelectors()
-    {
-        $twig = <<<TWIG
-            {%- for item in site.pageList|find() -%}
-                *{{- item.route -}}
-            {%- endfor -%}
-        TWIG;
-        $expected = '**zeta/psi*zeta/beta*zeta*omega/gamma*omega*alpha*alpha/delta*alpha/sigma*pagedata*segments';
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame($expected, $actual);
-    }
-
-    public function testFilterPageListWithOneSelector()
-    {
-        $twig = <<<TWIG
-            {%- for item in site.pageList|find("route=alpha") -%}
-                *{{- item.route -}}
-            {%- endfor -%}
-        TWIG;
-        $expected = '*alpha';
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame($expected, $actual);
-    }
-
-    public function testFilterPageListWithSelectorsSortAndLimit()
-    {
-        $twig = <<<TWIG
-            {%- for item in site.pageList|find("type=page", "sort=-title", "limit=3") -%}
-                *{{- item.title -}}
-            {%- endfor -%}
-        TWIG;
-        $expected = '*Zeta Psi*Zeta Index*Zeta Beta';
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame($expected, $actual);
-    }
-
-    public function testFilterArray()
-    {
-        $twig = <<<TWIG
-            {%- set arr = [{'key': 'abc'}, {'key': 'def'}, {'key': 'ghi'}] -%}
-            {%- for item in arr|find("key=def") -%}
-                *{{- item.key -}}
-            {%- endfor -%}
-        TWIG;
-        $expected = '*def';
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame($expected, $actual);
-    }
-
-    public function testFilterArrayWithDifferentOperators()
-    {
-        $twigArray = <<<TWIG
-            {%- set array = [{key: 'abcd'}, {key: 'efgh'}, {key: 'ijkl'}, {key: 'mnop'}, {key: 'qrst'}, {key: 'uvwx'}] -%}    
-        TWIG;
-
-        // matchEqual
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key=mnop")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('mnop', $actual);
-
-        // matchNotEqual
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key!=efgh")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('abcd,ijkl,mnop,qrst,uvwx', $actual);
-
-        // matchGreaterThan
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key>mnop")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('qrst,uvwx', $actual);
-
-        // matchGreaterThanEqual
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key>=mnop")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('mnop,qrst,uvwx', $actual);
-
-        // matchLessThan
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key<mnop")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('abcd,efgh,ijkl', $actual);
-
-        // matchLessThanEqual
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key<=mnop")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('abcd,efgh,ijkl,mnop', $actual);
-
-        // matchContains
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key*=no")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('mnop', $actual);
-
-        // matchStarts
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key^=m")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('mnop', $actual);
-
-        // matchEnds
-        $twig = <<<TWIG
-            $twigArray
-            {{- array|find("key$=p")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('mnop', $actual);
-
-        $words = <<<TWIG
-            {%- set array = [{key: 'this is great'}, {key: 'not the same'}, {key: 'this is yours'}] -%}    
-        TWIG;
-
-        // matchContainsWords
-        $twig = <<<TWIG
-            $words
-            {{- array|find("key~=is")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('this is great,this is yours', $actual);
-
-        // matchBitwiseAnd
-        $twig = <<<TWIG
-            {%- set array = [{key: 1}, {key: 2}, {key: 3}, {key: 4}, {key: 5}, {key: 6}, {key: 7}, {key: 8}] -%}
-            {{- array|find("key&2")|map(a => "#{a.key}")|join(',') -}}
-        TWIG;
-        $actual = $this->twigRenderer->renderString($twig);
-        $this->assertSame('2,3,6,7', $actual);
-    }
-}
diff --git a/tests/integration/SysPlugins/TwigCore/Filters/StrftimeFilterTest.php b/tests/integration/SysPlugins/TwigCore/Filters/StrftimeFilterTest.php
deleted file mode 100644
index 2f6d6770..00000000
--- a/tests/integration/SysPlugins/TwigCore/Filters/StrftimeFilterTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace tests\integration\SysPlugins\TwigCore\Filters;
-
-use herbie\Application;
-use herbie\ApplicationPaths;
-use herbie\TwigRenderer;
-
-use function herbie\time_format;
-use function herbie\time_from_string;
-
-final class StrftimeFilterTest extends \Codeception\Test\Unit
-{
-    protected TwigRenderer $twigRenderer;
-
-    protected function _setUp(): void
-    {
-        $app = new Application(new ApplicationPaths(
-            dirname(__DIR__, 5),
-            dirname(__DIR__, 3) . '/Fixtures/site',
-            dirname(__DIR__, 5) . '/vendor',
-            dirname(__DIR__, 4) . '/_data/web'
-        ));
-        $app->getPluginManager()->init();
-        $app->getTwigRenderer()->init();
-        $this->twigRenderer = $app->getTwigRenderer();
-    }
-
-    public function testStrftimeWithValidDates(): void
-    {
-        // timestamp as integer
-        $this->assertSame(
-            '12. September 2022',
-            $this->twigRenderer->renderString('{{ 1662952416|strftime("%e. %B %Y") }}')
-        );
-
-        // timestamp as string
-        $this->assertSame(
-            '12. September 2022',
-            $this->twigRenderer->renderString('{{ "1662952416"|strftime("%e. %B %Y") }}')
-        );
-
-        // iso-date
-        $this->assertSame(
-            '12. September 2022',
-            $this->twigRenderer->renderString('{{ "2022-09-12"|strftime("%e. %B %Y") }}')
-        );
-
-        // empty string
-        $this->assertSame(
-            time_format("%e. %B %Y"),
-            $this->twigRenderer->renderString('{{ ""|strftime("%e. %B %Y") }}')
-        );
-
-        // year with month (without day)
-        $this->assertSame(
-            time_format(" 1. September 2022"),
-            $this->twigRenderer->renderString('{{ "2022-09"|strftime("%e. %B %Y") }}')
-        );
-    }
-
-    public function testStrftimeWithWrongDates(): void
-    {
-        $this->assertSame(
-            'invalid-date',
-            $this->twigRenderer->renderString('{{ "invalid-date"|strftime("%e. %B %Y") }}')
-        );
-
-        $this->assertSame(
-            time_format('%e. %B %Y', time_from_string('1970-01-01')),
-            $this->twigRenderer->renderString('{{ 2000|strftime("%e. %B %Y") }}')
-        );
-
-        $this->assertSame(
-            '2000-13-32',
-            $this->twigRenderer->renderString('{{ "2000-13-32"|strftime("%e. %B %Y") }}')
-        );
-
-        $this->assertSame(
-            time_format('%e. %B %Y', time_from_string('2000-12-31')), // quite random
-            $this->twigRenderer->renderString('{{ "20000-12-31"|strftime("%e. %B %Y") }}')
-        );
-
-        $this->assertSame(
-            time_format("%e. %B %Y"),
-            $this->twigRenderer->renderString('{{ false|strftime("%e. %B %Y") }}')
-        );
-
-        $this->assertSame(
-            time_format('%e. %B %Y', time_from_string('1970-01-01')),
-            $this->twigRenderer->renderString('{{ true|strftime("%e. %B %Y") }}')
-        );
-    }
-}
diff --git a/tests/integration/SysPlugins/TwigCore/Filters/VisibleFilterTest.php b/tests/integration/SysPlugins/TwigCore/Filters/VisibleFilterTest.php
index 9a74a257..d333b9db 100644
--- a/tests/integration/SysPlugins/TwigCore/Filters/VisibleFilterTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Filters/VisibleFilterTest.php
@@ -28,7 +28,7 @@ protected function _setUp(): void
     public function testUnfilteredTree()
     {
         $twig = <<<TWIG
-            {%- for item1 in site.pageTree -%}
+            {%- for item1 in site.page_tree -%}
                 *{{- item1 -}}
                 {%- for item2 in item1.getChildren() -%}
                     **{{- item2 -}}
@@ -47,7 +47,7 @@ public function testUnfilteredTree()
     public function testFilteredTree()
     {
         $twig = <<<TWIG
-            {%- for item1 in site.pageTree|visible -%}
+            {%- for item1 in site.page_tree|visible -%}
                 *{{- item1 -}}
                 {%- for item2 in item1.getChildren() -%}
                     **{{- item2 -}}
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/AbsUrlFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/AbsUrlFunctionTest.php
index fe55aa1b..99da485b 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/AbsUrlFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/AbsUrlFunctionTest.php
@@ -25,8 +25,8 @@ private function twig(): TwigRenderer
     public function testUrlWithoutRoute(): void
     {
         $tests = [
-            ['http:/', '{{ abs_url() }}'],
-            ['http:/', '{{ abs_url("") }}'],
+            ['http:/', '{{ url_abs() }}'],
+            ['http:/', '{{ url_abs("") }}'],
         ];
         foreach ($tests as $test) {
             $this->assertSame($test[0], $this->twig()->renderString($test[1]));
@@ -36,9 +36,9 @@ public function testUrlWithoutRoute(): void
     public function testUrlWithValidRoutes(): void
     {
         $tests = [
-            ['http:/one', '{{ abs_url("one") }}'],
-            ['http:/one/two', '{{ abs_url("one/two") }}'],
-            ['http:/one/two/three', '{{ abs_url("one/two/three") }}']
+            ['http:/one', '{{ url_abs("one") }}'],
+            ['http:/one/two', '{{ url_abs("one/two") }}'],
+            ['http:/one/two/three', '{{ url_abs("one/two/three") }}']
         ];
         foreach ($tests as $test) {
             $this->assertSame($test[0], $this->twig()->renderString($test[1]));
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/AddCssFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/AddCssFunctionTest.php
index ef8e83ca..12368b92 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/AddCssFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/AddCssFunctionTest.php
@@ -21,7 +21,7 @@ private function twig(): TwigRenderer
 
     public function testPowerOn(): void
     {
-        $this->twig()->renderString('{{ add_css("@site/assets/styles.css") }}');
+        $this->twig()->renderString('{{ css_add("@site/assets/styles.css") }}');
     }
 
     // TODO write more tests
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/AddJsFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/AddJsFunctionTest.php
index 2ca9c3f9..950fb53a 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/AddJsFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/AddJsFunctionTest.php
@@ -21,7 +21,7 @@ private function twig(): TwigRenderer
 
     public function testPowerOn(): void
     {
-        $this->twig()->renderString('{{ add_js("@site/assets/script.js") }}');
+        $this->twig()->renderString('{{ js_add("@site/assets/script.js") }}');
     }
 
     // TODO write more tests
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/FileLinkFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/FileLinkFunctionTest.php
index cd1ffea1..ba193a7a 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/FileLinkFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/FileLinkFunctionTest.php
@@ -23,7 +23,7 @@ public function testPowerOn(): void
     {
         $this->assertEquals(
             '<span class="link link--download"><a href="/download/dummy.pdf" alt="" class="link__label">dummy.pdf</a></span>',
-            $this->twig()->renderString('{{ file_link("dummy.pdf") }}')
+            $this->twig()->renderString('{{ link_file("dummy.pdf") }}')
         );
     }
 
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/MailLinkFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/MailLinkFunctionTest.php
index c31eddf3..47c32b92 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/MailLinkFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/MailLinkFunctionTest.php
@@ -23,7 +23,7 @@ private function twig(): TwigRenderer
     public function testLinkWithoutParams(): void
     {
         $this->expectException(ArgumentCountError::class);
-        $twig = '{{ mail_link() }}';
+        $twig = '{{ link_mail() }}';
         $this->twig()->renderString($twig);
     }
 
@@ -32,7 +32,7 @@ public function testLinkWithEmail(): void
         $expected = $this->getHtml(
             '<a class="link__label" href="mailto&#x3A;me&#x40;example.com">me@example.com</a>'
         );
-        $twig = '{{ mail_link("me@example.com") }}';
+        $twig = '{{ link_mail("me@example.com") }}';
         $actual = $this->twig()->renderString($twig);
         $this->assertSame($expected, $actual);
     }
@@ -42,7 +42,7 @@ public function testLinkWithEmailAndLabel(): void
         $expected = $this->getHtml(
             '<a class="link__label" href="mailto&#x3A;me&#x40;example.com">Example</a>'
         );
-        $twig = '{{ mail_link("me@example.com", "Example") }}';
+        $twig = '{{ link_mail("me@example.com", "Example") }}';
         $actual = $this->twig()->renderString($twig);
         $this->assertSame($expected, $actual);
     }
@@ -52,7 +52,7 @@ public function testLinkWithEmailLabelAndAttribs(): void
         $expected = $this->getHtml(
             '<a class="link-class" href="mailto&#x3A;me&#x40;example.com" id="link-id">Example</a>'
         );
-        $twig = '{{ mail_link("me@example.com", "Example", {class:"link-class", id:"link-id"}) }}';
+        $twig = '{{ link_mail("me@example.com", "Example", {class:"link-class", id:"link-id"}) }}';
         $actual = $this->twig()->renderString($twig);
         $this->assertSame($expected, $actual);
     }
@@ -60,14 +60,14 @@ public function testLinkWithEmailLabelAndAttribs(): void
     public function testLinkWithCustomTemplate(): void
     {
         $expected = 'me@example.com';
-        $twig = '{{ mail_link("me@example.com", template="{{label}}") }}';
+        $twig = '{{ link_mail("me@example.com", template="{{label}}") }}';
         $actual = $this->twig()->renderString($twig);
         $this->assertSame($expected, $actual);
     }
 
     public function testLinkWithNotExistingCustomTemplate(): void
     {
-        $twig = '{{ mail_link("me@example.com", template="@not/existing/template.twig") }}';
+        $twig = '{{ link_mail("me@example.com", template="@not/existing/template.twig") }}';
         $this->assertEquals('me@example.com', $this->twig()->renderString($twig));
     }
 
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/OutputCssFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/OutputCssFunctionTest.php
index 55e69820..4a5f3f94 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/OutputCssFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/OutputCssFunctionTest.php
@@ -21,8 +21,8 @@ private function twig(): TwigRenderer
 
     public function testPowerOn(): void
     {
-        $twig = '{{ add_css("@site/assets/styles.css") }}'
-            . '{{ output_css() }}';
+        $twig = '{{ css_add("@site/assets/styles.css") }}'
+            . '{{ css_out() }}';
         $this->assertEquals(
             '<link href="/assets/assets/styles.css" type="text/css" rel="stylesheet">',
             $this->twig()->renderString($twig)
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/OutputJsFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/OutputJsFunctionTest.php
index da2becde..e8861c03 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/OutputJsFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/OutputJsFunctionTest.php
@@ -21,8 +21,8 @@ private function twig(): TwigRenderer
 
     public function testPowerOn(): void
     {
-        $twig = '{{ add_js("@site/assets/script.js") }}'
-            . '{{ output_js() }}';
+        $twig = '{{ js_add("@site/assets/script.js") }}'
+            . '{{ js_out() }}';
         $this->assertEquals(
             '<script src="/assets/assets/script.js"></script>',
             $this->twig()->renderString($twig)
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/PageLinkFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/PageLinkFunctionTest.php
index 0e87d8a8..8774b80b 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/PageLinkFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/PageLinkFunctionTest.php
@@ -23,7 +23,7 @@ public function testPowerOn(): void
     {
         $this->assertEquals(
             '<span class="link link--internal"><a href="/route" class="link__label">label</a></span>',
-            $this->twig()->renderString('{{ page_link("route", "label") }}')
+            $this->twig()->renderString('{{ link_page("route", "label") }}')
         );
     }
 
diff --git a/tests/integration/SysPlugins/TwigCore/Functions/UrlFunctionTest.php b/tests/integration/SysPlugins/TwigCore/Functions/UrlFunctionTest.php
index 7d1f55d3..803825bd 100644
--- a/tests/integration/SysPlugins/TwigCore/Functions/UrlFunctionTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Functions/UrlFunctionTest.php
@@ -22,14 +22,14 @@ private function twig(): TwigRenderer
 
     public function testUrlWithoutRoute(): void
     {
-        $twig = '{{ url() }}';
+        $twig = '{{ url_rel() }}';
         $this->assertSame('/', $this->twig()->renderString($twig));
     }
 
     public function testUrlWithValidRoutes(): void
     {
-        $this->assertSame('/one', $this->twig()->renderString('{{ url("one") }}'));
-        $this->assertSame('/one/two', $this->twig()->renderString('{{ url("one/two") }}'));
-        $this->assertSame('/one/two/three', $this->twig()->renderString('{{ url("one/two/three") }}'));
+        $this->assertSame('/one', $this->twig()->renderString('{{ url_rel("one") }}'));
+        $this->assertSame('/one/two', $this->twig()->renderString('{{ url_rel("one/two") }}'));
+        $this->assertSame('/one/two/three', $this->twig()->renderString('{{ url_rel("one/two/three") }}'));
     }
 }
diff --git a/tests/integration/SysPlugins/TwigCore/Tests/ReadableTest.php b/tests/integration/SysPlugins/TwigCore/Tests/ReadableTest.php
index 5821c7c4..f6148d9b 100644
--- a/tests/integration/SysPlugins/TwigCore/Tests/ReadableTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Tests/ReadableTest.php
@@ -42,7 +42,7 @@ public function testReadableWithoutCondition(): void
     public function testReadableWithEmptyParam(): void
     {
         $twig = <<<TWIG
-            {%- if '' is readable -%}readable{% else %}not readable{%- endif -%}
+            {%- if '' is file_readable -%}readable{% else %}not readable{%- endif -%}
         TWIG;
         $this->assertSame('not readable', $this->twig()->renderString($twig));
     }
@@ -50,7 +50,7 @@ public function testReadableWithEmptyParam(): void
     public function testReadableWithExistingAlias(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy.pdf' is readable -%}is readable{% else %}not readable{%- endif -%}
+            {%- if '@media/dummy.pdf' is file_readable -%}is readable{% else %}not readable{%- endif -%}
         TWIG;
         $this->assertSame('is readable', $this->twig()->renderString($twig));
     }
@@ -58,7 +58,7 @@ public function testReadableWithExistingAlias(): void
     public function testReadableWithExistingAliasWithoutPermissions(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy-no-rights.pdf' is readable -%}is readable{% else %}not readable{%- endif -%}
+            {%- if '@media/dummy-no-rights.pdf' is file_readable -%}is readable{% else %}not readable{%- endif -%}
         TWIG;
         $this->assertSame('not readable', $this->twig()->renderString($twig));
     }
@@ -66,7 +66,7 @@ public function testReadableWithExistingAliasWithoutPermissions(): void
     public function testReadableWithNotExistingAlias(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy-xyz.pdf' is readable -%}is readable{% else %}not readable{%- endif -%}
+            {%- if '@media/dummy-xyz.pdf' is file_readable -%}is readable{% else %}not readable{%- endif -%}
         TWIG;
         $this->assertSame('not readable', $this->twig()->renderString($twig));
     }
diff --git a/tests/integration/SysPlugins/TwigCore/Tests/WritableTest.php b/tests/integration/SysPlugins/TwigCore/Tests/WritableTest.php
index cd450f9c..ffbd7694 100644
--- a/tests/integration/SysPlugins/TwigCore/Tests/WritableTest.php
+++ b/tests/integration/SysPlugins/TwigCore/Tests/WritableTest.php
@@ -40,7 +40,7 @@ public function testWritableWithoutCondition(): void
     public function testWritableWithEmptyParam(): void
     {
         $twig = <<<TWIG
-            {%- if '' is writable -%}yes{% else %}no{%- endif -%}
+            {%- if '' is file_writable -%}yes{% else %}no{%- endif -%}
         TWIG;
         $this->assertSame('no', $this->twig()->renderString($twig));
     }
@@ -48,7 +48,7 @@ public function testWritableWithEmptyParam(): void
     public function testWritableWithExistingAlias(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy.pdf' is writable -%}yes{% else %}no{%- endif -%}
+            {%- if '@media/dummy.pdf' is file_writable -%}yes{% else %}no{%- endif -%}
         TWIG;
         $this->assertSame('yes', $this->twig()->renderString($twig));
     }
@@ -56,7 +56,7 @@ public function testWritableWithExistingAlias(): void
     public function testWritableWithExistingAliasWithoutPermissions(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy-no-rights.pdf' is writable -%}yes{% else %}no{%- endif -%}
+            {%- if '@media/dummy-no-rights.pdf' is file_writable -%}yes{% else %}no{%- endif -%}
         TWIG;
         $this->assertSame('no', $this->twig()->renderString($twig));
     }
@@ -64,7 +64,7 @@ public function testWritableWithExistingAliasWithoutPermissions(): void
     public function testReadableWithNotExistingAlias(): void
     {
         $twig = <<<TWIG
-            {%- if '@media/dummy-xyz.pdf' is writable -%}yes{% else %}no{%- endif -%}
+            {%- if '@media/dummy-xyz.pdf' is file_writable -%}yes{% else %}no{%- endif -%}
         TWIG;
         $this->assertSame('no', $this->twig()->renderString($twig));
     }
diff --git a/tests/integration/SysPlugins/TwigPlus/TwigPlusSmokeTest.php b/tests/integration/SysPlugins/TwigPlus/TwigPlusSmokeTest.php
index 261953b0..bb03a083 100644
--- a/tests/integration/SysPlugins/TwigPlus/TwigPlusSmokeTest.php
+++ b/tests/integration/SysPlugins/TwigPlus/TwigPlusSmokeTest.php
@@ -49,14 +49,7 @@ public function testMenuListFunction(): void
     public function testMenuTreeFunction(): void
     {
         $expected = '<div class="menu"><ul><li class="current"><a href="/">Index</a></li><li><a href="/alpha">Alpha Index</a></ul></div>';
-        $actual = $this->twig()->renderString('{{ menu_tree(maxDepth=0) }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testPageTaxonomiesFunction(): void
-    {
-        $expected = '<div class="blog-meta"></div>';
-        $actual = $this->twig()->renderString('{{ page_taxonomies() }}');
+        $actual = $this->twig()->renderString('{{ menu_tree(depth=0) }}');
         $this->assertEquals($expected, $actual);
     }
 
@@ -69,52 +62,10 @@ public function testMenuPagerFunction(): void
         $this->assertEquals($expected, $actual);
     }
 
-    public function testPagesFilteredFunction(): void
-    {
-        $expected = '';
-        $actual = $this->twig()->renderString('{{ pages_filtered([]) }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testPagesRecentFunction(): void
-    {
-        $expected = '<div class="widget-blog widget-blog-recent-posts"><h4>Recent posts</h4><ul><li><span class="link link--internal"><a href="/" class="link__label">Index</a></span></li></ul></div>';
-        $actual = $this->twig()->renderString('{{ pages_recent(limit=1) }}');
-        $this->assertEquals($expected, $actual);
-    }
-
     public function testMenuSitemapFunction(): void
     {
         $expected = '<div class="sitemap"><ul><li class="current"><a href="/">Index</a></li><li><a href="/alpha">Alpha Index</a></ul></div>';
-        $actual = $this->twig()->renderString('{{ menu_sitemap(maxDepth=0) }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTaxonomyArchiveFunction(): void
-    {
-        $expected = '';
-        $actual = $this->twig()->renderString('{{ taxonomy_archive() }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTaxonomyAuthorsFunction(): void
-    {
-        $expected = '';
-        $actual = $this->twig()->renderString('{{ taxonomy_authors() }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTaxonomyCategoriesFunction(): void
-    {
-        $expected = '';
-        $actual = $this->twig()->renderString('{{ taxonomy_categories() }}');
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testTaxonomyTagsFunction(): void
-    {
-        $expected = '';
-        $actual = $this->twig()->renderString('{{ taxonomy_tags() }}');
+        $actual = $this->twig()->renderString('{{ menu_sitemap(depth=0) }}');
         $this->assertEquals($expected, $actual);
     }
 }
diff --git a/website/site/config/main.php b/website/site/config/main.php
index 725778fb..83f79ef7 100644
--- a/website/site/config/main.php
+++ b/website/site/config/main.php
@@ -10,7 +10,7 @@
         'layouts' => 'twig'
     ],
     'enabledPlugins' => 'simplesearch,simplecontact',
-    'enabledSysPlugins' => 'twig_core,twig_plus,imagine,markdown',
+    'enabledSysPlugins' => 'twig,imagine,markdown',
     'components' => [
         'dataRepository' => [
             'adapter' => 'yaml'
diff --git a/website/site/data/plugins.yml b/website/site/data/plugins.yml
index 6cabeebb..be014f20 100644
--- a/website/site/data/plugins.yml
+++ b/website/site/data/plugins.yml
@@ -265,27 +265,16 @@
   status: stable
   enabled: false
 -
-  id: twig_core
-  name: Twig Core
-  desc: This system plugin provides basic Twig filters, functions and tests that are useful for creating a web project with Herbie.
+  id: twig
+  name: Twig
+  desc: This system plugin provides several Twig filters, functions and tests that are useful for creating a web project with Herbie.
   author: Herbie-Team
   version: 2.0.0
   composer:
-  github: https://github.com/getherbie/herbie/tree/2.x/plugins/twig_core
+  github: https://github.com/getherbie/herbie/tree/2.x/plugins/twig
   packagist:
   status: stable
   enabled: true
--
-  id: twig_plus
-  name: Twig Plus
-  desc: This system plugin provides extended Twig functions that are useful for creating a web project with Herbie.
-  author: Herbie-Team
-  version: 2.0.0
-  composer:
-  github: https://github.com/getherbie/herbie/tree/2.x/plugins/twig_plus
-  packagist:
-  status: stable
-  enabled: true  
 -
   id: video
   name: Video
diff --git a/website/site/data/twig_filters.yml b/website/site/data/twig_filters.yml
index e5ecaac2..3a236f58 100644
--- a/website/site/data/twig_filters.yml
+++ b/website/site/data/twig_filters.yml
@@ -1,41 +1,11 @@
 ---
-- name: filesize
+- name: format_size
   code: >-
-    {{ 12345678|filesize }}
+    {{ 12345678|format_size }}
   desc: Returns file size in a human readable format (B, KB, MB, GB, TB, PB).
   return:
     - string
     - The file size in human readable format
-- name: find
-  code: >-
-    {{ site.pageList|find("title^=this", "title~=is", "title$=great") }}
-  desc: >-
-    Find items of a traversable list by one or more selectors.      
-    Selectors are simple strings of text that specify fields and values. 
-    They are logical AND-connected and given as variadic arguments.
-    Selectors in Herbie are loosely based around the idea and syntax of CSS attribute selectors. 
-    A selector can be one of the following:
-    <table class="pure-table pure-table-horizontal">
-    <tr><td style='width:5%'>=</td><td>Equal to</td></tr>    
-    <tr><td>!=</td><td>Not equal to</td></tr>
-    <tr><td>&lt;</td><td>Less than</td></tr>    
-    <tr><td>&gt;</td><td>Greater than</td></tr>
-    <tr><td>&lt;=</td><td>Less than or equal to</td></tr>
-    <tr><td>&gt;=</td><td>Greater than or equal to</td></tr>
-    <tr><td>*=</td><td>Contains phrase/text</td></tr>
-    <tr><td>~=</td><td>Contains all words</td></tr>
-    <tr><td>^=</td><td>Starts with phrase/text</td></tr>
-    <tr><td>$=</td><td>Ends with phrase/text</td></tr>
-    <tr><td>&</td><td>Bitwise AND</td></tr>
-    </table>
-  params:
-    - name: selectors
-      type: string
-      desc: One or more selectors (optional, variadic)
-      default:
-  return:
-    - iterable
-    - The items matching the given selectors
 - name: slugify
   code: >-
     {{ "A string with spaces, Umlauts or special characters (?!&#)."|slugify }}
@@ -43,22 +13,9 @@
   return:
     - string
     - The slugified string
-- name: strftime
-  code: >-
-    {{ "2022-09-13"|strftime("%Y-%m-%d") }}
-  desc: Formats a local time/date according to locale settings. 
-    This is a wrapper for the same-named PHP function.
-  params:
-    - name: format
-      type: string
-      desc: The format, see http://php.net/strftime
-      default: "%x"
-  return:
-    - string
-    - The formatted time or date
 - name: visible
   code: >-
-    {{ site.pageTree|visible }}
+    {{ site.page_tree|visible }}
   desc: Filters the page tree by visible and active page items.
   return:
     - pageTree
diff --git a/website/site/data/twig_filters_builtin.yml b/website/site/data/twig_filters_builtin.yml
new file mode 100644
index 00000000..8902fae0
--- /dev/null
+++ b/website/site/data/twig_filters_builtin.yml
@@ -0,0 +1,55 @@
+---
+- name: abs
+- name: batch
+- name: capitalize
+- name: column
+- name: convert_encoding
+- name: country_name
+- name: currency_name
+- name: currency_symbol
+- name: data_uri
+- name: date
+- name: date_modify
+- name: default
+- name: escape
+- name: filter
+- name: first
+- name: format
+- name: format_currency
+- name: format_date
+- name: format_datetime
+- name: format_number
+- name: format_time
+- name: html_to_markdown
+- name: inline_css
+- name: inky_to_html
+- name: join
+- name: json_encode
+- name: keys
+- name: language_name
+- name: last
+- name: length
+- name: locale_name
+- name: lower
+- name: map
+- name: markdown_to_html
+- name: merge
+- name: nl2br
+- name: number_format
+- name: raw
+- name: reduce
+- name: replace
+- name: reverse
+- name: round
+- name: slice
+- name: slug
+- name: sort
+- name: spaceless
+- name: split
+- name: striptags
+- name: timezone_name
+- name: title
+- name: trim
+- name: u
+- name: upper
+- name: url_encode
diff --git a/website/site/data/twig_functions.yml b/website/site/data/twig_functions.yml
index 989c36fb..e529e863 100644
--- a/website/site/data/twig_functions.yml
+++ b/website/site/data/twig_functions.yml
@@ -1,7 +1,7 @@
 ---
-- name: abs_url
+- name: url_abs
   code: >-
-    {{ abs_url("doc/contents/variables") }}
+    {{ url_abs("doc/contents/variables") }}
   desc: Returns the absolute URL for a given route.
   params:
     - name: route
@@ -11,9 +11,9 @@
   return:
     - string
     - The absolute URL.
-- name: add_css
+- name: css_add
   code: >-
-    {{ add_css("@site/themes/styles.css", {class: "styles"}, "default", false, 1) }}
+    {{ css_add("@site/themes/styles.css", {class: "styles"}, "default", false, 1) }}
   desc: Adds a CSS asset to the HTML page.
   params:
     - name: paths
@@ -38,9 +38,9 @@
       default: "-1"
   return:
     - void
-- name: add_js
+- name: js_add
   code: >-
-    {{ add_js("@site/themes/script.js", {class: "scripts"}, "default", false, 1) }}
+    {{ js_add("@site/themes/script.js", {class: "scripts"}, "default", false, 1) }}
   desc: Adds a JavaScript asset to the HTML page.
   params:
     - name: paths
@@ -135,11 +135,11 @@
       type: string
       desc: The tree from the given route.
       default: '""'
-    - name: maxDepth
+    - name: depth
       type: int
       desc: The maximum depth level of the tree (-1 = unlimited).
       default: "-1"
-    - name: showHidden
+    - name: hidden
       type: bool
       desc: Show hidden pages.
       default: 'false'
@@ -160,7 +160,7 @@
       type: string
       desc: The delim.
       default: '""'
-    - name: homeLink
+    - name: home
       type: array|string
       desc: The link to the homepage. An array must be like [route, label].
       default: '""'
@@ -173,11 +173,11 @@
     - The breadcrumb path as HTML.
 - name: menu_list
   code: >-
-    {{ menu_list(site.pageList, "parentRoute|doc", "title|asc", false, 3, "@snippet/listing.twig") }}
+    {{ menu_list(site.page_list, "parentRoute|doc", "title|asc", false, 3, "@snippet/listing.twig") }}
   desc: Returns a paginated list of page items with links to the previous and next page.
     For the paging the GET parameter "page" is used.
   params:
-    - name: pageList
+    - name: page_list
       type: PageList
       desc: The page list.
       default: 'null'
@@ -214,25 +214,25 @@
       type: string
       desc: Limits the pagination to a certain branch of the page tree.
       default: ''
-    - name: prevPageLabel
+    - name: prev_label
       type: string
       desc: The label for the "previous" link.
         If empty the page title will be shown.
       default: ''
-    - name: nextPageLabel
+    - name: next_label
       type: string
       desc: The label for the "next" link.
         If empty the page title will be shown.
       default: ''
-    - name: prevPageIcon
+    - name: prev_icon
       type: string
       desc: The icon for the "previous" link.
       default: ''
-    - name: nextPageIcon
+    - name: next_icon
       type: string
       desc: The icon for the "next" link.
       default: ''
-    - name: linkClass
+    - name: class
       type: string
       desc: The CSS class name for the element.
         Various other class names are assembled from this class name.
@@ -254,11 +254,11 @@
       type: string
       desc: Limits the sitemap to a certain branch of the page tree.
       default: '""'
-    - name: maxDepth
+    - name: depth
       type: int
       desc: The maximum depth level of the sitemap.
       default: "-1"
-    - name: showHidden
+    - name: hidden
       type: bool
       desc: Show hidden pages.
       default: 'false'
@@ -279,11 +279,11 @@
       type: string
       desc: The menu from the given route.
       default: '""'
-    - name: maxDepth
+    - name: depth
       type: int
       desc: The maximum depth level of the tree.
       default: "-1"
-    - name: showHidden
+    - name: hidden
       type: bool
       desc: Show hidden pages.
       default: 'false'
@@ -294,41 +294,89 @@
   return:
     - string
     - The menu as unordered list
-- name: output_css
+- name: css_out
   code: >-
-    {{ output_css("default") }}
+    {{ css_out("default") }}
   desc: Outputs the CSS assets for a given group.
   params:
     - name: group
       type: string
       desc: The grouped CSS.
       default: 'null'
-    - name: addTimestamp
+    - name: timestamp
       type: bool
       desc: If true, a GET param with the modification timestamp of the file is added.
       default: false      
   return:
     - void
     - The CSS assets
-- name: output_js
+- name: js_out
   code: >-
-    {{ output_js("default") }}
+    {{ js_out("default") }}
   desc: Outputs the JavaScript assets for a given group.
   params:
     - name: group
       type: string
       desc: The grouped JavaScript.
       default: 'null'
-    - name: addTimestamp
+    - name: timestamp
       type: bool
       desc: If true, a GET param with the modification timestamp of the file is added.
       default: false
   return:
     - string
     - The JavaScript assets
-- name: page_link
+- name: link_file
+  code: >-
+    {{ link_file("dummy.pdf", "My dummy file", true, {class: "link-file"}) }}
+  desc: Returns a HTML link with a file from site/media folder.
+  params:
+    - name: path
+      type: string
+      desc: The path to the file in site/media folder.
+      default: ''
+    - name: label
+      type: string
+      desc: The label.
+      default: ''
+    - name: info
+      type: bool
+      desc: Adds info with file size und file extension.
+      default: false
+    - name: attribs
+      type: array
+      desc: The HTML attributes passed as an associative array.
+      default: ''
+  return:
+    - string
+    - The link to a file
+- name: link_mail
   code: >-
-    {{ page_link("doc/contents/variables", "Content variables", {class: "page-link"}) }}
+    {{ link_mail("me@example.com", "John Doe", {class: "link-page"}, "@snippet/link.twig") }}
+  desc: Returns a HTML mailto link.
+  params:
+    - name: email
+      type: string
+      desc: The email.
+      default: ''
+    - name: label
+      type: string
+      desc: The label.
+      default: ''
+    - name: attribs
+      type: array
+      desc: The HTML attributes passed as an associative array.
+      default: ''
+    - name: template
+      type: string
+      desc: The aliased path to the template file.
+      default: ''      
+  return:
+    - string
+    - The mailto link  
+- name: link_page
+  code: >-
+    {{ link_page("doc/contents/variables", "Content variables", {class: "link-page"}) }}
   desc: Returns a HTML link with label and attributes for a given route or an URL.
   params:
     - name: route
@@ -356,12 +404,12 @@
       type: string
       desc: The delim.
       default: '" / "'
-    - name: siteTitle
+    - name: site_title
       type: string
       desc: The title of the website.
         If set this title is appended on every page.
       default: 'null'
-    - name: rootTitle
+    - name: root_title
       type: string
       desc: The title of the root page of the website.
         If set this title is displayed on root page only.
@@ -391,10 +439,23 @@
   return:
     - string
     - The included snippet
+- name: query
+  code: >
+    {{ query(data).where("type=page", "title*=news").limit(3).order("-date").all() }}
+  desc: >
+    Find entries with the help of the built-in fluent query builder.
+    The query builder can be applied to any type of iterable data structure.
+    The queried data can be narrowed down, filtered, sorted and limited.
+  params:
+    - name: iterator
+      type: iterable
+      desc: The data to be queried.
+      default: iterable
 - name: translate
-  code: >-
-    {{ translate("app", "Plugin \"{plugin}\" enabled but not found!", {plugin: "dummy"}) }}
-  desc: Translates a string according to the configuration and locale settings.
+  code: >
+    {{ translate("app", "Plugin {plugin} enabled but not found!", {plugin: "dummy"}) }}
+  desc: >
+    Translates a string according to the configuration and locale settings.
   params:
     - name: category
       type: string
@@ -411,9 +472,9 @@
   return:
     - string
     - The translated message
-- name: url
+- name: url_rel
   code: >-
-    {{ url("doc/contents") }}
+    {{ url_rel("doc/contents") }}
   desc: Returns the relative URL to a given route.
   params:
     - name: route
diff --git a/website/site/data/twig_functions_builtin.yml b/website/site/data/twig_functions_builtin.yml
new file mode 100644
index 00000000..eb618349
--- /dev/null
+++ b/website/site/data/twig_functions_builtin.yml
@@ -0,0 +1,17 @@
+---
+- name: attribute
+- name: block
+- name: constant
+- name: cycle
+- name: date
+- name: dump
+- name: html_classes
+- name: include
+- name: max
+- name: min
+- name: parent
+- name: random
+- name: range
+- name: source
+- name: country_timezones
+- name: template_from_string
diff --git a/website/site/data/twig_tags_builtin.yml b/website/site/data/twig_tags_builtin.yml
new file mode 100644
index 00000000..ee5a1f9a
--- /dev/null
+++ b/website/site/data/twig_tags_builtin.yml
@@ -0,0 +1,21 @@
+---
+- name: apply
+- name: autoescape
+- name: block
+- name: cache
+- name: deprecated
+- name: do
+- name: embed
+- name: extends
+- name: flush
+- name: for
+- name: from
+- name: if
+- name: import
+- name: include
+- name: macro
+- name: sandbox
+- name: set
+- name: use
+- name: verbatim
+- name: with
diff --git a/website/site/data/twig_tests.yml b/website/site/data/twig_tests.yml
index 5ad8ab9f..ffe9fd3f 100644
--- a/website/site/data/twig_tests.yml
+++ b/website/site/data/twig_tests.yml
@@ -1,15 +1,15 @@
 ---
-- name: readable
+- name: file_readable
   code: >-
-    {% if "@site/data" is readable %}
+    {% if "@site/data" is file_readable %}
       Path or file is readable
     {% endif %}
   desc: Tests if the given alias or path exists and is readable.
   return:
     - bool
-- name: writable
+- name: file_writable
   code: >-
-    {% if "@site/data" is writable %}
+    {% if "@site/data" is file_writable %}
       Path or file is writable
     {% endif %}  
   desc: Tests if the given alias or path exists and is writable.
diff --git a/website/site/data/twig_tests_builtin.yml b/website/site/data/twig_tests_builtin.yml
new file mode 100644
index 00000000..0d9e2de0
--- /dev/null
+++ b/website/site/data/twig_tests_builtin.yml
@@ -0,0 +1,12 @@
+---
+- name: constant
+- name: defined
+- name: divisible by
+  slug: divisibleby
+- name: empty
+- name: even
+- name: iterable
+- name: 'null'
+- name: odd
+- name: same as
+  slug: sameas  
diff --git a/website/site/data/vars_global.yml b/website/site/data/vars_global.yml
index 1f3a8376..ec6576e1 100644
--- a/website/site/data/vars_global.yml
+++ b/website/site/data/vars_global.yml
@@ -1,22 +1,11 @@
 ---
-- name: baseUrl
-  desc: The base url.
-  type: string
-- name: config
-  desc: The configurations as Config object.
-  type: herbie\Config
+- name: content
+  desc: The rendered content with one or more content segments.
+    Only available in layout files.
+  type: array
 - name: page
-  desc: Page wide variables.
+  desc: The page object with its properties and methods.
   type: herbie\Page
-- name: route
-  desc: The requested route to a page, i.e. `documentation/variables`.
-  type: string
-- name: routeParams
-  desc: The requested route params.
-  type: array
 - name: site
-  desc: Project-wide variables.
+  desc: The site object with its properties and methods.
   type: herbie\Site
-- name: theme
-  desc: The configured theme.
-  type: string
diff --git a/website/site/data/vars_page.yml b/website/site/data/vars_page.yml
index cd97a78d..79264f10 100644
--- a/website/site/data/vars_page.yml
+++ b/website/site/data/vars_page.yml
@@ -84,6 +84,6 @@
 - name: page.type
   desc: 'The page type (default: page).'
   type: string
-- name: page.<NAME>
+- name: page.<name>
   desc: Any numbers of custom variables.
   type: mixed
diff --git a/website/site/data/vars_site.yml b/website/site/data/vars_site.yml
index 8d6d4351..64c3e724 100644
--- a/website/site/data/vars_site.yml
+++ b/website/site/data/vars_site.yml
@@ -1,11 +1,17 @@
 ---
+- name: site.base_url
+  desc: The base url.
+  type: string
 - name: site.charset
   desc: 'The charset (default: utf-8)'
   type: string
+- name: site.config
+  desc: The config object with its methods.
+  type: Config  
 - name: site.created
   desc: The time of the last recent created page in ISO-8601 format (2004-02-12T15:19:21+00:00).
   type: string
-- name: site.data.<NAME>
+- name: site.data.<name>
   desc: Project wide data structures, which are located in `site/data`.
   type: mixed
 - name: site.language
@@ -17,15 +23,24 @@
 - name: site.modified
   desc: The time of the last modified page in ISO-8601 format (2004-02-12T15:19:21+00:00).
   type: string
-- name: site.pageList
+- name: site.page_list
   desc: A list of all available pages.
   type: Traversable
-- name: site.pageTrail
+- name: site.page_trail
   desc: A trail from the current page up to the root page.
   type: Traversable
-- name: site.pageTree
+- name: site.page_tree
   desc: A tree of all available pages.
   type: Traversable
+- name: site.route
+  desc: The requested route to, i.e. `documentation/variables`.
+  type: string
+- name: site.route_params
+  desc: The requested route params.
+  type: array
+- name: site.theme
+  desc: The configured theme.
+  type: string
 - name: site.time
   desc: The current time in ISO-8601 format (2004-02-12T15:19:21+00:00).
-  type: string
+  type: string  
diff --git a/website/site/pages-de.zip b/website/site/pages-de.zip
deleted file mode 100644
index 8955a7a6..00000000
Binary files a/website/site/pages-de.zip and /dev/null differ
diff --git a/website/site/pages/2-doc/2-first-steps/3-installation.md b/website/site/pages/2-doc/2-first-steps/3-installation.md
index c371f496..c9bcd0ac 100644
--- a/website/site/pages/2-doc/2-first-steps/3-installation.md
+++ b/website/site/pages/2-doc/2-first-steps/3-installation.md
@@ -11,7 +11,7 @@ There are only a few host system requirements that must be met.
 These are:
 
 - Operating system: Windows, Linux or Mac
-- PHP: >=7.4
+- PHP: >=8.0
 - Composer: >=2.x
 
 ## Composer support
diff --git a/website/site/pages/2-doc/2-first-steps/4-configuration.md b/website/site/pages/2-doc/2-first-steps/4-configuration.md
index 903acf2c..67d78d59 100644
--- a/website/site/pages/2-doc/2-first-steps/4-configuration.md
+++ b/website/site/pages/2-doc/2-first-steps/4-configuration.md
@@ -54,13 +54,13 @@ All configuration values can be accessed via a function with support for dot not
 The following function calls:
 
 {% verbatim %}
-    {{ config.getAsString('charset') }}
-    {{ config.getAsString('fileExtensions.pages') }}
-    {{ config.getAsBool('components.virtualCorePlugin.enableTwigInLayoutFilter') }}
+    {{ site.config.as_string('charset') }}
+    {{ site.config.as_string('fileExtensions.pages') }}
+    {{ site.config.as_bool('plugins.CORE.enableTwigInLayoutFilter') }}
 {% endverbatim %}
 
 Return the following values:
 
-    Charset = {{ config.getAsString('charset') }}
-    Page extensions = {{ config.getAsString('fileExtensions.pages') }}
-    Enable twig = {{ config.getAsBool('components.virtualCorePlugin.enableTwigInLayoutFilter') }}
+    Charset = {{ site.config.as_string('charset') }}
+    Page extensions = {{ site.config.as_string('fileExtensions.pages') }}
+    Enable twig = {{ site.config.as_bool('plugins.CORE.enableTwigInLayoutFilter') }}
diff --git a/website/site/pages/2-doc/3-contents/5-variables.md b/website/site/pages/2-doc/3-contents/5-variables.md
index d472c273..66f22479 100644
--- a/website/site/pages/2-doc/3-contents/5-variables.md
+++ b/website/site/pages/2-doc/3-contents/5-variables.md
@@ -12,7 +12,7 @@ All variables can then be accessed in the layout and content files as normal Twi
 Here are some examples:
 
 {% verbatim %}
-    {{ route }}
+    {{ site.route }}
     {{ site.language }}
     {{ site.data.persons }}
     {{ page.layout }}
@@ -25,10 +25,10 @@ The details of these variables are listed below.
 
 {{ snippet("@site/snippets/variables.twig", {type:"vars_global"}) }}
 
-## Site variables
-
-{{ snippet("@site/snippets/variables.twig",{type:"vars_site"}) }}
-
 ## Page variables
 
 {{ snippet("@site/snippets/variables.twig", {type:"vars_page"}) }}
+
+## Site variables
+
+{{ snippet("@site/snippets/variables.twig",{type:"vars_site"}) }}
diff --git a/website/site/pages/2-doc/3-contents/6-data-files.md b/website/site/pages/2-doc/3-contents/6-data-files.md
index 02716949..f4190e16 100644
--- a/website/site/pages/2-doc/3-contents/6-data-files.md
+++ b/website/site/pages/2-doc/3-contents/6-data-files.md
@@ -14,7 +14,7 @@ At the same time, one has access to data without changing the central configurat
 ## The data folder
 
 In the data folder you create one or more JSON or YAML files that can contain any structured data.
-You can access this data in the template via `site.data.<FILENAME>`.
+You can access this data in the template via `site.data.<filename>`.
 
 ### Example: A list of people
 
diff --git a/website/site/pages/2-doc/5-indepth/2-commands.md b/website/site/pages/2-doc/5-indepth/2-commands.md
index fab18eba..e396ce15 100644
--- a/website/site/pages/2-doc/5-indepth/2-commands.md
+++ b/website/site/pages/2-doc/5-indepth/2-commands.md
@@ -54,7 +54,7 @@ The output looks like this:
     help         Display help for a command
     list         List commands
 
-The call to clear the caches then looks like this, for example.
+The command to clear temporary files then looks like this, for example.
 
     php vendor/bin/herbie clear-files
 
diff --git a/website/site/pages/2-doc/5-indepth/5-query-builder.md b/website/site/pages/2-doc/5-indepth/5-query-builder.md
new file mode 100644
index 00000000..83cb28b8
--- /dev/null
+++ b/website/site/pages/2-doc/5-indepth/5-query-builder.md
@@ -0,0 +1,225 @@
+---
+title: Query Builder
+layout: doc
+---
+
+# Query Builder
+
+Herbie provides a fluent query builder interacting with your content and data in PHP-land.
+
+~~~php
+$data = [
+    ['title' => 'Foo', 'layout' => 'blog'], 
+    ['title' => 'Bar', 'layout' => 'news'],
+    ['title' => 'Baz', 'layout' => 'blog'],      
+];
+$entries = (new \herbie\QueryBuilder)
+    ->from($data)
+    ->where('layout=blog')
+    ->offset(10)
+    ->limit(10)
+    ->order('title')
+    ->all()
+~~~
+
+In Twig the same query builder can be instantiated using the `query` function.
+
+~~~twig
+{{ '{%' }} set entries = query(data).where("layout=blog").offset(10).limit(10).order('title').all() {{ '%}' }} 
+~~~
+
+Some list entites also have a built-in query method, so the query builder can be used as follows.
+
+~~~twig
+{{ '{%' }} set entries = site.page_list.where("layout=blog").offset(10).limit(10).order('title').all() {{ '%}' }} 
+~~~
+
+## Retrieving Data
+
+A query builder allows you to query, filter, and narrow down the results you desire.
+The page list query builder allows you to find all the entries in a collection, by a specific author, and so on.
+
+### Getting multiple records
+
+The query builder allows you to assemble a query, chain additional constraints onto it, and then invoke the `all` method to get the results:
+
+~~~twig
+{{ '{{' }} query(site.page_list).where("layout=blog").limit(5).all() {{ '}}' }} 
+~~~
+
+This would return a list of the queried items.
+In this particular example, you would have a list of five page objects.
+
+### Getting a single record
+
+If you only want to get a single record, you may use the `one` method. 
+This method will return a single data object:
+
+~~~twig
+{{ '{{' }} query(site.page_list).where("layout=blog").one() {{ '}}' }} 
+~~~
+
+## Where
+
+The heart of the query builder are selectors, which are loosely based on CSS attribute selectors.
+
+### Selectors
+
+A selector is a simple text string that specifies fields and values, and that can be applied to a where condition.
+It can be one of the following:
+
+<table class="pure-table pure-table-horizontal">
+<tr><td style='width:5%'>=</td><td>Equal to</td></tr>    
+<tr><td>!=</td><td>Not equal to</td></tr>
+<tr><td>&lt;</td><td>Less than</td></tr>    
+<tr><td>&gt;</td><td>Greater than</td></tr>
+<tr><td>&lt;=</td><td>Less than or equal to</td></tr>
+<tr><td>&gt;=</td><td>Greater than or equal to</td></tr>
+<tr><td>*=</td><td>Contains phrase/text</td></tr>
+<tr><td>~=</td><td>Contains all words</td></tr>
+<tr><td>^=</td><td>Starts with phrase/text</td></tr>
+<tr><td>$=</td><td>Ends with phrase/text</td></tr>
+<tr><td>?=</td><td>Match regular expression</td></tr>
+<tr><td>&</td><td>Bitwise AND</td></tr>
+</table>
+
+With `where` clauses the result can be narrowed down as desired.
+There are three different formats that can be used for this.
+
+### String Format
+
+The String format is best used to specify simple conditions. 
+For example:
+
+~~~twig
+{{ '{{' }} query(data).where("layout=blog", "title*=news") {{ '}}' }} 
+~~~
+
+You can chain where clauses, filtering records based on more than one condition with AND:
+
+~~~twig
+{{ '{{' }} query(data).where("layout=blog").where("title*=news").where("hidden=false") {{ '}}' }} 
+~~~
+
+Values are type hinted according to the type of the field and one of the scalar types bool, float, int, or string.
+
+~~~twig
+{{ '{{' }} query(data).where("hidden=false", "size=14.25", "age=24", "layout=blog") {{ '}}' }} 
+~~~
+
+#### Multiple Fields
+
+If you want to match a value in one field or another, you may specify multiple fields separated by a pipe "|" symbol, i.e.
+
+~~~twig
+{{ '{{' }} query(data).where("name|title|menu_title=product") {{ '}}' }} 
+~~~
+
+Using the above syntax, the condition will match any data that have a name, title, or menu_title field of "product" or "Product".
+
+#### Multiple Values
+
+You may also specify an either/or value, by separating each of the values that may match with a pipe character "|".
+
+~~~twig
+{{ '{{' }} query(data).where("layout=blog|news") {{ '}}' }} 
+~~~
+
+#### Array Fields
+
+If the queried field is an array, the operator is applied for each array items as OR conjunction.
+
+~~~twig
+{{ '{{' }} query(data).where("tags=blog") {{ '}}' }}
+~~~
+
+Using the above syntax, the query will match if one of the tags equals to "blog".
+
+### Hash Format
+
+The hash format is best used to specify multiple AND-concatenated sub-conditions each being a simple equality assertion.
+It is written as an array whose keys are column names and values the corresponding values that the columns should be.
+For example:
+
+~~~twig
+{{ '{{' }} query(data).where({layout: "blog", age: 24, size: 178.5, hidden: false}) {{ '}}' }} 
+~~~
+
+### Operator Format
+
+The operator format is best used when you have more complex sub queries that are combined with an AND or OR where clause operator.
+For example:
+
+~~~twig
+{{ '{{' }} query(data).where(["OR", "layout=blog", "title*=blog|news", "date>=2022-12-12") {{ '}}' }} 
+~~~
+
+With the syntax above, the individual conditions are OR conjuncted.
+
+The AND/OR where clause operators can be nested:
+
+~~~twig
+{{ '{{' }} query(data).where(["OR", ["AND", "layout=blog", "title*=blog"], ["AND", "date>=2022-12-12", "cached=true"]]) {{ '}}' }} 
+~~~
+
+## Order
+
+The results can be ordered using the `order` method.
+The argument can be a callback or a field name preceded by a plus or minus sign, where plus means ascending and minus means descending.
+If the plus or minus sign is omitted, the order is ascending by default.
+Here are examples of it's usage.
+
+Ordered by title descending:
+
+~~~twig
+{{ '{{' }} query(data).order("-title") {{ '}}' }} 
+~~~
+
+Ordered by title ascending:
+
+~~~twig
+{{ '{{' }} query(data).order("title") {{ '}}' }} 
+{{ '{{' }} query(data).order("+title") {{ '}}' }} 
+~~~
+
+Ordered by title using a callback:
+
+~~~twig
+{{ '{{' }} query(data).order((a, b) => a.title <=> b.title) {{ '}}' }} 
+~~~
+
+## Limit
+
+You may limit the results by using the `limit` method:
+
+~~~twig
+{{ '{{' }} query(data).limit(10) {{ '}}' }} 
+~~~
+
+## Offset
+
+You may skip results by using the `offset` method:
+
+~~~twig
+{{ '{{' }} query(data).offset(10).limit(10) {{ '}}' }} 
+~~~
+
+## Count
+
+The query builder also provides a count method for retrieving the number of records returned.
+
+~~~twig
+{{ '{{' }} query(data).where("layout=blog").count() {{ '}}' }} 
+~~~
+
+## Paginate
+
+(To be done)
+
+If you want to get paginated results on a query, you may use the `paginate` method and specify the desired number of results per page.
+
+~~~twig
+{{ '{{' }} query(data).where("layout=blog").paginate(10); {{ '}}' }}
+~~~
+
+This will return an instance of `herbie\Pagination` that you can use to assemble the pagination style of your choice.
diff --git a/website/site/pages/2-doc/5-indepth/5-twig-filters.md b/website/site/pages/2-doc/5-indepth/5-twig-filters.md
index dac95ef9..01681f2e 100644
--- a/website/site/pages/2-doc/5-indepth/5-twig-filters.md
+++ b/website/site/pages/2-doc/5-indepth/5-twig-filters.md
@@ -6,6 +6,17 @@ layout: doc
 # Twig Filters
 
 Herbie is using [Twig Filters](https://twig.symfony.com/doc/3.x/filters/index.html) for modifying variables in layout and content files.
-In addition to the built-in filters of Twig itself, the following filters are available.
+The following filters are available.
 
 {{ snippet("@site/snippets/twig_features.twig", {type:"twig_filters"}) }}
+
+## Built-in Filters
+
+In addition to the filters mentioned above, Twig's built-in filters are of course also available.
+Please note that some of the filters may require the installation of additional Composer packages.
+
+<ul>
+{% for filter in site.data.twig_filters_builtin %}
+<li><a href="https://twig.symfony.com/doc/3.x/filters/{{ filter.name }}.html" target="_blank">{{ filter.name }}</a></li>
+{% endfor %}
+</ul>
diff --git a/website/site/pages/2-doc/5-indepth/6-twig-functions.md b/website/site/pages/2-doc/5-indepth/6-twig-functions.md
index b074bfcc..64a60c4a 100644
--- a/website/site/pages/2-doc/5-indepth/6-twig-functions.md
+++ b/website/site/pages/2-doc/5-indepth/6-twig-functions.md
@@ -9,3 +9,14 @@ Herbie is using [Twig Functions](https://twig.symfony.com/doc/3.x/functions/inde
 In addition to the built-in functions of Twig itself, the following functions are available.
 
 {{ snippet("@site/snippets/twig_features.twig", {type:"twig_functions"}) }}
+
+## Built-in Functions
+
+In addition to the functions mentioned above, Twig's built-in functions are of course also available.
+Please note that some of the functions may require the installation of additional Composer packages.
+
+<ul>
+{% for function in site.data.twig_functions_builtin %}
+<li><a href="https://twig.symfony.com/doc/3.x/functions/{{ function.name }}.html" target="_blank">{{ function.name }}</a></li>
+{% endfor %}
+</ul>
diff --git a/website/site/pages/2-doc/5-indepth/8-twig-tags.md b/website/site/pages/2-doc/5-indepth/8-twig-tags.md
new file mode 100644
index 00000000..60805a9b
--- /dev/null
+++ b/website/site/pages/2-doc/5-indepth/8-twig-tags.md
@@ -0,0 +1,15 @@
+---
+title: Twig Tags
+layout: doc
+---
+
+# Twig Tags
+
+Herbie does not provide its own Twig tags, but the tags provided by Twig are of course available. 
+Please note that some of the tags may require the installation of additional Composer packages.
+
+<ul>
+{% for tag in site.data.twig_tags_builtin %}
+<li><a href="https://twig.symfony.com/doc/3.x/tags/{{ tag.name }}.html" target="_blank">{{ tag.name }}</a></li>
+{% endfor %}
+</ul>
diff --git a/website/site/pages/2-doc/5-indepth/8-twig-tests.md b/website/site/pages/2-doc/5-indepth/8-twig-tests.md
index d2425e0b..9b6010c8 100644
--- a/website/site/pages/2-doc/5-indepth/8-twig-tests.md
+++ b/website/site/pages/2-doc/5-indepth/8-twig-tests.md
@@ -9,3 +9,14 @@ Herbie is using [Twig Tests](https://twig.symfony.com/doc/3.x/tests/index.html)
 In addition to the built-in tests of Twig, the following tests are available.
 
 {{ snippet("@site/snippets/twig_features.twig", {type:"twig_tests"}) }}
+
+## Built-in Tests
+
+In addition to the tests mentioned above, Twig's built-in tests are of course also available.
+Please note that some of the tests may require the installation of additional Composer packages.
+
+<ul>
+{% for test in site.data.twig_tests_builtin %}
+<li><a href="https://twig.symfony.com/doc/3.x/tests/{{ test.slug ?: test.name }}.html" target="_blank">{{ test.name }}</a></li>
+{% endfor %}
+</ul>
diff --git a/website/site/pages/2-doc/7-extending/1-index.md b/website/site/pages/2-doc/7-extending/1-index.md
index d6b63bce..1bd8a9e1 100644
--- a/website/site/pages/2-doc/7-extending/1-index.md
+++ b/website/site/pages/2-doc/7-extending/1-index.md
@@ -124,7 +124,7 @@ More precisely, only simple PHP files need to be created and placed in the appro
         </tr>
     </thead>
     <tbody>
-    {% for data in site.data.site_dir_extended|find("name^=extend")|find("name!=extend/plugins") %}
+    {% for data in query(site.data.site_dir_extended).where("name^=extend", "name!=extend/plugins") %}
         <tr>
             <td>site/{{ data.name }}</td>
             <td>{{ data.desc }}</td>
diff --git a/website/site/pages/3-recipes/1-index.md b/website/site/pages/3-recipes/1-index.md
index 7b2996cd..38786b85 100644
--- a/website/site/pages/3-recipes/1-index.md
+++ b/website/site/pages/3-recipes/1-index.md
@@ -5,12 +5,25 @@ layout: recipe
 
 # Recipes
 
-{{ pages_filtered(routeParams) }}
+{% apply spaceless %}
+    {% if site.route_params.author %}
+        <p>Filtered by Author "{{ site.route_params.author }}"</p>
+    {% elseif site.route_params.category %}
+        <p>Filtered by Category "{{ site.route_params.category }}"</p>
+    {% elseif site.route_params.tag %}
+        <p>Filtered by Tag "{{ site.route_params.tag }}"</p>
+    {% elseif site.route_params.year and site.route_params.month and site.route_params.day %}
+        <p>Filtered by Year/Month/Day "{{ site.route_params.year }}-{{ site.route_params.month }}-{{ site.route_params.day }}"</p>
+    {% elseif site.route_params.year and site.route_params.month %}
+        <p>Filtered by Year/Month "{{ site.route_params.year }}-{{ site.route_params.month }}"</p>
+    {% elseif site.route_params.year %}
+        <p>Filtered by Year "{{ site.route_params.year }}"</p>
+    {% endif %}
+{% endapply %}
 
-{% set items = site.pageList.filterItems('recipe', 'recipes', routeParams) %}
-{% for item in items %}
-<p class="post-title"><b>{{ page_link(item.route, item.title) }}</b><br>
-    {{ item.date|strftime("%e. %B %Y") }}
+{% for item in site.page_list.filterItems('recipe', 'recipes', site.route_params) %}
+<p class="post-title"><b>{{ link_page(item.route, item.title) }}</b><br>
+    {{ item.date|date("d. F Y") }}
 </p>
 {% else %}
 <p>There are no entries available.</p>
diff --git a/website/site/pages/3-recipes/adding-a-sitemap-for-search-engines.md b/website/site/pages/3-recipes/adding-a-sitemap-for-search-engines.md
index aab38ebf..02408cf6 100644
--- a/website/site/pages/3-recipes/adding-a-sitemap-for-search-engines.md
+++ b/website/site/pages/3-recipes/adding-a-sitemap-for-search-engines.md
@@ -54,9 +54,9 @@ Instead we retrieve a page list and iterate over all pages and output their URL
 ~~~xml
 <?xml version="1.0" encoding="UTF-8" ?>        
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for page in site.pageList %}
+{% for page in site.page_list %}
 <url>
-    <loc>{{ abs_url(page.route) }}</loc>
+    <loc>{{ url_abs(page.route) }}</loc>
     {% if(item.date) %}
         <lastmod>{{ page.date|date("c") }}</lastmod>
     {% endif %}
@@ -103,7 +103,7 @@ So, create a new page `robots.txt` in the `site/pages` folder with the following
     ---
     User-agent: *
     Allow: /
-    Sitemap: {{ abs_url('sitemap.xml') }}
+    Sitemap: {{ url_abs('sitemap.xml') }}
 {% endverbatim %}
 
 In this case, we allow all robots on all paths.
diff --git a/website/site/pages/atom.xml b/website/site/pages/atom.xml
index fec64efb..75803d5d 100644
--- a/website/site/pages/atom.xml
+++ b/website/site/pages/atom.xml
@@ -8,16 +8,16 @@ hidden: true
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title>Herbie CMS Feed</title>
     <subtitle>Create small but fully functional websites or blogs in no time and with little effort 👌</subtitle>
-    <link href="{{ abs_url('atom.xml') }}" rel="self" />
-    <link href="{{ abs_url('/') }}" />
-    <id>{{ abs_url('/') }}</id>
+    <link href="{{ url_abs('atom.xml') }}" rel="self" />
+    <link href="{{ url_abs('/') }}" />
+    <id>{{ url_abs('/') }}</id>
     <updated>{{ "now"|date('r') }}</updated>
-    {% for item in site.pageList %}
+    {% for item in site.page_list %}
         {% if item.title != '' %}
         <entry>
             <title>{{ item.title }} / Herbie CMS</title>
-            <link href="{{ abs_url(item.route) }}"/>
-            <id>{{ abs_url(item.route) }}</id>
+            <link href="{{ url_abs(item.route) }}"/>
+            <id>{{ url_abs(item.route) }}</id>
             {% if item.date %}<published>{{ item.date|date("c") }}</published>{% endif %}
             {% if item.date %}<updated>{{ item.date|date("c") }}</updated>{% endif %}
             {% if item.abstract %}<summary>{{ item.abstract }}</summary>{% endif %}
diff --git a/website/site/pages/imprint.md b/website/site/pages/imprint.md
index d8be5e75..bc2a1a61 100644
--- a/website/site/pages/imprint.md
+++ b/website/site/pages/imprint.md
@@ -11,7 +11,7 @@ Birsweg 5<br>
 CH-4203 Grellingen<br>
 
 Phone: +41 79 332 67 81<br>
-Email: {{ page_link("contact", "Use the contact form") }}
+Email: {{ link_page("contact", "Use the contact form") }}
 
 ## Disclaimer
 
diff --git a/website/site/pages/robots.txt b/website/site/pages/robots.txt
index 4623ce56..fffff1bc 100644
--- a/website/site/pages/robots.txt
+++ b/website/site/pages/robots.txt
@@ -4,4 +4,4 @@ layout: ""
 content_type: text/plain
 keep_extension: true
 ---
-Sitemap: {{ abs_url('sitemap.xml') }}
+Sitemap: {{ url_abs('sitemap.xml') }}
diff --git a/website/site/pages/sitemap.xml b/website/site/pages/sitemap.xml
index 818e8d17..0b29d843 100644
--- a/website/site/pages/sitemap.xml
+++ b/website/site/pages/sitemap.xml
@@ -6,9 +6,9 @@ keep_extension: true
 {% apply spaceless %}
 <?xml version="1.0" encoding="UTF-8" ?>        
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for item in site.pageList %}
+{% for item in site.page_list %}
 <url>
-    <loc>{{ abs_url(item.route) }}</loc>
+    <loc>{{ url_abs(item.route) }}</loc>
     {% if(item.date) %}
         <lastmod>{{ item.date|date("c") }}</lastmod>
     {% endif %}
diff --git a/website/site/snippets/plugins.twig b/website/site/snippets/plugins.twig
index 02549ba8..d2272460 100644
--- a/website/site/snippets/plugins.twig
+++ b/website/site/snippets/plugins.twig
@@ -1,5 +1,5 @@
 <div class="plugins">
-    {% set plugins = site.data.plugins|find("enabled=1")|sort((a, b) => a.id <=> b.id) %}
+    {% set plugins = query(site.data.plugins).where("enabled=1").order('id') %}
     <p>There are currently <b>{{ plugins|length }}</b> plugins available.</p>
     {% for item in plugins %}
         {% if item.enabled == true %}
diff --git a/website/site/snippets/twig_features.twig b/website/site/snippets/twig_features.twig
index 492aac85..7b589a26 100644
--- a/website/site/snippets/twig_features.twig
+++ b/website/site/snippets/twig_features.twig
@@ -1,4 +1,4 @@
-{% for item in attribute(site.data, type) %}
+{% for item in attribute(site.data, type)|sort((a, b) => a.name <=> b.name) %}
 <div class="doc-function">
     <h2>{{ attribute(item, 'name') }}</h2>
     <p>
diff --git a/website/site/themes/default/blog.twig b/website/site/themes/default/blog.twig
deleted file mode 100644
index b82e3f79..00000000
--- a/website/site/themes/default/blog.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "main.twig" %}
-
-{% block content %}
-    <div class="content-container">
-        <div class="container">
-            <div class="pure-g">
-                <div class="pure-u-1 pure-u-md-3-4">
-                    <div class="content">
-                        {{ content.default|raw }}
-                        {{ page_taxonomies(page, pageRoute='blog') }}
-                    </div>
-                </div>
-                <div class="pure-u-1 pure-u-md-1-4">
-                    <div class="sidebar">
-                        {{ include('includes/simplesearch.twig') }}
-                        {{ pages_recent(limit=3, pageType='blog', showDate=false) }}
-                        {{ taxonomy_categories(pageRoute='blog', pageType='blog', showCount=true) }}
-                        {{ taxonomy_tags(pageRoute='blog', pageType='blog', showCount=true) }}
-                        {{ taxonomy_authors(pageRoute='blog', pageType='blog', showCount=true) }}
-                        {{ taxonomy_archive(pageRoute='blog', pageType='blog', showCount=true) }}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
diff --git a/website/site/themes/default/css/styles.css b/website/site/themes/default/css/styles.css
index a2cd44ec..ac8bc05a 100644
--- a/website/site/themes/default/css/styles.css
+++ b/website/site/themes/default/css/styles.css
@@ -256,7 +256,7 @@ table {
     font-size:0.8945em;
     line-height:1.7;
 }
-.sidebar .widget-blog {
+.sidebar .widget {
     padding-bottom:2em;
 }
 .sidebar a {
diff --git a/website/site/themes/default/includes/simplesearch.twig b/website/site/themes/default/includes/simplesearch.twig
index dc84e080..7ff9edf5 100644
--- a/website/site/themes/default/includes/simplesearch.twig
+++ b/website/site/themes/default/includes/simplesearch.twig
@@ -1,5 +1,5 @@
 <div class="sidebar-simplesearch">
-    <form class="pure-form" action="{{ url('search') }}" method="get">
+    <form class="pure-form" action="{{ url_abs('search') }}" method="get">
         <input class="pure-input-1" type="text" name="query" value="" placeholder="Search website...">
         <button type="submit">{{ icon('search') }}</button>
     </form>
diff --git a/website/site/themes/default/main.twig b/website/site/themes/default/main.twig
index 9be22f69..405a382f 100644
--- a/website/site/themes/default/main.twig
+++ b/website/site/themes/default/main.twig
@@ -1,10 +1,10 @@
 {% apply spaceless %}
-    {{ add_css('@site/themes/default/css/purecss@3.0.0-pure.min.css') }}
-    {{ add_css('@site/themes/default/css/purecss@3.0.0-grids-responsive.min.css') }}
-    {{ add_css('@site/themes/default/css/highlight-stackoverflow-light@11.6.0.min.css') }}
-    {{ add_css('@site/themes/default/css/styles.css') }}
-    {{ add_js('@site/themes/default/js/highlight@11.6.0.min.js') }}
-    {{ add_js('@site/themes/default/js/scripts.js') }}
+    {{ css_add('@site/themes/default/css/purecss@3.0.0-pure.min.css') }}
+    {{ css_add('@site/themes/default/css/purecss@3.0.0-grids-responsive.min.css') }}
+    {{ css_add('@site/themes/default/css/highlight-stackoverflow-light@11.6.0.min.css') }}
+    {{ css_add('@site/themes/default/css/styles.css') }}
+    {{ js_add('@site/themes/default/js/highlight@11.6.0.min.js') }}
+    {{ js_add('@site/themes/default/js/scripts.js') }}
 {% endapply %}
 <!DOCTYPE html>
 <html lang="{{ site.language }}">
@@ -12,9 +12,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{ page_title(delim=' / ', siteTitle='Herbie CMS', rootTitle='Herbie CMS - A simple flat-file content management system', reverse=true) }}</title>
-    <base href="{{ baseUrl == '' ? '/' : baseUrl }}">
-    {{ output_css(addTimestamp=true) }}
+    <title>{{ page_title(delim=' / ', site_title='Herbie CMS', root_title='Herbie CMS - A simple flat-file content management system', reverse=true) }}</title>
+    <base href="{{ site.base_url }}">
+    {{ css_out(timestamp=true) }}
 </head>
 <body class="{{ css_classes() }}">
 <div class="header">
@@ -28,7 +28,7 @@
             </div>
             <div class="pure-g">
                 <div class="pure-u-3-5 pure-u-md-1-5">
-                    <h1 class="brand-title">{{ page_link('index', '<span class="e">E</span> Herbie CMS') }}</h1>
+                    <h1 class="brand-title">{{ link_page('index', '<span class="e">E</span> Herbie CMS') }}</h1>
                 </div>
                 <div class="pure-u-2-5 pure-u-md-4-5 text-right pure-hidden-phone">
                     <div class="topmenu" id="topmenu">
@@ -38,7 +38,7 @@
                                     {% for item in site.data.menu %}
                                         {% set active = (item.route == route) ? 'pure-menu-selected' : '' %}
                                         <li class="pure-menu-item {{ active }}">
-                                            {{ page_link(item.route, item.label, {class:"pure-menu-link"}) }}
+                                            {{ link_page(item.route, item.label, {class:"pure-menu-link"}) }}
                                         </li>
                                     {% endfor %}
                                 </ul>
@@ -55,7 +55,7 @@
     <div class="pure-menu">
         <ul class="pure-menu-list">
             {% for item in site.data.menu %}
-                <li class="pure-menu-item"><a class="pure-menu-link" href="{{ url(item.route) }}">{{ item.label }}</a>
+                <li class="pure-menu-item"><a class="pure-menu-link" href="{{ url_rel(item.route) }}">{{ item.label }}</a>
                 </li>
             {% endfor %}
         </ul>
@@ -87,17 +87,17 @@
             <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-4 footer-links">
                 <h3>Links</h3>
                 <ul>
-                    <li>{{ page_link('sitemap', 'Sitemap') }}</li>
-                    <li>{{ page_link('search', 'Search') }}</li>
-                    <li>{{ page_link('privacy-policy', 'Privacy policy') }}</li>
-                    <li>{{ page_link('imprint', 'Imprint') }}</li>
+                    <li>{{ link_page('sitemap', 'Sitemap') }}</li>
+                    <li>{{ link_page('search', 'Search') }}</li>
+                    <li>{{ link_page('privacy-policy', 'Privacy policy') }}</li>
+                    <li>{{ link_page('imprint', 'Imprint') }}</li>
                 </ul>
             </div>
             <div class="pure-u-1 pure-u-sm-1-2 pure-u-md-1-4">
                 <h3>Code</h3>
                 <ul>
-                    <li>{{ page_link('https://www.github.com/getherbie', 'Herbie at GitHub') }}</li>
-                    <li>{{ page_link('https://packagist.org/packages/getherbie/', 'Herbie at Packagist') }}</li>
+                    <li>{{ link_page('https://www.github.com/getherbie', 'Herbie at GitHub') }}</li>
+                    <li>{{ link_page('https://packagist.org/packages/getherbie/', 'Herbie at Packagist') }}</li>
                 </ul>
             </div>
         </div>
@@ -108,7 +108,7 @@
         </div>
     </div>
 </div>
-{{ output_js(addTimestamp=true) }}
+{{ js_out(timestamp=true) }}
 <script>
   document.addEventListener('DOMContentLoaded', () => {
     document.querySelectorAll('pre code[class*=language-]').forEach((el) => {
diff --git a/website/site/themes/default/recipe.twig b/website/site/themes/default/recipe.twig
index c36519bf..682461a5 100644
--- a/website/site/themes/default/recipe.twig
+++ b/website/site/themes/default/recipe.twig
@@ -7,17 +7,38 @@
                 <div class="pure-u-1 pure-u-md-3-4">
                     <div class="content">
                         {{ content.default|raw }}
-                        {# page_taxonomies(page, pageRoute='recipes') #}
                     </div>
                 </div>
                 <div class="pure-u-1 pure-u-md-1-4">
                     <div class="sidebar">
                         {{ include('includes/simplesearch.twig') }}
-                        {{ pages_recent(limit=3, pageType='recipe', showDate=false) }}
-                        {{ taxonomy_categories(pageRoute='recipes', pageType='recipe', showCount=true) }}
-                        {# taxonomy_tags(pageRoute='recipes', pageType='recipe', showCount=true) #}
-                        {# taxonomy_authors(pageRoute='recipes', pageType='recipe', showCount=true) #}
-                        {# taxonomy_archive(pageRoute='recipes', pageType='recipe', showCount=true) #}
+                        {# Show recent pages #}
+                        {% set recentPages = site.page_list.getRecent(3, 'recipe') %}
+                        {% if recentPages|length > 0 %}
+                            <div class="widget widget-pages-recent">
+                                <h4 class="widget-pages-recent-title">Recent recipes</h4>
+                                <ul class="widget-pages-recent-list">
+                                    {% for pageItem in recentPages %}
+                                        <li class="widget-pages-recent-item">
+                                            {{ link_page(pageItem.route, pageItem.title, {class: "widget-pages-recent-item-link"}) }}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        {% endif %}
+                        {# Show categories #}
+                        {% set categories = site.page_list.getCategories('recipe') %}
+                        {% if categories|length > 0 %}
+                            <div class="widget-blog widget-blog-categories">
+                                <h4>Categories</h4>
+                                <ul>
+                                    {% for category, count in categories %}
+                                        {% set route = '/recipes/category/' ~ category|slugify %}
+                                        <li>{{ link_page(route, category) }} ({{ count }})</li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        {% endif %}
                     </div>
                 </div>
             </div>