diff --git a/site/plugins/admin/views/templates/auth/registration.php b/site/plugins/admin/views/templates/auth/registration.php
index 1211eb8d..5ddade45 100644
--- a/site/plugins/admin/views/templates/auth/registration.php
+++ b/site/plugins/admin/views/templates/auth/registration.php
@@ -17,7 +17,7 @@ Themes::view('admin/views/partials/content-start')->display();
     <input type="hidden" name="token" value="<?php echo Token::generate(); ?>">
     <div class="row">
         <div class="col-4 float-center">
-            <h3 class="h3 auth-header text-center"><?php echo __('admin_users_create_new'); ?></h3>
+            <h3 class="h3 auth-header text-center"><?php echo __('admin_create_new_user'); ?></h3>
             <div class="form-group">
                 <label><?php echo __('admin_username'); ?></label>
                 <input type="text" name="username" value="" class="form-control" placeholder="lowercase chars only, e.g. admin" pattern="^[a-z0-9_-]{3,16}$" required="required">
@@ -31,7 +31,7 @@ Themes::view('admin/views/partials/content-start')->display();
                 <input type="password" name="password" value="" class="form-control" placeholder="complex string at least 8 chars long" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" required="required">
             </div>
             <div class="form-group">
-                <input type="submit" name="registration" value="<?php echo __('admin_users_create'); ?>" class="btn btn-black btn-block">
+                <input type="submit" name="registration" value="<?php echo __('admin_create_user'); ?>" class="btn btn-black btn-block">
             </div>
         </div>
     </div>
diff --git a/site/plugins/admin/views/templates/content/entries/add.php b/site/plugins/admin/views/templates/content/entries/add.php
index 94906a88..59f31cbc 100644
--- a/site/plugins/admin/views/templates/content/entries/add.php
+++ b/site/plugins/admin/views/templates/content/entries/add.php
@@ -13,12 +13,12 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                         'entries' => [
                                         'link' => Http::getBaseUrl() . '/admin/entries',
-                                        'title' => __('admin_entries_heading'),
+                                        'title' => __('admin_entries'),
                                         'attributes' => ['class' => 'navbar-item']
                                     ],
                        'entries_add' => [
                                         'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry'),
-                                        'title' => __('admin_entries_create_new'),
+                                        'title' => __('admin_create_new_entry'),
                                         'attributes' => ['class' => 'navbar-item active']
                                       ]
                       ])
@@ -32,11 +32,11 @@ Themes::view('admin/views/partials/content-start')->display();
         <?= Form::hidden('token', Token::generate()); ?>
         <?= Form::hidden('parent_entry', Http::get('entry')); ?>
         <div class="form-group">
-            <?= Form::label('title', __('admin_entries_title'), ['for' => 'entryTitle']) ?>
+            <?= Form::label('title', __('admin_title'), ['for' => 'entryTitle']) ?>
             <?= Form::input('title', '', ['class' => 'form-control', 'id' => 'entryTitle', 'required', 'data-validation' => 'length required', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('slug', __('admin_entries_name'), ['for' => 'entrySlug']) ?>
+            <?= Form::label('slug', __('admin_name'), ['for' => 'entrySlug']) ?>
             <?= Form::input('slug', '', ['class' => 'form-control', 'id' => 'entrySlug', 'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_name_empty_input')]) ?>
         </div>
         <div class="form-group">
diff --git a/site/plugins/admin/views/templates/content/entries/content.php b/site/plugins/admin/views/templates/content/entries/content.php
index 778bee02..deb74f4c 100644
--- a/site/plugins/admin/views/templates/content/entries/content.php
+++ b/site/plugins/admin/views/templates/content/entries/content.php
@@ -13,17 +13,17 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                             'edit_entry'           => [
                                                         'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name,
-                                                        'title'      => __('admin_entries_editor'),
+                                                        'title'      => __('admin_content'),
                                                         'attributes' => ['class' => 'navbar-item active']
                                                      ],
                             'edit_entry_media'     => [
                                                         'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true',
-                                                        'title'      => __('admin_entries_edit_media'),
+                                                        'title'      => __('admin_media'),
                                                         'attributes' => ['class' => 'navbar-item']
                                                     ],
                                 'edit_entry_source'           => [
                                                             'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true',
-                                                            'title'      => __('admin_entries_editor_source'),
+                                                            'title'      => __('admin_source'),
                                                             'attributes' => ['class' => 'navbar-item']
                                                          ]
                         ])
diff --git a/site/plugins/admin/views/templates/content/entries/list.php b/site/plugins/admin/views/templates/content/entries/list.php
index 79fa7a97..d954d975 100644
--- a/site/plugins/admin/views/templates/content/entries/list.php
+++ b/site/plugins/admin/views/templates/content/entries/list.php
@@ -6,14 +6,14 @@
     ->assign('links',   [
                             'entries' => [
                                             'link' => Http::getBaseUrl() . '/admin/entries',
-                                            'title' => __('admin_entries_heading'),
+                                            'title' => __('admin_entries'),
                                             'attributes' => ['class' => 'navbar-item active']
                                        ]
                         ])
     ->assign('buttons', [
                             'entries' => [
                                             'link' => Http::getBaseUrl() . '/admin/entries/add?entry='.Http::get('entry') ,
-                                            'title' => __('admin_entries_create_new'),
+                                            'title' => __('admin_create_new_entry'),
                                             'attributes' => ['class' => 'float-right btn']
                                        ]
                         ])
@@ -25,7 +25,7 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th><?= __('admin_entries_name') ?></th>
+            <th><?= __('admin_name') ?></th>
             <th></th>
         </tr>
     </thead>
@@ -41,20 +41,20 @@
             </td>
             <td class="text-right">
                 <div class="btn-group">
-                  <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/entries/edit?entry=<?= $entry['slug'] ?>"><?= __('admin_entries_edit') ?></a>
+                  <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/entries/edit?entry=<?= $entry['slug'] ?>"><?= __('admin_edit') ?></a>
                   <button type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="sr-only">Toggle Dropdown</span>
                   </button>
                   <div class="dropdown-menu">
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/add?entry=<?= $entry['slug'] ?>"><?= __('admin_add') ?></a>
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/duplicate?entry=<?= $entry['slug'] ?>&token=<?= Token::generate() ?>"><?= __('admin_duplicate') ?></a>
-                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/rename?entry=<?= $entry['slug'] ?>"><?= __('admin_entries_rename') ?></a>
+                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/rename?entry=<?= $entry['slug'] ?>"><?= __('admin_rename') ?></a>
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/move?entry=<?= $entry['slug'] ?>"><?= __('admin_move') ?></a>
-                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/<?= $entry['slug'] ?>" target="_blank"><?= __('admin_entries_preview') ?></a>
+                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/<?= $entry['slug'] ?>" target="_blank"><?= __('admin_preview') ?></a>
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/entries/type?entry=<?= $entry['slug'] ?>"><?= __('admin_type') ?></a>
                   </div>
                 </div>
-                <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/entries/delete?entry=<?= $entry['slug'] ?>&entry_current=<?= Http::get('entry') ?>&token=<?= Token::generate() ?>"><?= __('admin_entries_delete') ?></a>
+                <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/entries/delete?entry=<?= $entry['slug'] ?>&entry_current=<?= Http::get('entry') ?>&token=<?= Token::generate() ?>"><?= __('admin_delete') ?></a>
             </td>
         </tr>
     <?php endforeach ?>
diff --git a/site/plugins/admin/views/templates/content/entries/media.php b/site/plugins/admin/views/templates/content/entries/media.php
index 593bc931..4c812026 100644
--- a/site/plugins/admin/views/templates/content/entries/media.php
+++ b/site/plugins/admin/views/templates/content/entries/media.php
@@ -10,17 +10,17 @@ use function Flextype\Component\I18n\__;
         ->assign('links', [
                                 'edit_entry'           => [
                                                             'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name,
-                                                            'title'      => __('admin_entries_editor'),
+                                                            'title'      => __('admin_content'),
                                                             'attributes' => ['class' => 'navbar-item']
                                                          ],
                                 'edit_entry_media'     => [
                                                             'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true',
-                                                            'title'      => __('admin_entries_edit_media'),
+                                                            'title'      => __('admin_media'),
                                                             'attributes' => ['class' => 'navbar-item active']
                                                         ],
                                     'edit_entry_source'           => [
                                                                 'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true',
-                                                                'title'      => __('admin_entries_editor_source'),
+                                                                'title'      => __('admin_source'),
                                                                 'attributes' => ['class' => 'navbar-item']
                                                              ]
                             ])
@@ -35,10 +35,10 @@ use function Flextype\Component\I18n\__;
 <div class="input-group">
   <div class="custom-file">
     <input id="file" name="file" type="file" class="custom-file-input" id="inputGroupFile04" aria-describedby="inputGroupFileAddon">
-    <label class="custom-file-label" data-browse="<?= __('admin_entries_browse_files') ?>" for="inputGroupFileAddon"></label>
+    <label class="custom-file-label" data-browse="<?= __('admin_browse_files') ?>" for="inputGroupFileAddon"></label>
   </div>
   <div class="input-group-append">
-    <?= Form::submit('upload_file', __('admin_entries_files_upload'), ['class' => 'btn btn-outline-secondary']) ?>
+    <?= Form::submit('upload_file', __('admin_upload'), ['class' => 'btn btn-outline-secondary']) ?>
   </div>
 </div>
 <?= Form::close() ?>
@@ -75,7 +75,7 @@ use function Flextype\Component\I18n\__;
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="entriesImagePreviewLabel"><?= __('admin_entries_preview') ?></h5>
+        <h5 class="modal-title" id="entriesImagePreviewLabel"><?= __('admin_preview') ?></h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -84,7 +84,7 @@ use function Flextype\Component\I18n\__;
       </div>
       <div class="modal-footer">
           <input type="text" name="" class="form-control js-entry-image-url-placeholder" value="">
-          <a href="#" class="js-entry-image-delete-url-placeholder btn btn-primary"><?= __('admin_entries_files_delete') ?></a>
+          <a href="#" class="js-entry-image-delete-url-placeholder btn btn-primary"><?= __('admin_delete') ?></a>
       </div>
     </div>
   </div>
diff --git a/site/plugins/admin/views/templates/content/entries/move.php b/site/plugins/admin/views/templates/content/entries/move.php
index d20400b6..8d35d2a0 100644
--- a/site/plugins/admin/views/templates/content/entries/move.php
+++ b/site/plugins/admin/views/templates/content/entries/move.php
@@ -10,12 +10,12 @@ use function Flextype\Component\I18n\__;
         ->assign('links', [
                                 'entries'     => [
                                                     'link'  => Http::getBaseUrl() . '/admin/entries',
-                                                    'title' => __('admin_entries_heading'),
+                                                    'title' => __('admin_entries'),
                                                     'attributes' => ['class' => 'navbar-item']
                                                 ],
                                 'entries_move' => [
                                                     'link' => Http::getBaseUrl() . '/admin/entries/move',
-                                                    'title' => __('admin_entries_move'),
+                                                    'title' => __('admin_move'),
                                                     'attributes' => ['class' => 'navbar-item active']
                                                 ]
                          ])
@@ -32,7 +32,7 @@ use function Flextype\Component\I18n\__;
         <?= Form::hidden('entry_parent_current', $entry_parent) ?>
         <?= Form::hidden('name_current', $name_current) ?>
         <div class="form-group">
-           <?= Form::label('parent_entry', __('admin_entries_parent_entry')) ?>
+           <?= Form::label('parent_entry', __('admin_parent_entry')) ?>
            <?= Form::select('parent_entry', $entries_list, $entry_parent, array('class' => 'form-control')) ?>
         </div>
         <?= Form::submit('move_entry', __('admin_save'), ['class' => 'btn btn-black btn-fill btn-wd']) ?>
diff --git a/site/plugins/admin/views/templates/content/entries/rename.php b/site/plugins/admin/views/templates/content/entries/rename.php
index 8843b31a..0f60ac64 100644
--- a/site/plugins/admin/views/templates/content/entries/rename.php
+++ b/site/plugins/admin/views/templates/content/entries/rename.php
@@ -12,12 +12,12 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                             'entries'     => [
                                                 'link'  => Http::getBaseUrl() . '/admin/entries',
-                                                'title' => __('admin_entries_heading'),
+                                                'title' => __('admin_entries'),
                                                 'attributes' => ['class' => 'navbar-item']
                                             ],
                             'entries_add' => [
                                                 'link' => Http::getBaseUrl() . '/admin/entries/rename',
-                                                'title' => __('admin_entries_rename'),
+                                                'title' => __('admin_rename'),
                                                 'attributes' => ['class' => 'navbar-item active']
                                             ]
                      ])
@@ -34,7 +34,7 @@ Themes::view('admin/views/partials/content-start')->display();
         <?= Form::hidden('entry_parent', $entry_parent) ?>
         <?= Form::hidden('name_current', $name_current) ?>
         <div class="form-group">
-            <?= Form::label('name', __('admin_entries_name'), ['for' => 'entryName']) ?>
+            <?= Form::label('name', __('admin_name'), ['for' => 'entryName']) ?>
             <?= Form::input('name', $name_current, ['class' => 'form-control', 'id' => 'entryName',  'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_entries_error_title_empty_input')]) ?>
         </div>
         <?= Form::submit('rename_entry', __('admin_save'), ['class' => 'btn btn-black btn-fill btn-wd']) ?>
diff --git a/site/plugins/admin/views/templates/content/entries/source.php b/site/plugins/admin/views/templates/content/entries/source.php
index 4cb74557..0fba242e 100644
--- a/site/plugins/admin/views/templates/content/entries/source.php
+++ b/site/plugins/admin/views/templates/content/entries/source.php
@@ -10,17 +10,17 @@ use function Flextype\Component\I18n\__;
         ->assign('links', [
                                 'edit_entry'           => [
                                                             'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name,
-                                                            'title'      => __('admin_entries_editor'),
+                                                            'title'      => __('admin_content'),
                                                             'attributes' => ['class' => 'navbar-item']
                                                          ],
                                 'edit_entry_media'     => [
                                                             'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&media=true',
-                                                            'title'      => __('admin_entries_edit_media'),
+                                                            'title'      => __('admin_media'),
                                                             'attributes' => ['class' => 'navbar-item']
                                                         ],
                                     'edit_entry_source'           => [
                                                                 'link'       => Http::getBaseUrl() . '/admin/entries/edit?entry=' . $entry_name . '&source=true',
-                                                                'title'      => __('admin_entries_editor_source'),
+                                                                'title'      => __('admin_source'),
                                                                 'attributes' => ['class' => 'navbar-item active']
                                                              ]
                             ])
diff --git a/site/plugins/admin/views/templates/content/entries/type.php b/site/plugins/admin/views/templates/content/entries/type.php
index 55cb18a9..81b6cd5a 100644
--- a/site/plugins/admin/views/templates/content/entries/type.php
+++ b/site/plugins/admin/views/templates/content/entries/type.php
@@ -10,7 +10,7 @@ use function Flextype\Component\I18n\__;
         ->assign('links', [
                                 'entries'     => [
                                                     'link'  => Http::getBaseUrl() . '/admin/entries',
-                                                    'title' => __('admin_entries_heading'),
+                                                    'title' => __('admin_entries'),
                                                     'attributes' => ['class' => 'navbar-item']
                                                 ],
                                 'entries_move' => [
diff --git a/site/plugins/admin/views/templates/extends/fieldsets/list.php b/site/plugins/admin/views/templates/extends/fieldsets/list.php
index beadc7de..a38d7282 100644
--- a/site/plugins/admin/views/templates/extends/fieldsets/list.php
+++ b/site/plugins/admin/views/templates/extends/fieldsets/list.php
@@ -25,7 +25,7 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th><?= __('admin_entries_name') ?></th>
+            <th><?= __('admin_name') ?></th>
             <th></th>
         </tr>
     </thead>
@@ -42,7 +42,7 @@
                     <span class="sr-only">Toggle Dropdown</span>
                   </button>
                   <div class="dropdown-menu">
-                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/fieldsets/rename?fieldset=<?= $name ?>"><?= __('admin_entries_rename') ?></a>
+                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/fieldsets/rename?fieldset=<?= $name ?>"><?= __('admin_rename') ?></a>
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/fieldsets/duplicate?fieldset=<?= $name ?>&token=<?= Token::generate() ?>"><?= __('admin_duplicate') ?></a>
                   </div>
                 </div>
diff --git a/site/plugins/admin/views/templates/extends/menus/add.php b/site/plugins/admin/views/templates/extends/menus/add.php
index 5d19fed4..8cac6e72 100644
--- a/site/plugins/admin/views/templates/extends/menus/add.php
+++ b/site/plugins/admin/views/templates/extends/menus/add.php
@@ -13,7 +13,7 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                         'menus' => [
                                         'link' => Http::getBaseUrl() . '/admin/menus',
-                                        'title' => __('admin_menus_heading'),
+                                        'title' => __('admin_menus'),
                                         'attributes' => ['class' => 'navbar-item']
                                     ],
                        'menus_add' => [
diff --git a/site/plugins/admin/views/templates/extends/menus/list.php b/site/plugins/admin/views/templates/extends/menus/list.php
index e8107e25..680a5a9a 100644
--- a/site/plugins/admin/views/templates/extends/menus/list.php
+++ b/site/plugins/admin/views/templates/extends/menus/list.php
@@ -6,7 +6,7 @@
     ->assign('links',   [
                             'menus' => [
                                             'link' => Http::getBaseUrl() . '/admin/menus',
-                                            'title' => __('admin_menus_heading'),
+                                            'title' => __('admin_menus'),
                                             'attributes' => ['class' => 'navbar-item active']
                                        ]
                         ])
@@ -25,7 +25,7 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th><?= __('admin_entries_name') ?></th>
+            <th><?= __('admin_name') ?></th>
             <th></th>
         </tr>
     </thead>
diff --git a/site/plugins/admin/views/templates/extends/menus/rename.php b/site/plugins/admin/views/templates/extends/menus/rename.php
index 48e04e03..af8c16f5 100644
--- a/site/plugins/admin/views/templates/extends/menus/rename.php
+++ b/site/plugins/admin/views/templates/extends/menus/rename.php
@@ -13,7 +13,7 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                         'menus' => [
                                         'link' => Http::getBaseUrl() . '/admin/menus',
-                                        'title' => __('admin_menus_heading'),
+                                        'title' => __('admin_menus'),
                                         'attributes' => ['class' => 'navbar-item']
                                     ],
                        'menus_add' => [
@@ -32,7 +32,7 @@ Themes::view('admin/views/partials/content-start')->display();
         <?= Form::hidden('token', Token::generate()) ?>
         <?= Form::hidden('name_current', $name_current) ?>
         <div class="form-group">
-            <?= Form::label('name', __('admin_menu_name'), ['for' => 'menuName']) ?>
+            <?= Form::label('name', __('admin_name'), ['for' => 'menuName']) ?>
             <?= Form::input('name', $name_current, ['class' => 'form-control', 'id' => 'menuName',  'required', 'data-validation' => 'length required', 'data-validation-allowing' => '-_', 'data-validation-length' => 'min1', 'data-validation-error-msg' => __('admin_menu_error_title_empty_input')]) ?>
         </div>
         <?= Form::submit('rename_menu', __('admin_save'), ['class' => 'btn btn-black btn-fill btn-wd']) ?>
diff --git a/site/plugins/admin/views/templates/extends/plugins/list.php b/site/plugins/admin/views/templates/extends/plugins/list.php
index 0b2ddad3..75238dcd 100644
--- a/site/plugins/admin/views/templates/extends/plugins/list.php
+++ b/site/plugins/admin/views/templates/extends/plugins/list.php
@@ -9,14 +9,14 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links',   [
                             'plugins'          => [
                                                         'link'       => Http::getBaseUrl() . '/admin/plugins',
-                                                        'title'      => __('admin_plugins_heading'),
+                                                        'title'      => __('admin_plugins'),
                                                         'attributes' => ['class' => 'navbar-item active']
                                                   ]
                         ])
     ->assign('buttons', [
                             'plugins_get_more' => [
                                                 'link' => 'http://flextype.org/download/plugins',
-                                                'title' => __('admin_plugins_get_more_plugins'),
+                                                'title' => __('admin_get_more_plugins'),
                                                 'attributes' => ['class' => 'float-right btn', 'target' => '_blank']
                                             ]
                         ])
@@ -31,9 +31,9 @@ Themes::view('admin/views/partials/content-start')->display();
 <table class="table no-margin">
   <thead>
       <tr>
-          <th><?= __('admin_plugins_name') ?></th>
+          <th><?= __('admin_name') ?></th>
           <th></th>
-          <th width="90" class="text-right"><?= __('admin_plugins_status') ?></th>
+          <th width="90" class="text-right"><?= __('admin_status') ?></th>
       </tr>
   </thead>
   <tbody>
@@ -51,7 +51,7 @@ Themes::view('admin/views/partials/content-start')->display();
                   data-homepage="<?= $plugin['homepage'] ?>"
                   data-bugs="<?= $plugin['bugs']; ?>"
                   data-license="<?= $plugin['license'] ?>"
-                  ><?= __('admin_plugins_info') ?></a>
+                  ><?= __('admin_info') ?></a>
           </td>
           <td class="text-right">
               <div class="form-group no-margin">
@@ -71,21 +71,21 @@ Themes::view('admin/views/partials/content-start')->display();
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="pluginInfoModalLabel"><?= __('admin_plugins_info') ?></h5>
+        <h5 class="modal-title" id="pluginInfoModalLabel"><?= __('admin_info') ?></h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
       <div class="modal-body">
-          <p><b><?= __('admin_plugins_name') ?>: </b><span class="js-plugin-name-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_version') ?>: </b><span class="js-plugin-version-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_description') ?>: </b><span class="js-plugin-description-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_author_name') ?>: </b><span class="js-plugin-author-name-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_author_email') ?>: </b><span class="js-plugin-author-email-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_author_url') ?>: </b><span class="js-plugin-author-url-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_homepage') ?>: </b><span class="js-plugin-homepage-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_bugs') ?>: </b><span class="js-plugin-bugs-placeholder"></span></p>
-          <p><b><?= __('admin_plugins_license') ?>: </b><span class="js-plugin-license-placeholder"></span></p>
+          <p><b><?= __('admin_name') ?>: </b><span class="js-plugin-name-placeholder"></span></p>
+          <p><b><?= __('admin_version') ?>: </b><span class="js-plugin-version-placeholder"></span></p>
+          <p><b><?= __('admin_description') ?>: </b><span class="js-plugin-description-placeholder"></span></p>
+          <p><b><?= __('admin_author_name') ?>: </b><span class="js-plugin-author-name-placeholder"></span></p>
+          <p><b><?= __('admin_author_email') ?>: </b><span class="js-plugin-author-email-placeholder"></span></p>
+          <p><b><?= __('admin_author_url') ?>: </b><span class="js-plugin-author-url-placeholder"></span></p>
+          <p><b><?= __('admin_homepage') ?>: </b><span class="js-plugin-homepage-placeholder"></span></p>
+          <p><b><?= __('admin_bugs') ?>: </b><span class="js-plugin-bugs-placeholder"></span></p>
+          <p><b><?= __('admin_license') ?>: </b><span class="js-plugin-license-placeholder"></span></p>
       </div>
     </div>
   </div>
diff --git a/site/plugins/admin/views/templates/extends/snippets/list.php b/site/plugins/admin/views/templates/extends/snippets/list.php
index c19d44b1..dce6fa2f 100644
--- a/site/plugins/admin/views/templates/extends/snippets/list.php
+++ b/site/plugins/admin/views/templates/extends/snippets/list.php
@@ -25,7 +25,7 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th><?= __('admin_entries_name') ?></th>
+            <th><?= __('admin_name') ?></th>
             <th></th>
         </tr>
     </thead>
@@ -37,17 +37,17 @@
             </td>
             <td class="text-right">
                 <div class="btn-group">
-                  <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/snippets/edit?snippet=<?= basename($snippet, '.php') ?>"><?= __('admin_entries_edit') ?></a>
+                  <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/snippets/edit?snippet=<?= basename($snippet, '.php') ?>"><?= __('admin_edit') ?></a>
                   <button type="button" class="btn btn-default dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="sr-only">Toggle Dropdown</span>
                   </button>
                   <div class="dropdown-menu">
-                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/snippets/rename?snippet=<?= basename($snippet, '.php') ?>"><?= __('admin_entries_rename') ?></a>
+                    <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/snippets/rename?snippet=<?= basename($snippet, '.php') ?>"><?= __('admin_rename') ?></a>
                     <a class="dropdown-item" href="<?= Http::getBaseUrl() ?>/admin/snippets/duplicate?snippet=<?= basename($snippet, '.php') ?>&token=<?= Token::generate() ?>"><?= __('admin_duplicate') ?></a>
                     <a class="dropdown-item js-snippets-info" href="javascript:;"  data-toggle="modal" data-target="#snippetsInfoModal" data-name="<?= basename($snippet, '.php') ?>"><?= __('admin_embeded_code') ?></a>
                   </div>
                 </div>
-                <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/snippets/delete?snippet=<?= basename($snippet, '.php') ?>&token=<?= Token::generate() ?>"><?= __('admin_entries_delete') ?></a>
+                <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/snippets/delete?snippet=<?= basename($snippet, '.php') ?>&token=<?= Token::generate() ?>"><?= __('admin_delete') ?></a>
             </td>
         </tr>
     <?php endforeach ?>
diff --git a/site/plugins/admin/views/templates/extends/templates/list.php b/site/plugins/admin/views/templates/extends/templates/list.php
index 579ae03e..f6065018 100644
--- a/site/plugins/admin/views/templates/extends/templates/list.php
+++ b/site/plugins/admin/views/templates/extends/templates/list.php
@@ -25,7 +25,7 @@
 <table class="table no-margin">
     <thead>
         <tr>
-            <th><?= __('admin_entries_name') ?></th>
+            <th><?= __('admin_name') ?></th>
             <th><?= __('admin_type') ?></th>
             <th></th>
         </tr>
diff --git a/site/plugins/admin/views/templates/system/information/list.php b/site/plugins/admin/views/templates/system/information/list.php
index 33d6dbf4..f6827b85 100644
--- a/site/plugins/admin/views/templates/system/information/list.php
+++ b/site/plugins/admin/views/templates/system/information/list.php
@@ -8,7 +8,7 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                         'information' => [
                                             'link' => Http::getBaseUrl() . '/admin/information',
-                                            'title' => __('admin_menu_system_information'),
+                                            'title' => __('admin_information'),
                                             'attributes' => ['class' => 'navbar-item active']
                                          ],
                       ])
@@ -16,7 +16,7 @@ Themes::view('admin/views/partials/navbar')
 Themes::view('admin/views/partials/content-start')->display();
 ?>
 
-<h3 class="h3"><?= __('admin_system_settings_system') ?></h3>
+<h3 class="h3"><?= __('admin_system') ?></h3>
 
 <table class="table no-margin">
     <tbody>
diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php
index 6a097be4..60d30ec3 100644
--- a/site/plugins/admin/views/templates/system/settings/list.php
+++ b/site/plugins/admin/views/templates/system/settings/list.php
@@ -8,7 +8,7 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links',   [
                             'settings' => [
                                                 'link' => Http::getBaseUrl() . '/admin/settings',
-                                                'title' => __('admin_system_settings_heading'),
+                                                'title' => __('admin_settings'),
                                                 'attributes' => ['class' => 'navbar-item active']
                                           ]
                         ])
@@ -20,7 +20,7 @@ Themes::view('admin/views/partials/navbar')
                                               ],
                               'settings_clear_cache' => [
                                                   'link' => Http::getBaseUrl() . '/admin/settings?clear_cache=1&token='.Token::generate(),
-                                                  'title' => __('admin_system_clear_cache'),
+                                                  'title' => __('admin_clear_cache'),
                                                   'attributes' => ['class' => 'float-right btn']
                                             ]
                         ])
@@ -34,231 +34,231 @@ Themes::view('admin/views/partials/content-start')->display();
 <div class="row">
 
     <div class="col-md-12">
-        <h3 class="h3"><?=  __('admin_system_settings_site'); ?></h3>
+        <h3 class="h3"><?=  __('admin_site'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('title', __('admin_system_settings_site_title'), ['for' => 'systemSettingsSiteTitle']) ?>
+            <?= Form::label('title', __('admin_site_title'), ['for' => 'systemSettingsSiteTitle']) ?>
             <?= Form::input('title', $settings['title'], ['class' => 'form-control', 'id' => 'systemSettingsSiteTitle', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('description', __('admin_system_settings_site_description'), ['for' => 'systemSettingsSiteDescription']) ?>
+            <?= Form::label('description', __('admin_site_description'), ['for' => 'systemSettingsSiteDescription']) ?>
             <?= Form::input('description', $settings['description'], ['class' => 'form-control margin-hard-bottom', 'id' => 'systemSettingsSiteDescription']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('keywords', __('admin_system_settings_site_keywords'), ['for' => 'systemSettingsSiteKeywords']) ?>
+            <?= Form::label('keywords', __('admin_site_keywords'), ['for' => 'systemSettingsSiteKeywords']) ?>
             <?= Form::input('keywords', $settings['keywords'], ['class' => 'form-control', 'id' => 'systemSettingsSiteKeywords', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('robots', __('admin_system_settings_site_robots'), ['for' => 'systemSettingsSiteRobots']) ?>
+            <?= Form::label('robots', __('admin_site_robots'), ['for' => 'systemSettingsSiteRobots']) ?>
             <?= Form::input('robots', $settings['robots'], ['class' => 'form-control', 'id' => 'systemSettingsSiteRobots', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('author[name]', __('admin_system_settings_site_author_name'), ['for' => 'systemSettingsSiteAuthorName']) ?>
+            <?= Form::label('author[name]', __('admin_author_name'), ['for' => 'systemSettingsSiteAuthorName']) ?>
             <?= Form::input('author[name]', $settings['author']['name'], ['class' => 'form-control', 'id' => 'systemSettingsSiteAuthorName', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('author[email]', __('admin_system_settings_site_author_email'), ['for' => 'systemSettingsSiteAuthorEmail']) ?>
+            <?= Form::label('author[email]', __('admin_author_email'), ['for' => 'systemSettingsSiteAuthorEmail']) ?>
             <?= Form::input('author[email]', $settings['author']['email'], ['class' => 'form-control', 'id' => 'systemSettingsSiteAuthorEmail', 'required']) ?>
         </div>
     </div>
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?=  __('admin_system_settings_general'); ?></h3>
+        <h3 class="h3"><?=  __('admin_general'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('timezone', __('admin_system_settings_system_timezone'), ['for' => 'systemSettingsSystemTimezone']) ?>
+            <?= Form::label('timezone', __('admin_timezone'), ['for' => 'systemSettingsSystemTimezone']) ?>
             <?= Form::select('timezone', Date::timezones(), $settings['timezone'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTimezone', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('date_format', __('admin_system_settings_system_date_format'), ['for' => 'systemSettingsSystemDateFormat']) ?>
+            <?= Form::label('date_format', __('admin_date_format'), ['for' => 'systemSettingsSystemDateFormat']) ?>
             <?= Form::input('date_format', $settings['date_format'], ['class' => 'form-control', 'id' => 'systemSettingsSystemDateFormat', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('charset', __('admin_system_settings_system_charset'), ['for' => 'systemSettingsSystemCharset']) ?>
+            <?= Form::label('charset', __('admin_charset'), ['for' => 'systemSettingsSystemCharset']) ?>
             <?= Form::input('charset', $settings['charset'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCharset', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('theme', __('admin_system_settings_system_theme'), ['for' => 'systemSettingsSystemTheme']) ?>
+            <?= Form::label('theme', __('admin_theme'), ['for' => 'systemSettingsSystemTheme']) ?>
             <?= Form::select('theme', $themes, $settings['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('locale', __('admin_system_settings_system_locale'), ['for' => 'systemSettingsSystemLocale']) ?>
+            <?= Form::label('locale', __('admin_locale'), ['for' => 'systemSettingsSystemLocale']) ?>
             <?= Form::select('locale', $locales, $settings['locale'], ['class' => 'form-control', 'id' => 'entryTemplate']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('entries[main]', __('admin_system_settings_system_entries_main'), ['for' => 'systemSettingsSystemEntriesMain']) ?>
+            <?= Form::label('entries[main]', __('admin_entry_main'), ['for' => 'systemSettingsSystemEntriesMain']) ?>
             <?= Form::select('entries[main]', $entries, $settings['entries']['main'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesMain', 'required']) ?>
         </div>
     </div>
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?=  __('admin_system_settings_media'); ?></h3>
+        <h3 class="h3"><?=  __('admin_media'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('entries[media][upload_images_quality]', __('admin_system_settings_system_upload_images_quality'), ['for' => 'systemSettingsSystemTheme']) ?>
+            <?= Form::label('entries[media][upload_images_quality]', __('admin_quality'), ['for' => 'systemSettingsSystemTheme']) ?>
             <?= Form::input('entries[media][upload_images_quality]', $settings['entries']['media']['upload_images_quality'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('entries[media][accept_file_types]', __('admin_system_settings_system_upload_accept_file_types'), ['for' => 'systemSettingsSystemTheme']) ?>
+            <?= Form::label('entries[media][accept_file_types]', __('admin_accept_file_types'), ['for' => 'systemSettingsSystemTheme']) ?>
             <?= Form::input('entries[media][accept_file_types]', $settings['entries']['media']['accept_file_types'] , ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('entries[media][upload_images_width]', __('admin_system_settings_system_upload_images_width'), ['for' => 'systemSettingsSystemTheme']) ?>
+            <?= Form::label('entries[media][upload_images_width]', __('admin_width'), ['for' => 'systemSettingsSystemTheme']) ?>
             <?= Form::input('entries[media][upload_images_width]', $settings['entries']['media']['upload_images_width'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('entries[media][upload_images_height]', __('admin_system_settings_system_upload_images_height'), ['for' => 'systemSettingsSystemEntriesMain']) ?>
+            <?= Form::label('entries[media][upload_images_height]', __('admin_height'), ['for' => 'systemSettingsSystemEntriesMain']) ?>
             <?= Form::input('entries[media][upload_images_height]', $settings['entries']['media']['upload_images_height'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesMain', 'required']) ?>
         </div>
     </div>
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?= __('admin_system_settings_error_404_page'); ?></h3>
+        <h3 class="h3"><?= __('admin_error_404_page'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('entries[error404][title]', __('admin_system_settings_system_entries_error404_title'), ['for' => 'systemSettingsSystemEntriesError404Title']) ?>
+            <?= Form::label('entries[error404][title]', __('admin_error404_title'), ['for' => 'systemSettingsSystemEntriesError404Title']) ?>
             <?= Form::input('entries[error404][title]', $settings['entries']['error404']['title'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Title', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('entries[error404][description]', __('admin_system_settings_system_entries_error404_description'), ['for' => 'systemSettingsSystemEntriesError404Description']) ?>
+            <?= Form::label('entries[error404][description]', __('admin_error404_description'), ['for' => 'systemSettingsSystemEntriesError404Description']) ?>
             <?= Form::input('entries[error404][description]', $settings['entries']['error404']['description'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Description', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('entries[error404][content]', __('admin_system_settings_system_entries_error404_content'), ['for' => 'systemSettingsSystemEntriesError404Content']) ?>
+            <?= Form::label('entries[error404][content]', __('admin_error404_content'), ['for' => 'systemSettingsSystemEntriesError404Content']) ?>
             <?= Form::input('entries[error404][content]', $settings['entries']['error404']['content'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Content', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('entries[error404][template]', __('admin_system_settings_system_entries_error404_template'), ['for' => 'systemSettingsSystemEntriesError404Template']) ?>
+            <?= Form::label('entries[error404][template]', __('admin_error404_template'), ['for' => 'systemSettingsSystemEntriesError404Template']) ?>
             <?= Form::input('entries[error404][template]', $settings['entries']['error404']['template'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Template', 'required']) ?>
         </div>
     </div>
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?=  __('admin_system_settings_debuggig'); ?></h3>
+        <h3 class="h3"><?=  __('admin_debugging'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('errors[display]', __('admin_system_settings_system_errors_display'), ['for' => 'systemSettingsSystemErrorsDisplay']) ?>
-            <?= Form::select('errors[display]', [0 => __('admin_system_settings_system_errors_enabled_false'), 1 => __('admin_system_settings_system_errors_enabled_true')], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?>
+            <?= Form::label('errors[display]', __('admin_errors_display'), ['for' => 'systemSettingsSystemErrorsDisplay']) ?>
+            <?= Form::select('errors[display]', [0 => __('admin_disabled'), 1 => __('admin_enabled')], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?>
         </div>
     </div>
 
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?=  __('admin_system_settings_cache'); ?></h3>
+        <h3 class="h3"><?=  __('admin_cache'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[enabled]', __('admin_system_settings_system_cache_enabled'), ['for' => 'systemSettingsSystemCacheEnabled']) ?>
-            <?= Form::select('cache[enabled]', [0 => __('admin_system_settings_system_cache_enabled_false'), 1 => __('admin_system_settings_system_cache_enabled_true')], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?>
+            <?= Form::label('cache[enabled]', __('admin_cache_enabled'), ['for' => 'systemSettingsSystemCacheEnabled']) ?>
+            <?= Form::select('cache[enabled]', [0 => __('admin_disabled'), 1 => __('admin_enabled')], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[prefix]', __('admin_system_settings_system_cache_prefix'), ['for' => 'systemSettingsSystemCachePrefix']) ?>
+            <?= Form::label('cache[prefix]', __('admin_cache_prefix'), ['for' => 'systemSettingsSystemCachePrefix']) ?>
             <?= Form::input('cache[prefix]', $settings['cache']['prefix'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCachePrefix', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[driver]', __('admin_system_settings_system_cache_driver'), ['for' => 'systemSettingsSystemCacheDriver']) ?>
+            <?= Form::label('cache[driver]', __('admin_cache_driver'), ['for' => 'systemSettingsSystemCacheDriver']) ?>
             <?= Form::select('cache[driver]', $cache_driver, $settings['cache']['driver'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheDriver', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[lifetime]', __('admin_system_settings_system_cache_lifetime'), ['for' => 'systemSettingsSystemCacheLifetime']) ?>
+            <?= Form::label('cache[lifetime]', __('admin_cache_lifetime'), ['for' => 'systemSettingsSystemCacheLifetime']) ?>
             <?= Form::input('cache[lifetime]', $settings['cache']['lifetime'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheLifetime', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[memcache][server]', __('admin_system_settings_cache_memcache_server'), ['for' => 'systemSettingsSystemCacheMemcacheServer']) ?>
+            <?= Form::label('cache[memcache][server]', __('admin_memcache_server'), ['for' => 'systemSettingsSystemCacheMemcacheServer']) ?>
             <?= Form::input('cache[memcache][server]', $settings['cache']['memcache']['server'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheMemcacheServer', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[memcache][port]', __('admin_system_settings_cache_memcache_port'), ['for' => 'systemSettingsSystemCacheMemcachePort']) ?>
+            <?= Form::label('cache[memcache][port]', __('admin_memcache_port'), ['for' => 'systemSettingsSystemCacheMemcachePort']) ?>
             <?= Form::input('cache[memcache][port]', $settings['cache']['memcache']['port'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheMemcachePort', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[memcached][server]', __('admin_system_settings_cache_memcached_server'), ['for' => 'systemSettingsSystemCacheMemcachedServer']) ?>
+            <?= Form::label('cache[memcached][server]', __('admin_memcached_server'), ['for' => 'systemSettingsSystemCacheMemcachedServer']) ?>
             <?= Form::input('cache[memcached][server]', $settings['cache']['memcached']['server'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheMemcachedServer', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[memcached][port]', __('admin_system_settings_cache_memcached_port'), ['for' => 'systemSettingsSystemCacheMemcachedPort']) ?>
+            <?= Form::label('cache[memcached][port]', __('admin_memcached_port'), ['for' => 'systemSettingsSystemCacheMemcachedPort']) ?>
             <?= Form::input('cache[memcached][port]', $settings['cache']['memcached']['port'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheMemcachedPort', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[redis][socket]', __('admin_system_settings_cache_redis_socket'), ['for' => 'systemSettingsSystemCacheRedisSocket']) ?>
+            <?= Form::label('cache[redis][socket]', __('admin_redis_socket'), ['for' => 'systemSettingsSystemCacheRedisSocket']) ?>
             <?= Form::input('cache[redis][socket]', $settings['cache']['redis']['socket'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheRedisSocket', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[redis][password]', __('admin_system_settings_cache_redis_password'), ['for' => 'systemSettingsSystemCacheRedisPassword']) ?>
+            <?= Form::label('cache[redis][password]', __('admin_redis_password'), ['for' => 'systemSettingsSystemCacheRedisPassword']) ?>
             <?= Form::input('cache[redis][password]', $settings['cache']['redis']['password'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheRedisPassword', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[redis][server]', __('admin_system_settings_cache_redis_server'), ['for' => 'systemSettingsSystemCacheRedisServer']) ?>
+            <?= Form::label('cache[redis][server]', __('admin_redis_server'), ['for' => 'systemSettingsSystemCacheRedisServer']) ?>
             <?= Form::input('cache[redis][server]', $settings['cache']['redis']['server'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheRedisServer', 'required']) ?>
         </div>
         <div class="form-group">
-            <?= Form::label('cache[redis][port]', __('admin_system_settings_cache_redis_port'), ['for' => 'systemSettingsSystemCacheRedisPort']) ?>
+            <?= Form::label('cache[redis][port]', __('admin_redis_port'), ['for' => 'systemSettingsSystemCacheRedisPort']) ?>
             <?= Form::input('cache[redis][port]', $settings['cache']['redis']['port'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheRedisPort', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[sqlite3][database]', __('admin_system_settings_cache_sqlite3_database'), ['for' => 'systemSettingsSystemCacheSQLite3Database']) ?>
+            <?= Form::label('cache[sqlite3][database]', __('admin_sqlite3_database'), ['for' => 'systemSettingsSystemCacheSQLite3Database']) ?>
             <?= Form::input('cache[sqlite3][database]', $settings['cache']['sqlite3']['database'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheSQLite3Database', 'required']) ?>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('cache[sqlite3][table]', __('admin_system_settings_cache_sqlite3_table'), ['for' => 'systemSettingsSystemCacheSQLite3Table']) ?>
+            <?= Form::label('cache[sqlite3][table]', __('admin_sqlite3_table'), ['for' => 'systemSettingsSystemCacheSQLite3Table']) ?>
             <?= Form::input('cache[sqlite3][table]', $settings['cache']['sqlite3']['table'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheSQLite3Table', 'required']) ?>
         </div>
     </div>
 
     <div class="col-md-12">
         <br>
-        <h3 class="h3"><?=  __('admin_system_settings_admin_panel'); ?></h3>
+        <h3 class="h3"><?=  __('admin_admin_panel'); ?></h3>
         <hr>
     </div>
 
     <div class="col-md-6">
         <div class="form-group">
-            <?= Form::label('admin_panel[theme]', __('admin_system_settings_admin_panel_theme'), ['for' => 'systemSettingsSystemAdminPanelTheme']) ?>
-            <?= Form::select('admin_panel[theme]', ['light' => __('admin_system_settings_admin_panel_theme_light'), 'dark' => __('admin_system_settings_admin_panel_theme_dark')], $settings['admin_panel']['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemAdminPanelTheme', 'required']) ?>
+            <?= Form::label('admin_panel[theme]', __('admin_theme'), ['for' => 'systemSettingsSystemAdminPanelTheme']) ?>
+            <?= Form::select('admin_panel[theme]', ['light' => __('admin_light'), 'dark' => __('admin_dark')], $settings['admin_panel']['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemAdminPanelTheme', 'required']) ?>
         </div>
     </div>
 </div>
diff --git a/site/plugins/admin/views/templates/users/profile.php b/site/plugins/admin/views/templates/users/profile.php
index 3af347b8..31cf7929 100644
--- a/site/plugins/admin/views/templates/users/profile.php
+++ b/site/plugins/admin/views/templates/users/profile.php
@@ -9,7 +9,7 @@ Themes::view('admin/views/partials/navbar')
     ->assign('links', [
                         'information' => [
                                             'link' => Http::getBaseUrl() . '/admin/profile',
-                                            'title' => __('admin_menu_profile'),
+                                            'title' => __('admin_profile'),
                                             'attributes' => ['class' => 'navbar-item active']
                                          ],
                       ])
@@ -22,7 +22,7 @@ Themes::view('admin/views/partials/content-start')->display();
     <?= __('admin_username') ?>: <?= Session::get('username') ?> <br>
     <?= __('admin_role') ?>: <?= Session::get('role') ?> <br>
     <br>
-    <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/logout?token=<?= Token::generate() ?>"><?= __('admin_menu_logout') ?></a>
+    <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/logout?token=<?= Token::generate() ?>"><?= __('admin_logout') ?></a>
 </div>
 
 <?php Themes::view('admin/views/partials/content-end')->display() ?>