diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en.yaml
index 673ee221..cd059dc5 100755
--- a/site/plugins/admin/languages/en.yaml
+++ b/site/plugins/admin/languages/en.yaml
@@ -1,109 +1,72 @@
 admin: "Admin"
-admin_cache: "Cache"
 admin_cancel: "Cancel"
 admin_create: "Create"
 admin_debugging: "Debugging"
-admin_description: "Description"
 admin_email: "Email"
 admin_flextype_version: "Flextype Version"
-admin_information_heading: "Information"
+admin_information: "Information"
 admin_installed: "Installed"
 admin_keywords: "Keywords"
 admin_login: "Login"
-admin_menu_content_entries: "Entries"
-admin_menu_extends: "Extends"
-admin_menu_extends_plugins: "Plugins"
-admin_menu_extends_themes: "Themes"
-admin_menu_help: "Help"
-admin_menu_help_documentation: "Getting Help"
-admin_menu_logout: "Logout"
-admin_menu_entries: "Entries"
-admin_menu_profile: "Profile"
-admin_menu_system: "System"
-admin_menu_system_information: "Information"
-admin_menu_system_settings: "Settings"
-admin_menu_view_site: "View Site"
-admin_menu_extends_snippets: "Snippets"
-admin_message_cache_files_deleted: "Cache files deleted"
-admin_message_entry_changes_saved: "Changes successfully saved"
-admin_message_entry_cloned: "Entry cloned"
-admin_message_entry_created: "Entry created"
-admin_message_entry_deleted: "Entry deleted"
-admin_message_entry_file_deleted: "File successfully deleted"
-admin_message_entry_file_uploaded: "File successfully uploaded"
-admin_message_entry_file_not_uploaded: "File was not uploaded"
-admin_message_entry_moved: "Entry moved"
-admin_message_entry_renamed: "Entry renamed"
-admin_message_settings_saved: "Settings saved"
-admin_message_wrong_username_password: "Wrong username or password"
+admin_entries: "Entries"
+admin_extends: "Extends"
+admin_plugins: "Plugins"
+admin_themes: "Themes"
+admin_help: "Help"
+admin_getting_help: "Getting Help"
+admin_logout: "Logout"
+admin_profile: "Profile"
+admin_view_site: "View Site"
+admin_snippets: "Snippets"
 admin_not_installed: "Not Installed"
-admin_off: "off"
-admin_on: "on"
+admin_off: "Off"
+admin_on: "On"
 admin_add: "Add"
-admin_entries_attributes: "Entry Attributes"
-admin_entries_fieldset_for_template: "Fieldset for template"
+admin_entry_attributes: "Entry Attributes"
+admin_fieldset_for_template: "Fieldset for template"
 admin_content: "Content"
-admin_entries_create_new: "Create New Entry"
+admin_create_new_entry: "Create New Entry"
 admin_date: "Date"
-admin_entries_delete: "Delete"
-admin_entries_description: "Description"
-admin_entries_draft: "Draft"
-admin_entries_edit: "Edit"
-admin_menu_content_menus: "Menus"
-admin_entries_edit_blocks: "Blocks"
-admin_entries_edit_media: "Media"
-admin_entries_edit_entry: "Edit entry"
-admin_entries_edit_settings: "Settings"
-admin_entries_edit_template: "Template"
-admin_entries_edit_templates: "Templates"
-admin_entries_editor: "Entry"
-admin_entries_editor_fieldset: "Fieldset"
-admin_entries_editor_source: "Source"
-admin_entries_editor_template: "Template"
-admin_entries_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_entries_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"
-admin_entries_files: "Files"
-admin_entries_files_delete: "Delete"
-admin_entries_files_upload: "Upload"
-admin_entries_heading: "Entries"
-admin_entries_hidden: "Hidden"
-admin_entries_image_preview: "Image preview"
+admin_draft: "Draft"
+admin_edit: "Edit"
+admin_menus: "Menus"
+admin_blocks: "Blocks"
+admin_media: "Media"
+admin_settings: "Settings"
+admin_templates: "Templates"
+admin_entry: "Entry"
+admin_fieldset: "Fieldset"
+admin_source: "Source"
+admin_files: "Files"
+admin_upload: "Upload"
+admin_hidden: "Hidden"
+admin_image_preview: "Image preview"
 admin_move: "Move"
-admin_entries_name: "Name"
-admin_entries_entry: "Entry"
-admin_entries_parent_entry: "Entry parent"
-admin_entries_preview: "Preview"
-admin_entries_publish: "Publish"
-admin_entries_rename: "Rename"
-admin_entries_rename_entry: "Rename"
-admin_entries_save_entry: "Save entry"
-admin_entries_settings: "Settings"
-admin_entries_switch_back_to_editor_mode: "Editor mode"
-admin_entries_switch_to_expert_mode: "Expert mode"
-admin_entries_template: "Template"
-admin_entries_title: "Title"
-admin_entries_url: "Url"
-admin_entries_view: "View"
+admin_parent_entry: "Entry parent"
+admin_preview: "Preview"
+admin_publish: "Publish"
+admin_rename: "Rename"
+admin_save_entry: "Save entry"
+admin_template: "Template"
+admin_title: "Title"
+admin_url: "Url"
+admin_view: "View"
 admin_visibility: "Visibility"
-admin_entries_visible: "Visible"
+admin_visible: "Visible"
 admin_password: "Password"
 admin_php_built_on: "PHP Built On"
 admin_php_version: "PHP Version"
-admin_plugins_author_email: "Author email"
-admin_plugins_author_name: "Author name"
-admin_plugins_author_url: "Author url"
-admin_plugins_bugs: "Bugs"
-admin_plugins_description: "Description"
-admin_plugins_get_more_plugins: "Get More Plugins"
-admin_plugins_heading: "Plugins"
-admin_plugins_homepage: "Homepage"
-admin_plugins_info: "Info"
-admin_plugins_license: "License"
-admin_plugins_name: "Name"
-admin_plugins_status: "Status"
-admin_plugins_status_disabled: "disabled"
-admin_plugins_status_enabled: "enabled"
-admin_plugins_version: "Version"
+admin_author_url: "Author url"
+admin_bugs: "Bugs"
+admin_description: "Description"
+admin_get_more_plugins: "Get More Plugins"
+admin_homepage: "Homepage"
+admin_info: "Info"
+admin_license: "License"
+admin_status: "Status"
+admin_disabled: "disabled"
+admin_enabled: "enabled"
+admin_version: "Version"
 admin_role: "Role"
 admin_save: "Save"
 admin_security_check_results: "Security check results"
@@ -111,75 +74,53 @@ admin_security_check_results_debug: "Due to the type and amount of information a
 admin_security_check_results_htaccess: "The Flextype .htaccess file has been found to be writable. We would advise you to remove all write permissions. <br>You can do this on unix systems with: <code>chmod a-w :path</code>"
 admin_security_check_results_index: "The Flextype index.php file has been found to be writable. We would advise you to remove all write permissions. <br>You can do this on unix systems with: <code>chmod a-w :path</code>"
 admin_server: "Server"
-admin_settings: "Settings"
 admin_site: "Site"
+admin_clear_cache: "Clear cache"
+admin_error404_title: "Error404 entry title"
+admin_error404_description: "Error404 entry description"
+admin_error404_content: "Error404 entry content"
+admin_error404_template: "Error404 entry template"
+admin_heading: "Settings"
+admin_general: "General"
+admin_error_404_page: "Error 404 page"
+admin_cache: "Cache"
+admin_author_email: "Author email"
+admin_author_name: "Author name"
+admin_site_description: "Site description"
+admin_site_keywords: "Site keywords"
+admin_site_robots: "Robots"
+admin_site_title: "Site title"
 admin_system: "System"
-admin_system_clear_cache: "Clear cache"
-admin_system_settings_system_entries_error404_title: "Error404 entry title"
-admin_system_settings_system_entries_error404_description: "Error404 entry description"
-admin_system_settings_system_entries_error404_content: "Error404 entry content"
-admin_system_settings_system_entries_error404_template: "Error404 entry template"
-admin_system_settings_heading: "Settings"
-admin_system_settings_site: "Site"
-admin_system_settings_general: "General"
-admin_system_settings_error_404_page: "Error 404 page"
-admin_system_settings_debuggig: "Debugging"
-admin_system_settings_cache: "Cache"
-admin_system_settings_site_author_email: "Author email"
-admin_system_settings_site_author_name: "Author name"
-admin_system_settings_site_description: "Site description"
-admin_system_settings_site_keywords: "Site keywords"
-admin_system_settings_site_robots: "Robots"
-admin_system_settings_site_title: "Site title"
-admin_system_settings_system: "System"
-admin_system_settings_system_cache_driver: "Cache driver"
-admin_system_settings_system_cache_enabled: "Cache enabled"
-admin_system_settings_system_cache_lifetime: "Cache lifetime"
-admin_system_settings_system_cache_prefix: "Cache prefix"
-admin_system_settings_system_charset: "Charset"
-admin_system_settings_system_date_format: "Date format"
-admin_system_settings_system_errors_display: "Display errors"
-admin_system_settings_system_locale: "Locale"
-admin_system_settings_system_entries_main: "Main entry"
-admin_system_settings_system_theme: "Theme"
-admin_system_settings_system_timezone: "Timezone"
+admin_cache_driver: "Cache driver"
+admin_cache_enabled: "Cache enabled"
+admin_cache_lifetime: "Cache lifetime"
+admin_cache_prefix: "Cache prefix"
+admin_charset: "Charset"
+admin_date_format: "Date format"
+admin_errors_display: "Display errors"
+admin_locale: "Locale"
+admin_entry_main: "Main entry"
+admin_theme: "Theme"
+admin_timezone: "Timezone"
 admin_username: "Username"
-admin_users_create: "Create User"
-admin_users_create_new: "Create New User"
-admin_view_site: "View Site"
+admin_create_user: "Create User"
+admin_create_new_user: "Create New User"
 admin_web_server: "Web Server"
 admin_web_server_php_interface: "WebServer to PHP Interface"
-admin_menus_heading: "Menus"
 admin_menu: "Menu"
-admin_menus: "Menu"
-admin_menus_create_new_category: "Create New Category"
-admin_menus_delete_category: "Delete Category"
-admin_menus_create_new_item: "Create New Item"
-admin_menus_name: "Name"
-admin_menu_item_edit: "Edit"
-admin_menu_item_delete: "Delete"
-admin_menus_url: "Url"
-admin_menus_order: "Order"
-admin_menus_edit_category: "Edit category"
-admin_create_new_menu: "Create New Menu"
-admin_menu_extends_fieldsets: "Fieldsets"
-admin_menu_extends_templates: "Templates"
-admin_preview: "Preview"
-admin_template: "Template"
-admin_templates: "Templates"
-admin_template_create_new: "Create New Template"
-admin_fieldset: "Fieldset"
-admin_create_new_fieldset: "Create New Fieldset"
-admin_name: "Name"
-admin_fieldsets: "Fieldsets"
-admin_edit: "Edit"
-admin_rename: "Rename"
-admin_duplicate: "Duplicate"
+admin_create_new_category: "Create New Category"
+admin_delete_category: "Delete Category"
+admin_create_new_item: "Create New Item"
 admin_delete: "Delete"
-admin_title: "Title"
+admin_order: "Order"
+admin_edit_category: "Edit category"
+admin_create_new_menu: "Create New Menu"
+admin_fieldsets: "Fieldsets"
+admin_template_create_new: "Create New Template"
+admin_create_new_fieldset: "Create New Fieldset"
+admin_duplicate: "Duplicate"
 admin_summary: "Summary"
 admin_snippet: "Snippet"
-admin_snippets: "Snippets"
 admin_type: "Type"
 admin_partial: "Partial"
 admin_clone: "Clone"
@@ -206,40 +147,41 @@ admin_message_fieldset_deleted: "Fieldset deleted"
 admin_message_fieldset_renamed: "Fieldset renamed"
 admin_message_fieldset_duplicated: "Fieldset duplicated"
 admin_message_entry_duplicated: "Entry duplicated"
-admin_menus_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_menus_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"
-admin_fieldsets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_fieldsets_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"
-admin_templates_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_snippets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
-admin_system_settings_system_cache_enabled_false: "Off"
-admin_system_settings_system_cache_enabled_true: "On"
-admin_system_settings_system_errors_enabled_false: "Off"
-admin_system_settings_system_errors_enabled_true: "On"
-admin_system_settings_media: "Media"
-admin_system_settings_system_upload_images_quality: "Quality"
-admin_system_settings_system_upload_images_width: "Width"
-admin_system_settings_system_upload_images_height: "Height"
-admin_system_settings_system_upload_accept_file_types: "Accept file types"
+admin_message_cache_files_deleted: "Cache files deleted"
+admin_message_entry_changes_saved: "Changes successfully saved"
+admin_message_entry_cloned: "Entry cloned"
+admin_message_entry_created: "Entry created"
+admin_message_entry_deleted: "Entry deleted"
+admin_message_entry_file_deleted: "File successfully deleted"
+admin_message_entry_file_uploaded: "File successfully uploaded"
+admin_message_entry_file_not_uploaded: "File was not uploaded"
+admin_message_entry_moved: "Entry moved"
+admin_message_entry_renamed: "Entry renamed"
+admin_message_settings_saved: "Settings saved"
+admin_message_wrong_username_password: "Wrong username or password"
+admin_quality: "Quality"
+admin_width: "Width"
+admin_height: "Height"
+admin_types: "Accept file types"
 admin_embeded_code: "Embeded Code"
 admin_shortcode: "Shortcode"
 admin_php_code: "PHP Code"
-admin_entries_choose_files_to_upload: "Choose file"
-admin_entries_browse_files: "Browse"
+admin_choose_files_to_upload: "Choose file"
+admin_browse_files: "Browse"
 admin_copy: "Copy"
-admin_system_settings_admin_panel: "Admin Panel"
-admin_system_settings_admin_panel_theme: "Theme"
-admin_system_settings_admin_panel_theme_light: "Light"
-admin_system_settings_admin_panel_theme_dark: "Dark"
-admin_entries_move: "Move"
-admin_menu_name: "Name"
-admin_system_settings_cache_memcache_server: "Memcache Server"
-admin_system_settings_cache_memcache_port: "Memcache Port"
-admin_system_settings_cache_memcached_server: "Memcached Server"
-admin_system_settings_cache_memcached_port: "Memcached Port"
-admin_system_settings_cache_redis_socket: "Redis Socket"
-admin_system_settings_cache_redis_password: "Redis Password"
-admin_system_settings_cache_redis_server: "Redis Server"
-admin_system_settings_cache_redis_port: "Redis Port"
-admin_system_settings_cache_sqlite3_database: "SQLite3 Database"
-admin_system_settings_cache_sqlite3_table: "SQLite3 Table"
+admin_admin_panel: "Admin Panel"
+admin_light: "Light"
+admin_dark: "Dark"
+admin_name: "Name"
+admin_memcache_server: "Memcache Server"
+admin_memcache_port: "Memcache Port"
+admin_memcached_server: "Memcached Server"
+admin_memcached_port: "Memcached Port"
+admin_redis_socket: "Redis Socket"
+admin_redis_password: "Redis Password"
+admin_redis_server: "Redis Server"
+admin_redis_port: "Redis Port"
+admin_sqlite3_database: "SQLite3 Database"
+admin_sqlite3_table: "SQLite3 Table"
+admin_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
+admin_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"