diff --git a/cache/compiled/blueprints/master-dev.hehe.net.php b/cache/compiled/blueprints/master-dev.hehe.net.php
index 54e796c..28762da 100644
--- a/cache/compiled/blueprints/master-dev.hehe.net.php
+++ b/cache/compiled/blueprints/master-dev.hehe.net.php
@@ -1,15 +1,9 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledBlueprints',
-    'timestamp' => 1533212898,
-    'checksum' => '4dcee84bfe33cf4c48e8f8ff29b374b7',
+    'timestamp' => 1533216532,
+    'checksum' => '634995e03e46ea3655d934b8b9baffec',
     'files' => [
-        'user/plugins/admin/blueprints/config' => [
-            'media' => [
-                'file' => 'user/plugins/admin/blueprints/config/media.yaml',
-                'modified' => 1533014916
-            ]
-        ],
         'system/blueprints/config' => [
             'media' => [
                 'file' => 'system/blueprints/config/media.yaml',
@@ -72,53 +66,6 @@ return [
                     'validation' => 'loose'
                 ]
             ],
-            'media.types' => [
-                'name' => 'media.types',
-                'type' => 'list',
-                'label' => 'PLUGIN_ADMIN.MEDIA_TYPES',
-                'style' => 'vertical',
-                'key' => 'extension',
-                'controls' => 'both',
-                'collapsed' => true,
-                'validation' => 'loose',
-                'array' => true
-            ],
-            'media.types.*' => [
-                'type' => '_parent',
-                'name' => 'media.types.*',
-                'form_field' => false
-            ],
-            'media.types.*.type' => [
-                'type' => 'text',
-                'label' => 'PLUGIN_ADMIN.TYPE',
-                'name' => 'media.types.*.type',
-                'validation' => 'loose'
-            ],
-            'media.types.*.thumb' => [
-                'type' => 'text',
-                'label' => 'PLUGIN_ADMIN.THUMB',
-                'name' => 'media.types.*.thumb',
-                'validation' => 'loose'
-            ],
-            'media.types.*.mime' => [
-                'type' => 'text',
-                'label' => 'PLUGIN_ADMIN.MIME_TYPE',
-                'validate' => [
-                    'type' => 'lower'
-                ],
-                'name' => 'media.types.*.mime',
-                'validation' => 'loose'
-            ],
-            'media.types.*.image' => [
-                'type' => 'textarea',
-                'yaml' => true,
-                'label' => 'PLUGIN_ADMIN.IMAGE_OPTIONS',
-                'validate' => [
-                    'type' => 'yaml'
-                ],
-                'name' => 'media.types.*.image',
-                'validation' => 'loose'
-            ],
             'site' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -173,10 +120,17 @@ return [
                 'name' => 'site.taxonomies',
                 'validation' => 'loose'
             ],
+            'site.content' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'site.content',
+                'validation' => 'loose'
+            ],
             'site.summary' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'site.summary',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'site.summary.enabled' => [
                 'type' => 'toggle',
@@ -225,8 +179,8 @@ return [
                 'validation' => 'loose'
             ],
             'site.metadata' => [
-                'type' => 'array',
-                'label' => 'PLUGIN_ADMIN.METADATA',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'site.metadata',
                 'validation' => 'loose'
             ],
@@ -237,8 +191,8 @@ return [
                 'validation' => 'loose'
             ],
             'site.routes' => [
-                'type' => 'array',
-                'label' => 'PLUGIN_ADMIN.CUSTOM_ROUTES',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'site.routes',
                 'validation' => 'loose'
             ],
@@ -632,10 +586,17 @@ return [
                 'name' => 'system.pages.frontmatter.ignore_fields',
                 'validation' => 'loose'
             ],
+            'system.content' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'system.content',
+                'validation' => 'loose'
+            ],
             'system.languages' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.languages',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.languages.supported' => [
                 'type' => 'selectize',
@@ -793,6 +754,12 @@ return [
                 'name' => 'system.pages.vary_accept_encoding',
                 'validation' => 'loose'
             ],
+            'system.http_headers' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'system.http_headers',
+                'validation' => 'loose'
+            ],
             'system.pages.markdown' => [
                 'type' => '_parent',
                 'name' => 'system.pages.markdown',
@@ -854,6 +821,12 @@ return [
                 'name' => 'system.pages.markdown.escape_markup',
                 'validation' => 'loose'
             ],
+            'system.markdown' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'system.markdown',
+                'validation' => 'loose'
+            ],
             'system.cache' => [
                 'type' => '_parent',
                 'name' => 'system.cache',
@@ -1056,10 +1029,17 @@ return [
                 'name' => 'system.cache.redis.password',
                 'validation' => 'loose'
             ],
+            'system.caching' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'system.caching',
+                'validation' => 'loose'
+            ],
             'system.twig' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.twig',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.twig.cache' => [
                 'type' => 'toggle',
@@ -1132,9 +1112,10 @@ return [
                 'validation' => 'loose'
             ],
             'system.assets' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.assets',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.assets.css_pipeline' => [
                 'type' => 'toggle',
@@ -1300,9 +1281,10 @@ return [
                 'validation' => 'loose'
             ],
             'system.errors' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.errors',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.errors.display' => [
                 'type' => 'select',
@@ -1335,9 +1317,10 @@ return [
                 'validation' => 'loose'
             ],
             'system.debugger' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.debugger',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.debugger.enabled' => [
                 'type' => 'toggle',
@@ -1443,9 +1426,10 @@ return [
                 'validation' => 'loose'
             ],
             'system.media' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.media',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.media.enable_media_timestamp' => [
                 'type' => 'toggle',
@@ -1498,9 +1482,10 @@ return [
                 'validation' => 'loose'
             ],
             'system.session' => [
-                'type' => '_parent',
+                'type' => 'section',
+                'underline' => true,
                 'name' => 'system.session',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'system.session.enabled' => [
                 'type' => 'hidden',
@@ -1771,6 +1756,12 @@ return [
                 'name' => 'system.custom_base_url',
                 'validation' => 'loose'
             ],
+            'system.advanced' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'system.advanced',
+                'validation' => 'loose'
+            ],
             'plugins.admin' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -1783,6 +1774,12 @@ return [
                 'name' => 'plugins',
                 'form_field' => false
             ],
+            'plugins.admin.Basics' => [
+                'type' => 'section',
+                'underline' => false,
+                'name' => 'plugins.admin.Basics',
+                'validation' => 'loose'
+            ],
             'plugins.admin.enabled' => [
                 'type' => 'hidden',
                 'label' => 'PLUGIN_ADMIN.PLUGIN_STATUS',
@@ -2081,6 +2078,19 @@ return [
                 'name' => 'plugins.admin.hide_modular_page_types',
                 'validation' => 'loose'
             ],
+            'plugins.admin.MediaResize' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'plugins.admin.MediaResize',
+                'validation' => 'loose'
+            ],
+            'plugins.admin.MediaResizeNote' => [
+                'type' => 'spacer',
+                'text' => 'PLUGIN_ADMIN.PAGEMEDIA_RESIZER',
+                'markdown' => true,
+                'name' => 'plugins.admin.MediaResizeNote',
+                'validation' => 'loose'
+            ],
             'plugins.admin.pagemedia' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.pagemedia',
@@ -2171,6 +2181,12 @@ return [
                 'name' => 'plugins.admin.pagemedia.resize_quality',
                 'validation' => 'loose'
             ],
+            'plugins.admin.Dashboard' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'plugins.admin.Dashboard',
+                'validation' => 'loose'
+            ],
             'plugins.admin.widgets' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.widgets',
@@ -2251,6 +2267,12 @@ return [
                 'name' => 'plugins.admin.widgets.dashboard-pages',
                 'validation' => 'loose'
             ],
+            'plugins.admin.Notifications' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'plugins.admin.Notifications',
+                'validation' => 'loose'
+            ],
             'plugins.admin.notifications' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.notifications',
@@ -2316,6 +2338,12 @@ return [
                 'name' => 'plugins.admin.notifications.themes',
                 'validation' => 'loose'
             ],
+            'plugins.admin.Popularity' => [
+                'type' => 'section',
+                'underline' => true,
+                'name' => 'plugins.admin.Popularity',
+                'validation' => 'loose'
+            ],
             'plugins.admin.popularity' => [
                 'type' => '_parent',
                 'name' => 'plugins.admin.popularity',
@@ -2536,10 +2564,15 @@ return [
                 'name' => 'plugins.form.inline_errors',
                 'validation' => 'strict'
             ],
+            'plugins.form.general' => [
+                'type' => 'section',
+                'name' => 'plugins.form.general',
+                'validation' => 'strict'
+            ],
             'plugins.form.files' => [
-                'type' => '_parent',
+                'type' => 'section',
                 'name' => 'plugins.form.files',
-                'form_field' => false
+                'validation' => 'strict'
             ],
             'plugins.form.files.multiple' => [
                 'type' => 'toggle',
@@ -2633,9 +2666,9 @@ return [
                 'validation' => 'strict'
             ],
             'plugins.form.recaptcha' => [
-                'type' => '_parent',
+                'type' => 'section',
                 'name' => 'plugins.form.recaptcha',
-                'form_field' => false
+                'validation' => 'strict'
             ],
             'plugins.form.recaptcha.site_key' => [
                 'type' => 'text',
@@ -2804,10 +2837,15 @@ return [
                 'name' => 'plugins.login.user_registration.redirect_after_activation',
                 'validation' => 'loose'
             ],
+            'plugins.login.routes' => [
+                'type' => 'section',
+                'name' => 'plugins.login.routes',
+                'validation' => 'loose'
+            ],
             'plugins.login.rememberme' => [
-                'type' => '_parent',
+                'type' => 'section',
                 'name' => 'plugins.login.rememberme',
-                'form_field' => false
+                'validation' => 'loose'
             ],
             'plugins.login.rememberme.enabled' => [
                 'type' => 'toggle',
@@ -2842,6 +2880,11 @@ return [
                 'name' => 'plugins.login.rememberme.name',
                 'validation' => 'loose'
             ],
+            'plugins.login.login' => [
+                'type' => 'tab',
+                'name' => 'plugins.login.login',
+                'validation' => 'loose'
+            ],
             'plugins.login.user_registration.enabled' => [
                 'type' => 'toggle',
                 'label' => 'PLUGIN_ADMIN.ENABLED',
@@ -2869,6 +2912,11 @@ return [
                 'name' => 'plugins.login.user_registration.default_values',
                 'validation' => 'loose'
             ],
+            'plugins.login.registration_fields' => [
+                'type' => 'section',
+                'name' => 'plugins.login.registration_fields',
+                'validation' => 'loose'
+            ],
             'plugins.login.user_registration.groups' => [
                 'type' => 'selectize',
                 'size' => 'large',
@@ -2896,6 +2944,12 @@ return [
                 'name' => 'plugins.login.user_registration.access.site',
                 'validation' => 'loose'
             ],
+            'plugins.login.access_levels' => [
+                'type' => 'section',
+                'security' => 'admin.super',
+                'name' => 'plugins.login.access_levels',
+                'validation' => 'loose'
+            ],
             'plugins.login.user_registration.options' => [
                 'type' => '_parent',
                 'name' => 'plugins.login.user_registration.options',
@@ -2982,6 +3036,16 @@ return [
                 'name' => 'plugins.login.user_registration.options.send_welcome_email',
                 'validation' => 'loose'
             ],
+            'plugins.login.options' => [
+                'type' => 'section',
+                'name' => 'plugins.login.options',
+                'validation' => 'loose'
+            ],
+            'plugins.login.registration' => [
+                'type' => 'tab',
+                'name' => 'plugins.login.registration',
+                'validation' => 'loose'
+            ],
             'plugins.login.max_pw_resets_count' => [
                 'type' => 'number',
                 'size' => 'x-small',
@@ -3030,6 +3094,18 @@ return [
                 'name' => 'plugins.login.max_login_interval',
                 'validation' => 'loose'
             ],
+            'plugins.login.Security' => [
+                'type' => 'tab',
+                'name' => 'plugins.login.Security',
+                'validation' => 'loose'
+            ],
+            'plugins.login.tabs' => [
+                'type' => 'tabs',
+                'active' => 1,
+                'class' => 'subtle',
+                'name' => 'plugins.login.tabs',
+                'validation' => 'loose'
+            ],
             'plugins.error' => [
                 'type' => '_root',
                 'form_field' => false,
@@ -3364,17 +3440,9 @@ return [
             
         ],
         'nested' => [
-            'media' => [
-                'types' => [
-                    '*' => [
-                        'type' => 'media.types.*.type',
-                        'thumb' => 'media.types.*.thumb',
-                        'mime' => 'media.types.*.mime',
-                        'image' => 'media.types.*.image'
-                    ]
-                ]
-            ],
+            'media' => 'media',
             'site' => [
+                'content' => 'site.content',
                 'title' => 'site.title',
                 'default_lang' => 'site.default_lang',
                 'author' => [
@@ -3389,8 +3457,8 @@ return [
                     'delimiter' => 'site.summary.delimiter'
                 ],
                 'metadata' => 'site.metadata',
-                'redirects' => 'site.redirects',
-                'routes' => 'site.routes'
+                'routes' => 'site.routes',
+                'redirects' => 'site.redirects'
             ],
             'streams' => [
                 'schemes' => [
@@ -3398,6 +3466,7 @@ return [
                 ]
             ],
             'system' => [
+                'content' => 'system.content',
                 'home' => [
                     'alias' => 'system.home.alias',
                     'hide_in_urls' => 'system.home.hide_in_urls'
@@ -3455,6 +3524,9 @@ return [
                     'http_accept_language' => 'system.languages.http_accept_language',
                     'override_locale' => 'system.languages.override_locale'
                 ],
+                'http_headers' => 'system.http_headers',
+                'markdown' => 'system.markdown',
+                'caching' => 'system.caching',
                 'cache' => [
                     'enabled' => 'system.cache.enabled',
                     'check' => [
@@ -3513,6 +3585,12 @@ return [
                         'close_connection' => 'system.debugger.shutdown.close_connection'
                     ]
                 ],
+                'media' => [
+                    'enable_media_timestamp' => 'system.media.enable_media_timestamp',
+                    'auto_metadata_exif' => 'system.media.auto_metadata_exif',
+                    'allowed_fallback_types' => 'system.media.allowed_fallback_types',
+                    'unsupported_inline_types' => 'system.media.unsupported_inline_types'
+                ],
                 'images' => [
                     'default_image_quality' => 'system.images.default_image_quality',
                     'cache_all' => 'system.images.cache_all',
@@ -3520,12 +3598,6 @@ return [
                     'debug' => 'system.images.debug',
                     'auto_fix_orientation' => 'system.images.auto_fix_orientation'
                 ],
-                'media' => [
-                    'enable_media_timestamp' => 'system.media.enable_media_timestamp',
-                    'auto_metadata_exif' => 'system.media.auto_metadata_exif',
-                    'allowed_fallback_types' => 'system.media.allowed_fallback_types',
-                    'unsupported_inline_types' => 'system.media.unsupported_inline_types'
-                ],
                 'session' => [
                     'enabled' => 'system.session.enabled',
                     'timeout' => 'system.session.timeout',
@@ -3535,6 +3607,7 @@ return [
                     'path' => 'system.session.path',
                     'split' => 'system.session.split'
                 ],
+                'advanced' => 'system.advanced',
                 'gpm' => [
                     'releases' => 'system.gpm.releases',
                     'proxy_url' => 'system.gpm.proxy_url',
@@ -3555,6 +3628,7 @@ return [
             ],
             'plugins' => [
                 'admin' => [
+                    'Basics' => 'plugins.admin.Basics',
                     'enabled' => 'plugins.admin.enabled',
                     'cache_enabled' => 'plugins.admin.cache_enabled',
                     'twofa_enabled' => 'plugins.admin.twofa_enabled',
@@ -3588,6 +3662,8 @@ return [
                     ],
                     'hide_page_types' => 'plugins.admin.hide_page_types',
                     'hide_modular_page_types' => 'plugins.admin.hide_modular_page_types',
+                    'MediaResize' => 'plugins.admin.MediaResize',
+                    'MediaResizeNote' => 'plugins.admin.MediaResizeNote',
                     'pagemedia' => [
                         'resize_width' => 'plugins.admin.pagemedia.resize_width',
                         'resize_height' => 'plugins.admin.pagemedia.resize_height',
@@ -3597,6 +3673,7 @@ return [
                         'res_max_height' => 'plugins.admin.pagemedia.res_max_height',
                         'resize_quality' => 'plugins.admin.pagemedia.resize_quality'
                     ],
+                    'Dashboard' => 'plugins.admin.Dashboard',
                     'widgets' => [
                         'dashboard-maintenance' => 'plugins.admin.widgets.dashboard-maintenance',
                         'dashboard-statistics' => 'plugins.admin.widgets.dashboard-statistics',
@@ -3604,12 +3681,14 @@ return [
                         'dashboard-feed' => 'plugins.admin.widgets.dashboard-feed',
                         'dashboard-pages' => 'plugins.admin.widgets.dashboard-pages'
                     ],
+                    'Notifications' => 'plugins.admin.Notifications',
                     'notifications' => [
                         'feed' => 'plugins.admin.notifications.feed',
                         'dashboard' => 'plugins.admin.notifications.dashboard',
                         'plugins' => 'plugins.admin.notifications.plugins',
                         'themes' => 'plugins.admin.notifications.themes'
                     ],
+                    'Popularity' => 'plugins.admin.Popularity',
                     'popularity' => [
                         'enabled' => 'plugins.admin.popularity.enabled',
                         'ignore' => 'plugins.admin.popularity.ignore',
@@ -3630,6 +3709,7 @@ return [
                 ],
                 'form' => [
                     'enabled' => 'plugins.form.enabled',
+                    'general' => 'plugins.form.general',
                     'built_in_css' => 'plugins.form.built_in_css',
                     'inline_css' => 'plugins.form.inline_css',
                     'refresh_prevention' => 'plugins.form.refresh_prevention',
@@ -3650,6 +3730,8 @@ return [
                     ]
                 ],
                 'login' => [
+                    'tabs' => 'plugins.login.tabs',
+                    'login' => 'plugins.login.login',
                     'enabled' => 'plugins.login.enabled',
                     'built_in_css' => 'plugins.login.built_in_css',
                     'route' => 'plugins.login.route',
@@ -3661,6 +3743,7 @@ return [
                     'parent_acl' => 'plugins.login.parent_acl',
                     'dynamic_page_visibility' => 'plugins.login.dynamic_page_visibility',
                     'protect_protected_page_media' => 'plugins.login.protect_protected_page_media',
+                    'routes' => 'plugins.login.routes',
                     'route_activate' => 'plugins.login.route_activate',
                     'route_register' => 'plugins.login.route_register',
                     'user_registration' => [
@@ -3687,6 +3770,11 @@ return [
                         'timeout' => 'plugins.login.rememberme.timeout',
                         'name' => 'plugins.login.rememberme.name'
                     ],
+                    'registration' => 'plugins.login.registration',
+                    'registration_fields' => 'plugins.login.registration_fields',
+                    'access_levels' => 'plugins.login.access_levels',
+                    'options' => 'plugins.login.options',
+                    'Security' => 'plugins.login.Security',
                     'max_pw_resets_count' => 'plugins.login.max_pw_resets_count',
                     'max_pw_resets_interval' => 'plugins.login.max_pw_resets_interval',
                     'max_login_count' => 'plugins.login.max_login_count',
diff --git a/cache/compiled/config/master-dev.hehe.net.php b/cache/compiled/config/master-dev.hehe.net.php
index 82525b8..6952f1d 100644
--- a/cache/compiled/config/master-dev.hehe.net.php
+++ b/cache/compiled/config/master-dev.hehe.net.php
@@ -1,8 +1,8 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledConfig',
-    'timestamp' => 1533212898,
-    'checksum' => 'c81a8b8a807087534f87e6d61103fb33',
+    'timestamp' => 1533216532,
+    'checksum' => 'd9a7367a4562634893bd9167bee60ea2',
     'files' => [
         'user/config' => [
             'media' => [
@@ -27,7 +27,7 @@ return [
             ],
             'system' => [
                 'file' => 'user/config/system.yaml',
-                'modified' => 1533208003
+                'modified' => 1533216531
             ]
         ],
         'system/config' => [
diff --git a/cache/compiled/files/2d5fa3f2e561fcda0c830b5dff5b98df.yaml.php b/cache/compiled/files/2d5fa3f2e561fcda0c830b5dff5b98df.yaml.php
deleted file mode 100644
index ee60084..0000000
--- a/cache/compiled/files/2d5fa3f2e561fcda0c830b5dff5b98df.yaml.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-return [
-    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
-    'filename' => '/mnt/data/Sites/hehe.net/user/plugins/admin/blueprints/config/media.yaml',
-    'modified' => 1533014916,
-    'data' => [
-        'title' => 'PLUGIN_ADMIN.MEDIA',
-        'form' => [
-            'validation' => 'loose',
-            'fields' => [
-                'types' => [
-                    'name' => 'medias',
-                    'type' => 'list',
-                    'label' => 'PLUGIN_ADMIN.MEDIA_TYPES',
-                    'style' => 'vertical',
-                    'key' => 'extension',
-                    'controls' => 'both',
-                    'collapsed' => true,
-                    'fields' => [
-                        '.extension' => [
-                            'type' => 'key',
-                            'label' => 'PLUGIN_ADMIN.FILE_EXTENSION'
-                        ],
-                        '.type' => [
-                            'type' => 'text',
-                            'label' => 'PLUGIN_ADMIN.TYPE'
-                        ],
-                        '.thumb' => [
-                            'type' => 'text',
-                            'label' => 'PLUGIN_ADMIN.THUMB'
-                        ],
-                        '.mime' => [
-                            'type' => 'text',
-                            'label' => 'PLUGIN_ADMIN.MIME_TYPE',
-                            'validate' => [
-                                'type' => 'lower'
-                            ]
-                        ],
-                        '.image' => [
-                            'type' => 'textarea',
-                            'yaml' => true,
-                            'label' => 'PLUGIN_ADMIN.IMAGE_OPTIONS',
-                            'validate' => [
-                                'type' => 'yaml'
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    ]
-];
diff --git a/cache/compiled/files/41e27877bae384c98ac5a023db4b7036.yaml.php b/cache/compiled/files/41e27877bae384c98ac5a023db4b7036.yaml.php
index f54ada9..bde08c4 100644
--- a/cache/compiled/files/41e27877bae384c98ac5a023db4b7036.yaml.php
+++ b/cache/compiled/files/41e27877bae384c98ac5a023db4b7036.yaml.php
@@ -2,7 +2,7 @@
 return [
     '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
     'filename' => '/mnt/data/Sites/hehe.net/user/config/system.yaml',
-    'modified' => 1533208003,
+    'modified' => 1533216531,
     'data' => [
         'absolute_urls' => false,
         'param_sep' => ':',
diff --git a/cache/compiled/files/53cc72103b9bae75b9db40339f747a61.yaml.php b/cache/compiled/files/53cc72103b9bae75b9db40339f747a61.yaml.php
new file mode 100644
index 0000000..78ecf32
--- /dev/null
+++ b/cache/compiled/files/53cc72103b9bae75b9db40339f747a61.yaml.php
@@ -0,0 +1,10 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/user/config/plugins/taxonomylist.yaml',
+    'modified' => 1533212898,
+    'data' => [
+        'enabled' => true,
+        'route' => '/blog'
+    ]
+];
diff --git a/cache/compiled/files/5fa2101f9bd31b27ee830ca1eb7ade8b.yaml.php b/cache/compiled/files/5fa2101f9bd31b27ee830ca1eb7ade8b.yaml.php
new file mode 100644
index 0000000..33ddbe8
--- /dev/null
+++ b/cache/compiled/files/5fa2101f9bd31b27ee830ca1eb7ade8b.yaml.php
@@ -0,0 +1,126 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/user/plugins/admin/blueprints/admin/pages/raw.yaml',
+    'modified' => 1533014916,
+    'data' => [
+        'rules' => [
+            'slug' => [
+                'pattern' => '[a-zA-Zа-яA-Я0-9_\\-]+',
+                'min' => 1,
+                'max' => 200
+            ]
+        ],
+        'form' => [
+            'validation' => 'loose',
+            'fields' => [
+                'tabs' => [
+                    'type' => 'tabs',
+                    'active' => 1,
+                    'fields' => [
+                        'content' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.CONTENT',
+                            'fields' => [
+                                'frontmatter' => [
+                                    'classes' => 'frontmatter',
+                                    'type' => 'editor',
+                                    'label' => 'PLUGIN_ADMIN.FRONTMATTER',
+                                    'autofocus' => true,
+                                    'codemirror' => [
+                                        'mode' => 'yaml',
+                                        'indentUnit' => 4,
+                                        'autofocus' => true,
+                                        'indentWithTabs' => false,
+                                        'lineNumbers' => true,
+                                        'styleActiveLine' => true,
+                                        'gutters' => [
+                                            0 => 'CodeMirror-lint-markers'
+                                        ],
+                                        'lint' => true
+                                    ]
+                                ],
+                                'content' => [
+                                    'type' => 'markdown'
+                                ],
+                                'header.media_order' => [
+                                    'type' => 'pagemedia',
+                                    'label' => 'PLUGIN_ADMIN.PAGE_MEDIA'
+                                ]
+                            ]
+                        ],
+                        'options' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.OPTIONS',
+                            'fields' => [
+                                'columns' => [
+                                    'type' => 'columns',
+                                    'fields' => [
+                                        'column1' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'ordering' => [
+                                                    'type' => 'toggle',
+                                                    'label' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX',
+                                                    'help' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP',
+                                                    'highlight' => 1,
+                                                    'options' => [
+                                                        1 => 'PLUGIN_ADMIN.ENABLED',
+                                                        0 => 'PLUGIN_ADMIN.DISABLED'
+                                                    ],
+                                                    'validate' => [
+                                                        'type' => 'bool'
+                                                    ]
+                                                ],
+                                                'folder' => [
+                                                    'type' => 'text',
+                                                    'label' => 'PLUGIN_ADMIN.FOLDER_NAME',
+                                                    'help' => 'PLUGIN_ADMIN.FOLDER_NAME_HELP',
+                                                    'validate' => [
+                                                        'rule' => 'slug',
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'route' => [
+                                                    'type' => 'parents',
+                                                    'label' => 'PLUGIN_ADMIN.PARENT',
+                                                    'classes' => 'fancy',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'name' => [
+                                                    'type' => 'select',
+                                                    'classes' => 'fancy',
+                                                    'label' => 'PLUGIN_ADMIN.DISPLAY_TEMPLATE',
+                                                    'help' => 'PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP',
+                                                    'default' => 'default',
+                                                    'data-options@' => '\\Grav\\Plugin\\AdminPlugin::pagesTypes',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ]
+                                            ]
+                                        ],
+                                        'column2' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'order' => [
+                                                    'type' => 'order',
+                                                    'label' => 'PLUGIN_ADMIN.ORDERING'
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ],
+                                'blueprint' => [
+                                    'type' => 'blueprint'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    ]
+];
diff --git a/cache/compiled/files/68d66f089f21b10531e3634341af862e.yaml.php b/cache/compiled/files/68d66f089f21b10531e3634341af862e.yaml.php
deleted file mode 100644
index 44257fa..0000000
--- a/cache/compiled/files/68d66f089f21b10531e3634341af862e.yaml.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-return [
-    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
-    'filename' => '/mnt/data/Sites/hehe.net/user/data/licenses.yaml',
-    'modified' => 1533212888,
-    'data' => [
-        
-    ]
-];
diff --git a/cache/compiled/files/a73364d4c6c5f58716b3a6b0902a6810.yaml.php b/cache/compiled/files/a73364d4c6c5f58716b3a6b0902a6810.yaml.php
new file mode 100644
index 0000000..c80ace6
--- /dev/null
+++ b/cache/compiled/files/a73364d4c6c5f58716b3a6b0902a6810.yaml.php
@@ -0,0 +1,124 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/user/plugins/admin/blueprints/admin/pages/modular_raw.yaml',
+    'modified' => 1533014916,
+    'data' => [
+        'rules' => [
+            'slug' => [
+                'pattern' => '[a-zA-Zа-яA-Я0-9_\\-]+',
+                'min' => 1,
+                'max' => 200
+            ]
+        ],
+        'form' => [
+            'validation' => 'loose',
+            'fields' => [
+                'tabs' => [
+                    'type' => 'tabs',
+                    'active' => 1,
+                    'fields' => [
+                        'content' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.CONTENT',
+                            'fields' => [
+                                'frontmatter' => [
+                                    'classes' => 'frontmatter',
+                                    'type' => 'editor',
+                                    'label' => 'PLUGIN_ADMIN.FRONTMATTER',
+                                    'autofocus' => true,
+                                    'codemirror' => [
+                                        'mode' => 'yaml',
+                                        'indentUnit' => 4,
+                                        'autofocus' => true,
+                                        'indentWithTabs' => false,
+                                        'lineNumbers' => true,
+                                        'styleActiveLine' => true,
+                                        'gutters' => [
+                                            0 => 'CodeMirror-lint-markers'
+                                        ],
+                                        'lint' => true
+                                    ]
+                                ],
+                                'content' => [
+                                    'type' => 'markdown'
+                                ],
+                                'header.media_order' => [
+                                    'type' => 'pagemedia',
+                                    'label' => 'PLUGIN_ADMIN.PAGE_MEDIA'
+                                ]
+                            ]
+                        ],
+                        'options' => [
+                            'type' => 'tab',
+                            'title' => 'PLUGIN_ADMIN.OPTIONS',
+                            'fields' => [
+                                'columns' => [
+                                    'type' => 'columns',
+                                    'fields' => [
+                                        'column1' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'ordering' => [
+                                                    'type' => 'toggle',
+                                                    'label' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX',
+                                                    'help' => 'PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP',
+                                                    'highlight' => 1,
+                                                    'options' => [
+                                                        1 => 'PLUGIN_ADMIN.ENABLED',
+                                                        0 => 'PLUGIN_ADMIN.DISABLED'
+                                                    ],
+                                                    'validate' => [
+                                                        'type' => 'bool'
+                                                    ]
+                                                ],
+                                                'folder' => [
+                                                    'type' => 'text',
+                                                    'label' => 'PLUGIN_ADMIN.FILENAME',
+                                                    'validate' => [
+                                                        'rule' => 'slug',
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'route' => [
+                                                    'type' => 'parents',
+                                                    'label' => 'PLUGIN_ADMIN.PARENT',
+                                                    'classes' => 'fancy',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ],
+                                                'name' => [
+                                                    'type' => 'select',
+                                                    'classes' => 'fancy',
+                                                    'label' => 'PLUGIN_ADMIN.MODULAR_TEMPLATE',
+                                                    'default' => 'default',
+                                                    'data-options@' => '\\Grav\\Plugin\\AdminPlugin::pagesModularTypes',
+                                                    'validate' => [
+                                                        'required' => true
+                                                    ]
+                                                ]
+                                            ]
+                                        ],
+                                        'column2' => [
+                                            'type' => 'column',
+                                            'fields' => [
+                                                'order' => [
+                                                    'type' => 'order',
+                                                    'label' => 'PLUGIN_ADMIN.ORDERING'
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ],
+                                'blueprint' => [
+                                    'type' => 'blueprint'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    ]
+];
diff --git a/cache/compiled/files/b41e0b84cdfb728b0b5afb73d2a0c16f.yaml.php b/cache/compiled/files/b41e0b84cdfb728b0b5afb73d2a0c16f.yaml.php
deleted file mode 100644
index 7a6b43d..0000000
--- a/cache/compiled/files/b41e0b84cdfb728b0b5afb73d2a0c16f.yaml.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-return [
-    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
-    'filename' => '/mnt/data/Sites/hehe.net/user/themes/hehe/blueprints/partials/blog-bits.yaml',
-    'modified' => 1533014916,
-    'data' => [
-        'form' => [
-            'fields' => [
-                'hero_title' => [
-                    'type' => 'spacer',
-                    'title' => 'Hero Section'
-                ],
-                'header.hero_classes' => [
-                    'type' => 'text',
-                    'label' => 'Hero Classes',
-                    'markdown' => true,
-                    'description' => 'There are several Hero class options that can be listed here (space separated):<br />`text-light`, `text-dark`, `title-h1h2`, `parallax`, `overlay-dark-gradient`, `overlay-light-gradient`, `overlay-dark`, `overlay-light`, `hero-fullscreen`, `hero-large`, `hero-medium`, `hero-small`, `hero-tiny`<br />Please consult the [Quark documentation](https://github.com/getgrav/grav-theme-quark#hero-options) for more details.'
-                ],
-                'header.hero_image' => [
-                    'type' => 'filepicker',
-                    'label' => 'Hero Image',
-                    'preview_images' => true,
-                    'description' => 'If not specified, this defaults to the first image found in the page\'s folder'
-                ],
-                'toggles_title' => [
-                    'type' => 'spacer',
-                    'title' => 'Configuration'
-                ],
-                'header.blog_url' => [
-                    'type' => 'text',
-                    'toggleable' => true,
-                    'label' => 'Blog Route',
-                    'help' => 'The route to the main blog page that contains the "Show ..." configuration',
-                    'default' => '/blog',
-                    'placeholder' => '/blog',
-                    'size' => 'medium'
-                ],
-                'header.show_sidebar' => [
-                    'type' => 'toggle',
-                    'toggleable' => true,
-                    'label' => 'Show Sidebar',
-                    'highlight' => 1,
-                    'options' => [
-                        1 => 'PLUGIN_ADMIN.ENABLED',
-                        0 => 'PLUGIN_ADMIN.DISABLED'
-                    ],
-                    'validate' => [
-                        'type' => 'bool'
-                    ]
-                ],
-                'header.show_breadcrumbs' => [
-                    'type' => 'toggle',
-                    'toggleable' => true,
-                    'label' => 'Show Breadcrumbs',
-                    'highlight' => 1,
-                    'options' => [
-                        1 => 'PLUGIN_ADMIN.ENABLED',
-                        0 => 'PLUGIN_ADMIN.DISABLED'
-                    ],
-                    'validate' => [
-                        'type' => 'bool'
-                    ]
-                ],
-                'header.show_pagination' => [
-                    'type' => 'toggle',
-                    'toggleable' => true,
-                    'label' => 'Show Pagination',
-                    'highlight' => 1,
-                    'options' => [
-                        1 => 'PLUGIN_ADMIN.ENABLED',
-                        0 => 'PLUGIN_ADMIN.DISABLED'
-                    ],
-                    'validate' => [
-                        'type' => 'bool'
-                    ]
-                ]
-            ]
-        ]
-    ]
-];
diff --git a/cache/compiled/files/ba2ec62c9385c474d44ea0e340ef0fe7.yaml.php b/cache/compiled/files/ba2ec62c9385c474d44ea0e340ef0fe7.yaml.php
new file mode 100644
index 0000000..771c1dc
--- /dev/null
+++ b/cache/compiled/files/ba2ec62c9385c474d44ea0e340ef0fe7.yaml.php
@@ -0,0 +1,35 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/user/themes/hehe/blueprints/modular/text.yaml',
+    'modified' => 1533014916,
+    'data' => [
+        'title' => 'Text',
+        '@extends' => 'default',
+        'form' => [
+            'fields' => [
+                'tabs' => [
+                    'fields' => [
+                        'content' => [
+                            'fields' => [
+                                'header.media_order' => [
+                                    'label' => 'Page Media (first one will be displayed next to your content)'
+                                ],
+                                'header.image_align' => [
+                                    'type' => 'select',
+                                    'label' => 'Image position',
+                                    'classes' => 'fancy',
+                                    'default' => 'left',
+                                    'options' => [
+                                        'left' => 'Left',
+                                        'right' => 'Right'
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    ]
+];
diff --git a/cache/compiled/files/d777a1c57442075c1e3f65d8a9fc1e6d.yaml.php b/cache/compiled/files/d777a1c57442075c1e3f65d8a9fc1e6d.yaml.php
deleted file mode 100644
index 480d968..0000000
--- a/cache/compiled/files/d777a1c57442075c1e3f65d8a9fc1e6d.yaml.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-return [
-    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
-    'filename' => '/mnt/data/Sites/hehe.net/user/themes/hehe/blueprints/item.yaml',
-    'modified' => 1533014916,
-    'data' => [
-        'extends@' => 'default',
-        'form' => [
-            'fields' => [
-                'tabs' => [
-                    'fields' => [
-                        'blog' => [
-                            'type' => 'tab',
-                            'title' => 'Blog Item',
-                            'fields' => [
-                                'header_options' => [
-                                    'type' => 'section',
-                                    'title' => 'Header Options',
-                                    'underline' => true
-                                ],
-                                'header.continue_link' => [
-                                    'type' => 'toggle',
-                                    'toggleable' => true,
-                                    'label' => 'DF Style Link',
-                                    'help' => 'Daring Fireball style title link',
-                                    'highlight' => 1,
-                                    'default' => 1,
-                                    'options' => [
-                                        1 => 'PLUGIN_ADMIN.ENABLED',
-                                        0 => 'PLUGIN_ADMIN.DISABLED'
-                                    ],
-                                    'validate' => [
-                                        'type' => 'bool'
-                                    ]
-                                ],
-                                'header.header_image' => [
-                                    'type' => 'toggle',
-                                    'toggleable' => true,
-                                    'label' => 'Display Header Image',
-                                    'help' => 'Enabled displaying of a header image',
-                                    'highlight' => 1,
-                                    'options' => [
-                                        1 => 'PLUGIN_ADMIN.ENABLED',
-                                        0 => 'PLUGIN_ADMIN.DISABLED'
-                                    ]
-                                ],
-                                'header.header_image_file' => [
-                                    'type' => 'text',
-                                    'toggleable' => true,
-                                    'label' => 'Image File',
-                                    'help' => 'image filename that exists in the page folder. If not provided, will use the first image found.',
-                                    'placeholder' => 'For example: myimage.jpg'
-                                ],
-                                'header.header_image_width' => [
-                                    'type' => 'text',
-                                    'toggleable' => true,
-                                    'label' => 'Image Width',
-                                    'size' => 'small',
-                                    'help' => 'Header width in px',
-                                    'placeholder' => 'Default is 900',
-                                    'validate' => [
-                                        'type' => 'int',
-                                        'min' => 0,
-                                        'max' => 5000
-                                    ]
-                                ],
-                                'header.header_image_height' => [
-                                    'type' => 'text',
-                                    'toggleable' => true,
-                                    'label' => 'Image Height',
-                                    'size' => 'small',
-                                    'help' => 'Header height in px',
-                                    'placeholder' => 'Default is 300',
-                                    'validate' => [
-                                        'type' => 'int',
-                                        'min' => 0,
-                                        'max' => 5000
-                                    ]
-                                ],
-                                'summary' => [
-                                    'type' => 'section',
-                                    'title' => 'Summary',
-                                    'underline' => true
-                                ],
-                                'header.summary.enabled' => [
-                                    'type' => 'toggle',
-                                    'toggleable' => true,
-                                    'label' => 'Summary',
-                                    'highlight' => 1,
-                                    'options' => [
-                                        1 => 'PLUGIN_ADMIN.ENABLED',
-                                        0 => 'PLUGIN_ADMIN.DISABLED'
-                                    ]
-                                ],
-                                'header.summary.format' => [
-                                    'type' => 'select',
-                                    'toggleable' => true,
-                                    'label' => 'Format',
-                                    'classes' => 'fancy',
-                                    'options' => [
-                                        'short' => 'Use the first occurence of delimter or size',
-                                        'long' => 'Summary delimiter will be ignored'
-                                    ]
-                                ],
-                                'header.summary.size' => [
-                                    'type' => 'text',
-                                    'toggleable' => true,
-                                    'label' => 'Size',
-                                    'classes' => 'large',
-                                    'placeholder' => 300,
-                                    'validate' => [
-                                        'type' => 'int',
-                                        'min' => 1
-                                    ]
-                                ],
-                                'header.summary.delimiter' => [
-                                    'type' => 'text',
-                                    'toggleable' => true,
-                                    'label' => 'Summary delimiter',
-                                    'classes' => 'large',
-                                    'placeholder' => '==='
-                                ]
-                            ],
-                            'import@' => [
-                                'type' => 'partials/blog-bits'
-                            ]
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    ]
-];
diff --git a/cache/compiled/files/d7f037045dff7447fdb4256236fd98ad.yaml.php b/cache/compiled/files/d7f037045dff7447fdb4256236fd98ad.yaml.php
new file mode 100644
index 0000000..2e226d7
--- /dev/null
+++ b/cache/compiled/files/d7f037045dff7447fdb4256236fd98ad.yaml.php
@@ -0,0 +1,48 @@
+<?php
+return [
+    '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
+    'filename' => '/mnt/data/Sites/hehe.net/system/blueprints/pages/modular.yaml',
+    'modified' => 1533014916,
+    'data' => [
+        'title' => 'PLUGIN_ADMIN.MODULAR',
+        'extends@' => 'default',
+        'form' => [
+            'fields' => [
+                'tabs' => [
+                    'type' => 'tabs',
+                    'active' => 1,
+                    'fields' => [
+                        'content' => [
+                            'fields' => [
+                                'modular_title' => [
+                                    'type' => 'spacer',
+                                    'title' => 'PLUGIN_ADMIN.MODULAR_SETUP'
+                                ],
+                                'header.content.items' => [
+                                    'type' => 'text',
+                                    'label' => 'PLUGIN_ADMIN.ITEMS',
+                                    'default' => '@self.modular',
+                                    'size' => 'medium'
+                                ],
+                                'header.content.order.by' => [
+                                    'type' => 'text',
+                                    'label' => 'PLUGIN_ADMIN.ORDER_BY',
+                                    'placeholder' => 'date',
+                                    'help' => NULL,
+                                    'size' => 'small'
+                                ],
+                                'header.content.order.dir' => [
+                                    'type' => 'text',
+                                    'label' => 'PLUGIN_ADMIN.ORDER',
+                                    'help' => '"desc" or "asc" are valid values',
+                                    'placeholder' => 'desc',
+                                    'size' => 'small'
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
+    ]
+];
diff --git a/cache/compiled/languages/master-dev.hehe.net.php b/cache/compiled/languages/master-dev.hehe.net.php
index c75ceb8..323c76b 100644
--- a/cache/compiled/languages/master-dev.hehe.net.php
+++ b/cache/compiled/languages/master-dev.hehe.net.php
@@ -1,7 +1,7 @@
 <?php
 return [
     '@class' => 'Grav\\Common\\Config\\CompiledLanguages',
-    'timestamp' => 1533208004,
+    'timestamp' => 1533216532,
     'checksum' => '6c5391e484bf1638c9846acf597e3d7f',
     'files' => [
         'system/languages' => [
@@ -22875,6 +22875,6 @@ Path: `%2$s`
             ]
         ],
         'checksum' => '6c5391e484bf1638c9846acf597e3d7f',
-        'timestamp' => 1533208004
+        'timestamp' => 1533216532
     ]
 ];
diff --git a/cache/problem-check-g-71f39f85 b/cache/problem-check-g-e49844b3
similarity index 100%
rename from cache/problem-check-g-71f39f85
rename to cache/problem-check-g-e49844b3
diff --git a/logs/popularity/daily.json b/logs/popularity/daily.json
index 398afc9..632600c 100644
--- a/logs/popularity/daily.json
+++ b/logs/popularity/daily.json
@@ -1 +1 @@
-{"01-08-2018":19,"02-08-2018":315}
\ No newline at end of file
+{"01-08-2018":19,"02-08-2018":424}
\ No newline at end of file
diff --git a/logs/popularity/monthly.json b/logs/popularity/monthly.json
index 48e18fb..23112de 100644
--- a/logs/popularity/monthly.json
+++ b/logs/popularity/monthly.json
@@ -1 +1 @@
-{"08-2018":334}
\ No newline at end of file
+{"08-2018":443}
\ No newline at end of file
diff --git a/logs/popularity/totals.json b/logs/popularity/totals.json
index 417f04e..553d792 100644
--- a/logs/popularity/totals.json
+++ b/logs/popularity/totals.json
@@ -1 +1 @@
-{"\/":152,"\/projets":99,"\/news":6,"\/a-propros":6,"\/projets-n-1":1,"\/projets\/projets-n-1":66,"\/projets\/projet-n-2":4}
\ No newline at end of file
+{"\/":168,"\/projets":99,"\/news":79,"\/a-propros":10,"\/projets-n-1":1,"\/projets\/projets-n-1":82,"\/projets\/projet-n-2":4}
\ No newline at end of file
diff --git a/logs/popularity/visitors.json b/logs/popularity/visitors.json
index 8c3f296..96f4f45 100644
--- a/logs/popularity/visitors.json
+++ b/logs/popularity/visitors.json
@@ -1 +1 @@
-{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1533213951}
\ No newline at end of file
+{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1533218608}
\ No newline at end of file
diff --git a/user/pages/03.news/_news-1/text.md b/user/pages/03.news/_news-1/text.md
new file mode 100644
index 0000000..317cc7d
--- /dev/null
+++ b/user/pages/03.news/_news-1/text.md
@@ -0,0 +1,5 @@
+---
+title: 'News 1'
+---
+
+Salut je suis la premiere news
\ No newline at end of file
diff --git a/user/pages/03.news/default.md b/user/pages/03.news/default.md
deleted file mode 100644
index 563592b..0000000
--- a/user/pages/03.news/default.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: News
----
-
diff --git a/user/pages/03.news/modular.md b/user/pages/03.news/modular.md
new file mode 100644
index 0000000..c26d6b7
--- /dev/null
+++ b/user/pages/03.news/modular.md
@@ -0,0 +1,6 @@
+---
+title: News
+content:
+    items: '@self.modular'
+---
+
diff --git a/user/pages/04.a-propros/default.md b/user/pages/04.a-propros/default.md
index 538f787..1255655 100644
--- a/user/pages/04.a-propros/default.md
+++ b/user/pages/04.a-propros/default.md
@@ -2,3 +2,4 @@
 title: 'A propros'
 ---
 
+Je suis la page a propos
\ No newline at end of file
diff --git a/user/themes/hehe/templates/blog.html.twig b/user/themes/hehe/templates/blog.html.twig
index 70d8e76..2ae91c3 100644
--- a/user/themes/hehe/templates/blog.html.twig
+++ b/user/themes/hehe/templates/blog.html.twig
@@ -6,30 +6,16 @@
 {% set show_sidebar = header_var('show_sidebar', [page, blog])|defined(true)  %}
 {% set show_pagination = header_var('show_pagination', [page, blog])|defined(true) %}
 
-{% block stylesheets %}
-    {% do assets.addCss('theme://css/bricklayer.css') %}
-    {{ parent() }}
-{% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-    {% do assets.add('theme://js/bricklayer.min.js') %}
-{% endblock %}
-
 {% block hero %}
     {% include 'partials/hero.html.twig' with {id: 'blog-hero', content: page.content, hero_image: blog_image} %}
 {% endblock %}
 
 {% block body %}
 
-        {% if show_breadcrumbs and config.plugins.breadcrumbs.enabled %}
-            {% include 'partials/breadcrumbs.html.twig' %}
-        {% endif %}
-
         {% embed 'partials/layout.html.twig' with {blog: page} %}
             {% block item %}
 
-                <div class="bricklayer">
+                <div class="item">
                 {% for child in collection %}
                     {% include 'partials/blog-list-item.html.twig' with {blog: page, page: child} %}
                 {% endfor %}
@@ -43,13 +29,6 @@
 
             {% endblock %}
 
-            {% block sidebar %}
-                {% include 'partials/sidebar.html.twig' %}
-            {% endblock %}
         {% endembed %}
 
-    <script>
-        //Bricklayer
-        var bricklayer = new Bricklayer(document.querySelector('.bricklayer'))
-    </script>
 {% endblock %}
diff --git a/user/themes/hehe/templates/item.html.twig b/user/themes/hehe/templates/item.html.twig
index 91ee1b0..d1e4c43 100644
--- a/user/themes/hehe/templates/item.html.twig
+++ b/user/themes/hehe/templates/item.html.twig
@@ -20,8 +20,8 @@
 {% endblock %}
 
 {% block body %}
-  <section id="body-wrapper" class="section blog-listing">
-      <section class="container {{ grid_size }}">
+  <section id="body-wrapper">
+      <section id="container">
           {% embed 'partials/layout.html.twig' %}
               {% block item %}
                   {% include 'partials/blog-item.html.twig' %}
diff --git a/user/themes/hehe/templates/modular.html.twig b/user/themes/hehe/templates/modular.html.twig
index ba983ad..ce613dc 100644
--- a/user/themes/hehe/templates/modular.html.twig
+++ b/user/themes/hehe/templates/modular.html.twig
@@ -13,6 +13,7 @@
 {% block bottom %}
     {{ parent() }}
     {% if show_onpage_menu %}
+
         <script>
         // singlePageNav initialization & configuration
         $('ul.navigation').singlePageNav({
@@ -22,28 +23,13 @@
             currentClass: 'active'
         });
         </script>
+
     {% endif %}
 {% endblock %}
 
 {% block header_navigation %}
-    {% if show_onpage_menu %}
-        <ul class="navigation">
-        {% for module in page.collection() %}
-            {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
-            <li><a class="{{ current_module }}" href="#{{ _self.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
-        {% endfor %}
-        {% for mitem in site.menu %}
-            <li>
-                <a {% if mitem.class %}class="{{ mitem.class }}"{% endif %} href="{{ mitem.url }}">
-                    {% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %}
-                    {{ mitem.text }}
-                </a>
-            </li>
-        {% endfor %}
-        </ul>
-    {% else %}
-        {{  parent() }}
-    {% endif %}
+  {% include 'partials/navigation.html.twig' %}
+  {% include 'partials/taxonomylist.html.twig' with { taxonomy: 'tag'} %}
 {% endblock %}
 
 {% block hero %}
@@ -55,7 +41,6 @@
 
 {% block body %}
     {% for module in page.collection() if module.template != 'modular/hero' %}
-        <div id="{{ _self.pageLinkName(module.menu) }}"></div>
-        {{ module.content }}
+      {{ module.content }}
     {% endfor %}
 {% endblock %}
diff --git a/user/themes/hehe/templates/modular/text.html.twig b/user/themes/hehe/templates/modular/text.html.twig
index 07ab995..f349900 100644
--- a/user/themes/hehe/templates/modular/text.html.twig
+++ b/user/themes/hehe/templates/modular/text.html.twig
@@ -1,17 +1,18 @@
 {% set grid_size = theme_var('grid-size') %}
 {% set image = page.media.images|first %}
 
-<section class="section modular-text {{ page.header.class}} bg-gray">
-    <section class="container {{ grid_size }}">
-        <div class="columns {{ page.header.image_align|default('align-right') }}">
-            <div class="column col-6 col-md-12">
-                {{ content }}
-            </div>
-            <div class="column col-6 col-md-12">
-                {% if image %}
-                    {{ image.html }}
-                {% endif %}
-            </div>
-        </div>
-    </section>
+<section class="news">
+
+    <h3>{{ header.title }}</h3>
+
+    <div class="txt">
+        {{ content }}
+    </div>
+
+    {% if image %}
+      <div class="media">
+        {{ image.html }}
+      </div>
+    {% endif %}
+
 </section>
diff --git a/user/themes/hehe/templates/partials/blog-item.html.twig b/user/themes/hehe/templates/partials/blog-item.html.twig
index 033c861..ff62ce8 100644
--- a/user/themes/hehe/templates/partials/blog-item.html.twig
+++ b/user/themes/hehe/templates/partials/blog-item.html.twig
@@ -1,7 +1,7 @@
-<div class="content-item h-entry">
+<div class="content-item">
 
 {% if not hero_image_name %}
-    <div class="content-title text-center">
+    <div class="content-title">
         {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %}
         {% if page.header.subtitle %}
         <h3 >{{ page.header.subtitle }}</h3>
@@ -10,35 +10,31 @@
 {% endif %}
 
     <div class="e-content">
+      <div class="media">
+        {% for image in page.media.images %}
+          {{ image.html }}
+        {% endfor %}
+      </div>
+
       <div class="txt">
         {{ page.content }}
 
         <div class="taxonomy">
           {% include 'partials/blog/taxonomy.html.twig' %}
         </div>
-
       </div>
 
-      <div class="media">
-        {% for image in page.media.images %}
-          {{ image.html }}
-        {% endfor %}
-      </div>
     </div>
 
-    {% if page.header.continue_link is sameas(true) and config.plugins.comments.enabled %}
-        {% include 'partials/comments.html.twig' %}
-    {% endif %}
-
 </div>
 
-<p class="prev-next text-center">
+<p class="prev-next">
 
     {% if not page.isLast %}
-            <a class="btn" href="{{ page.prevSibling.url }}"><i class="fa fa-angle-left"></i> {{ 'BLOG.ITEM.PREV_POST'|t }}</a>
+            <a class="btn prev" href="{{ page.prevSibling.url }}">{{ 'BLOG.ITEM.PREV_POST'|t}}</a>
     {% endif %}
 
     {% if not page.isFirst %}
-        <a class="btn" href="{{ page.nextSibling.url }}">{{ 'BLOG.ITEM.NEXT_POST'|t }} <i class="fa fa-angle-right"></i></a>
+        <a class="btn next" href="{{ page.nextSibling.url }}">{{ 'BLOG.ITEM.NEXT_POST'|t }}</i></a>
     {% endif %}
 </p>
diff --git a/user/themes/hehe/templates/partials/blog/title.html.twig b/user/themes/hehe/templates/partials/blog/title.html.twig
index 93475f2..020a2bf 100644
--- a/user/themes/hehe/templates/partials/blog/title.html.twig
+++ b/user/themes/hehe/templates/partials/blog/title.html.twig
@@ -1,11 +1,11 @@
 {% set title_level = title_level ?: 'h2' %}
 {% if page.header.link %}
-    <{{ title_level }} class="p-name mt-1">
+    <{{ title_level }}>
         {% if page.header.continue_link is not sameas(false) %}
         <a href="{{ page.url }}"><i class="fa fa-angle-double-right u-url"></i></a>
         {% endif %}
         <a href="{{ page.header.link }}" class="u-url">{{ page.title }}</a>
     </{{ title_level }}>
 {% else %}
-    <{{ title_level }} class="p-name mt-1"><a href="{{ page.url }}" class="u-url">{{ page.title }}</a></{{ title_level }}>
+    <{{ title_level }}><a href="{{ page.url }}" class="u-url">{{ page.title }}</a></{{ title_level }}>
 {% endif %}
diff --git a/user/themes/hehe/templates/partials/layout.html.twig b/user/themes/hehe/templates/partials/layout.html.twig
index 8a51b67..66e841c 100644
--- a/user/themes/hehe/templates/partials/layout.html.twig
+++ b/user/themes/hehe/templates/partials/layout.html.twig
@@ -1,6 +1,6 @@
 {% set item_col = show_sidebar ? 'col-9 col-md-12' : 'col-12' %}
 {% set sidebar_col = show_sidebar ? 'col-3 col-md-12' : 'col-12' %}
 
-    <div id="items" class="column {{ item_col }} extra-spacing">
+    <div id="items" class="column">
         {% block item %}{% endblock %}
     </div>