diff --git a/Extend.php b/Extend.php
new file mode 100644
index 0000000..9041f02
--- /dev/null
+++ b/Extend.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace SoosyzeApp\Theme\Editorial;
+
+class Extend extends \SoosyzeCore\System\ExtendTheme
+{
+    public function boot()
+    {
+    }
+
+    public function getDir()
+    {
+        return __DIR__;
+    }
+}
diff --git a/assets/css/main.css b/assets/css/main.css
index 2760596..18a03fe 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -60,7 +60,9 @@ input, select, textarea {
     -ms-appearance: none;
     appearance: none;
 }
-
+.img-thumbnail {
+    max-width: 100%;
+}
 /* Basic */
 
 @-ms-viewport {
diff --git a/assets/js/admin.js b/assets/js/admin.js
deleted file mode 100644
index 72ea703..0000000
--- a/assets/js/admin.js
+++ /dev/null
@@ -1,16 +0,0 @@
-$(function () {
-    /* MODAL */
-    var target = '';
-    $('[data-toogle="modal"]').click(function (evt) {
-        evt.preventDefault();
-        target = $(this).data('target');
-        $(target).show();
-        $('body').toggleClass('modal-open');
-    });
-    $(window).click(function (evt) {
-        if (evt.target.className === 'modal' || evt.target.className === 'close') {
-            $(target).hide();
-            $('body').toggleClass('modal-open');
-        }
-    });
-});
\ No newline at end of file
diff --git a/components/block/news-last.php b/components/block/news-last.php
index b801dfe..e21aeab 100644
--- a/components/block/news-last.php
+++ b/components/block/news-last.php
@@ -7,25 +7,35 @@
 
                 <article>
                     <a class="image" href="<?php echo $new[ 'link_view' ]; ?>">
-                        <img src="<?php echo $new[ 'field' ][ 'image' ][ 'field_value' ]; ?>" alt="Illustration <?php echo $new[ 'title' ]; ?>">
+                        <img src="<?php echo $new[ 'field' ][ 'image' ][ 'field_value' ]; ?>" alt="Illustration <?php echo t($new[ 'title' ]); ?>">
                     </a>
-                    <h3><a href="<?php echo $new[ 'link_view' ]; ?>"><?php echo $new[ 'title' ]; ?></a></h3>
+
+                    <h3>
+                        <a href="<?php echo $new[ 'link_view' ]; ?>"><?php echo t($new[ 'title' ]); ?></a>
+                    </h3>
+
                     <small><?php echo date('F d, Y', $new[ 'date_created' ]); ?></small>
-                    <small> ~<?php echo $new[ 'field' ][ 'reading_time' ][ 'field_value' ] . ' ' . t('minute(s)'); ?></small>
-                    <p><?php echo $new[ 'field' ][ 'summary' ][ 'field_display' ]; ?></p>
+
+                    <small> ~<?php echo $new[ 'field' ][ 'reading_time' ][ 'field_value' ]
+                                . ' '
+                                . t(if_or($new[ 'field' ][ 'reading_time' ][ 'field_value' ] === 1, 'minute', 'minutes')); ?></small>
+
+                    <p><?php echo xss($new[ 'field' ][ 'summary' ][ 'field_display' ]); ?></p>
+
                     <ul class="actions">
-                        <li><a href="<?php echo $new[ 'link_view' ]; ?>" class="button">En savoir plus</a></li>
+                        <li>
+                            <a href="<?php echo $new[ 'link_view' ]; ?>" class="button"><?php echo t('Learn more'); ?></a>
+                        </li>
                     </ul>
                 </article>
             <?php endforeach; ?>
 
         </div>
-
     </div>
     <?php if ($is_link_more): ?>
         <footer class="major">
             <ul class="buttons">
-                <li><a href="<?php echo $link_more; ?>" class="btn btn-primary"><?php echo t('Toutes les actualités'); ?></a></li>
+                <li><a href="<?php echo $link_more; ?>" class="btn btn-primary"><?php echo t('All news'); ?></a></li>
             </ul>
         </footer>
     <?php endif; ?>
diff --git a/composer.json b/composer.json
index e35ff8d..ea467cb 100644
--- a/composer.json
+++ b/composer.json
@@ -2,9 +2,15 @@
     "name": "soosyze-extension/editorial",
     "type": "soosyze-theme",
     "description": "Say hello to Editorial, a blog/magazine-ish template built around a toggleable \"locking\" sidebar (scroll down to see what I mean) and an accordion-style menu.",
-    "version": "1.0",
+    "version": "1.0.0",
+    "autoload": {
+        "psr-4": {
+            "SoosyzeApp\\Theme\\Editorial\\": "/"
+        }
+    },
     "extra": {
-        "soosyze-theme": {
+        "soosyze": {
+            "title": "Editorial",
             "sections": [
                 "header",
                 "sidebar",
diff --git a/html.php b/html.php
index 314c807..82e5328 100644
--- a/html.php
+++ b/html.php
@@ -7,37 +7,38 @@
 <html lang="fr">
     <head>
         <meta charset="utf-8" />
-        <title><?php echo $title; ?></title>
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <title><?php echo htmlspecialchars($title); ?></title>
         <?php if ($favicon): ?>
+
             <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
         <?php endif; ?>
-        <meta name="description" content="<?php echo $description; ?>"/>
-        <meta name="keywords" content="<?php echo $keyboard; ?>"/>
-        <meta name="generator" content="<?php echo $generator; ?>"/>
 
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
+        <?php echo $meta; ?>
+        <?php echo $styles; ?>
+
         <link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/main.css" />
         <link rel="stylesheet" href="<?php echo $base_theme; ?>assets/css/admin.css" />
-        <?php echo $styles; ?>
     </head>
     <body class="is-preload">
         <!-- Wrapper -->
         <div id="wrapper">
             <?php echo $section[ 'page' ]; ?>
+
             <?php if (isset($section[ 'page_bottom' ])): ?>
                 <?php echo $section[ 'page_bottom' ]; ?>
             <?php endif; ?>
         </div>
         <!-- Scripts -->
-        <script src="<?php echo $base_theme; ?>assets/js/jquery.min.js"></script>
-        <script src="https://code.jquery.com/ui/1.12.0/jquery-ui.min.js" integrity="sha256-eGE6blurk5sHj+rmkfsGYeKyZx3M4bG+ZlFyA7Kns7E=" crossorigin="anonymous"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.8.3/Sortable.min.js"></script>
+        <?php echo $scripts; ?>
+        <script src="https://code.jquery.com/ui/1.12.0/jquery-ui.min.js"
+                integrity="sha256-eGE6blurk5sHj+rmkfsGYeKyZx3M4bG+ZlFyA7Kns7E="
+                crossorigin="anonymous">
+        </script>
+        <?php echo $script_inline; ?>
         <script src="<?php echo $base_theme; ?>assets/js/browser.min.js"></script>
         <script src="<?php echo $base_theme; ?>assets/js/breakpoints.min.js"></script>
         <script src="<?php echo $base_theme; ?>assets/js/util.js"></script>
         <script src="<?php echo $base_theme; ?>assets/js/main.js"></script>
-        <script src="<?php echo $base_theme; ?>assets/js/admin.js"></script>
-        <?php echo $scripts; ?>
     </body>
 </html>
\ No newline at end of file
diff --git a/menu-user.php b/menu-user.php
index b3cc5e8..5450da3 100644
--- a/menu-user.php
+++ b/menu-user.php
@@ -3,14 +3,14 @@
     <?php foreach ($menu as $link): ?>
 
         <li class="<?php echo $link[ 'link_active' ]; ?>">
-            <?php if (!empty($link[ 'submenu' ])): ?>
-                <span class="opener"><?php echo $link[ 'title_link' ]; ?></span>
-                <?php echo $link[ 'submenu' ]; ?>
-            <?php else: ?>
+        <?php if (empty($link[ 'submenu' ])): ?>
             <a href="<?php echo $link[ 'link' ]; ?>"<?php if ($link[ 'target_link' ]): ?> target="_blank" rel="noopener noreferrer" <?php endif; ?>>
-                <?php echo !empty($link['icon']) ? "<i class='{$link['icon']}' aria-hidden='true'></i> " : ''; ?><?php echo $link[ 'title_link' ]; ?>
+                <?php echo if_or($link['icon'], '<i class="' . htmlspecialchars($link['icon']) . ' aria-hidden="true"></i> ') . t($link[ 'title_link' ]); ?>
             </a>
-            <?php endif; ?>
+        <?php else: ?>
+            <span class="opener"><?php echo t($link[ 'title_link' ]); ?></span>
+            <?php echo $link[ 'submenu' ]; ?>
+        <?php endif; ?>
 
         </li>
     <?php endforeach; ?>
diff --git a/menu.php b/menu.php
index b3cc5e8..5450da3 100644
--- a/menu.php
+++ b/menu.php
@@ -3,14 +3,14 @@
     <?php foreach ($menu as $link): ?>
 
         <li class="<?php echo $link[ 'link_active' ]; ?>">
-            <?php if (!empty($link[ 'submenu' ])): ?>
-                <span class="opener"><?php echo $link[ 'title_link' ]; ?></span>
-                <?php echo $link[ 'submenu' ]; ?>
-            <?php else: ?>
+        <?php if (empty($link[ 'submenu' ])): ?>
             <a href="<?php echo $link[ 'link' ]; ?>"<?php if ($link[ 'target_link' ]): ?> target="_blank" rel="noopener noreferrer" <?php endif; ?>>
-                <?php echo !empty($link['icon']) ? "<i class='{$link['icon']}' aria-hidden='true'></i> " : ''; ?><?php echo $link[ 'title_link' ]; ?>
+                <?php echo if_or($link['icon'], '<i class="' . htmlspecialchars($link['icon']) . ' aria-hidden="true"></i> ') . t($link[ 'title_link' ]); ?>
             </a>
-            <?php endif; ?>
+        <?php else: ?>
+            <span class="opener"><?php echo t($link[ 'title_link' ]); ?></span>
+            <?php echo $link[ 'submenu' ]; ?>
+        <?php endif; ?>
 
         </li>
     <?php endforeach; ?>
diff --git a/news/content-news-index.php b/news/content-news-index.php
index 66a44c5..47eecc8 100644
--- a/news/content-news-index.php
+++ b/news/content-news-index.php
@@ -6,20 +6,31 @@
 
                 <article>
                     <a class="image" href="<?php echo $new[ 'link_view' ]; ?>">
-                        <img src="<?php echo $new[ 'field' ][ 'image' ][ 'field_value' ]; ?>" alt="Illustration <?php echo $new[ 'title' ]; ?>">
+                        <img src="<?php echo $new[ 'field' ][ 'image' ][ 'field_value' ]; ?>" alt="Illustration <?php echo t($new[ 'title' ]); ?>">
                     </a>
-                    <h3><a href="<?php echo $new[ 'link_view' ]; ?>"><?php echo $new[ 'title' ]; ?></a></h3>
+
+                    <h3>
+                        <a href="<?php echo $new[ 'link_view' ]; ?>"><?php echo t($new[ 'title' ]); ?></a>
+                    </h3>
+
                     <small><?php echo date('F d, Y', $new[ 'date_created' ]); ?></small>
-                    <small> ~<?php echo $new[ 'field' ][ 'reading_time' ][ 'field_value' ] . ' ' . t('minute(s)'); ?></small>
-                    <p><?php echo $new[ 'field' ][ 'summary' ][ 'field_display' ]; ?></p>
+
+                    <small> ~<?php echo $new[ 'field' ][ 'reading_time' ][ 'field_value' ]
+                    . ' '
+                    . t(if_or($new[ 'field' ][ 'reading_time' ][ 'field_value' ] === 1, 'minute', 'minutes')); ?></small>
+
+                    <p><?php echo xss($new[ 'field' ][ 'summary' ][ 'field_display' ]); ?></p>
+
                     <ul class="actions">
-                        <li><a href="<?php echo $new[ 'link_view' ]; ?>" class="button">En savoir plus</a></li>
+                        <li>
+                            <a href="<?php echo $new[ 'link_view' ]; ?>" class="button"><?php echo t('Learn more'); ?></a>
+                        </li>
                     </ul>
                 </article>
             <?php endforeach; ?>
 
         </div>
-    <?php else: ?> 
+    <?php else: ?>
 
         <div class="col-12">
             <p><?php echo $default; ?></p>
diff --git a/node/content-node-show_article.php b/node/content-node-show_article.php
index 46cae94..590ea46 100644
--- a/node/content-node-show_article.php
+++ b/node/content-node-show_article.php
@@ -1,6 +1,4 @@
 
-<?php echo $node_submenu; ?>
-
 <div class="article_img">
     <?php echo $fields[ 'image' ][ 'field_display' ]; ?>
 </div>
@@ -9,6 +7,8 @@
     <?php echo strftime('%d.%B.%Y', $node[ 'date_created' ]); ?>
     -
     <i class="fa fa-clock"></i> 
-    ~<?php echo $fields[ 'reading_time' ][ 'field_value' ] . ' ' . t('minute(s)'); ?>
+    ~<?php echo $fields[ 'reading_time' ][ 'field_value' ]
+    . ' '
+    . t(if_or($fields[ 'reading_time' ][ 'field_value' ] === 1, 'minute', 'minutes')); ?>
 </div>
-<?php echo $fields[ 'body' ][ 'field_display' ]; ?>
\ No newline at end of file
+<?php echo xss($fields[ 'body' ][ 'field_display' ]); ?>
\ No newline at end of file
diff --git a/page-front.php b/page-front.php
index e68fc30..1890fa8 100644
--- a/page-front.php
+++ b/page-front.php
@@ -8,8 +8,8 @@
                 <?php if ($logo): ?>
                     <img src="<?php echo $logo; ?>" class="logo home" alt="Logo site">
                 <?php endif; ?>
-                <h1><?php echo $title; ?></h1>
-            </a>							
+                <h1><?php echo htmlspecialchars($title); ?></h1>
+            </a>
             <ul class="icons">
                 <li><a href="#" class="icon fab fa-twitter"><span class="label">Twitter</span></a></li>
                 <li><a href="#" class="icon fab fa-facebook"><span class="label">Facebook</span></a></li>
@@ -22,7 +22,7 @@
         <!-- Content -->
         <section>
             <header class="main">
-                <h2><?php echo $title_main; ?></h2>
+                <h2><?php echo htmlspecialchars($title_main); ?></h2>
             </header>
 
             <?php if (!empty($section[ 'messages' ])): ?>
@@ -31,6 +31,8 @@
             <?php if (!empty($section[ 'content_header' ])): ?>
                 <?php echo $section[ 'content_header' ]; ?>
             <?php endif; ?>
+            <?php echo $section[ 'submenu' ]; ?>
+
             <?php echo $section[ 'content' ]; ?>
             <?php if (!empty($section[ 'content_footer' ])): ?>
                 <?php echo $section[ 'content_footer' ]; ?>
diff --git a/page.php b/page.php
index 3ca7a86..b5f846c 100644
--- a/page.php
+++ b/page.php
@@ -8,8 +8,8 @@
                 <?php if ($logo): ?>
                     <img src="<?php echo $logo; ?>" class="logo" alt="Logo site">
                 <?php endif; ?>
-                <strong><?php echo $title; ?></strong>
-            </a>							
+                <strong><?php echo htmlspecialchars($title); ?></strong>
+            </a>
             <ul class="icons">
                 <li><a href="#" class="icon fab fa-twitter"><span class="label">Twitter</span></a></li>
                 <li><a href="#" class="icon fab fa-facebook"><span class="label">Facebook</span></a></li>
@@ -22,7 +22,7 @@
         <!-- Content -->
         <section>
             <header class="main">
-                <h1><?php echo $title_main; ?></h1>
+                <h1><?php echo htmlspecialchars($title_main); ?></h1>
             </header>
 
             <?php if (!empty($section[ 'messages' ])): ?>
@@ -31,6 +31,8 @@
             <?php if (!empty($section[ 'content_header' ])): ?>
                 <?php echo $section[ 'content_header' ]; ?>
             <?php endif; ?>
+            <?php echo $section[ 'submenu' ]; ?>
+
             <?php echo $section[ 'content' ]; ?>
             <?php if (!empty($section[ 'content_footer' ])): ?>
                 <?php echo $section[ 'content_footer' ]; ?>