diff --git a/doc/translations.xls b/doc/translations.xls
index 1711ceab..552dc5a7 100644
Binary files a/doc/translations.xls and b/doc/translations.xls differ
diff --git a/src/application/config/autoload.php b/src/application/config/autoload.php
index 8846a11a..521ab1c7 100644
--- a/src/application/config/autoload.php
+++ b/src/application/config/autoload.php
@@ -96,7 +96,7 @@ $autoload['config'] = array();
 |
 */
 
-$autoload['language'] = array('frontend', 'backend');
+$autoload['language'] = array('translations');
 
 
 /*
diff --git a/src/application/controllers/appointments.php b/src/application/controllers/appointments.php
index a6f18ca5..133fb6fb 100644
--- a/src/application/controllers/appointments.php
+++ b/src/application/controllers/appointments.php
@@ -38,8 +38,8 @@ class Appointments extends CI_Controller {
                         // The requested appointment doesn't exist in the database. Display
                         // a message to the customer.
                         $view = array(
-                            'message_title' => $this->lang->line('fe_appointment_not_found'),
-                            'message_text'  => $this->lang->line('fe_appointment_does_not_exist_in_db'),
+                            'message_title' => $this->lang->line('appointment_not_found'),
+                            'message_text'  => $this->lang->line('appointment_does_not_exist_in_db'),
                             'message_icon'  => $this->config->item('base_url') 
                                              . 'assets/images/error.png',
                             'company_name'  => $company_name
@@ -147,22 +147,22 @@ class Appointments extends CI_Controller {
                             ->get_setting('notifications', $provider['id']);
                     
                     if (!$post_data['manage_mode']) {
-                        $customer_title = $this->lang->line('fe_appointment_booked');
-                        $customer_message = $this->lang->line('fe_thank_your_for_appointment');
+                        $customer_title = $this->lang->line('appointment_booked');
+                        $customer_message = $this->lang->line('thank_your_for_appointment');
                         $customer_link = $this->config->item('base_url') . 'appointments/index/' 
                                 . $appointment['hash'];
 
-                        $provider_title = $this->lang->line('fe_appointment_added_to_your_plan');
-                        $provider_message = $this->lang->line('fe_appointment_link_description');
+                        $provider_title = $this->lang->line('appointment_added_to_your_plan');
+                        $provider_message = $this->lang->line('appointment_link_description');
                         $provider_link = $this->config->item('base_url') . 'backend/index/' 
                                 . $appointment['hash'];
                     } else {
-                        $customer_title = $this->lang->line('be_appointment_changes_saved');
+                        $customer_title = $this->lang->line('appointment_changes_saved');
                         $customer_message = '';
                         $customer_link = $this->config->item('base_url') . 'appointments/index/' 
                                 . $appointment['hash'];
 
-                        $provider_title = $this->lang->line('be_appointment_details_changed');
+                        $provider_title = $this->lang->line('appointment_details_changed');
                         $provider_message = '';
                         $provider_link = $this->config->item('base_url') . 'backend/index/' 
                                 . $appointment['hash'];
diff --git a/src/application/language/english/backend_lang.php b/src/application/language/english/backend_lang.php
deleted file mode 100644
index 2f7f2d18..00000000
--- a/src/application/language/english/backend_lang.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-// Backend Translation File
-$lang['be_display_calendar'] = 'Display Calendar';
-$lang['be_providers'] = 'Providers';
-$lang['be_services'] = 'Services';
-$lang['be_calendar'] = 'Calendar';
-$lang['be_customers'] = 'Customers';
-$lang['be_users'] = 'Users';
-$lang['be_settings'] = 'Settings';
-$lang['be_log_out'] = 'Log Out';
-$lang['be_synchronize'] = 'Sychronize';
-$lang['be_enable_sync'] = 'Enable Sync';
-$lang['be_disable_sync'] = 'Disable Sync';
-$lang['be_reload'] = 'Reload';
-$lang['be_appointment'] = 'Appointment';
-$lang['be_unavailable'] = 'Unavailable';
-$lang['be_day'] = 'Day';
-$lang['be_week'] = 'Week';
-$lang['be_month'] = 'Month';
-$lang['be_today'] = 'Today';
-$lang['be_not_working'] = 'Not Working';
-$lang['be_break'] = 'Break';
-$lang['be_add'] = 'Add';
-$lang['be_edit'] = 'Edit';
-$lang['be_delete'] = 'Delete';
-$lang['be_hello'] = 'Hello';
-$lang['be_all_day'] = 'All Day';
-$lang['be_manage_appointment_record_hint'] = 'Manage all the appointment records of the available providers and services.';
-$lang['be_select_filter_item_hint'] = 'Select a provider or a service and view the appointments on the calendar.';
-$lang['be_enable_appointment_sync_hint'] = 'Enable appointment synchronization with provider\'s Google Calendar account.';
-$lang['be_manage_customers_hint'] = 'Manage the registered customers and view their booking history.';
-$lang['be_manage_services_hint'] = 'Manage the available services and categories of the system.';
-$lang['be_manage_users_hint'] = 'Manage the backend users (admins, providers, secretaries).';
-$lang['be_settings_hint'] = 'Set system and user settings.';
-$lang['be_log_out_hint'] = 'Log out of the system.';
-$lang['be_unavailable_periods_hint'] = 'During unavailable periods the provider won\'t accept new appointments.';
-$lang['be_new_appointment_hint'] = 'Create a new appointment and store it into the database.';
-$lang['be_reload_appointments_hint'] = 'Reload calendar appointments.';
-$lang['be_trigger_google_sync_hint'] = 'Trigger the Google Calendar synchronization process.';
-$lang['be_appointment_updated'] = 'Appointment updated successfully!';
-$lang['be_undo'] = 'Undo';
-$lang['be_cancel'] = 'Cancel';
-$lang['be_appointment_details_changed'] = 'Appointment details have changed.';
-$lang['be_appointment_changes_saved'] = 'Appointment changes have been successfully saved!';
-$lang['be_save'] = 'Save';
-$lang['be_new'] = 'New';
-$lang['be_select'] = 'Select';
-$lang['be_hide'] = 'Hide';
-$lang['be_type_to_filter_customers'] = 'Type to filter customers.';
-$lang['be_clear_fields_add_existing_customer_hint'] = 'Clear the fields and enter a new customer.';
-$lang['be_pick_existing_customer_hint'] = 'Pick an existing customer.';
-$lang['be_new_appointment_title'] = 'New Appointment';
-$lang['be_edit_appointment_title'] = 'Edit Appointment';
-$lang['be_delete_appointment_title'] = 'Delete Appointment';
-$lang['be_write_appointment_removal_reason'] = 'Please take a minute to write the reason you are deleting the appointment:';
-$lang['be_appointment_saved'] = 'Appointment saved successfully!';
-$lang['be_new_unavailable_title'] = 'New Unavailable Period';
-$lang['be_edit_unavailable_title'] = 'Edit Unavailable Period';
-$lang['be_unavailable_saved'] = 'Unavailable period saved successfully!';
-$lang['be_start_date_before_end_error'] = 'Start date value is bigger than end date!';
-$lang['be_invalid_email'] = 'Invalid email address!';
-$lang['be_customers'] = 'Customers';
-$lang['be_details'] = 'Details';
-$lang['be_no_records_found'] = 'No records found...';
-$lang['be_services'] = 'Services';
-$lang['be_duration_minutes'] = 'Duration (Minutes)';
-$lang['be_currency'] = 'Currency';
-$lang['be_category'] = 'Category';
-$lang['be_no_category'] = 'No Category';
-$lang['be_description'] = 'Description';
-$lang['be_categories'] = 'Categories';
-$lang['be_admins'] = 'Admins';
-$lang['be_providers'] = 'Providers';
-$lang['be_secretaries'] = 'Secretaries';
-$lang['be_mobile_number'] = 'Mobile Number';
-$lang['be_state'] = 'State';
-$lang['be_username'] = 'Username';
-$lang['be_password'] = 'Password';
-$lang['be_retype_password'] = 'Retype Password';
-$lang['be_receive_notifications'] = 'Receive Notifications';
-$lang['be_passwords_mismatch'] = 'Passwords mismatch!';
-$lang['be_admin_saved'] = 'Admin saved successfully!';
-$lang['be_provider_saved'] = 'Provider saved successfully!';
-$lang['be_secretary_saved'] = 'Secretary saved successfully!';
-$lang['be_admin_deleted'] = 'Admin deleted successfully!';
-$lang['be_provider_deleted'] = 'Provider deleted successfully!';
-$lang['be_secretary_deleted'] = 'Secretary deleted successfully!';
-$lang['be_service_saved'] = 'Service saved successfully!';
-$lang['be_service_category_saved'] = 'Service category saved successfully!';
-$lang['be_service_deleted'] = 'Service deleted successfully!';
-$lang['be_servce_category_deleted'] = 'Service category deleted successfully!';
-$lang['be_customer_saved'] = 'Customer saved successfully!';
-$lang['be_customer_deleted'] = 'Customer deleted successfully!';
-$lang['be_current_view'] = 'Current View';
-$lang['be_working_plan'] = 'Working Plan';
-$lang['be_reset_plan'] = 'Reset Plan';
-$lang['be_monday'] = 'Monday';
-$lang['be_tuesday'] = 'Tuesday';
-$lang['be_wednesday'] = 'Wednesday';
-$lang['be_thursday'] = 'Thursday';
-$lang['be_friday'] = 'Friday';
-$lang['be_saturday'] = 'Saturday';
-$lang['be_sunday'] = 'Sunday';
-$lang['be_breaks'] = 'Breaks';
-$lang['be_add_breaks_during_each_day'] = 'Add the working breaks during each day. During breaks the provider will not accept any appointments.';
-$lang['be_day'] = 'Day';
-$lang['be_actions'] = 'Actions';
-$lang['be_reset_working_plan_hint'] = 'Reset the working plan back to the default values.';
-$lang['be_company_name'] = 'Company Name';
-$lang['be_company_name_hint'] = 'Company name will be displayed everywhere on the system (required).';
-$lang['be_company_email'] = 'Company Email';
-$lang['be_company_email_hint'] = 'This will be the company email address. It will be used as the sender and the reply address of the system emails (required).';
-$lang['be_company_link'] = 'Company Link';
-$lang['be_company_link_hint'] = 'Company link should point to the official website of the company (required).';
-$lang['be_go_to_booking_page'] = 'Go To Booking Page';
-$lang['be_settings_saved'] = 'Settings saved successfully!';
-$lang['be_general'] = 'General';
-$lang['be_business_logic'] = 'Business Logic';
-$lang['be_current_user'] = 'Current User';
-$lang['be_about_ea'] = 'About E!A';
-$lang['be_edit_working_plan_hint'] = 'Mark below the days and hours that your company will accept appointments. You will be able to adjust appointments in non working hours but the customers will not be able to book appointments by themselves in non working periods. This working plan will be the default for every new provider record but you will be able to change each provider\'s plan separately by editing his record. After that you can add break periods.';
-$lang['be_edit_breaks_hint'] = 'Add the working breaks during each day. These breaks will be applied for all new providers.';
-$lang['be_book_advance_timeout'] = 'Book Advance Timeout';
-$lang['be_book_advance_timeout_hint'] = 'Define the timeout (in minutes) before the customers can book or re-arrange appointments with the company.';
-$lang['be_timeout_minutes'] = 'Timeout (Minutes)';
-$lang['be_about_ea_info'] = 'Easy!Appointments is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar so you can use them with other services.';
-$lang['be_current_version'] = 'Current Version';
-$lang['be_support'] = 'Support';
-$lang['be_about_ea_support'] = 'If you encounter any problems when using Easy!Appointments you can search the official Google Group for answers. You might also need to create a new issue on the Google Code page in order to help the development progress.';
-$lang['be_official_website'] = 'Official Website';
-$lang['be_google_plus_community'] = 'Google+ Community';
-$lang['be_support_group'] = 'Support Group';
-$lang['be_project_issues'] = 'Project Issues';
-$lang['be_license'] = 'License';
-$lang['be_about_ea_license'] = 'Easy!Appointments is licensed under the GPLv3 license. By using the code of Easy!Appointments in any way you are agreeing to the terms described in the following url:';
-$lang['be_logout_success'] = 'You have been successfully logged out! Click on one of the following buttons to navigate to a different page.';
-$lang['be_book_appointment_title'] = 'Book Appointment';
-$lang['be_backend_section'] = 'Backend Section';
-$lang['be_you_need_to_login'] = 'Welcome! You will need to login in order to view backend pages.';
-$lang['be_enter_username_here'] = 'Enter your username here ...';
-$lang['be_enter_password_here'] = 'Enter your password here ...';
-$lang['be_login'] = 'Login';
-$lang['be_forgot_your_password'] = 'Forgot Your Password?';
-$lang['be_login_failed'] = 'Login failed, please enter the correct credentials and try again.';
-$lang['be_type_username_and_email_for_new_password'] = 'Type your username and your email address to get your new password.';
-$lang['be_enter_email_here'] = 'Enter your email here ...';
-$lang['be_regenerate_password'] = 'Regenerate Password';
-$lang['be_go_to_login'] = 'Go Back To Login Page';
-$lang['be_new_password_sent_with_email'] = 'Your new password has been sent to you with an email.';
-$lang['be_new_account_password'] = 'New Account Password';
-$lang['be_new_password_is'] = 'Your new account password is $password. Please store this email to be able to retrieve your password if necessary. You can also change this password with a new one in the settings page.';
-$lang['be_delete_record_prompt'] = 'Are you sure that you want to delete this record? This action cannot be undone.';
-$lang['be_delete_admin'] = 'Delete Admin';
-$lang['be_delete_customer'] = 'Delete Customer';
-$lang['be_delete_service'] = 'Delete Service';
-$lang['be_delete_category'] = 'Delete Service Category';
-$lang['be_delete_provider'] = 'Delete Provider';
-$lang['be_delete_secretary'] = 'Delete Secretary';
-$lang['be_delete_appointment'] = 'Delete Appointment';
-$lang['be_delete_unavailable'] = 'Delete Unavailable Period';
-$lang['be_delete'] = 'Delete';
-$lang['be_unexpected_issues'] = 'Unexpected Isasues';
-$lang['be_unexpected_issues_message'] = 'The operation could not complete due to unexpected issues.';
-$lang['be_close'] = 'Close';
-$lang['be_page_not_found'] = 'Page Not Found';
-$lang['be_page_not_found_message'] = 'Unfortunately the page you requested does not exist. Please check your browser URL or head to another location using the buttons below.';
-$lang['be_error'] = 'Error';
-$lang['be_no_privileges'] = 'No Privileges';
-$lang['be_no_provileges_message'] = 'You do not have the required privileges to view this page. Please navigate to a different section.';
-$lang['be_backend_calendar'] = 'Backend Calendar';
-$lang['be_start_date_time'] = 'Start Date / Time';
-$lang['be_end_date_time'] = 'End Date / Time';
-$lang['be_licensed_under'] = 'Licensed Under';
-$lang['be_unexpected_issues_occurred'] = 'Unexpected issues occured!';
-$lang['be_service_communication_error'] = 'A server communication error occurred, please try again.';
-$lang['be_no_privileges_edit_appointments'] = 'You do not have the required privileges to edit appointments.';
-$lang['be_unavailable_updated'] = 'Unavailable time period updated successfully!';
-$lang['be_appointments'] = 'Appointments';
-$lang['be_unexpected_warnings'] = 'Unexpected Warnings';
-$lang['be_unexpected_warnings_message'] = 'The operation completed but some warnings appeared.';
-$lang['be_filter'] = 'Filter';
-$lang['be_clear'] = 'Clear';
-$lang['be_uncategorized'] = 'Uncategorized';
-$lang['be_username_already_exists'] = 'Username already exists.';
-$lang['be_password_length_notice']  = 'Password must be at least $number characters long.';
-$lang['be_general_settings'] = 'General Settings';
-$lang['be_personal_information'] = 'Personal Information';
-$lang['be_system_login'] = 'System Login';
-$lang['be_user_settings_are_invalid'] = 'User settings are invalid! Please review your settings and try again.';
-$lang['be_add_break'] = 'Add Break';
diff --git a/src/application/language/english/frontend_lang.php b/src/application/language/english/frontend_lang.php
deleted file mode 100644
index 64a3bb7a..00000000
--- a/src/application/language/english/frontend_lang.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-// Frontend Translation File
-$lang['fe_page_title'] = 'Book Appointment With';
-$lang['fe_step_one_title'] = 'Select Service & Provider';
-$lang['fe_select_service'] = 'Select Service';
-$lang['fe_select_provider'] = 'Select Provider';
-$lang['fe_duration'] = 'Duration';
-$lang['fe_minutes'] = 'Minutes';
-$lang['fe_price'] = 'Price';
-$lang['fe_next'] = 'Next';
-$lang['fe_back'] = 'Back';
-$lang['fe_step_two_title'] = 'Select Appointment Date And Time';
-$lang['fe_no_available_hours'] = 'There are no available appointment hours for the selected date. Please choose another date.';
-$lang['fe_appointment_hour_missing'] = 'Please select an appointment hour before continuing!';
-$lang['fe_step_three_title'] = 'Fill In Your Information';
-$lang['fe_first_name'] = 'First Name';
-$lang['fe_last_name'] = 'Last Name';
-$lang['fe_email'] = 'Email';
-$lang['fe_phone_number'] = 'Phone Number';
-$lang['fe_address'] = 'Address';
-$lang['fe_city'] = 'City';
-$lang['fe_zip_code'] = 'Zip Code';
-$lang['fe_notes'] = 'Notes';
-$lang['fe_fields_are_required'] = 'Fields with * are required!';
-$lang['fe_step_four_title'] = 'Confirm Appointment';
-$lang['fe_confirm'] = 'Confirm';
-$lang['fe_update'] = 'Update';
-$lang['fe_cancel_appointment_hint'] = 'Press the "Cancel" button to remove the appointment from the company schedule.';
-$lang['fe_cancel'] = 'Cancel';
-$lang['fe_appointment_registered'] = 'Your appointment has been successfully registered!';
-$lang['fe_cancel_appointment_title'] = 'Cancel Appointment';
-$lang['fe_appointment_cancelled'] = 'Your appointment has been successfully cancelled!';
-$lang['fe_appointment_cancelled_title'] = 'Appointment Cancelled';
-$lang['fe_reason'] = 'Reason';
-$lang['fe_appointment_removed_from_schedule'] = 'The following appointment was removed from the company\'s schedule.';
-$lang['fe_appointment_details_was_sent_to_you'] = 'An email with the appointment details has been sent to you.';
-$lang['fe_add_to_google_calendar'] = 'Add to Google Calendar';
-$lang['fe_appointment_booked'] = 'Your appointment has been successfully booked!';
-$lang['fe_thank_you_for_appointment'] = 'Thank you for arranging an appointment with us. Below you can see the appointment details. Make changes by clicking the appointment link.';
-$lang['fe_appointment_details_title'] = 'Appointment Details';
-$lang['fe_customer_details_title'] = 'Customer Details';
-$lang['fe_service'] = 'Service';
-$lang['fe_provider'] = 'Provider';
-$lang['fe_customer'] = 'Customer';
-$lang['fe_start'] = 'Start';
-$lang['fe_end'] = 'End';
-$lang['fe_name'] = 'Name';
-$lang['fe_phone'] = 'Phone';
-$lang['fe_address'] = 'Address';
-$lang['fe_appointment_link_title'] = 'Appointment Link';
-$lang['fe_success'] = 'Success!';
-$lang['fe_appointment_added_to_google_calendar'] = 'Your appointment has been added to your Google Calendar account.';
-$lang['fe_view_appointment_in_google_calendar'] = 'Click here to view your appointment on Google Calendar.';
-$lang['fe_appointment_added_to_your_plan'] = 'A new appointment has been added to your plan.';
-$lang['fe_appointment_link_description'] = 'You can make changes by clicking the appointment link below.';
-$lang['fe_appointment_not_found'] = 'Appointment Not Found!';
-$lang['fe_appointment_does_not_exist_in_db'] = 'The appointment you requested does not exist in the system database anymore.';
\ No newline at end of file
diff --git a/src/application/language/english/translations_lang.php b/src/application/language/english/translations_lang.php
new file mode 100644
index 00000000..627915d3
--- /dev/null
+++ b/src/application/language/english/translations_lang.php
@@ -0,0 +1,264 @@
+<?php
+// English
+$lang['page_title'] = 'Book Appointment With';
+$lang['step_one_title'] = 'Select Service & Provider';
+$lang['select_service'] = 'Select Service';
+$lang['select_provider'] = 'Select Provider';
+$lang['duration'] = 'Duration';
+$lang['minutes'] = 'Minutes';
+$lang['price'] = 'Price';
+$lang['next'] = 'Next';
+$lang['back'] = 'Back';
+$lang['step_two_title'] = 'Select Appointment Date And Time';
+$lang['no_available_hours'] = 'There are no available appointment hours for the selected date. Please choose another date.';
+$lang['appointment_hour_missing'] = 'Please select an appointment hour before continuing!';
+$lang['step_three_title'] = 'Fill In Your Information';
+$lang['first_name'] = 'First Name';
+$lang['last_name'] = 'Last Name';
+$lang['email'] = 'Email';
+$lang['phone_number'] = 'Phone Number';
+$lang['address'] = 'Address';
+$lang['city'] = 'City';
+$lang['zip_code'] = 'Zip Code';
+$lang['notes'] = 'Notes';
+$lang['fields_are_required'] = 'Fields with * are required!';
+$lang['step_four_title'] = 'Confirm Appointment';
+$lang['confirm'] = 'Confirm';
+$lang['update'] = 'Update';
+$lang['cancel_appointment_hint'] = 'Press the "Cancel" button to remove the appointment from the company schedule.';
+$lang['cancel'] = 'Cancel';
+$lang['appointment_registered'] = 'Your appointment has been successfully registered!';
+$lang['cancel_appointment_title'] = 'Cancel Appointment';
+$lang['appointment_cancelled'] = 'Your appointment has been successfully cancelled!';
+$lang['appointment_cancelled_title'] = 'Appointment Cancelled';
+$lang['reason'] = 'Reason';
+$lang['appointment_removed_from_schedule'] = 'The following appointment was removed from the company\'s schedule.';
+$lang['appointment_details_was_sent_to_you'] = 'An email with the appointment details has been sent to you.';
+$lang['add_to_google_calendar'] = 'Add to Google Calendar';
+$lang['appointment_booked'] = 'Your appointment has been successfully booked!';
+$lang['thank_you_for_appointment'] = 'Thank you for arranging an appointment with us. Below you can see the appointment details. Make changes by clicking the appointment link.';
+$lang['appointment_details_title'] = 'Appointment Details';
+$lang['customer_details_title'] = 'Customer Details';
+$lang['service'] = 'Service';
+$lang['provider'] = 'Provider';
+$lang['customer'] = 'Customer';
+$lang['start'] = 'Start';
+$lang['end'] = 'End';
+$lang['name'] = 'Name';
+$lang['phone'] = 'Phone';
+$lang['address'] = 'Address';
+$lang['appointment_link_title'] = 'Appointment Link';
+$lang['success'] = 'Success!';
+$lang['appointment_added_to_google_calendar'] = 'Your appointment has been added to your Google Calendar account.';
+$lang['view_appointment_in_google_calendar'] = 'Click here to view your appointment on Google Calendar.';
+$lang['appointment_added_to_your_plan'] = 'A new appointment has been added to your plan.';
+$lang['appointment_link_description'] = 'You can make changes by clicking the appointment link below.';
+$lang['appointment_not_found'] = 'Appointment Not Found!';
+$lang['appointment_does_not_exist_in_db'] = 'The appointment you requested does not exist in the system database anymore.';
+$lang['display_calendar'] = 'Display Calendar';
+$lang['providers'] = 'Providers';
+$lang['services'] = 'Services';
+$lang['calendar'] = 'Calendar';
+$lang['customers'] = 'Customers';
+$lang['users'] = 'Users';
+$lang['settings'] = 'Settings';
+$lang['log_out'] = 'Log Out';
+$lang['synchronize'] = 'Sychronize';
+$lang['enable_sync'] = 'Enable Sync';
+$lang['disable_sync'] = 'Disable Sync';
+$lang['reload'] = 'Reload';
+$lang['appointment'] = 'Appointment';
+$lang['unavailable'] = 'Unavailable';
+$lang['day'] = 'Day';
+$lang['week'] = 'Week';
+$lang['month'] = 'Month';
+$lang['today'] = 'Today';
+$lang['not_working'] = 'Not Working';
+$lang['break'] = 'Break';
+$lang['add'] = 'Add';
+$lang['edit'] = 'Edit';
+$lang['delete'] = 'Delete';
+$lang['hello'] = 'Hello';
+$lang['all_day'] = 'All Day';
+$lang['manage_appointment_record_hint'] = 'Manage all the appointment records of the available providers and services.';
+$lang['select_filter_item_hint'] = 'Select a provider or a service and view the appointments on the calendar.';
+$lang['enable_appointment_sync_hint'] = 'Enable appointment synchronization with provider\'s Google Calendar account.';
+$lang['manage_customers_hint'] = 'Manage the registered customers and view their booking history.';
+$lang['manage_services_hint'] = 'Manage the available services and categories of the system.';
+$lang['manage_users_hint'] = 'Manage the backend users (admins, providers, secretaries).';
+$lang['settings_hint'] = 'Set system and user settings.';
+$lang['log_out_hint'] = 'Log out of the system.';
+$lang['unavailable_periods_hint'] = 'During unavailable periods the provider won\'t accept new appointments.';
+$lang['new_appointment_hint'] = 'Create a new appointment and store it into the database.';
+$lang['reload_appointments_hint'] = 'Reload calendar appointments.';
+$lang['trigger_google_sync_hint'] = 'Trigger the Google Calendar synchronization process.';
+$lang['appointment_updated'] = 'Appointment updated successfully!';
+$lang['undo'] = 'Undo';
+$lang['cancel'] = 'Cancel';
+$lang['appointment_details_changed'] = 'Appointment details have changed.';
+$lang['appointment_changes_saved'] = 'Appointment changes have been successfully saved!';
+$lang['save'] = 'Save';
+$lang['new'] = 'New';
+$lang['select'] = 'Select';
+$lang['hide'] = 'Hide';
+$lang['type_to_filter_customers'] = 'Type to filter customers.';
+$lang['clear_fields_add_existing_customer_hint'] = 'Clear the fields and enter a new customer.';
+$lang['pick_existing_customer_hint'] = 'Pick an existing customer.';
+$lang['new_appointment_title'] = 'New Appointment';
+$lang['edit_appointment_title'] = 'Edit Appointment';
+$lang['delete_appointment_title'] = 'Delete Appointment';
+$lang['write_appointment_removal_reason'] = 'Please take a minute to write the reason you are deleting the appointment:';
+$lang['appointment_saved'] = 'Appointment saved successfully!';
+$lang['new_unavailable_title'] = 'New Unavailable Period';
+$lang['edit_unavailable_title'] = 'Edit Unavailable Period';
+$lang['unavailable_saved'] = 'Unavailable period saved successfully!';
+$lang['start_date_before_end_error'] = 'Start date value is bigger than end date!';
+$lang['invalid_email'] = 'Invalid email address!';
+$lang['customers'] = 'Customers';
+$lang['details'] = 'Details';
+$lang['no_records_found'] = 'No records found...';
+$lang['services'] = 'Services';
+$lang['duration_minutes'] = 'Duration (Minutes)';
+$lang['currency'] = 'Currency';
+$lang['category'] = 'Category';
+$lang['no_category'] = 'No Category';
+$lang['description'] = 'Description';
+$lang['categories'] = 'Categories';
+$lang['admins'] = 'Admins';
+$lang['providers'] = 'Providers';
+$lang['secretaries'] = 'Secretaries';
+$lang['mobile_number'] = 'Mobile Number';
+$lang['state'] = 'State';
+$lang['username'] = 'Username';
+$lang['password'] = 'Password';
+$lang['retype_password'] = 'Retype Password';
+$lang['receive_notifications'] = 'Receive Notifications';
+$lang['passwords_mismatch'] = 'Passwords mismatch!';
+$lang['admin_saved'] = 'Admin saved successfully!';
+$lang['provider_saved'] = 'Provider saved successfully!';
+$lang['secretary_saved'] = 'Secretary saved successfully!';
+$lang['admin_deleted'] = 'Admin deleted successfully!';
+$lang['provider_deleted'] = 'Provider deleted successfully!';
+$lang['secretary_deleted'] = 'Secretary deleted successfully!';
+$lang['service_saved'] = 'Service saved successfully!';
+$lang['service_category_saved'] = 'Service category saved successfully!';
+$lang['service_deleted'] = 'Service deleted successfully!';
+$lang['servce_category_deleted'] = 'Service category deleted successfully!';
+$lang['customer_saved'] = 'Customer saved successfully!';
+$lang['customer_deleted'] = 'Customer deleted successfully!';
+$lang['current_view'] = 'Current View';
+$lang['working_plan'] = 'Working Plan';
+$lang['reset_plan'] = 'Reset Plan';
+$lang['monday'] = 'Monday';
+$lang['tuesday'] = 'Tuesday';
+$lang['wednesday'] = 'Wednesday';
+$lang['thursday'] = 'Thursday';
+$lang['friday'] = 'Friday';
+$lang['saturday'] = 'Saturday';
+$lang['sunday'] = 'Sunday';
+$lang['breaks'] = 'Breaks';
+$lang['add_breaks_during_each_day'] = 'Add the working breaks during each day. During breaks the provider will not accept any appointments.';
+$lang['day'] = 'Day';
+$lang['actions'] = 'Actions';
+$lang['reset_working_plan_hint'] = 'Reset the working plan back to the default values.';
+$lang['company_name'] = 'Company Name';
+$lang['company_name_hint'] = 'Company name will be displayed everywhere on the system (required).';
+$lang['company_email'] = 'Company Email';
+$lang['company_email_hint'] = 'This will be the company email address. It will be used as the sender and the reply address of the system emails (required).';
+$lang['company_link'] = 'Company Link';
+$lang['company_link_hint'] = 'Company link should point to the official website of the company (required).';
+$lang['go_to_booking_page'] = 'Go To Booking Page';
+$lang['settings_saved'] = 'Settings saved successfully!';
+$lang['general'] = 'General';
+$lang['business_logic'] = 'Business Logic';
+$lang['current_user'] = 'Current User';
+$lang['about_ea'] = 'About E!A';
+$lang['edit_working_plan_hint'] = 'Mark below the days and hours that your company will accept appointments. You will be able to adjust appointments in non working hours but the customers will not be able to book appointments by themselves in non working periods. This working plan will be the default for every new provider record but you will be able to change each provider\'s plan separately by editing his record. After that you can add break periods.';
+$lang['edit_breaks_hint'] = 'Add the working breaks during each day. These breaks will be applied for all new providers.';
+$lang['book_advance_timeout'] = 'Book Advance Timeout';
+$lang['book_advance_timeout_hint'] = 'Define the timeout (in minutes) before the customers can book or re-arrange appointments with the company.';
+$lang['timeout_minutes'] = 'Timeout (Minutes)';
+$lang['about_ea_info'] = 'Easy!Appointments is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar so you can use them with other services.';
+$lang['current_version'] = 'Current Version';
+$lang['support'] = 'Support';
+$lang['about_ea_support'] = 'If you encounter any problems when using Easy!Appointments you can search the official Google Group for answers. You might also need to create a new issue on the Google Code page in order to help the development progress.';
+$lang['official_website'] = 'Official Website';
+$lang['google_plus_community'] = 'Google+ Community';
+$lang['support_group'] = 'Support Group';
+$lang['project_issues'] = 'Project Issues';
+$lang['license'] = 'License';
+$lang['about_ea_license'] = 'Easy!Appointments is licensed under the GPLv3 license. By using the code of Easy!Appointments in any way you are agreeing to the terms described in the following url:';
+$lang['logout_success'] = 'You have been successfully logged out! Click on one of the following buttons to navigate to a different page.';
+$lang['book_appointment_title'] = 'Book Appointment';
+$lang['backend_section'] = 'Backend Section';
+$lang['you_need_to_login'] = 'Welcome! You will need to login in order to view backend pages.';
+$lang['enter_username_here'] = 'Enter your username here ...';
+$lang['enter_password_here'] = 'Enter your password here ...';
+$lang['login'] = 'Login';
+$lang['forgot_your_password'] = 'Forgot Your Password?';
+$lang['login_failed'] = 'Login failed, please enter the correct credentials and try again.';
+$lang['type_username_and_email_for_new_password'] = 'Type your username and your email address to get your new password.';
+$lang['enter_email_here'] = 'Enter your email here ...';
+$lang['regenerate_password'] = 'Regenerate Password';
+$lang['go_to_login'] = 'Go Back To Login Page';
+$lang['new_password_sent_with_email'] = 'Your new password has been sent to you with an email.';
+$lang['new_account_password'] = 'New Account Password';
+$lang['new_password_is'] = 'Your new account password is $password. Please store this email to be able to retrieve your password if necessary. You can also change this password with a new one in the settings page.';
+$lang['delete_record_prompt'] = 'Are you sure that you want to delete this record? This action cannot be undone.';
+$lang['delete_admin'] = 'Delete Admin';
+$lang['delete_customer'] = 'Delete Customer';
+$lang['delete_service'] = 'Delete Service';
+$lang['delete_category'] = 'Delete Service Category';
+$lang['delete_provider'] = 'Delete Provider';
+$lang['delete_secretary'] = 'Delete Secretary';
+$lang['delete_appointment'] = 'Delete Appointment';
+$lang['delete_unavailable'] = 'Delete Unavailable Period';
+$lang['delete'] = 'Delete';
+$lang['unexpected_issues'] = 'Unexpected Isasues';
+$lang['unexpected_issues_message'] = 'The operation could not complete due to unexpected issues.';
+$lang['close'] = 'Close';
+$lang['page_not_found'] = 'Page Not Found';
+$lang['page_not_found_message'] = 'Unfortunately the page you requested does not exist. Please check your browser URL or head to another location using the buttons below.';
+$lang['error'] = 'Error';
+$lang['no_privileges'] = 'No Privileges';
+$lang['no_provileges_message'] = 'You do not have the required privileges to view this page. Please navigate to a different section.';
+$lang['backend_calendar'] = 'Backend Calendar';
+$lang['start_date_time'] = 'Start Date / Time';
+$lang['end_date_time'] = 'End Date / Time';
+$lang['licensed_under'] = 'Licensed Under';
+$lang['unexpected_issues_occurred'] = 'Unexpected issues occured!';
+$lang['service_communication_error'] = 'A server communication error occurred, please try again.';
+$lang['no_privileges_edit_appointments'] = 'You do not have the required privileges to edit appointments.';
+$lang['unavailable_updated'] = 'Unavailable time period updated successfully!';
+$lang['appointments'] = 'Appointments';
+$lang['unexpected_warnings'] = 'Unexpected Warnings';
+$lang['unexpected_warnings_message'] = 'The operation completed but some warnings appeared.';
+$lang['filter'] = 'Filter';
+$lang['clear'] = 'Clear';
+$lang['uncategorized'] = 'Uncategorized';
+$lang['username_already_exists'] = 'Username already exists.';
+$lang['password_length_notice']  = 'Password must be at least $number characters long.';
+$lang['general_settings'] = 'General Settings';
+$lang['personal_information'] = 'Personal Information';
+$lang['system_login'] = 'System Login';
+$lang['user_settings_are_invalid'] = 'User settings are invalid! Please review your settings and try again.';
+$lang['add_break'] = 'Add Break';
+$lang['january'] = 'January';
+$lang['february'] = 'February';
+$lang['march'] = 'March';
+$lang['april'] = 'April';
+$lang['may'] = 'May';
+$lang['june'] = 'June';
+$lang['july'] = 'July';
+$lang['august'] = 'August';
+$lang['september'] = 'September';
+$lang['october'] = 'October';
+$lang['november'] = 'November';
+$lang['december'] = 'December';
+$lang['previous'] = 'Previous';
+$lang['next'] = 'Next';
+$lang['now'] = 'Now';
+$lang['select_time'] = 'Select Time';
+$lang['time'] = 'Time';
+$lang['hour'] = 'Hour';
+$lang['minute'] = 'Minute';
diff --git a/src/application/language/german/backend_lang.php b/src/application/language/german/backend_lang.php
deleted file mode 100644
index 4e489020..00000000
--- a/src/application/language/german/backend_lang.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-// Backend Translation File
-$lang['be_display_calendar'] = 'Kalender anzeigen';
-$lang['be_providers'] = 'Anbieter';
-$lang['be_services'] = 'Dienstleistungen';
-$lang['be_calendar'] = 'Kalender';
-$lang['be_customers'] = 'Kunden';
-$lang['be_users'] = 'Nutzer';
-$lang['be_settings'] = 'Einstellungen';
-$lang['be_log_out'] = 'Abmelden';
-$lang['be_synchronize'] = 'Synchronisieren';
-$lang['be_enable_sync'] = 'Sync einschalten';
-$lang['be_disable_sync'] = 'Sync ausschalten';
-$lang['be_reload'] = 'Neu laden';
-$lang['be_appointment'] = 'Termin';
-$lang['be_unavailable'] = 'Nicht möglich';
-$lang['be_day'] = 'Tag';
-$lang['be_week'] = 'Woche';
-$lang['be_month'] = 'Monat';
-$lang['be_today'] = 'Heute';
-$lang['be_not_working'] = 'Sonn- und Feiertag';
-$lang['be_break'] = 'Pause';
-$lang['be_add'] = 'Hinzufügen';
-$lang['be_edit'] = 'Bearbeiten';
-$lang['be_delete'] = 'Löschen';
-$lang['be_hello'] = 'Hallo';
-$lang['be_all_day'] = 'Ganztägig';
-$lang['be_manage_appointment_record_hint'] = 'Verwalten Sie alle Termineintragungen der zur Verfügung stehenden Anbieter und Dienstleistungen.';
-$lang['be_select_filter_item_hint'] = 'Wählen Sie einen Anbieter oder eine Dienstleistung und sehen Sie die Termine im Kalender an.';
-$lang['be_enable_appointment_sync_hint'] = 'Beginnen Sie die Terminsynchronisatonen mit dem Google Kalender des Dienstleisters.';
-$lang['be_manage_customers_hint'] = 'Verwalten Sie die registrierten Kunden und sehen Sie die vergangenen Buchungen ein.';
-$lang['be_manage_services_hint'] = 'Verwalten Sie die erhältlichen Dienstleistungen und Kategorien des Systems.';
-$lang['be_manage_users_hint'] = 'Verwalten Sie die Endnutzer (Admins, Anbieter, Büropersonal).';
-$lang['be_settings_hint'] = 'Setzen Sie das System aus Nutzereinstellungen.';
-$lang['be_log_out_hint'] = 'Melden Sie sich vom System ab.';
-$lang['be_unavailable_periods_hint'] = 'Über den Zeitraum nicht erhältlicher Dienstleistung werden neue Termin von den Anbietern nicht akzeptiert.';
-$lang['be_new_appointment_hint'] = 'Bestimmen Sie einen neuen Termin und sichern Sie ihn in der Datenbank.';
-$lang['be_reload_appointments_hint'] = 'Kalendertermine neu laden.';
-$lang['be_trigger_google_sync_hint'] = 'Starten Sie den Synchronisationsprozess von Google Kalender.';
-$lang['be_appointment_updated'] = 'Die Termine sind erfolgreich erneuert worden!';
-$lang['be_undo'] = 'Schritt zurück';
-$lang['be_cancel'] = 'Abbrechen';
-$lang['be_appointment_details_changed'] = 'Die Termindetails haben sich geändert.';
-$lang['be_appointment_changes_saved'] = 'Die Terminänderungen sind erfolgreich gespeichert worden!';
-$lang['be_save'] = 'Speichern';
-$lang['be_new'] = 'Neu';
-$lang['be_select'] = 'Auswahl';
-$lang['be_hide'] = 'Verbergen';
-$lang['be_type_to_filter_customers'] = 'Eingeben um Kunden zu filtern.';
-$lang['be_clear_fields_add_existing_customer_hint'] = 'Deaktivieren Sie die Felder und geben Sie einen neuen Kunden.';
-$lang['be_pick_existing_customer_hint'] = 'Wählen Sie einen vorhandenen Kunden.';
-$lang['be_new_appointment_title'] = 'Neuer Termin';
-$lang['be_edit_appointment_title'] = 'Termin bearbeiten';
-$lang['be_delete_appointment_title'] = 'Termin löschen';
-$lang['be_write_appointment_removal_reason'] = 'Bitte nehmen Sie sich eine Minute Zeit um den Grund aufzuschreiben warum Sie den Termin löschen:';
-$lang['be_appointment_saved'] = 'Termin erfolgreich gespeichert!';
-$lang['be_new_unavailable_title'] = 'Neuer nicht zur Verfügung stehender Zeitraum';
-$lang['be_edit_unavailable_title'] = 'Nicht zur Verfügung stehenden Zeitraum bearbeiten';
-$lang['be_unavailable_saved'] = 'Nicht zur Verfügung stehender Zeitraum erfolgreich gespeichert!';
-$lang['be_start_date_before_end_error'] = 'Das Startdatum ist größer als das Enddatum!';
-$lang['be_invalid_email'] = 'Ungültige E-Mail-Adresse!';
-$lang['be_customers'] = 'Kunden';
-$lang['be_details'] = 'Details';
-$lang['be_no_records_found'] = 'Keine Einträge gefunden ...';
-$lang['be_services'] = 'Dienstleistungen';
-$lang['be_duration_minutes'] = 'Dauer (Minuten)';
-$lang['be_currency'] = 'Währung';
-$lang['be_category'] = 'Kategorie';
-$lang['be_no_category'] = 'Keine Kategorie';
-$lang['be_description'] = 'Beschreibung';
-$lang['be_categories'] = 'Kategorien';
-$lang['be_admins'] = 'Administrator';
-$lang['be_providers'] = 'Anbieter';
-$lang['be_secretaries'] = 'Bearbeiter';
-$lang['be_mobile_number'] = 'Mobiltelefonnummer';
-$lang['be_state'] = 'Region / Land';
-$lang['be_username'] = 'Nutzername';
-$lang['be_password'] = 'Passwort';
-$lang['be_retype_password'] = 'Passwort neu eingeben';
-$lang['be_receive_notifications'] = 'Nachrichtenempfang';
-$lang['be_passwords_mismatch'] = 'Passwort nicht gültig!';
-$lang['be_admin_saved'] = 'Administrator erfolgreich gesichert!';
-$lang['be_provider_saved'] = 'Anbieter erfolgreich gesichert!';
-$lang['be_secretary_saved'] = 'Bearbeiter erfolgreich gesichert!';
-$lang['be_admin_deleted'] = 'Administrator erfolgreich gelöscht!';
-$lang['be_provider_deleted'] = 'Anbieter erfolgreich gelöscht!';
-$lang['be_secretary_deleted'] = 'Bearbeiter erfolgreich gelöscht!';
-$lang['be_service_saved'] = 'Dienstleistung erfolgreich gesichert!';
-$lang['be_service_category_saved'] = 'Dienstleistungskategorie erfolgreich gesichert!';
-$lang['be_service_deleted'] = 'Dienstleistung erfolgreich gelöscht!';
-$lang['be_servce_category_deleted'] = 'Dienstleistungskategorie erfolgreicht gelöscht!';
-$lang['be_customer_saved'] = 'Kunde erfolgreich gesichert!';
-$lang['be_customer_deleted'] = 'Kunde erfolgreich gelöscht!';
-$lang['be_current_view'] = 'Laufende Ansicht';
-$lang['be_working_plan'] = 'Arbeitsplan';
-$lang['be_reset_plan'] = 'Neustart Plan';
-$lang['be_monday'] = 'Montag';
-$lang['be_tuesday'] = 'Dienstag';
-$lang['be_wednesday'] = 'Mittwoch';
-$lang['be_thursday'] = 'Donnerstag';
-$lang['be_friday'] = 'Freitag';
-$lang['be_saturday'] = 'Samstag';
-$lang['be_sunday'] = 'Sonntag';
-$lang['be_breaks'] = 'Pausen';
-$lang['be_add_breaks_during_each_day'] = 'Fügen Sie die Arbeitspausen für jeden Tag hinzu. Während der Pausen kann der Dienstleister keine Termin akzeptieren.';
-$lang['be_day'] = 'Tag';
-$lang['be_actions'] = 'Aktionen';
-$lang['be_reset_working_plan_hint'] = 'Setzen Sie den Arbeitsplan auf die Standardwerte zurück.';
-$lang['be_company_name'] = 'Name der Firma';
-$lang['be_company_name_hint'] = 'Der Firmenname wird überall im System verwendet (erforderlich).';
-$lang['be_company_email'] = 'Email der Firma';
-$lang['be_company_email_hint'] = 'Das wird die E-Mail-Adresse der Firma sein. Sie wird verwendet als Adresse des Absenders für die E-Mails des Systems (erforderlich).';
-$lang['be_company_link'] = 'Weblink der Firma';
-$lang['be_company_link_hint'] = 'Der Firmenlink sollte auf die offizielle Webseite der Firma weisen (erforderlich).';
-$lang['be_go_to_booking_page'] = 'Gehe zu Buchungsseite';
-$lang['be_settings_saved'] = 'Einstellungen erfolgreich gesichert!';
-$lang['be_general'] = 'Allgemeines';
-$lang['be_business_logic'] = 'Unternehmerische Logik';
-$lang['be_current_user'] = 'Laufender Nutzer';
-$lang['be_about_ea'] = 'Über E!A';
-$lang['be_edit_working_plan_hint'] = 'Bitte notieren Sie im folgenden die Tage und Zeiten für die das Unternehmen Termine anbietet. Sie können Termine auch für Feiertage festlegen, aber die Kunden können an diesen Tagen keine Buchung durchführen. Dieser Arbeitsplan ist voreingestellt für alle neuen Einschreibungen von Dienstleistern, aber Sie haben die Möglichkeit den Arbeitsplan zu ändern und zwar für jeden Anbieter gesondert, indem Sie seine Einschreibung bearbeiten. Danach fügen Sie die Zeiträume der Pausen hinzu.';
-$lang['be_edit_breaks_hint'] = 'Fügen Sie die betrieblichen Pausen je Tag hinzu. Diese Pausen werden für alle neuen Dienstleister angewendet.';
-$lang['be_book_advance_timeout'] = 'Zeitgrenze vor einer Buchung';
-$lang['be_book_advance_timeout_hint'] = 'Legen Sie eine Zeitgrenze (in Minuten) fest bevor die Kunden eine Terminbuchung oder eine Terminänderungen durchführen können.';
-$lang['be_timeout_minutes'] = 'Zeitgrenze (Minuten)';
-$lang['be_about_ea_info'] = 'Easy!Appointments ist eine extrem anpassungsfähige Internet-Applikation die es Ihren Kunden ermöglicht, einen Termin mit Ihnen über des Internet zu schließen. Darüberhinaus gibt es Ihnen die Möglichkeit Ihre Daten mit dem Google Kalender zu synchronisieren, so dass Sie diese mit anderen Dienstleistungsprogrammen nutzen können.';
-$lang['be_current_version'] = 'Laufende Version';
-$lang['be_support'] = 'Unterstützung';
-$lang['be_about_ea_support'] = 'Falls Sie irgendein Problem bei der Nutzung von Easy!Appointments haben sollten können Sie die offizielle Google Gruppe nach Lösungen durchsuchen. Sie können auch ein neues Thema in Google Code beginnen, damit Sie die Findung von Lösungen unterstützen. ';
-$lang['be_official_website'] = 'Offiezielle Webseite';
-$lang['be_google_plus_community'] = 'Google+ Gemeinschaft';
-$lang['be_support_group'] = 'Gruppenunterstützung';
-$lang['be_project_issues'] = 'Projectthemen';
-$lang['be_license'] = 'Nutzungslizenz';
-$lang['be_about_ea_license'] = 'Easy!Appointment ist lizensiert under der GPLv3-Lizenz. Bei Benutzung des Codes für Easy!Appointments auf irgendeine Weise stimmen Sie mit den Nutzungsbedingungen zu wie sie in folgender url aufgeführt sind:';
-$lang['be_logout_success'] = 'Sie haben sich erfolgreich abgemeldet! Klicken sie auf einen der folgende Tasten, um auf eine andere Seite zu gelangen.';
-$lang['be_book_appointment_title'] = 'Terminbuchung';
-$lang['be_backend_section'] = 'Backend Sektion';
-$lang['be_you_need_to_login'] = 'Willkommen! Sie müssen sich anmelden um die Backend-Seiten zu sehen.';
-$lang['be_enter_username_here'] = 'Geben Sie Ihren Nutzernamen hier ein ...';
-$lang['be_enter_password_here'] = 'Geben Sie Ihr Passwort hier ein ...';
-$lang['be_login'] = 'Anmelden';
-$lang['be_forgot_your_password'] = 'Passowort vergessen?';
-$lang['be_login_failed'] = 'Die Anmeldung gelang nicht, bitte geben Sie die richtigen Anmeldedaten ein und versuchen Sie es erneut.';
-$lang['be_type_username_and_email_for_new_password'] = 'Geben Sie Ihren Nutzernamen und Ihre E-Mail-Adresse ein, um Ihr neues Passwort zu erhalten.';
-$lang['be_enter_email_here'] = 'Geben Sie Ihre E-Mail hier ein ...';
-$lang['be_regenerate_password'] = 'Passwort generieren';
-$lang['be_go_to_login'] = 'Gehe Sie zurück auf die Anmelde-Seite';
-$lang['be_new_password_sent_with_email'] = 'Ihr neues Passwort ist Ihnen per E-Mail gesendet worden.';
-$lang['be_new_account_password'] = 'Neues Kontopasswort';
-$lang['be_new_password_is'] = 'Ihr neue Passwort ist $password. Bitte sichern Sie dieses E-Mail damit Sie Ihr Passwort nachlesen können falls nötig. Sie können diese Passwort auf der Seite Einstellungen auch mit einem neuen austauschen.';
-$lang['be_delete_record_prompt'] = 'Sind Sie sicher, dass Sie diesen Eintrag löschen möchten? Dieser Vorgang kann nicht zurückgenommen werden.';
-$lang['be_delete_admin'] = 'Administrator löschen';
-$lang['be_delete_customer'] = 'Kunde löschen';
-$lang['be_delete_service'] = 'Dienstleistung löschen';
-$lang['be_delete_category'] = 'Servicekategorie löschen';
-$lang['be_delete_provider'] = 'Zeitraum löschen';
-$lang['be_delete_secretary'] = 'Bearbeiter löschen';
-$lang['be_delete_appointment'] = 'Termin löschen';
-$lang['be_delete_unavailable'] = 'Nicht zur Verfügung stehender Zeitraum löschen';
-$lang['be_delete'] = 'Löschen';
-$lang['be_unexpected_issues'] = 'Unvorhergesene Vorfälle';
-$lang['be_unexpected_issues_message'] = 'Dieser Vorgang konnte aufgrund unvorgesehener Vorfälle nicht beendet werden.';
-$lang['be_close'] = 'Schließen';
-$lang['be_page_not_found'] = 'Seite Nicht Gefunden';
-$lang['be_page_not_found_message'] = 'Leider ist die von Ihnen angeforderte Seite existiert nicht. Bitte überprüfen Sie Ihre Browser-URL oder navigieren Sie zu einem anderen Ort mit den Tasten unten.';
-$lang['be_error'] = 'Fehler';
-$lang['be_no_privileges'] = 'Unzureichende Berechtigungen';
-$lang['be_no_provileges_message'] = 'Sie haben nicht die Berechtigung, diese Seite zu sehen. Bitte wechseln Sie zu einem anderen Abschnitt.';
-$lang['be_backend_calendar'] = 'Backend Kalender';
-$lang['be_start_date_time'] = 'Start Datum / Zeit';
-$lang['be_end_date_time'] = 'Ende Datum / Zeit';
-$lang['be_licensed_under'] = 'Lizenzierte Unter';
-$lang['be_unexpected_issues_occured'] = 'Unerwartete Probleme aufgetreten!';
-$lang['be_service_communication_error'] = 'Während der Kommunikation mit dem Server ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.';
-$lang['be_no_privileges_edit_appointments'] = 'Sie haben nicht die Berechtigung, um Termine zu bearbeiten.';
-$lang['be_unavailable_updated'] = 'Nicht zur Verfügung stehender Zeitraum erfolgreich erneuert worden!';
-$lang['be_appointments'] = 'Terminen';
-$lang['be_unexpected_warnings'] = 'Unerwartete Warnungen';
-$lang['be_unexpected_warnings_message'] = 'Der Vorgang wurde abgeschlossen, aber einige Warnungen erscheint.';
-$lang['be_filter'] = 'Filtern';
-$lang['be_clear'] = 'Deaktivieren';
-$lang['be_uncategorized'] = 'Nicht Zugeordnet';
-$lang['be_username_already_exists'] = 'Benutzername ist bereits vorhanden.';
-$lang['be_password_length_notice']  = 'Das Passwort muss mindestens $number Zeichen lang sein.';
-$lang['be_general_settings'] = 'Allgemeine Einstellungen';
-$lang['be_personal_information'] = 'Persönliche Informationen';
-$lang['be_system_login'] = 'System Login';
-$lang['be_user_settings_are_invalid'] = 'Benutzereinstellungen sind ungültig! Bitte überprüfen Sie Ihre Einstellungen und wiederholen Sie den Vorgang.';
-$lang['be_add_break'] = 'Interval Hinzufügen';
\ No newline at end of file
diff --git a/src/application/language/german/frontend_lang.php b/src/application/language/german/frontend_lang.php
deleted file mode 100644
index 92b83eed..00000000
--- a/src/application/language/german/frontend_lang.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-// Frontend Translation File
-$lang['fe_page_title'] = 'Vereinbaren Sie einen Termin mit';
-$lang['fe_step_one_title'] = 'Auswahl der Dienstleistung und des Anbieters';
-$lang['fe_select_service'] = 'Auswahl der Dienstleistung';
-$lang['fe_select_provider'] = 'Auswahl des Anbieters';
-$lang['fe_duration'] = 'Dauer';
-$lang['fe_minutes'] = 'Minuten';
-$lang['fe_price'] = 'Preis';
-$lang['fe_next'] = 'Vor';
-$lang['fe_back'] = 'Zurück';
-$lang['fe_step_two_title'] = 'Auswahl des Datums und der Uhrzeit des Termins';
-$lang['fe_no_available_hours'] = 'Es gibt leider keine freien Termine für das ausgewählte Datum. Bitte wählen Sie ein anderes Datum.';
-$lang['fe_appointment_hour_missing'] = 'Bitte wählen Sie einen Termin bevor Sie fortfahren!';
-$lang['fe_step_three_title'] = 'Bitte tragen Sie Ihre persönlichen Daten ein';
-$lang['fe_first_name'] = 'Vorname';
-$lang['fe_last_name'] = 'Nachname';
-$lang['fe_email'] = 'E-Mail';
-$lang['fe_phone_number'] = 'Telefonnummer';
-$lang['fe_address'] = 'Adresse';
-$lang['fe_city'] = 'Stadt';
-$lang['fe_zip_code'] = 'Postleitzahl';
-$lang['fe_notes'] = 'Bemerkungen';
-$lang['fe_fields_are_required'] = 'Die Felder mit einem * sind Pflichtfelder!';
-$lang['fe_step_four_title'] = 'Bitte bestätigen Sie die Terminauswahl';
-$lang['fe_confirm'] = 'Bestätigung';
-$lang['fe_update'] = 'Aktualisierung';
-$lang['fe_cancel_appointment_hint'] = 'Bitte klicken Sie auf "Abbrechen" um den Termin aus dem Terminplan des Unternehmens zu löschen.';
-$lang['fe_cancel'] = 'Abbrechen';
-$lang['fe_appointment_registered'] = 'Ihr Termin ist erfolgreich registriert worden!';
-$lang['fe_cancel_appointment_title'] = 'Termin stornieren';
-$lang['fe_appointment_cancelled'] = 'Ihr Termin ist erfolgreich storniert worden!';
-$lang['fe_appointment_cancelled_title'] = 'Termin storniert';
-$lang['fe_reason'] = 'Grund';
-$lang['fe_appointment_removed_from_schedule'] = 'Der folgende Termin wurde erfolgreich von der Terminplanung des Unternehmens storniert.';
-$lang['fe_appointment_details_was_sent_to_you'] = 'Eine E-Mail mit den Termindaten ist an Sie gesendet worden.';
-$lang['fe_add_to_google_calendar'] = 'Zum Google Kalender hinzufügen';
-$lang['fe_appointment_booked'] = 'Ihr Termin ist erfolgreich gebucht worden!';
-$lang['fe_thank_you_for_appointment'] = 'Vielen Dank für die Terminauswahl mit uns. Weiter unten können Sie Ihre Termindaten sehen. Änderungen können durch klicken auf den Termin-Link durchgeführt werden.';
-$lang['fe_appointment_details_title'] = 'Termindaten';
-$lang['fe_customer_details_title'] = 'Kundendaten';
-$lang['fe_service'] = 'Dienstleistung';
-$lang['fe_provider'] = 'Anbieter';
-$lang['fe_customer'] = 'Kunde';
-$lang['fe_start'] = 'Beginn';
-$lang['fe_end'] = 'Ende';
-$lang['fe_name'] = 'Name';
-$lang['fe_phone'] = 'Telefonnummer';
-$lang['fe_address'] = 'Adresse';
-$lang['fe_appointment_link_title'] = 'Termin-Link';
-$lang['fe_success'] = 'Erfolg!';
-$lang['fe_appointment_added_to_google_calendar'] = 'Ihr Termin ist zu Ihrem Google Kalender Konto hinzugefügt worden.';
-$lang['fe_view_appointment_in_google_calendar'] = 'Bitte klicken Sie hier, um Ihren Termin im Google Kalender zu sehen.';
-$lang['fe_appointment_added_to_your_plan'] = 'Ein neuer Termin ist zu Ihrer Planung hinzugefügt worden.';
-$lang['fe_appointment_link_description'] = 'Sie können Änderungen durch Klicken auf den Termin-Link durchführen.';
-$lang['fe_appointment_not_found'] = 'Termin nicht gefunden!';
-$lang['fe_appointment_does_not_exist_in_db'] = 'Die von Ihnen angeforderte Termin nicht in der Systemdatenbank mehr gibt.';
\ No newline at end of file
diff --git a/src/application/language/german/translations_lang.php b/src/application/language/german/translations_lang.php
new file mode 100644
index 00000000..29113151
--- /dev/null
+++ b/src/application/language/german/translations_lang.php
@@ -0,0 +1,264 @@
+<?php
+// German
+$lang['page_title'] = 'Vereinbaren Sie einen Termin mit';
+$lang['step_one_title'] = 'Auswahl der Dienstleistung und des Anbieters';
+$lang['select_service'] = 'Auswahl der Dienstleistung';
+$lang['select_provider'] = 'Auswahl des Anbieters';
+$lang['duration'] = 'Dauer';
+$lang['minutes'] = 'Minuten';
+$lang['price'] = 'Preis';
+$lang['next'] = 'Vor';
+$lang['back'] = 'Zurück';
+$lang['step_two_title'] = 'Auswahl des Datums und der Uhrzeit des Termins';
+$lang['no_available_hours'] = 'Es gibt leider keine freien Termine für das ausgewählte Datum. Bitte wählen Sie ein anderes Datum.';
+$lang['appointment_hour_missing'] = 'Bitte wählen Sie einen Termin bevor Sie fortfahren!';
+$lang['step_three_title'] = 'Bitte tragen Sie Ihre persönlichen Daten ein';
+$lang['first_name'] = 'Vorname';
+$lang['last_name'] = 'Nachname';
+$lang['email'] = 'E-Mail';
+$lang['phone_number'] = 'Telefonnummer';
+$lang['address'] = 'Adresse';
+$lang['city'] = 'Stadt';
+$lang['zip_code'] = 'Postleitzahl';
+$lang['notes'] = 'Bemerkungen';
+$lang['fields_are_required'] = 'Die Felder mit einem * sind Pflichtfelder!';
+$lang['step_four_title'] = 'Bitte bestätigen Sie die Terminauswahl';
+$lang['confirm'] = 'Bestätigung';
+$lang['update'] = 'Aktualisierung';
+$lang['cancel_appointment_hint'] = 'Bitte klicken Sie auf "Abbrechen" um den Termin aus dem Terminplan des Unternehmens zu löschen.';
+$lang['cancel'] = 'Abbrechen';
+$lang['appointment_registered'] = 'Ihr Termin ist erfolgreich registriert worden!';
+$lang['cancel_appointment_title'] = 'Termin stornieren';
+$lang['appointment_cancelled'] = 'Ihr Termin ist erfolgreich storniert worden!';
+$lang['appointment_cancelled_title'] = 'Termin storniert';
+$lang['reason'] = 'Grund';
+$lang['appointment_removed_from_schedule'] = 'Der folgende Termin wurde erfolgreich von der Terminplanung des Unternehmens storniert.';
+$lang['appointment_details_was_sent_to_you'] = 'Eine E-Mail mit den Termindaten ist an Sie gesendet worden.';
+$lang['add_to_google_calendar'] = 'Zum Google Kalender hinzufügen';
+$lang['appointment_booked'] = 'Ihr Termin ist erfolgreich gebucht worden!';
+$lang['thank_you_for_appointment'] = 'Vielen Dank für die Terminauswahl mit uns. Weiter unten können Sie Ihre Termindaten sehen. Änderungen können durch klicken auf den Termin-Link durchgeführt werden.';
+$lang['appointment_details_title'] = 'Termindaten';
+$lang['customer_details_title'] = 'Kundendaten';
+$lang['service'] = 'Dienstleistung';
+$lang['provider'] = 'Anbieter';
+$lang['customer'] = 'Kunde';
+$lang['start'] = 'Beginn';
+$lang['end'] = 'Ende';
+$lang['name'] = 'Name';
+$lang['phone'] = 'Telefonnummer';
+$lang['address'] = 'Adresse';
+$lang['appointment_link_title'] = 'Termin-Link';
+$lang['success'] = 'Erfolg!';
+$lang['appointment_added_to_google_calendar'] = 'Ihr Termin ist zu Ihrem Google Kalender Konto hinzugefügt worden.';
+$lang['view_appointment_in_google_calendar'] = 'Bitte klicken Sie hier, um Ihren Termin im Google Kalender zu sehen.';
+$lang['appointment_added_to_your_plan'] = 'Ein neuer Termin ist zu Ihrer Planung hinzugefügt worden.';
+$lang['appointment_link_description'] = 'Sie können Änderungen durch Klicken auf den Termin-Link durchführen.';
+$lang['appointment_not_found'] = 'Termin nicht gefunden!';
+$lang['appointment_does_not_exist_in_db'] = 'Die von Ihnen angeforderte Termin nicht in der Systemdatenbank mehr gibt.';
+$lang['display_calendar'] = 'Kalender anzeigen';
+$lang['providers'] = 'Anbieter';
+$lang['services'] = 'Dienstleistungen';
+$lang['calendar'] = 'Kalender';
+$lang['customers'] = 'Kunden';
+$lang['users'] = 'Nutzer';
+$lang['settings'] = 'Einstellungen';
+$lang['log_out'] = 'Abmelden';
+$lang['synchronize'] = 'Synchronisieren';
+$lang['enable_sync'] = 'Sync einschalten';
+$lang['disable_sync'] = 'Sync ausschalten';
+$lang['reload'] = 'Neu laden';
+$lang['appointment'] = 'Termin';
+$lang['unavailable'] = 'Nicht möglich';
+$lang['day'] = 'Tag';
+$lang['week'] = 'Woche';
+$lang['month'] = 'Monat';
+$lang['today'] = 'Heute';
+$lang['not_working'] = 'Sonn- und Feiertag';
+$lang['break'] = 'Pause';
+$lang['add'] = 'Hinzufügen';
+$lang['edit'] = 'Bearbeiten';
+$lang['delete'] = 'Löschen';
+$lang['hello'] = 'Hallo';
+$lang['all_day'] = 'Ganztägig';
+$lang['manage_appointment_record_hint'] = 'Verwalten Sie alle Termineintragungen der zur Verfügung stehenden Anbieter und Dienstleistungen.';
+$lang['select_filter_item_hint'] = 'Wählen Sie einen Anbieter oder eine Dienstleistung und sehen Sie die Termine im Kalender an.';
+$lang['enable_appointment_sync_hint'] = 'Beginnen Sie die Terminsynchronisatonen mit dem Google Kalender des Dienstleisters.';
+$lang['manage_customers_hint'] = 'Verwalten Sie die registrierten Kunden und sehen Sie die vergangenen Buchungen ein.';
+$lang['manage_services_hint'] = 'Verwalten Sie die erhältlichen Dienstleistungen und Kategorien des Systems.';
+$lang['manage_users_hint'] = 'Verwalten Sie die Endnutzer (Admins, Anbieter, Büropersonal).';
+$lang['settings_hint'] = 'Setzen Sie das System aus Nutzereinstellungen.';
+$lang['log_out_hint'] = 'Melden Sie sich vom System ab.';
+$lang['unavailable_periods_hint'] = 'Über den Zeitraum nicht erhältlicher Dienstleistung werden neue Termin von den Anbietern nicht akzeptiert.';
+$lang['new_appointment_hint'] = 'Bestimmen Sie einen neuen Termin und sichern Sie ihn in der Datenbank.';
+$lang['reload_appointments_hint'] = 'Kalendertermine neu laden.';
+$lang['trigger_google_sync_hint'] = 'Starten Sie den Synchronisationsprozess von Google Kalender.';
+$lang['appointment_updated'] = 'Die Termine sind erfolgreich erneuert worden!';
+$lang['undo'] = 'Schritt zurück';
+$lang['cancel'] = 'Abbrechen';
+$lang['appointment_details_changed'] = 'Die Termindetails haben sich geändert.';
+$lang['appointment_changes_saved'] = 'Die Terminänderungen sind erfolgreich gespeichert worden!';
+$lang['save'] = 'Speichern';
+$lang['new'] = 'Neu';
+$lang['select'] = 'Auswahl';
+$lang['hide'] = 'Verbergen';
+$lang['type_to_filter_customers'] = 'Eingeben um Kunden zu filtern.';
+$lang['clear_fields_add_existing_customer_hint'] = 'Deaktivieren Sie die Felder und geben Sie einen neuen Kunden.';
+$lang['pick_existing_customer_hint'] = 'Wählen Sie einen vorhandenen Kunden.';
+$lang['new_appointment_title'] = 'Neuer Termin';
+$lang['edit_appointment_title'] = 'Termin bearbeiten';
+$lang['delete_appointment_title'] = 'Termin löschen';
+$lang['write_appointment_removal_reason'] = 'Bitte nehmen Sie sich eine Minute Zeit um den Grund aufzuschreiben warum Sie den Termin löschen:';
+$lang['appointment_saved'] = 'Termin erfolgreich gespeichert!';
+$lang['new_unavailable_title'] = 'Neuer nicht zur Verfügung stehender Zeitraum';
+$lang['edit_unavailable_title'] = 'Nicht zur Verfügung stehenden Zeitraum bearbeiten';
+$lang['unavailable_saved'] = 'Nicht zur Verfügung stehender Zeitraum erfolgreich gespeichert!';
+$lang['start_date_before_end_error'] = 'Das Startdatum ist größer als das Enddatum!';
+$lang['invalid_email'] = 'Ungültige E-Mail-Adresse!';
+$lang['customers'] = 'Kunden';
+$lang['details'] = 'Details';
+$lang['no_records_found'] = 'Keine Einträge gefunden ...';
+$lang['services'] = 'Dienstleistungen';
+$lang['duration_minutes'] = 'Dauer (Minuten)';
+$lang['currency'] = 'Währung';
+$lang['category'] = 'Kategorie';
+$lang['no_category'] = 'Keine Kategorie';
+$lang['description'] = 'Beschreibung';
+$lang['categories'] = 'Kategorien';
+$lang['admins'] = 'Administrator';
+$lang['providers'] = 'Anbieter';
+$lang['secretaries'] = 'Bearbeiter';
+$lang['mobile_number'] = 'Mobiltelefonnummer';
+$lang['state'] = 'Region / Land';
+$lang['username'] = 'Nutzername';
+$lang['password'] = 'Passwort';
+$lang['retype_password'] = 'Passwort neu eingeben';
+$lang['receive_notifications'] = 'Nachrichtenempfang';
+$lang['passwords_mismatch'] = 'Passwort nicht gültig!';
+$lang['admin_saved'] = 'Administrator erfolgreich gesichert!';
+$lang['provider_saved'] = 'Anbieter erfolgreich gesichert!';
+$lang['secretary_saved'] = 'Bearbeiter erfolgreich gesichert!';
+$lang['admin_deleted'] = 'Administrator erfolgreich gelöscht!';
+$lang['provider_deleted'] = 'Anbieter erfolgreich gelöscht!';
+$lang['secretary_deleted'] = 'Bearbeiter erfolgreich gelöscht!';
+$lang['service_saved'] = 'Dienstleistung erfolgreich gesichert!';
+$lang['service_category_saved'] = 'Dienstleistungskategorie erfolgreich gesichert!';
+$lang['service_deleted'] = 'Dienstleistung erfolgreich gelöscht!';
+$lang['servce_category_deleted'] = 'Dienstleistungskategorie erfolgreicht gelöscht!';
+$lang['customer_saved'] = 'Kunde erfolgreich gesichert!';
+$lang['customer_deleted'] = 'Kunde erfolgreich gelöscht!';
+$lang['current_view'] = 'Laufende Ansicht';
+$lang['working_plan'] = 'Arbeitsplan';
+$lang['reset_plan'] = 'Neustart Plan';
+$lang['monday'] = 'Montag';
+$lang['tuesday'] = 'Dienstag';
+$lang['wednesday'] = 'Mittwoch';
+$lang['thursday'] = 'Donnerstag';
+$lang['friday'] = 'Freitag';
+$lang['saturday'] = 'Samstag';
+$lang['sunday'] = 'Sonntag';
+$lang['breaks'] = 'Pausen';
+$lang['add_breaks_during_each_day'] = 'Fügen Sie die Arbeitspausen für jeden Tag hinzu. Während der Pausen kann der Dienstleister keine Termin akzeptieren.';
+$lang['day'] = 'Tag';
+$lang['actions'] = 'Aktionen';
+$lang['reset_working_plan_hint'] = 'Setzen Sie den Arbeitsplan auf die Standardwerte zurück.';
+$lang['company_name'] = 'Name der Firma';
+$lang['company_name_hint'] = 'Der Firmenname wird überall im System verwendet (erforderlich).';
+$lang['company_email'] = 'Email der Firma';
+$lang['company_email_hint'] = 'Das wird die E-Mail-Adresse der Firma sein. Sie wird verwendet als Adresse des Absenders für die E-Mails des Systems (erforderlich).';
+$lang['company_link'] = 'Weblink der Firma';
+$lang['company_link_hint'] = 'Der Firmenlink sollte auf die offizielle Webseite der Firma weisen (erforderlich).';
+$lang['go_to_booking_page'] = 'Gehe zu Buchungsseite';
+$lang['settings_saved'] = 'Einstellungen erfolgreich gesichert!';
+$lang['general'] = 'Allgemeines';
+$lang['business_logic'] = 'Unternehmerische Logik';
+$lang['current_user'] = 'Laufender Nutzer';
+$lang['about_ea'] = 'Über E!A';
+$lang['edit_working_plan_hint'] = 'Bitte notieren Sie im folgenden die Tage und Zeiten für die das Unternehmen Termine anbietet. Sie können Termine auch für Feiertage festlegen, aber die Kunden können an diesen Tagen keine Buchung durchführen. Dieser Arbeitsplan ist voreingestellt für alle neuen Einschreibungen von Dienstleistern, aber Sie haben die Möglichkeit den Arbeitsplan zu ändern und zwar für jeden Anbieter gesondert, indem Sie seine Einschreibung bearbeiten. Danach fügen Sie die Zeiträume der Pausen hinzu.';
+$lang['edit_breaks_hint'] = 'Fügen Sie die betrieblichen Pausen je Tag hinzu. Diese Pausen werden für alle neuen Dienstleister angewendet.';
+$lang['book_advance_timeout'] = 'Zeitgrenze vor einer Buchung';
+$lang['book_advance_timeout_hint'] = 'Legen Sie eine Zeitgrenze (in Minuten) fest bevor die Kunden eine Terminbuchung oder eine Terminänderungen durchführen können.';
+$lang['timeout_minutes'] = 'Zeitgrenze (Minuten)';
+$lang['about_ea_info'] = 'Easy!Appointments ist eine extrem anpassungsfähige Internet-Applikation die es Ihren Kunden ermöglicht, einen Termin mit Ihnen über des Internet zu schließen. Darüberhinaus gibt es Ihnen die Möglichkeit Ihre Daten mit dem Google Kalender zu synchronisieren, so dass Sie diese mit anderen Dienstleistungsprogrammen nutzen können.';
+$lang['current_version'] = 'Laufende Version';
+$lang['support'] = 'Unterstützung';
+$lang['about_ea_support'] = 'Falls Sie irgendein Problem bei der Nutzung von Easy!Appointments haben sollten können Sie die offizielle Google Gruppe nach Lösungen durchsuchen. Sie können auch ein neues Thema in Google Code beginnen, damit Sie die Findung von Lösungen unterstützen. ';
+$lang['official_website'] = 'Offiezielle Webseite';
+$lang['google_plus_community'] = 'Google+ Gemeinschaft';
+$lang['support_group'] = 'Gruppenunterstützung';
+$lang['project_issues'] = 'Projectthemen';
+$lang['license'] = 'Nutzungslizenz';
+$lang['about_ea_license'] = 'Easy!Appointment ist lizensiert under der GPLv3-Lizenz. Bei Benutzung des Codes für Easy!Appointments auf irgendeine Weise stimmen Sie mit den Nutzungsbedingungen zu wie sie in folgender url aufgeführt sind:';
+$lang['logout_success'] = 'Sie haben sich erfolgreich abgemeldet! Klicken sie auf einen der folgende Tasten, um auf eine andere Seite zu gelangen.';
+$lang['book_appointment_title'] = 'Terminbuchung';
+$lang['backend_section'] = 'Backend Sektion';
+$lang['you_need_to_login'] = 'Willkommen! Sie müssen sich anmelden um die Backend-Seiten zu sehen.';
+$lang['enter_username_here'] = 'Geben Sie Ihren Nutzernamen hier ein ...';
+$lang['enter_password_here'] = 'Geben Sie Ihr Passwort hier ein ...';
+$lang['login'] = 'Anmelden';
+$lang['forgot_your_password'] = 'Passowort vergessen?';
+$lang['login_failed'] = 'Die Anmeldung gelang nicht, bitte geben Sie die richtigen Anmeldedaten ein und versuchen Sie es erneut.';
+$lang['type_username_and_email_for_new_password'] = 'Geben Sie Ihren Nutzernamen und Ihre E-Mail-Adresse ein, um Ihr neues Passwort zu erhalten.';
+$lang['enter_email_here'] = 'Geben Sie Ihre E-Mail hier ein ...';
+$lang['regenerate_password'] = 'Passwort generieren';
+$lang['go_to_login'] = 'Gehe Sie zurück auf die Anmelde-Seite';
+$lang['new_password_sent_with_email'] = 'Ihr neues Passwort ist Ihnen per E-Mail gesendet worden.';
+$lang['new_account_password'] = 'Neues Kontopasswort';
+$lang['new_password_is'] = 'Ihr neue Passwort ist $password. Bitte sichern Sie dieses E-Mail damit Sie Ihr Passwort nachlesen können falls nötig. Sie können diese Passwort auf der Seite Einstellungen auch mit einem neuen austauschen.';
+$lang['delete_record_prompt'] = 'Sind Sie sicher, dass Sie diesen Eintrag löschen möchten? Dieser Vorgang kann nicht zurückgenommen werden.';
+$lang['delete_admin'] = 'Administrator löschen';
+$lang['delete_customer'] = 'Kunde löschen';
+$lang['delete_service'] = 'Dienstleistung löschen';
+$lang['delete_category'] = 'Servicekategorie löschen';
+$lang['delete_provider'] = 'Zeitraum löschen';
+$lang['delete_secretary'] = 'Bearbeiter löschen';
+$lang['delete_appointment'] = 'Termin löschen';
+$lang['delete_unavailable'] = 'Nicht zur Verfügung stehender Zeitraum löschen';
+$lang['delete'] = 'Löschen';
+$lang['unexpected_issues'] = 'Unvorhergesene Vorfälle';
+$lang['unexpected_issues_message'] = 'Dieser Vorgang konnte aufgrund unvorgesehener Vorfälle nicht beendet werden.';
+$lang['close'] = 'Schließen';
+$lang['page_not_found'] = 'Seite Nicht Gefunden';
+$lang['page_not_found_message'] = 'Leider ist die von Ihnen angeforderte Seite existiert nicht. Bitte überprüfen Sie Ihre Browser-URL oder navigieren Sie zu einem anderen Ort mit den Tasten unten.';
+$lang['error'] = 'Fehler';
+$lang['no_privileges'] = 'Unzureichende Berechtigungen';
+$lang['no_provileges_message'] = 'Sie haben nicht die Berechtigung, diese Seite zu sehen. Bitte wechseln Sie zu einem anderen Abschnitt.';
+$lang['backend_calendar'] = 'Backend Kalender';
+$lang['start_date_time'] = 'Start Datum / Zeit';
+$lang['end_date_time'] = 'Ende Datum / Zeit';
+$lang['licensed_under'] = 'Lizenzierte Unter';
+$lang['unexpected_issues_occured'] = 'Unerwartete Probleme aufgetreten!';
+$lang['service_communication_error'] = 'Während der Kommunikation mit dem Server ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.';
+$lang['no_privileges_edit_appointments'] = 'Sie haben nicht die Berechtigung, um Termine zu bearbeiten.';
+$lang['unavailable_updated'] = 'Nicht zur Verfügung stehender Zeitraum erfolgreich erneuert worden!';
+$lang['appointments'] = 'Terminen';
+$lang['unexpected_warnings'] = 'Unerwartete Warnungen';
+$lang['unexpected_warnings_message'] = 'Der Vorgang wurde abgeschlossen, aber einige Warnungen erscheint.';
+$lang['filter'] = 'Filtern';
+$lang['clear'] = 'Deaktivieren';
+$lang['uncategorized'] = 'Nicht Zugeordnet';
+$lang['username_already_exists'] = 'Benutzername ist bereits vorhanden.';
+$lang['password_length_notice']  = 'Das Passwort muss mindestens $number Zeichen lang sein.';
+$lang['general_settings'] = 'Allgemeine Einstellungen';
+$lang['personal_information'] = 'Persönliche Informationen';
+$lang['system_login'] = 'System Login';
+$lang['user_settings_are_invalid'] = 'Benutzereinstellungen sind ungültig! Bitte überprüfen Sie Ihre Einstellungen und wiederholen Sie den Vorgang.';
+$lang['add_break'] = 'Interval Hinzufügen';
+$lang['january'] = 'Januar';
+$lang['february'] = 'Februar';
+$lang['march'] = 'März';
+$lang['april'] = 'April';
+$lang['may'] = 'May';
+$lang['june'] = 'Juni';
+$lang['july'] = 'Juli';
+$lang['august'] = 'August';
+$lang['september'] = 'September';
+$lang['october'] = 'October';
+$lang['november'] = 'November';
+$lang['december'] = 'Dezember';
+$lang['previous'] = 'Vorherig';
+$lang['next'] = 'Nächste';
+$lang['now'] = 'Jetzt';
+$lang['select_time'] = 'Zeit Wählen';
+$lang['time'] = 'Zeit';
+$lang['hour'] = 'Uhr';
+$lang['minute'] = 'Minute';
\ No newline at end of file
diff --git a/src/application/language/greek/backend_lang.php b/src/application/language/greek/backend_lang.php
deleted file mode 100644
index 3377d4a1..00000000
--- a/src/application/language/greek/backend_lang.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-// Backend Translation File
-$lang['be_display_calendar'] = 'Προβολή Ημερολογίου';
-$lang['be_providers'] = 'Πάροχοι';
-$lang['be_services'] = 'Υπηρεσίες';
-$lang['be_calendar'] = 'Ημερολόγιο';
-$lang['be_customers'] = 'Πελάτες';
-$lang['be_users'] = 'Χρήστες';
-$lang['be_settings'] = 'Ρυθμίσεις';
-$lang['be_log_out'] = 'Αποσύνδεση';
-$lang['be_synchronize'] = 'Συγχρονισμός';
-$lang['be_enable_sync'] = 'Ενεργοποίηση Συγχρ.';
-$lang['be_disable_sync'] = 'Απενεργοποίηση Συγχρ.';
-$lang['be_reload'] = 'Επαναφόρτωση';
-$lang['be_appointment'] = 'Ραντεβού';
-$lang['be_unavailable'] = 'Μη Διαθέσιμος';
-$lang['be_day'] = 'Ημέρα';
-$lang['be_week'] = 'Εβδομάδα';
-$lang['be_month'] = 'Μήνας';
-$lang['be_today'] = 'Σήμερα';
-$lang['be_not_working'] = 'Μη Εργάσιμη';
-$lang['be_break'] = 'Διάλειμμα';
-$lang['be_add'] = 'Προσθήκη';
-$lang['be_edit'] = 'Επεξεργασία';
-$lang['be_delete'] = 'Διαγραφή';
-$lang['be_hello'] = 'Χαίρετε';
-$lang['be_all_day'] = 'Ολοήμερο';
-$lang['be_manage_appointment_record_hint'] = 'Διαχειριστείτε όλες τις εγγραφές ραντεβού των διαθέσιμων πάροχων και υπηρεσιών.';
-$lang['be_select_filter_item_hint'] = 'Επιλέξτε τον πάροχο ή την υπηρεσία και δείτε τα ραντεβού στο ημερολόγιο.';
-$lang['be_enable_appointment_sync_hint'] = 'Ενεργοποιείστε τον συγχρονισμό ραντεβού με τον λογαριασμό Google Calendar του πάροχου.';
-$lang['be_manage_customers_hint'] = 'Διαχειριστείτε του καταχωρημένους πελάτες και δείτε το ιστορικό των κρατήσεων τους.';
-$lang['be_manage_services_hint'] = 'Διαχειριστείτε όλες τις διαθέσιμες υπηρεσίες και κατηγορίες του συστήματος.';
-$lang['be_manage_users_hint'] = 'Διαχειριστείτε τους χρήστες του backend (διαχειριστές, πάροχοι, γραμματείς).';
-$lang['be_settings_hint'] = 'Επεξεργαστείτε τις ρυθμίσεις του συστήματος ή του τρέχοντος χρήστη.';
-$lang['be_log_out_hint'] = 'Αποσυνδεθείτε από το σύστημα.';
-$lang['be_unavailable_periods_hint'] = 'Κατά την διάρκεια των μη διαθέσιμων διαστημάτων οι πάροχοι δεν θα δέχονται νέα ραντεβού.';
-$lang['be_new_appointment_hint'] = 'Δημιουργείστε ένα νέο ραντεβού και αποθηκεύστε το στην βάση δεδομένων.';
-$lang['be_reload_appointments_hint'] = 'Επαναφορτώστε τα ραντεβού του ημερολογίου.';
-$lang['be_trigger_google_sync_hint'] = 'Εκκινήστε την διαδικασία συγχρονισμού με το Google Calendar.';
-$lang['be_appointment_updated'] = 'Το ραντεβού ενημερώθηκε επιτυχώς!';
-$lang['be_undo'] = 'Αναίρεση';
-$lang['be_cancel'] = 'Ακύρωση';
-$lang['be_appointment_details_changed'] = 'Τα στοιχεία του ραντεβού έχουν αλλάξει.';
-$lang['be_appointment_changes_saved'] = 'Οι αλλαγές του ραντεβού αποθηκεύτηκαν επιτυχώς.';
-$lang['be_save'] = 'Αποθήκευση';
-$lang['be_new'] = 'Νέο';
-$lang['be_select'] = 'Επιλογή';
-$lang['be_hide'] = 'Απόκρυψη';
-$lang['be_type_to_filter_customers'] = 'Πληκτρολογήστε για να φιλτράρετε τους πελάτες.';
-$lang['be_clear_fields_add_existing_customer_hint'] = 'Καθαρισμός των πεδίων και εισαγωγή νέου πελάτη.';
-$lang['be_pick_existing_customer_hint'] = 'Επιλογή ενός υπάρχων πελάτη.';
-$lang['be_new_appointment_title'] = 'Νέο Ραντεβού';
-$lang['be_edit_appointment_title'] = 'Επεξεργασία Ραντεβού';
-$lang['be_delete_appointment_title'] = 'Διαγραφή Ραντεβού';
-$lang['be_write_appointment_removal_reason'] = 'Παρακαλώ πάρτε λίγο χρόνο για να γράψετε τον λόγο για τον οποίο διαγράφετε το ραντεβού.';
-$lang['be_appointment_saved'] = 'Το ραντεβού αποθηκεύτηκε επιτυχώς!';
-$lang['be_new_unavailable_title'] = 'Νέα Μη Διαθέσιμη Περίοδος';
-$lang['be_edit_unavailable_title'] = 'Επεξεργασία Μη Διαθέσιμης Περιόδου';
-$lang['be_unavailable_saved'] = 'Η μη διαθέσιμη περίοδος αποθηκεύτηκε επιτυχώς!';
-$lang['be_start_date_before_end_error'] = 'Η ημερομηνία εκκίνησης είναι μεγαλύτερα από την ημερομηνία λήξης.';
-$lang['be_invalid_email'] = 'Λανθασμένη διεύθυνση email!';
-$lang['be_customers'] = 'Πελάτες';
-$lang['be_details'] = 'Λεπτομέρειες';
-$lang['be_no_records_found'] = 'Δεν βρέθηκαν εγγραφές ...';
-$lang['be_services'] = 'Υπηρεσίες';
-$lang['be_duration_minutes'] = 'Διάρκεια (Λεπτά)';
-$lang['be_currency'] = 'Νομισματική Μονάδα';
-$lang['be_category'] = 'Κατηγορία';
-$lang['be_no_category'] = 'Καμία Κατηγορία';
-$lang['be_description'] = 'Περιγραφή';
-$lang['be_categories'] = 'Κατηγορίες';
-$lang['be_admins'] = 'Διαχειριστές';
-$lang['be_providers'] = 'Πάροχοι';
-$lang['be_secretaries'] = 'Γραμματείς';
-$lang['be_mobile_number'] = 'Κινητό';
-$lang['be_state'] = 'Πολιτεία';
-$lang['be_username'] = 'Όνομα Χρήστη';
-$lang['be_password'] = 'Κωδικός Πρόσβασης';
-$lang['be_retype_password'] = 'Πληκτρολογήστε Ξανά τον Κωδικό';
-$lang['be_receive_notifications'] = 'Λήψη Ειδοποιήσεων';
-$lang['be_passwords_mismatch'] = 'Οι κωδικοί δεν ταιριάζουν!';
-$lang['be_admin_saved'] = 'Ο διαχειριστής αποθηκεύτηκε επιτυχώς!';
-$lang['be_provider_saved'] = 'Ο πάροχος αποθηκεύτηκε επιτυχώς!';
-$lang['be_secretary_saved'] = 'Ο γραμματέας αποθηκεύτηκε επιτυχώς!';
-$lang['be_admin_deleted'] = 'Ο διαχειριστής διαγράφηκε επιτυχώς!';
-$lang['be_provider_deleted'] = 'Ο πάροχος διαγράφηκε επιτυχώς!';
-$lang['be_secretary_deleted'] = 'Ο γραμματέας διαγράφηκε επιτυχώς!';
-$lang['be_service_saved'] = 'Η υπηρεσία αποθηκεύτηκε επιτυχώς!';
-$lang['be_service_category_saved'] = 'Η κατηγορία υπηρεσιών αποθηκεύτηκε επιτυχώς!';
-$lang['be_service_deleted'] = 'Η υπηρεσία διαγράφηκε επιτυχώς!';
-$lang['be_servce_category_deleted'] = 'Η κατηγορία υπηρεσιών διαγράφηκε επιτυχώς!';
-$lang['be_customer_saved'] = 'Ο πελάτης αποθηκεύτηκε επιτυχώς!';
-$lang['be_customer_deleted'] = 'Ο πελάτης διαγράφηκε επιτυχώς!';
-$lang['be_current_view'] = 'Τρέχων Προβολή';
-$lang['be_working_plan'] = 'Πλάνο Εργασίας';
-$lang['be_reset_plan'] = 'Επαναφορά Πλάνου';
-$lang['be_monday'] = 'Δευτέρα';
-$lang['be_tuesday'] = 'Τρίτη';
-$lang['be_wednesday'] = 'Τετάρτη';
-$lang['be_thursday'] = 'Πέμπτη';
-$lang['be_friday'] = 'Παρασκευή';
-$lang['be_saturday'] = 'Σάββατο';
-$lang['be_sunday'] = 'Κυριακή';
-$lang['be_breaks'] = 'Διαλείμματα';
-$lang['be_add_breaks_during_each_day'] = 'Προσθέστε τα εργασιακά διαλείμματα στην ημέρα που αντιστοιχούν. Κατά την διάρκεια των διαλειμμάτων οι πάροχοι δεν θα αποδέχονται ραντεβού.';
-$lang['be_day'] = 'Ημέρα';
-$lang['be_actions'] = 'Ενέργειες';
-$lang['be_reset_working_plan_hint'] = 'Επαναφορά του πλάνου εργασίας πίσω στις προεπιλεγμένες τιμές.';
-$lang['be_company_name'] = 'Όνομα Εταιρείας';
-$lang['be_company_name_hint'] = 'Το όνομα της εταιρείας θα εμφανίζεται παντού στο σύστημα (απαιτείται).';
-$lang['be_company_email'] = 'Email Εταιρείας';
-$lang['be_company_email_hint'] = 'Αυτή θα είναι η ηλεκτρονική διεύθυνση της εταιρείας. Θα χρησιμοποιείται ως η διεύθυνση του αποστολέα για τα email του συστήματος (απαιτείται).';
-$lang['be_company_link'] = 'Σύνδεσμος Εταιρείας';
-$lang['be_company_link_hint'] = 'Ο σύνδεσμος εταιρείας θα πρέπει να δείχνει στην επίσιμη ιστοσελίδα της εταιρείας (απαιτείται).';
-$lang['be_go_to_booking_page'] = 'Πλοήγηση Στην Σελίδα Κράτησης';
-$lang['be_settings_saved'] = 'Οι ρυθμίσεις αποθηκεύτηκαν επιτυχώς!';
-$lang['be_general'] = 'Γενικά';
-$lang['be_business_logic'] = 'Επιχειρηματική Λογική';
-$lang['be_current_user'] = 'Τρέχων Χρήστης';
-$lang['be_about_ea'] = 'Σχετικά με το E!A';
-$lang['be_edit_working_plan_hint'] = 'Σημειώστε παρακάτω τις μέρες και ώρες στις οποίες η εταιρεία θα δέχεται τα ραντεβού. Θα είστε σε θέση να τοποθετήσετε ραντεβού σε μη εργάσιμες ώρες αλλά οι πελάτες δεν θα μπορούν από μόνοι τους να να κάνουν κράτηση σε μη εργάσιμες χρονικές περιόδους. Αυτό το πλάνο εργασίας θα είναι η προεπιλεγμένη ρύθμιση για όλες τις νέες εγγραφές πάροχων υπηρεσιών αλλά θα είστε σε θέση να αλλάξετε το πλάνο του κάθε πάροχου ξεχωριστά, επεξεργάζοντας την εγγραφή του. Μετά από αυτήν την διαδικασία προσθέστε τα διαστήματα τα οποία αντιστοιχούν στα διαλείμματα.';
-$lang['be_edit_breaks_hint'] = 'Προσθέστε τα εργασιακά διαλείμματα στην ημέρα που αντιστοιχούν. Αυτά τα διαλείμματα θα εφαρμόζονται σε όλους τους νέους πάροχους.';
-$lang['be_book_advance_timeout'] = 'Χρονικό Όριο Πριν Από Κράτηση';
-$lang['be_book_advance_timeout_hint'] = 'Ορίστε το χρονικό περιθώριο (σε λεπτά) πριν οι πελάτες να μπορέσουν να κρατήσουν ή να τροποποιήσουν τα ραντεβού  με την εταιρεία.';
-$lang['be_timeout_minutes'] = 'Χρονικό Όριο (Λεπτά)';
-$lang['be_about_ea_info'] = 'Το Easy!Appointments είναι μια εξαιρετικά προσαρμόσιμη διαδικτυακή εφαρμογή η οποία επιτρέπει στους πελάτες σας να κλείνουν ραντεβού με εσάς μέσω του διαδικτύου. Επιπλέον παρέχει την δυνατότητα να συγχρονίσετε τα δεδομένα σας με το Google Calendar έτσι ώστε να μπορέσετε να τα χρησιμοποιήσετε με άλλες υπηρεσίες.';
-$lang['be_current_version'] = 'Τρέχων Έκδοση';
-$lang['be_support'] = 'Υποστήριξη';
-$lang['be_about_ea_support'] = 'Αν αντιμετωπίσετε προβλήματα κατά την χρήση του Easy!Appointments μπορείτε να ψάξετε το επίσημο Google Group για απαντήσεις. Μπορείτε επίσης να δημιουργήσετε ένα νέο θέμα στην σελίδα Google Code έτσι ώστε να βοηθήσετε την πρόοδο της ανάπτυξης.';
-$lang['be_official_website'] = 'Επίσημη Ιστοσελίδα';
-$lang['be_google_plus_community'] = 'Google+ Κοινότητα';
-$lang['be_support_group'] = 'Group Υποστήριξης';
-$lang['be_project_issues'] = 'Ζητήματα Έργου';
-$lang['be_license'] = 'Άδεια Χρήσης';
-$lang['be_about_ea_license'] = 'Το Easy!Appointments έχει αδειοδοτηθεί υπό την άδεια χρήσης GPLv3. Χρησιμοποιώντας τον κώδικα του Easy!Appointents με οποιονδήποτε τρόπο συμφωνείτε με τους όρους που περιγράφονται στον ακόλουθο σύνδεσμο:';
-$lang['be_logout_success'] = 'Έχετε αποσυνδεθεί επιτυχώς! Πατήστε σε κάποιο από τα ακόλουθα κουμπιά για να πλοηγηθείτε σε άλλη σελίδα.';
-$lang['be_book_appointment_title'] = 'Κράτηση Ραντεβού';
-$lang['be_backend_section'] = 'Τμήμα Backend';
-$lang['be_you_need_to_login'] = 'Καλώς ήρθατε! Θα χρειαστεί να συνδεθείτε για να δείτε τις σελίδες του backend.';
-$lang['be_enter_username_here'] = 'Εισάγετε το όνομα χρήστη σας εδώ ...';
-$lang['be_enter_password_here'] = 'Εισάγετε τον κωδικό σας εδώ ...';
-$lang['be_login'] = 'Σύνδεση';
-$lang['be_forgot_your_password'] = 'Ξεχάσατε τον κωδικό σας;';
-$lang['be_login_failed'] = 'Η σύνδεση απέτυχε, παρακαλώ εισάγετε τα σωστά στοιχεία σύνδεσης  και δοκιμάστε ξανά.';
-$lang['be_type_username_and_email_for_new_password'] = 'Εισάγετε το όνομα χρήστη και την διεύθυνση email για να λάβετε τον καινούργιο κωδικό πρόσβασης.';
-$lang['be_enter_email_here'] = 'Εισάγετε το email σας εδώ ...';
-$lang['be_regenerate_password'] = 'Παραγωγή Κωδικού';
-$lang['be_go_to_login'] = 'Πλοήγηση Πίσω Στην Σελίδα Σύνδεσης';
-$lang['be_new_password_sent_with_email'] = 'Ο νέος σας κωδικός έχει αποσταλεί με email.';
-$lang['be_new_account_password'] = 'Νέος Κωδικός Λογαριασμού';
-$lang['be_new_password_is'] = 'Ο νέος κωδικός του λογαριασμού σας είναι $password. Παρακαλώ αποθηκεύστε αυτό το email για να μπορείτε να ξαναβρείτε τον κωδικό αν είναι απαραίτητο. Μπορείτε επίσης να αλλάξετε αυτόν τον κωδικό με έναν καινούργιο στην σελίδα των ρυθμίσεων.';
-$lang['be_delete_record_prompt'] = 'Είστε σίγουρος ότι θέλετε να διαγράψετε αυτήν την εγγραφή; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.';
-$lang['be_delete_admin'] = 'Διαγραφή Διαχειριστή';
-$lang['be_delete_customer'] = 'Διαγραφή Πελάτη';
-$lang['be_delete_service'] = 'Διαγραφή Υπηρεσίας';
-$lang['be_delete_category'] = 'Διαγραφή Κατηγορίας Υπηρεσιών';
-$lang['be_delete_provider'] = 'Διαγραφή Πάροχου';
-$lang['be_delete_secretary'] = 'Διαγραφή Γραμματέα';
-$lang['be_delete_appointment'] = 'Διαγραφή Ραντεβού';
-$lang['be_delete_unavailable'] = 'Διαγραφή Μη Διαθέσιμης Περιόδου';
-$lang['be_delete'] = 'Διαγραφή';
-$lang['be_unexpected_issues'] = 'Απροσδόκητα Ζητήματα';
-$lang['be_unexpected_issues_message'] = 'Η διαδικασία δεν μπόρεσε να ολοκληρωθεί λόγω απροσδόκητων ζητημάτων.';
-$lang['be_close'] = 'Κλείσιμο';
-$lang['be_page_not_found'] = 'Η Σελίδα Δεν Βρέθηκε';
-$lang['be_page_not_found_message'] = 'Δυστυχώς η σελίδα που ζητήσατε δεν υπάρχει. Παρακαλώ ελέγξτε την διεύθυνση του περιηγητή σας ή πηγαίνετε σε κάποια από τις παρακάτω τοποθεσίες.';
-$lang['be_error'] = 'Σφάλμα';
-$lang['be_no_privileges'] = 'Ανεπαρκή Δικαιώματα';
-$lang['be_no_provileges_message'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε αυτήν την σελίδα. Παρακαλώ πλοηγηθείτε σε κάποιο άλλο τμήμα.';
-$lang['be_backend_calendar'] = 'Ημερολόγιο Backend';
-$lang['be_start_date_time'] = 'Ημ. / Ώρα Έναρξης';
-$lang['be_end_date_time'] = 'Ημ. / Ώρα Λήξης';
-$lang['be_licensed_under'] = 'Σύμφωνα Με Την Άδεια';
-$lang['be_unexpected_issues_occured'] = 'Παρουσιάστηκαν απροσδόκητα προβλήματα!';
-$lang['be_service_communication_error'] = 'Παρουσιάστηκε σφάλμα κατά την επικοινωνία με τον διακομιστή, παρακαλώ προσπαθήστε ξανά.';
-$lang['be_no_privileges_edit_appointments'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να επεξεργαστείτε ραντεβού.';
-$lang['be_unavailable_updated'] = 'Η μη διαθέσιμη περίοδος ενημερώθηκε επιτυχώς!';
-$lang['be_appointments'] = 'Ραντεβού';
-$lang['be_unexpected_warnings'] = 'Απροσδόκητες Προειδοποιήσεις';
-$lang['be_unexpected_warnings_message'] = 'Η διαδικασία ολοκληρώθηκε αλλά εμφανίστηκαν κάποιες προειδοποιήσειες.';
-$lang['be_filter'] = 'Φιλτράρισμα';
-$lang['be_clear'] = 'Καθαρισμός';
-$lang['be_uncategorized'] = 'Χωρίς Κατηγορία';
-$lang['be_username_already_exists'] = 'Το όνομα χρήστη υπάρχει ήδη.';
-$lang['be_password_length_notice']  = 'Ο κωδικός θα πρέπει να είναι τουλάχιστον $number χαρακτήρες.';
-$lang['be_general_settings'] = 'Γενικές Ρυθμίσεις';
-$lang['be_personal_information'] = 'Προσωπικές Πληροφορίες';
-$lang['be_system_login'] = 'Σύνδεση Στο Σύστημα';
-$lang['be_user_settings_are_invalid'] = 'Οι ρυθμίσεις του χρήστη δεν είναι έγκυρες. Παρακαλώ ελέγξτε τις ρυθμίσεις και προσπαθήστε ξανά.';
-$lang['be_add_break'] = 'Προσθήκη Διαλείμματος';
-$lang['be_edit_break'] = 'Επεξεργασία Διαλείμματος';
-$lang['be_delete_break'] = 'Διαγραφή Διαλείμματος';
\ No newline at end of file
diff --git a/src/application/language/greek/frontend_lang.php b/src/application/language/greek/frontend_lang.php
deleted file mode 100644
index 9fbcaece..00000000
--- a/src/application/language/greek/frontend_lang.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-// Frontend Translation File
-$lang['fe_page_title'] = 'Κράτηση Ραντεβού Με';
-$lang['fe_step_one_title'] = 'Επιλογή Υπηρεσίας & Πάροχου';
-$lang['fe_select_service'] = 'Επιλογή Υπηρεσίας';
-$lang['fe_select_provider'] = 'Επιλογή Πάροχου';
-$lang['fe_duration'] = 'Διάρκεια';
-$lang['fe_minutes'] = 'Λεπτά';
-$lang['fe_price'] = 'Τιμή';
-$lang['fe_next'] = 'Επόμενο';
-$lang['fe_back'] = 'Πίσω';
-$lang['fe_step_two_title'] = 'Επιλογή Ημερομηνίας και Ώρας Ραντεβού';
-$lang['fe_no_available_hours'] = 'Δεν υπάρχουν διαθέσιμες ώρες ραντεβού για την επιλεγμένη ημερομηνία. Παρακαλώ επιλέξτε άλλη ημερομηνία.';
-$lang['fe_appointment_hour_missing'] = 'Παρακαλώ επιλέξτε μια ημερομηνία ραντεβού πριν συνεχίσετε.';
-$lang['fe_step_three_title'] = 'Συμπληρώστε Τα Στοιχεία Σας';
-$lang['fe_first_name'] = 'Όνομα';
-$lang['fe_last_name'] = 'Επώνυμο';
-$lang['fe_email'] = 'Email';
-$lang['fe_phone_number'] = 'Τηλέφωνο';
-$lang['fe_address'] = 'Διεύθυνση';
-$lang['fe_city'] = 'Πόλη';
-$lang['fe_zip_code'] = 'Ταχυδρομικός Κώδικας';
-$lang['fe_notes'] = 'Σημειώσεις';
-$lang['fe_fields_are_required'] = 'Τα πεδία με * είναι υποχρεωτικά!';
-$lang['fe_step_four_title'] = 'Επιβεβαίωση Κράτησης Ραντεβού';
-$lang['fe_confirm'] = 'Επιβεβαίωση';
-$lang['fe_update'] = 'Ενημέρωση';
-$lang['fe_cancel_appointment_hint'] = 'Πιέστε το κουμπί “Άκυρο” για να διαγράψετε το ραντεβού από το πλάνο της εταιρείας.';
-$lang['fe_cancel'] = 'Άκυρο';
-$lang['fe_appointment_registered'] = 'Το ραντεβού σας καταχωρήθηκε επιτυχώς!';
-$lang['fe_cancel_appointment_title'] = 'Ακύρωση Ραντεβού';
-$lang['fe_appointment_cancelled'] = 'Το ραντεβού σας ακυρώθηκε επιτυχώς!';
-$lang['fe_appointment_cancelled_title'] = 'Το Ραντεβού Ακυρώθηκε';
-$lang['fe_reason'] = 'Αιτία';
-$lang['fe_appointment_removed_from_schedule'] = 'Αυτό το ραντεβού διαγράφηκε από το πλάνο της εταιρείας.';
-$lang['fe_appointment_details_was_sent_to_you'] = 'Ένα email με τις λεπτομέρειες του ραντεβού έχει σταλεί σε εσάς.';
-$lang['fe_add_to_google_calendar'] = 'Προσθήκη στο Google Calendar';
-$lang['fe_appointment_booked'] = 'Το ραντεβού σας κρατήθηκε επιτυχώς!';
-$lang['fe_thank_you_for_appointment'] = 'Ευχαριστούμε για την κράτηση ραντεβού με εμάς. Παρακάτω μπορείτε να δείτε τις λεπτομέρειες του ραντεβού. Πραγματοποιείστε αλλαγές ακολουθώντας τον σύνδεσμο του ραντεβού.';
-$lang['fe_appointment_details_title'] = 'Λεπτομέρειες Ραντεβού';
-$lang['fe_customer_details_title'] = 'Λεπτομέρειες Πελάτη';
-$lang['fe_service'] = 'Υπηρεσία';
-$lang['fe_provider'] = 'Πάροχος';
-$lang['fe_customer'] = 'Πελάτης';
-$lang['fe_start'] = 'Έναρξη';
-$lang['fe_end'] = 'Λήξη';
-$lang['fe_name'] = 'Όνομα';
-$lang['fe_phone'] = 'Τηλέφωνο';
-$lang['fe_address'] = 'Διεύθυνση';
-$lang['fe_appointment_link_title'] = 'Σύνδεσμος Ραντεβού';
-$lang['fe_success'] = 'Επιτυχία!';
-$lang['fe_appointment_added_to_google_calendar'] = 'Το ραντεβού έχει προστεθεί στον λογαριασμό σας στο Google Calendar.';
-$lang['fe_view_appointment_in_google_calendar'] = 'Πατήστε εδώ για να δείτε το ραντεβού στο Google Calendar.';
-$lang['fe_appointment_added_to_your_plan'] = 'Ένα νέο ραντεβού έχει προστεθεί στο πλάνο σας.';
-$lang['fe_appointment_link_description'] = 'Μπορείτε να πραγματοποιήσετε αλλαγές πατώντας στον σύνδεσμο του ραντεβού.';
-$lang['fe_appointment_not_found'] = 'Το Ραντεβού Δεν Βρέθηκε!';
-$lang['fe_appointment_does_not_exist_in_db'] = 'Το ραντεβού που ζητήσατε δεν υπάρχει πλέον στην βάση δεδομένων του συστήματος.';
\ No newline at end of file
diff --git a/src/application/language/greek/translations_lang.php b/src/application/language/greek/translations_lang.php
new file mode 100644
index 00000000..62cc135a
--- /dev/null
+++ b/src/application/language/greek/translations_lang.php
@@ -0,0 +1,264 @@
+<?php
+// Greek
+$lang['page_title'] = 'Κράτηση Ραντεβού Με';
+$lang['step_one_title'] = 'Επιλογή Υπηρεσίας & Πάροχου';
+$lang['select_service'] = 'Επιλογή Υπηρεσίας';
+$lang['select_provider'] = 'Επιλογή Πάροχου';
+$lang['duration'] = 'Διάρκεια';
+$lang['minutes'] = 'Λεπτά';
+$lang['price'] = 'Τιμή';
+$lang['next'] = 'Επόμενο';
+$lang['back'] = 'Πίσω';
+$lang['step_two_title'] = 'Επιλογή Ημερομηνίας και Ώρας Ραντεβού';
+$lang['no_available_hours'] = 'Δεν υπάρχουν διαθέσιμες ώρες ραντεβού για την επιλεγμένη ημερομηνία. Παρακαλώ επιλέξτε άλλη ημερομηνία.';
+$lang['appointment_hour_missing'] = 'Παρακαλώ επιλέξτε μια ημερομηνία ραντεβού πριν συνεχίσετε.';
+$lang['step_three_title'] = 'Συμπληρώστε Τα Στοιχεία Σας';
+$lang['first_name'] = 'Όνομα';
+$lang['last_name'] = 'Επώνυμο';
+$lang['email'] = 'Email';
+$lang['phone_number'] = 'Τηλέφωνο';
+$lang['address'] = 'Διεύθυνση';
+$lang['city'] = 'Πόλη';
+$lang['zip_code'] = 'Ταχυδρομικός Κώδικας';
+$lang['notes'] = 'Σημειώσεις';
+$lang['fields_are_required'] = 'Τα πεδία με * είναι υποχρεωτικά!';
+$lang['step_four_title'] = 'Επιβεβαίωση Κράτησης Ραντεβού';
+$lang['confirm'] = 'Επιβεβαίωση';
+$lang['update'] = 'Ενημέρωση';
+$lang['cancel_appointment_hint'] = 'Πιέστε το κουμπί “Άκυρο” για να διαγράψετε το ραντεβού από το πλάνο της εταιρείας.';
+$lang['cancel'] = 'Άκυρο';
+$lang['appointment_registered'] = 'Το ραντεβού σας καταχωρήθηκε επιτυχώς!';
+$lang['cancel_appointment_title'] = 'Ακύρωση Ραντεβού';
+$lang['appointment_cancelled'] = 'Το ραντεβού σας ακυρώθηκε επιτυχώς!';
+$lang['appointment_cancelled_title'] = 'Το Ραντεβού Ακυρώθηκε';
+$lang['reason'] = 'Αιτία';
+$lang['appointment_removed_from_schedule'] = 'Αυτό το ραντεβού διαγράφηκε από το πλάνο της εταιρείας.';
+$lang['appointment_details_was_sent_to_you'] = 'Ένα email με τις λεπτομέρειες του ραντεβού έχει σταλεί σε εσάς.';
+$lang['add_to_google_calendar'] = 'Προσθήκη στο Google Calendar';
+$lang['appointment_booked'] = 'Το ραντεβού σας κρατήθηκε επιτυχώς!';
+$lang['thank_you_for_appointment'] = 'Ευχαριστούμε για την κράτηση ραντεβού με εμάς. Παρακάτω μπορείτε να δείτε τις λεπτομέρειες του ραντεβού. Πραγματοποιείστε αλλαγές ακολουθώντας τον σύνδεσμο του ραντεβού.';
+$lang['appointment_details_title'] = 'Λεπτομέρειες Ραντεβού';
+$lang['customer_details_title'] = 'Λεπτομέρειες Πελάτη';
+$lang['service'] = 'Υπηρεσία';
+$lang['provider'] = 'Πάροχος';
+$lang['customer'] = 'Πελάτης';
+$lang['start'] = 'Έναρξη';
+$lang['end'] = 'Λήξη';
+$lang['name'] = 'Όνομα';
+$lang['phone'] = 'Τηλέφωνο';
+$lang['address'] = 'Διεύθυνση';
+$lang['appointment_link_title'] = 'Σύνδεσμος Ραντεβού';
+$lang['success'] = 'Επιτυχία!';
+$lang['appointment_added_to_google_calendar'] = 'Το ραντεβού έχει προστεθεί στον λογαριασμό σας στο Google Calendar.';
+$lang['view_appointment_in_google_calendar'] = 'Πατήστε εδώ για να δείτε το ραντεβού στο Google Calendar.';
+$lang['appointment_added_to_your_plan'] = 'Ένα νέο ραντεβού έχει προστεθεί στο πλάνο σας.';
+$lang['appointment_link_description'] = 'Μπορείτε να πραγματοποιήσετε αλλαγές πατώντας στον σύνδεσμο του ραντεβού.';
+$lang['appointment_not_found'] = 'Το Ραντεβού Δεν Βρέθηκε!';
+$lang['appointment_does_not_exist_in_db'] = 'Το ραντεβού που ζητήσατε δεν υπάρχει πλέον στην βάση δεδομένων του συστήματος.';
+$lang['display_calendar'] = 'Προβολή Ημερολογίου';
+$lang['providers'] = 'Πάροχοι';
+$lang['services'] = 'Υπηρεσίες';
+$lang['calendar'] = 'Ημερολόγιο';
+$lang['customers'] = 'Πελάτες';
+$lang['users'] = 'Χρήστες';
+$lang['settings'] = 'Ρυθμίσεις';
+$lang['log_out'] = 'Αποσύνδεση';
+$lang['synchronize'] = 'Συγχρονισμός';
+$lang['enable_sync'] = 'Ενεργοποίηση Συγχρ.';
+$lang['disable_sync'] = 'Απενεργοποίηση Συγχρ.';
+$lang['reload'] = 'Επαναφόρτωση';
+$lang['appointment'] = 'Ραντεβού';
+$lang['unavailable'] = 'Μη Διαθέσιμος';
+$lang['day'] = 'Ημέρα';
+$lang['week'] = 'Εβδομάδα';
+$lang['month'] = 'Μήνας';
+$lang['today'] = 'Σήμερα';
+$lang['not_working'] = 'Μη Εργάσιμη';
+$lang['break'] = 'Διάλειμμα';
+$lang['add'] = 'Προσθήκη';
+$lang['edit'] = 'Επεξεργασία';
+$lang['delete'] = 'Διαγραφή';
+$lang['hello'] = 'Χαίρετε';
+$lang['all_day'] = 'Ολοήμερο';
+$lang['manage_appointment_record_hint'] = 'Διαχειριστείτε όλες τις εγγραφές ραντεβού των διαθέσιμων πάροχων και υπηρεσιών.';
+$lang['select_filter_item_hint'] = 'Επιλέξτε τον πάροχο ή την υπηρεσία και δείτε τα ραντεβού στο ημερολόγιο.';
+$lang['enable_appointment_sync_hint'] = 'Ενεργοποιείστε τον συγχρονισμό ραντεβού με τον λογαριασμό Google Calendar του πάροχου.';
+$lang['manage_customers_hint'] = 'Διαχειριστείτε του καταχωρημένους πελάτες και δείτε το ιστορικό των κρατήσεων τους.';
+$lang['manage_services_hint'] = 'Διαχειριστείτε όλες τις διαθέσιμες υπηρεσίες και κατηγορίες του συστήματος.';
+$lang['manage_users_hint'] = 'Διαχειριστείτε τους χρήστες του backend (διαχειριστές, πάροχοι, γραμματείς).';
+$lang['settings_hint'] = 'Επεξεργαστείτε τις ρυθμίσεις του συστήματος ή του τρέχοντος χρήστη.';
+$lang['log_out_hint'] = 'Αποσυνδεθείτε από το σύστημα.';
+$lang['unavailable_periods_hint'] = 'Κατά την διάρκεια των μη διαθέσιμων διαστημάτων οι πάροχοι δεν θα δέχονται νέα ραντεβού.';
+$lang['new_appointment_hint'] = 'Δημιουργείστε ένα νέο ραντεβού και αποθηκεύστε το στην βάση δεδομένων.';
+$lang['reload_appointments_hint'] = 'Επαναφορτώστε τα ραντεβού του ημερολογίου.';
+$lang['trigger_google_sync_hint'] = 'Εκκινήστε την διαδικασία συγχρονισμού με το Google Calendar.';
+$lang['appointment_updated'] = 'Το ραντεβού ενημερώθηκε επιτυχώς!';
+$lang['undo'] = 'Αναίρεση';
+$lang['cancel'] = 'Ακύρωση';
+$lang['appointment_details_changed'] = 'Τα στοιχεία του ραντεβού έχουν αλλάξει.';
+$lang['appointment_changes_saved'] = 'Οι αλλαγές του ραντεβού αποθηκεύτηκαν επιτυχώς.';
+$lang['save'] = 'Αποθήκευση';
+$lang['new'] = 'Νέο';
+$lang['select'] = 'Επιλογή';
+$lang['hide'] = 'Απόκρυψη';
+$lang['type_to_filter_customers'] = 'Πληκτρολογήστε για να φιλτράρετε τους πελάτες.';
+$lang['clear_fields_add_existing_customer_hint'] = 'Καθαρισμός των πεδίων και εισαγωγή νέου πελάτη.';
+$lang['pick_existing_customer_hint'] = 'Επιλογή ενός υπάρχων πελάτη.';
+$lang['new_appointment_title'] = 'Νέο Ραντεβού';
+$lang['edit_appointment_title'] = 'Επεξεργασία Ραντεβού';
+$lang['delete_appointment_title'] = 'Διαγραφή Ραντεβού';
+$lang['write_appointment_removal_reason'] = 'Παρακαλώ πάρτε λίγο χρόνο για να γράψετε τον λόγο για τον οποίο διαγράφετε το ραντεβού.';
+$lang['appointment_saved'] = 'Το ραντεβού αποθηκεύτηκε επιτυχώς!';
+$lang['new_unavailable_title'] = 'Νέα Μη Διαθέσιμη Περίοδος';
+$lang['edit_unavailable_title'] = 'Επεξεργασία Μη Διαθέσιμης Περιόδου';
+$lang['unavailable_saved'] = 'Η μη διαθέσιμη περίοδος αποθηκεύτηκε επιτυχώς!';
+$lang['start_date_before_end_error'] = 'Η ημερομηνία εκκίνησης είναι μεγαλύτερα από την ημερομηνία λήξης.';
+$lang['invalid_email'] = 'Λανθασμένη διεύθυνση email!';
+$lang['customers'] = 'Πελάτες';
+$lang['details'] = 'Λεπτομέρειες';
+$lang['no_records_found'] = 'Δεν βρέθηκαν εγγραφές ...';
+$lang['services'] = 'Υπηρεσίες';
+$lang['duration_minutes'] = 'Διάρκεια (Λεπτά)';
+$lang['currency'] = 'Νομισματική Μονάδα';
+$lang['category'] = 'Κατηγορία';
+$lang['no_category'] = 'Καμία Κατηγορία';
+$lang['description'] = 'Περιγραφή';
+$lang['categories'] = 'Κατηγορίες';
+$lang['admins'] = 'Διαχειριστές';
+$lang['providers'] = 'Πάροχοι';
+$lang['secretaries'] = 'Γραμματείς';
+$lang['mobile_number'] = 'Κινητό';
+$lang['state'] = 'Πολιτεία';
+$lang['username'] = 'Όνομα Χρήστη';
+$lang['password'] = 'Κωδικός Πρόσβασης';
+$lang['retype_password'] = 'Πληκτρολογήστε Ξανά τον Κωδικό';
+$lang['receive_notifications'] = 'Λήψη Ειδοποιήσεων';
+$lang['passwords_mismatch'] = 'Οι κωδικοί δεν ταιριάζουν!';
+$lang['admin_saved'] = 'Ο διαχειριστής αποθηκεύτηκε επιτυχώς!';
+$lang['provider_saved'] = 'Ο πάροχος αποθηκεύτηκε επιτυχώς!';
+$lang['secretary_saved'] = 'Ο γραμματέας αποθηκεύτηκε επιτυχώς!';
+$lang['admin_deleted'] = 'Ο διαχειριστής διαγράφηκε επιτυχώς!';
+$lang['provider_deleted'] = 'Ο πάροχος διαγράφηκε επιτυχώς!';
+$lang['secretary_deleted'] = 'Ο γραμματέας διαγράφηκε επιτυχώς!';
+$lang['service_saved'] = 'Η υπηρεσία αποθηκεύτηκε επιτυχώς!';
+$lang['service_category_saved'] = 'Η κατηγορία υπηρεσιών αποθηκεύτηκε επιτυχώς!';
+$lang['service_deleted'] = 'Η υπηρεσία διαγράφηκε επιτυχώς!';
+$lang['servce_category_deleted'] = 'Η κατηγορία υπηρεσιών διαγράφηκε επιτυχώς!';
+$lang['customer_saved'] = 'Ο πελάτης αποθηκεύτηκε επιτυχώς!';
+$lang['customer_deleted'] = 'Ο πελάτης διαγράφηκε επιτυχώς!';
+$lang['current_view'] = 'Τρέχων Προβολή';
+$lang['working_plan'] = 'Πλάνο Εργασίας';
+$lang['reset_plan'] = 'Επαναφορά Πλάνου';
+$lang['monday'] = 'Δευτέρα';
+$lang['tuesday'] = 'Τρίτη';
+$lang['wednesday'] = 'Τετάρτη';
+$lang['thursday'] = 'Πέμπτη';
+$lang['friday'] = 'Παρασκευή';
+$lang['saturday'] = 'Σάββατο';
+$lang['sunday'] = 'Κυριακή';
+$lang['breaks'] = 'Διαλείμματα';
+$lang['add_breaks_during_each_day'] = 'Προσθέστε τα εργασιακά διαλείμματα στην ημέρα που αντιστοιχούν. Κατά την διάρκεια των διαλειμμάτων οι πάροχοι δεν θα αποδέχονται ραντεβού.';
+$lang['day'] = 'Ημέρα';
+$lang['actions'] = 'Ενέργειες';
+$lang['reset_working_plan_hint'] = 'Επαναφορά του πλάνου εργασίας πίσω στις προεπιλεγμένες τιμές.';
+$lang['company_name'] = 'Όνομα Εταιρείας';
+$lang['company_name_hint'] = 'Το όνομα της εταιρείας θα εμφανίζεται παντού στο σύστημα (απαιτείται).';
+$lang['company_email'] = 'Email Εταιρείας';
+$lang['company_email_hint'] = 'Αυτή θα είναι η ηλεκτρονική διεύθυνση της εταιρείας. Θα χρησιμοποιείται ως η διεύθυνση του αποστολέα για τα email του συστήματος (απαιτείται).';
+$lang['company_link'] = 'Σύνδεσμος Εταιρείας';
+$lang['company_link_hint'] = 'Ο σύνδεσμος εταιρείας θα πρέπει να δείχνει στην επίσιμη ιστοσελίδα της εταιρείας (απαιτείται).';
+$lang['go_to_booking_page'] = 'Πλοήγηση Στην Σελίδα Κράτησης';
+$lang['settings_saved'] = 'Οι ρυθμίσεις αποθηκεύτηκαν επιτυχώς!';
+$lang['general'] = 'Γενικά';
+$lang['business_logic'] = 'Επιχειρηματική Λογική';
+$lang['current_user'] = 'Τρέχων Χρήστης';
+$lang['about_ea'] = 'Σχετικά με το E!A';
+$lang['edit_working_plan_hint'] = 'Σημειώστε παρακάτω τις μέρες και ώρες στις οποίες η εταιρεία θα δέχεται τα ραντεβού. Θα είστε σε θέση να τοποθετήσετε ραντεβού σε μη εργάσιμες ώρες αλλά οι πελάτες δεν θα μπορούν από μόνοι τους να να κάνουν κράτηση σε μη εργάσιμες χρονικές περιόδους. Αυτό το πλάνο εργασίας θα είναι η προεπιλεγμένη ρύθμιση για όλες τις νέες εγγραφές πάροχων υπηρεσιών αλλά θα είστε σε θέση να αλλάξετε το πλάνο του κάθε πάροχου ξεχωριστά, επεξεργάζοντας την εγγραφή του. Μετά από αυτήν την διαδικασία προσθέστε τα διαστήματα τα οποία αντιστοιχούν στα διαλείμματα.';
+$lang['edit_breaks_hint'] = 'Προσθέστε τα εργασιακά διαλείμματα στην ημέρα που αντιστοιχούν. Αυτά τα διαλείμματα θα εφαρμόζονται σε όλους τους νέους πάροχους.';
+$lang['book_advance_timeout'] = 'Χρονικό Όριο Πριν Από Κράτηση';
+$lang['book_advance_timeout_hint'] = 'Ορίστε το χρονικό περιθώριο (σε λεπτά) πριν οι πελάτες να μπορέσουν να κρατήσουν ή να τροποποιήσουν τα ραντεβού  με την εταιρεία.';
+$lang['timeout_minutes'] = 'Χρονικό Όριο (Λεπτά)';
+$lang['about_ea_info'] = 'Το Easy!Appointments είναι μια εξαιρετικά προσαρμόσιμη διαδικτυακή εφαρμογή η οποία επιτρέπει στους πελάτες σας να κλείνουν ραντεβού με εσάς μέσω του διαδικτύου. Επιπλέον παρέχει την δυνατότητα να συγχρονίσετε τα δεδομένα σας με το Google Calendar έτσι ώστε να μπορέσετε να τα χρησιμοποιήσετε με άλλες υπηρεσίες.';
+$lang['current_version'] = 'Τρέχων Έκδοση';
+$lang['support'] = 'Υποστήριξη';
+$lang['about_ea_support'] = 'Αν αντιμετωπίσετε προβλήματα κατά την χρήση του Easy!Appointments μπορείτε να ψάξετε το επίσημο Google Group για απαντήσεις. Μπορείτε επίσης να δημιουργήσετε ένα νέο θέμα στην σελίδα Google Code έτσι ώστε να βοηθήσετε την πρόοδο της ανάπτυξης.';
+$lang['official_website'] = 'Επίσημη Ιστοσελίδα';
+$lang['google_plus_community'] = 'Google+ Κοινότητα';
+$lang['support_group'] = 'Group Υποστήριξης';
+$lang['project_issues'] = 'Ζητήματα Έργου';
+$lang['license'] = 'Άδεια Χρήσης';
+$lang['about_ea_license'] = 'Το Easy!Appointments έχει αδειοδοτηθεί υπό την άδεια χρήσης GPLv3. Χρησιμοποιώντας τον κώδικα του Easy!Appointents με οποιονδήποτε τρόπο συμφωνείτε με τους όρους που περιγράφονται στον ακόλουθο σύνδεσμο:';
+$lang['logout_success'] = 'Έχετε αποσυνδεθεί επιτυχώς! Πατήστε σε κάποιο από τα ακόλουθα κουμπιά για να πλοηγηθείτε σε άλλη σελίδα.';
+$lang['book_appointment_title'] = 'Κράτηση Ραντεβού';
+$lang['backend_section'] = 'Τμήμα Backend';
+$lang['you_need_to_login'] = 'Καλώς ήρθατε! Θα χρειαστεί να συνδεθείτε για να δείτε τις σελίδες του backend.';
+$lang['enter_username_here'] = 'Εισάγετε το όνομα χρήστη σας εδώ ...';
+$lang['enter_password_here'] = 'Εισάγετε τον κωδικό σας εδώ ...';
+$lang['login'] = 'Σύνδεση';
+$lang['forgot_your_password'] = 'Ξεχάσατε τον κωδικό σας;';
+$lang['login_failed'] = 'Η σύνδεση απέτυχε, παρακαλώ εισάγετε τα σωστά στοιχεία σύνδεσης  και δοκιμάστε ξανά.';
+$lang['type_username_and_email_for_new_password'] = 'Εισάγετε το όνομα χρήστη και την διεύθυνση email για να λάβετε τον καινούργιο κωδικό πρόσβασης.';
+$lang['enter_email_here'] = 'Εισάγετε το email σας εδώ ...';
+$lang['regenerate_password'] = 'Παραγωγή Κωδικού';
+$lang['go_to_login'] = 'Πλοήγηση Πίσω Στην Σελίδα Σύνδεσης';
+$lang['new_password_sent_with_email'] = 'Ο νέος σας κωδικός έχει αποσταλεί με email.';
+$lang['new_account_password'] = 'Νέος Κωδικός Λογαριασμού';
+$lang['new_password_is'] = 'Ο νέος κωδικός του λογαριασμού σας είναι $password. Παρακαλώ αποθηκεύστε αυτό το email για να μπορείτε να ξαναβρείτε τον κωδικό αν είναι απαραίτητο. Μπορείτε επίσης να αλλάξετε αυτόν τον κωδικό με έναν καινούργιο στην σελίδα των ρυθμίσεων.';
+$lang['delete_record_prompt'] = 'Είστε σίγουρος ότι θέλετε να διαγράψετε αυτήν την εγγραφή; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.';
+$lang['delete_admin'] = 'Διαγραφή Διαχειριστή';
+$lang['delete_customer'] = 'Διαγραφή Πελάτη';
+$lang['delete_service'] = 'Διαγραφή Υπηρεσίας';
+$lang['delete_category'] = 'Διαγραφή Κατηγορίας Υπηρεσιών';
+$lang['delete_provider'] = 'Διαγραφή Πάροχου';
+$lang['delete_secretary'] = 'Διαγραφή Γραμματέα';
+$lang['delete_appointment'] = 'Διαγραφή Ραντεβού';
+$lang['delete_unavailable'] = 'Διαγραφή Μη Διαθέσιμης Περιόδου';
+$lang['delete'] = 'Διαγραφή';
+$lang['unexpected_issues'] = 'Απροσδόκητα Ζητήματα';
+$lang['unexpected_issues_message'] = 'Η διαδικασία δεν μπόρεσε να ολοκληρωθεί λόγω απροσδόκητων ζητημάτων.';
+$lang['close'] = 'Κλείσιμο';
+$lang['page_not_found'] = 'Η Σελίδα Δεν Βρέθηκε';
+$lang['page_not_found_message'] = 'Δυστυχώς η σελίδα που ζητήσατε δεν υπάρχει. Παρακαλώ ελέγξτε την διεύθυνση του περιηγητή σας ή πηγαίνετε σε κάποια από τις παρακάτω τοποθεσίες.';
+$lang['error'] = 'Σφάλμα';
+$lang['no_privileges'] = 'Ανεπαρκή Δικαιώματα';
+$lang['no_provileges_message'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε αυτήν την σελίδα. Παρακαλώ πλοηγηθείτε σε κάποιο άλλο τμήμα.';
+$lang['backend_calendar'] = 'Ημερολόγιο Backend';
+$lang['start_date_time'] = 'Ημ. / Ώρα Έναρξης';
+$lang['end_date_time'] = 'Ημ. / Ώρα Λήξης';
+$lang['licensed_under'] = 'Σύμφωνα Με Την Άδεια';
+$lang['unexpected_issues_occured'] = 'Παρουσιάστηκαν απροσδόκητα προβλήματα!';
+$lang['service_communication_error'] = 'Παρουσιάστηκε σφάλμα κατά την επικοινωνία με τον διακομιστή, παρακαλώ προσπαθήστε ξανά.';
+$lang['no_privileges_edit_appointments'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να επεξεργαστείτε ραντεβού.';
+$lang['unavailable_updated'] = 'Η μη διαθέσιμη περίοδος ενημερώθηκε επιτυχώς!';
+$lang['appointments'] = 'Ραντεβού';
+$lang['unexpected_warnings'] = 'Απροσδόκητες Προειδοποιήσεις';
+$lang['unexpected_warnings_message'] = 'Η διαδικασία ολοκληρώθηκε αλλά εμφανίστηκαν κάποιες προειδοποιήσειες.';
+$lang['filter'] = 'Φιλτράρισμα';
+$lang['clear'] = 'Καθαρισμός';
+$lang['uncategorized'] = 'Χωρίς Κατηγορία';
+$lang['username_already_exists'] = 'Το όνομα χρήστη υπάρχει ήδη.';
+$lang['password_length_notice']  = 'Ο κωδικός θα πρέπει να είναι τουλάχιστον $number χαρακτήρες.';
+$lang['general_settings'] = 'Γενικές Ρυθμίσεις';
+$lang['personal_information'] = 'Προσωπικές Πληροφορίες';
+$lang['system_login'] = 'Σύνδεση Στο Σύστημα';
+$lang['user_settings_are_invalid'] = 'Οι ρυθμίσεις του χρήστη δεν είναι έγκυρες. Παρακαλώ ελέγξτε τις ρυθμίσεις και προσπαθήστε ξανά.';
+$lang['add_break'] = 'Προσθήκη Διαλείμματος';
+$lang['january'] = 'Ιανουάριος';
+$lang['february'] = 'Φεβρουάριος';
+$lang['march'] = 'Μάρτιος';
+$lang['april'] = 'Απρίλιος';
+$lang['may'] = 'Μάιος';
+$lang['june'] = 'Ιούνιος';
+$lang['july'] = 'Ιούλιος';
+$lang['august'] = 'Αύγουστος';
+$lang['september'] = 'Σεπτέμβριος';
+$lang['october'] = 'Οκτώβριος';
+$lang['november'] = 'Νοέμβριος';
+$lang['december'] = 'Δεκέμβριος';
+$lang['previous'] = 'Προηγούμενο';
+$lang['next'] = 'Επόμενο';
+$lang['now'] = 'Τώρα';
+$lang['select_time'] = 'Επιλέξτε Ώρα';
+$lang['time'] = 'Χρόνος';
+$lang['hour'] = 'Ώρα';
+$lang['minute'] = 'Λεπτά';
\ No newline at end of file
diff --git a/src/application/libraries/notifications.php b/src/application/libraries/notifications.php
index 052530c6..f0dbeeba 100644
--- a/src/application/libraries/notifications.php
+++ b/src/application/libraries/notifications.php
@@ -84,17 +84,17 @@ class Notifications {
             '$customer_address'         => $customer_data['address'],
             
             // Translations
-            'Appointment Details' => $this->ci->lang->line('fe_appointment_details_title'),
-            'Service' => $this->ci->lang->line('fe_service'),
-            'Provider' => $this->ci->lang->line('fe_provider'),
-            'Start' => $this->ci->lang->line('fe_start'),
-            'End' => $this->ci->lang->line('fe_end'),
-            'Customer Details' => $this->ci->lang->line('fe_customer_details_title'),
-            'Name' => $this->ci->lang->line('fe_name'),
-            'Email' => $this->ci->lang->line('fe_email'),
-            'Phone' => $this->ci->lang->line('fe_phone'),
-            'Address' => $this->ci->lang->line('fe_address'),
-            'Appointment Link' => $this->ci->lang->line('fe_appointment_link_title')
+            'Appointment Details' => $this->ci->lang->line('appointment_details_title'),
+            'Service' => $this->ci->lang->line('service'),
+            'Provider' => $this->ci->lang->line('provider'),
+            'Start' => $this->ci->lang->line('start'),
+            'End' => $this->ci->lang->line('end'),
+            'Customer Details' => $this->ci->lang->line('customer_details_title'),
+            'Name' => $this->ci->lang->line('name'),
+            'Email' => $this->ci->lang->line('email'),
+            'Phone' => $this->ci->lang->line('phone'),
+            'Address' => $this->ci->lang->line('address'),
+            'Appointment Link' => $this->ci->lang->line('appointment_link_title')
         );
         
         $email_html = file_get_contents(dirname(dirname(__FILE__)) 
@@ -142,8 +142,8 @@ class Notifications {
             $service_data, $customer_data, $company_settings, $to_address, $reason) {
       	// :: PREPARE EMAIL REPLACE ARRAY
         $replace_array = array(
-            '$email_title'          => $this->ci->lang->line('fe_appointment_cancelled_title'),
-            '$email_message'        => $this->ci->lang->line('fe_appointment_removed_from_schedule'),
+            '$email_title'          => $this->ci->lang->line('appointment_cancelled_title'),
+            '$email_message'        => $this->ci->lang->line('appointment_removed_from_schedule'),
             '$appointment_service'  => $service_data['name'],
             '$appointment_provider' => $provider_data['first_name'] . ' ' . $provider_data['last_name'],
             '$appointment_date'     => date('d/m/Y H:i', strtotime($appointment_data['start_datetime'])),
@@ -157,17 +157,17 @@ class Notifications {
             '$reason'               => $reason,
             
             // Translations
-            'Appointment Details' => $this->ci->lang->line('fe_appointment_details_title'),
-            'Service' => $this->ci->lang->line('fe_service'),
-            'Provider' => $this->ci->lang->line('fe_provider'),
-            'Date' => $this->ci->lang->line('fe_start'),
-            'Duration' => $this->ci->lang->line('fe_duration'),
-            'Customer Details' => $this->ci->lang->line('fe_customer_details_title'),
-            'Name' => $this->ci->lang->line('fe_name'),
-            'Email' => $this->ci->lang->line('fe_email'),
-            'Phone' => $this->ci->lang->line('fe_phone'),
-            'Address' => $this->ci->lang->line('fe_address'),
-            'Reason' => $this->ci->lang->line('fe_reason')
+            'Appointment Details' => $this->ci->lang->line('appointment_details_title'),
+            'Service' => $this->ci->lang->line('service'),
+            'Provider' => $this->ci->lang->line('provider'),
+            'Date' => $this->ci->lang->line('start'),
+            'Duration' => $this->ci->lang->line('duration'),
+            'Customer Details' => $this->ci->lang->line('customer_details_title'),
+            'Name' => $this->ci->lang->line('name'),
+            'Email' => $this->ci->lang->line('email'),
+            'Phone' => $this->ci->lang->line('phone'),
+            'Address' => $this->ci->lang->line('address'),
+            'Reason' => $this->ci->lang->line('reason')
         );
         
         $email_html = file_get_contents(dirname(dirname(__FILE__)) 
@@ -181,7 +181,7 @@ class Notifications {
         $mail->AddAddress($to_address); // "Name" argument crushes the phpmailer class.
         $mail->IsHTML(true);
         $mail->CharSet      = 'UTF-8';
-        $mail->Subject      = $this->ci->lang->line('fe_appointment_cancelled_title');
+        $mail->Subject      = $this->ci->lang->line('appointment_cancelled_title');
         $mail->Body         = $email_html;
 
         if (!$mail->Send()) {
@@ -200,8 +200,8 @@ class Notifications {
      */
     public function send_password($password, $email, $company_settings) {
         $replace_array = array(
-            '$email_title' => $this->ci->lang->line('be_new_account_password'),
-            '$email_message' => $this->ci->lang->line('be_new_password_is'),
+            '$email_title' => $this->ci->lang->line('new_account_password'),
+            '$email_message' => $this->ci->lang->line('new_password_is'),
             '$company_name' => $company_settings['company_name'],
             '$company_email' => $company_settings['company_email'],
             '$company_link' => $company_settings['company_link'],
@@ -219,7 +219,7 @@ class Notifications {
         $mail->AddAddress($email); // "Name" argument crushes the phpmailer class.
         $mail->IsHTML(true);
         $mail->CharSet = 'UTF-8';
-        $mail->Subject = $this->ci->lang->line('be_new_account_password');
+        $mail->Subject = $this->ci->lang->line('new_account_password');
         $mail->Body = $email_html;
 
         if (!$mail->Send()) {
diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index 8eabd293..b208ab16 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('fe_page_title') . ' ' .  $company_name; ?></title>
+    <title><?php echo $this->lang->line('page_title') . ' ' .  $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php
@@ -102,17 +102,17 @@
                 <span id="company-name"><?php echo $company_name; ?></span>
                 
                 <div id="steps">
-                    <div id="step-1" class="book-step active-step" title="<?php echo $this->lang->line('fe_step_one_title'); ?>">
+                    <div id="step-1" class="book-step active-step" title="<?php echo $this->lang->line('step_one_title'); ?>">
                         <strong>1</strong>
                     </div>
                     
-                    <div id="step-2" class="book-step" title="<?php echo $this->lang->line('fe_step_two_title'); ?>">
+                    <div id="step-2" class="book-step" title="<?php echo $this->lang->line('step_two_title'); ?>">
                         <strong>2</strong>
                     </div>
-                    <div id="step-3" class="book-step" title="<?php echo $this->lang->line('fe_step_three_title'); ?>">
+                    <div id="step-3" class="book-step" title="<?php echo $this->lang->line('step_three_title'); ?>">
                         <strong>3</strong>
                     </div>
-                    <div id="step-4" class="book-step" title="<?php echo $this->lang->line('fe_step_four_title'); ?>">
+                    <div id="step-4" class="book-step" title="<?php echo $this->lang->line('step_four_title'); ?>">
                         <strong>4</strong>
                     </div>
                 </div>
@@ -126,14 +126,14 @@
                     echo '
                         <div id="cancel-appointment-frame">
                             <p class="pull-left">' . 
-                                $this->lang->line('fe_cancel_appointment_hint') .
+                                $this->lang->line('cancel_appointment_hint') .
                             '</p>
                             <form id="cancel-appointment-form" method="post" class="pull-right"  
                                     action="' . $this->config->item('base_url') 
                                     . 'appointments/cancel/' . $appointment_data['hash'] . '">
                                 <textarea name="cancel_reason" style="display:none"></textarea>
                                 <button id="cancel-appointment" class="btn btn-inverse">' .
-                                        $this->lang->line('fe_cancel') . '</button>
+                                        $this->lang->line('cancel') . '</button>
                             </form>
                         </div>';
                 }   
@@ -145,7 +145,7 @@
                 // ------------------------------------------------------
                 if (isset($exceptions)) {
                     echo '<div style="margin: 10px">';
-                    echo '<h4>' . $this->lang->line('be_unexpected_issues') . '</h4>';
+                    echo '<h4>' . $this->lang->line('unexpected_issues') . '</h4>';
                     foreach($exceptions as $exception) {
                         echo exceptionToHtml($exception);
                     }
@@ -158,11 +158,11 @@
                 // ------------------------------------------------------ ?>
             <div id="wizard-frame-1" class="wizard-frame">                
                 <div class="frame-container">
-                    <h3 class="frame-title"><?php echo $this->lang->line('fe_step_one_title'); ?></h3>
+                    <h3 class="frame-title"><?php echo $this->lang->line('step_one_title'); ?></h3>
                     
                     <div class="frame-content" style="width:520px">
                         <label for="select-service">
-                            <strong><?php echo $this->lang->line('fe_select_service'); ?></strong>
+                            <strong><?php echo $this->lang->line('select_service'); ?></strong>
                         </label>
                         
                         <select id="select-service">
@@ -221,7 +221,7 @@
                         </select>
 
                         <label for="select-provider">
-                            <strong><?php echo $this->lang->line('fe_select_provider'); ?></strong>
+                            <strong><?php echo $this->lang->line('select_provider'); ?></strong>
                         </label>
                         
                         <select id="select-provider"></select>
@@ -233,7 +233,7 @@
                 <div class="command-buttons">
                     <button type="button" id="button-next-1" class="btn button-next btn-primary" 
                             data-step_index="1">
-                        <?php echo $this->lang->line('fe_next'); ?> 
+                        <?php echo $this->lang->line('next'); ?> 
                         <i class="icon-forward icon-white"></i></button>
                 </div>
             </div>
@@ -245,7 +245,7 @@
             <div id="wizard-frame-2" class="wizard-frame" style="display:none;">
                 <div class="frame-container">
                     
-                    <h3 class="frame-title"><?php echo $this->lang->line('fe_step_two_title'); ?></h3>
+                    <h3 class="frame-title"><?php echo $this->lang->line('step_two_title'); ?></h3>
                     
                     <div class="frame-content" style="width:600px">
                         <div class="span3">
@@ -262,11 +262,11 @@
                 <div class="command-buttons">
                     <button type="button" id="button-back-2" class="btn button-back" 
                             data-step_index="2"><i class="icon-backward"></i> 
-                        <?php echo $this->lang->line('fe_back'); ?>
+                        <?php echo $this->lang->line('back'); ?>
                     </button>
                     <button type="button" id="button-next-2" class="btn button-next btn-primary" 
                             data-step_index="2">
-                        <?php echo $this->lang->line('fe_next'); ?>
+                        <?php echo $this->lang->line('next'); ?>
                         <i class="icon-forward icon-white"></i>
                     </button>
                 </div>
@@ -279,37 +279,37 @@
             <div id="wizard-frame-3" class="wizard-frame" style="display:none;">
                 <div class="frame-container">
                     
-                    <h3 class="frame-title"><?php echo $this->lang->line('fe_step_three_title'); ?></h3>
+                    <h3 class="frame-title"><?php echo $this->lang->line('step_three_title'); ?></h3>
                     
                     <div class="frame-content" style="width:600px">
                         <div class="span3">
-                            <label for="first-name"><?php echo $this->lang->line('fe_first_name'); ?> *</label>
+                            <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
                             <input type="text" id="first-name" class="required" maxlength="100" />
                             
-                            <label for="last-name"><?php echo $this->lang->line('fe_last_name'); ?> *</label>
+                            <label for="last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
                             <input type="text" id="last-name" class="required" maxlength="250" />
 
-                            <label for="email"><?php echo $this->lang->line('fe_email'); ?> *</label>
+                            <label for="email"><?php echo $this->lang->line('email'); ?> *</label>
                             <input type="text" id="email" class="required" maxlength="250" />
 
-                            <label for="phone-number"><?php echo $this->lang->line('fe_phone_number'); ?> *</label>
+                            <label for="phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
                             <input type="text" id="phone-number" class="required" maxlength="60" />
 
                             <br/><br/>
-                            <em id="form-message" class="text-error"><?php echo $this->lang->line('fe_fields_are_required'); ?></em>
+                            <em id="form-message" class="text-error"><?php echo $this->lang->line('fields_are_required'); ?></em>
                         </div>
 
                         <div class="span3">
-                            <label for="address"><?php echo $this->lang->line('fe_address'); ?></label>
+                            <label for="address"><?php echo $this->lang->line('address'); ?></label>
                             <input type="text" id="address" maxlength="250" />
 
-                            <label for="city"><?php echo $this->lang->line('fe_city'); ?></label>
+                            <label for="city"><?php echo $this->lang->line('city'); ?></label>
                             <input type="text" id="city" maxlength="120" />
 
-                            <label for="zip-code"><?php echo $this->lang->line('fe_zip_code'); ?></label>
+                            <label for="zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
                             <input type="text" id="zip-code" maxlength="120" />
 
-                            <label for="notes"><?php echo $this->lang->line('fe_notes'); ?></label>
+                            <label for="notes"><?php echo $this->lang->line('notes'); ?></label>
                             <textarea id="notes" maxlength="500" rows="3"></textarea>
                         </div>
                     </div>
@@ -318,11 +318,11 @@
                 <div class="command-buttons">
                     <button type="button" id="button-back-3" class="btn button-back" 
                             data-step_index="3"><i class="icon-backward"></i> 
-                        <?php echo $this->lang->line('fe_back'); ?>
+                        <?php echo $this->lang->line('back'); ?>
                     </button>
                     <button type="button" id="button-next-3" class="btn button-next btn-primary" 
                             data-step_index="3">
-                        <?php echo $this->lang->line('fe_next'); ?>
+                        <?php echo $this->lang->line('next'); ?>
                         <i class="icon-forward icon-white"></i>
                     </button>
                 </div>
@@ -334,7 +334,7 @@
                 // ------------------------------------------------------ ?>
             <div id="wizard-frame-4" class="wizard-frame" style="display:none;">
                 <div class="frame-container">
-                    <h3 class="frame-title"><?php echo $this->lang->line('fe_step_four_title'); ?></h3>
+                    <h3 class="frame-title"><?php echo $this->lang->line('step_four_title'); ?></h3>
                     <div class="frame-content" style="width:600px">
                         <div id="appointment-details" class="span3"></div>
                         <div id="customer-details" class="span3"></div>
@@ -344,14 +344,14 @@
                 <div class="command-buttons">
                     <button type="button" id="button-back-4" class="btn button-back" 
                             data-step_index="4"><i class="icon-backward"></i> 
-                        <?php echo $this->lang->line('fe_back'); ?>
+                        <?php echo $this->lang->line('back'); ?>
                     </button>
                     <form id="book-appointment-form" style="display:inline-block" method="post">
                         <button type="submit" class="btn btn-success">
                             <i class="icon-ok icon-white"></i>
                             <?php
-                                echo (!$manage_mode) ? $this->lang->line('fe_confirm')
-                                        : $this->lang->line('fe_update');
+                                echo (!$manage_mode) ? $this->lang->line('confirm')
+                                        : $this->lang->line('update');
                             ?>
                         </button>
                         <input type="hidden" name="post_data" />
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index a8edcb71..c9aa4ece 100644
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('fe_appointment_registered') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('appointment_registered') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -147,12 +147,12 @@
                                 $('#success-frame').append(
                                     '<br><br>' +
                                     '<div class="alert alert-success">' +
-                                        '<h4>' + EALang['fe_success'] + '</h4>' +
+                                        '<h4>' + EALang['success'] + '</h4>' +
                                         '<p>' +
-                                            EALang['fe_appointment_added_to_google_calendar'] + 
+                                            EALang['appointment_added_to_google_calendar'] + 
                                             '<br>' + 
                                             '<a href="' + response.htmlLink + '" target="_blank">' + 
-                                                EALang['fe_view_appointment_in_google_calendar'] +
+                                                EALang['view_appointment_in_google_calendar'] +
                                             '</a>' + 
                                         '</p>' +
                                     '</div>'
@@ -185,13 +185,13 @@
     <div id="success-frame" class="frame-container">
         <img id="success-icon" src="<?php echo $this->config->base_url(); ?>assets/images/success.png" />
 
-        <h3><?php echo $this->lang->line('fe_appointment_registered'); ?></h3>
-        <p><?php echo $this->lang->line('fe_appointment_details_was_sent_to_you'); ?></p>
+        <h3><?php echo $this->lang->line('appointment_registered'); ?></h3>
+        <p><?php echo $this->lang->line('appointment_details_was_sent_to_you'); ?></p>
 
         <?php if ($this->config->item('ea_google_sync_feature')) { ?>
         <button id="add-to-google-calendar" class="btn btn-primary">
             <i class="icon-plus icon-white"></i>
-            <?php echo $this->lang->line('fe_add_to_google_calendar'); ?>
+            <?php echo $this->lang->line('add_to_google_calendar'); ?>
         </button>
         <?php } ?>
         
diff --git a/src/application/views/appointments/cancel.php b/src/application/views/appointments/cancel.php
index 1b12aebc..99bac9ec 100644
--- a/src/application/views/appointments/cancel.php
+++ b/src/application/views/appointments/cancel.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('fe_appointment_cancelled_title'); ?></title>
+    <title><?php echo $this->lang->line('appointment_cancelled_title'); ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -49,7 +49,7 @@
     <div id="success-frame" class="frame-container">
         <img id="success-icon" src="<?php echo $this->config->base_url(); ?>assets/images/success.png" />
         
-        <h3><?php echo $this->lang->line('fe_appointment_cancelled'); ?></h3>
+        <h3><?php echo $this->lang->line('appointment_cancelled'); ?></h3>
         
         <?php 
             // Display exceptions (if any).
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index 7d5eadfc..1bab70eb 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -38,10 +38,10 @@
     <div id="calendar-toolbar">
         <div id="calendar-filter">
             <label for="select-filter-item">
-                <?php echo $this->lang->line('be_display_calendar'); ?>
+                <?php echo $this->lang->line('display_calendar'); ?>
             </label>
             <select id="select-filter-item" 
-                    title="<?php echo $this->lang->line('be_select_filter_item_hint'); ?>">
+                    title="<?php echo $this->lang->line('select_filter_item_hint'); ?>">
             </select>
         </div>
         
@@ -51,37 +51,37 @@
                 <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
                         && $this->config->item('ea_google_sync_feature') == TRUE) { ?>
                 <button id="google-sync" class="btn btn-primary" 
-                        title="<?php echo $this->lang->line('be_trigger_google_sync_hint'); ?>">
+                        title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
                     <i class="icon-refresh icon-white"></i>
-                    <span><?php echo $this->lang->line('be_synchronize'); ?></span>
+                    <span><?php echo $this->lang->line('synchronize'); ?></span>
                 </button>
 
                 <button id="enable-sync" class="btn" data-toggle="button" 
-                        title="<?php echo $this->lang->line('be_enable_appointment_sync_hint'); ?>">
+                        title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
                     <i class="icon-calendar"></i>
-                    <span><?php echo $this->lang->line('be_enable_sync'); ?></span>
+                    <span><?php echo $this->lang->line('enable_sync'); ?></span>
                 </button>
                 <?php } ?>
                 
                 <button id="reload-appointments" class="btn" 
-                        title="<?php echo $this->lang->line('be_reload_appointments_hint'); ?>">
+                        title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
                     <i class="icon-repeat"></i>
-                    <span><?php echo $this->lang->line('be_reload'); ?></span>
+                    <span><?php echo $this->lang->line('reload'); ?></span>
                 </button>
             </div>
             
             <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE) { ?>
             <div class="btn-group">
                 <button id="insert-appointment" class="btn btn-info" 
-                        title="<?php echo $this->lang->line('be_new_appointment_hint'); ?>">
+                        title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
                     <i class="icon-plus icon-white"></i>
-                    <span><?php echo $this->lang->line('be_appointment'); ?></span>
+                    <span><?php echo $this->lang->line('appointment'); ?></span>
                 </button>
 
                 <button id="insert-unavailable" class="btn" 
-                        title="<?php echo $this->lang->line('be_unavailable_periods_hint'); ?>">
+                        title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
                     <i class="icon-plus"></i>
-                    <span><?php echo $this->lang->line('be_unavailable'); ?></span>
+                    <span><?php echo $this->lang->line('unavailable'); ?></span>
                 </button>
             </div>
             <?php } ?>
@@ -102,7 +102,7 @@
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" 
                 aria-hidden="true">&times;</button>
-        <h3><?php echo $this->lang->line('be_edit_appointment_title'); ?></h3>
+        <h3><?php echo $this->lang->line('edit_appointment_title'); ?></h3>
     </div>
     
     <div class="modal-body">
@@ -110,12 +110,12 @@
         
         <form class="form-horizontal">
             <fieldset>
-                <legend><?php echo $this->lang->line('fe_appointment_details_title'); ?></legend>
+                <legend><?php echo $this->lang->line('appointment_details_title'); ?></legend>
                 
                 <input id="appointment-id" type="hidden" />
                 
                 <div class="control-group">
-                    <label for="select-service" class="control-label"><?php echo $this->lang->line('fe_service'); ?> *</label>
+                    <label for="select-service" class="control-label"><?php echo $this->lang->line('service'); ?> *</label>
                     <div class="controls">
                         <select id="select-service" class="required span4">
                             <?php 
@@ -175,28 +175,28 @@
                 </div>
                 
                 <div class="control-group">
-                    <label for="select-provider" class="control-label"><?php echo $this->lang->line('fe_provider'); ?> *</label>
+                    <label for="select-provider" class="control-label"><?php echo $this->lang->line('provider'); ?> *</label>
                     <div class="controls">
                         <select id="select-provider" class="required span4"></select>
                     </div>
                 </div>
                 
                 <div class="control-group">
-                    <label for="start-datetime" class="control-label"><?php echo $this->lang->line('be_start_date_time'); ?></label>
+                    <label for="start-datetime" class="control-label"><?php echo $this->lang->line('start_date_time'); ?></label>
                     <div class="controls">
                         <input type="text" id="start-datetime" />
                     </div>
                 </div>
                 
                 <div class="control-group">
-                    <label for="end-datetime" class="control-label"><?php echo $this->lang->line('be_start_date_time'); ?></label>
+                    <label for="end-datetime" class="control-label"><?php echo $this->lang->line('start_date_time'); ?></label>
                     <div class="controls">
                         <input type="text" id="end-datetime" />
                     </div>
                 </div>
                 
                 <div class="control-group">
-                    <label for="notes" class="control-label"><?php echo $this->lang->line('fe_notes'); ?></label>
+                    <label for="notes" class="control-label"><?php echo $this->lang->line('notes'); ?></label>
                     <div class="controls">
                         <textarea id="appointment-notes" class="span4" rows="3"></textarea>
                     </div>
@@ -205,17 +205,17 @@
 
             <fieldset class="row-fluid">
                 <legend>
-                    <?php echo $this->lang->line('fe_customer_details_title'); ?>
+                    <?php echo $this->lang->line('customer_details_title'); ?>
                     <button id="new-customer" class="btn btn-mini" 
-                            title="<?php echo $this->lang->line('be_clear_fields_add_existing_customer_hint'); ?>"
-                            type="button"><?php echo $this->lang->line('be_new'); ?>
+                            title="<?php echo $this->lang->line('clear_fields_add_existing_customer_hint'); ?>"
+                            type="button"><?php echo $this->lang->line('new'); ?>
                     </button>
                     <button id="select-customer" class="btn btn-primary btn-mini" 
-                            title="<?php echo $this->lang->line('be_pick_existing_customer_hint'); ?>" 
-                            type="button"><?php echo $this->lang->line('be_select'); ?>
+                            title="<?php echo $this->lang->line('pick_existing_customer_hint'); ?>" 
+                            type="button"><?php echo $this->lang->line('select'); ?>
                     </button>
                     <input type="text" id="filter-existing-customers"
-                           placeholder="<?php echo $this->lang->line('be_type_to_filter_customers'); ?>" 
+                           placeholder="<?php echo $this->lang->line('type_to_filter_customers'); ?>" 
                            style="display: none;" class="input-medium"/>
                     <div id="existing-customers-list" style="display: none;"></div>
                 </legend>
@@ -225,7 +225,7 @@
                 <div class="span5">
                     <div class="control-group">
                         <label for="first-name" class="control-label">
-                            <?php echo $this->lang->line('fe_first_name'); ?> *</label>
+                            <?php echo $this->lang->line('first_name'); ?> *</label>
                         <div class="controls">
                             <input type="text" id="first-name" class="required" />
                         </div>
@@ -233,7 +233,7 @@
 
                     <div class="control-group">
                         <label for="last-name" class="control-label">
-                            <?php echo $this->lang->line('fe_last_name'); ?>*</label>
+                            <?php echo $this->lang->line('last_name'); ?>*</label>
                         <div class="controls">
                             <input type="text" id="last-name" class="required" />
                         </div>
@@ -241,7 +241,7 @@
 
                     <div class="control-group">
                         <label for="email" class="control-label">
-                            <?php echo $this->lang->line('fe_email'); ?>*</label>
+                            <?php echo $this->lang->line('email'); ?>*</label>
                         <div class="controls">
                             <input type="text" id="email" class="required" />
                         </div>
@@ -249,7 +249,7 @@
 
                     <div class="control-group">
                         <label for="phone-number" class="control-label">
-                            <?php echo $this->lang->line('fe_phone_number'); ?>*</label>
+                            <?php echo $this->lang->line('phone_number'); ?>*</label>
                         <div class="controls">
                             <input type="text" id="phone-number" class="required" />
                         </div>
@@ -258,7 +258,7 @@
                 <div class="span6">
                     <div class="control-group">
                         <label for="address" class="control-label">
-                            <?php echo $this->lang->line('fe_address'); ?>
+                            <?php echo $this->lang->line('address'); ?>
                         </label>
                         <div class="controls">
                             <input type="text" id="address" />
@@ -267,7 +267,7 @@
 
                     <div class="control-group">
                         <label for="city" class="control-label">
-                            <?php echo $this->lang->line('fe_city'); ?>
+                            <?php echo $this->lang->line('city'); ?>
                         </label>
                         <div class="controls">
                             <input type="text" id="city" />
@@ -276,7 +276,7 @@
 
                     <div class="control-group">
                         <label for="zip-code" class="control-label">
-                            <?php echo $this->lang->line('fe_zip_code'); ?>
+                            <?php echo $this->lang->line('zip_code'); ?>
                         </label>
                         <div class="controls">
                             <input type="text" id="zip-code" />
@@ -285,7 +285,7 @@
                     
                     <div class="control-group">
                         <label for="notes" class="control-label">
-                            <?php echo $this->lang->line('fe_notes'); ?></label>
+                            <?php echo $this->lang->line('notes'); ?></label>
                         <div class="controls">
                             <textarea id="customer-notes" rows="3"></textarea>
                         </div>
@@ -297,10 +297,10 @@
     
     <div class="modal-footer">
         <button id="save-appointment" class="btn btn-primary">
-            <?php echo $this->lang->line('be_save'); ?>
+            <?php echo $this->lang->line('save'); ?>
         </button>
         <button id="cancel-appointment" class="btn">
-            <?php echo $this->lang->line('fe_cancel'); ?>
+            <?php echo $this->lang->line('cancel'); ?>
         </button>
     </div>
 </div>
@@ -316,7 +316,7 @@
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" 
                 aria-hidden="true">&times;</button>
-        <h3><?php echo $this->lang->line('be_new_unavailable_title'); ?></h3>
+        <h3><?php echo $this->lang->line('new_unavailable_title'); ?></h3>
         
     </div>
     
@@ -329,7 +329,7 @@
                 
                 <div class="control-group">
                     <label for="unavailable-start" class="control-label">
-                        <?php echo $this->lang->line('fe_start'); ?>
+                        <?php echo $this->lang->line('start'); ?>
                     </label>
                     <div class="controls">
                         <input type="text" id="unavailable-start" />
@@ -338,7 +338,7 @@
                 
                 <div class="control-group">
                     <label for="unavailable-end" class="control-label">
-                        <?php echo $this->lang->line('fe_end'); ?>
+                        <?php echo $this->lang->line('end'); ?>
                     </label>
                     <div class="controls">
                         <input type="text" id="unavailable-end" />
@@ -347,7 +347,7 @@
                 
                 <div class="control-group">
                     <label for="unavailable-notes" class="control-label">
-                        <?php echo $this->lang->line('fe_notes'); ?>
+                        <?php echo $this->lang->line('notes'); ?>
                     </label>
                     <div class="controls">
                         <textarea id="unavailable-notes" rows="3" class="span3"></textarea>
@@ -359,10 +359,10 @@
     
     <div class="modal-footer">
         <button id="save-unavailable" class="btn btn-primary">
-            <?php echo $this->lang->line('be_save'); ?>
+            <?php echo $this->lang->line('save'); ?>
         </button>
         <button id="cancel-unavailable" class="btn">
-            <?php echo $this->lang->line('fe_cancel'); ?>
+            <?php echo $this->lang->line('cancel'); ?>
         </button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 488d5bfc..214404dd 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -29,15 +29,15 @@
 	<div id="filter-customers" class="filter-records column span4">
 		<form class="input-append">
 			<input class="key span12" type="text" />
-            <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter'); ?>">
+            <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear'); ?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear'); ?>">
                     <i class="icon-repeat"></i>
                 </button>
 		</form>
         
-        <h2><?php echo $this->lang->line('be_customers'); ?></h2>
+        <h2><?php echo $this->lang->line('customers'); ?></h2>
         <div class="results"></div>
 	</div>
 
@@ -47,21 +47,21 @@
                 <?php if ($privileges[PRIV_CUSTOMERS]['add'] == TRUE) { ?>
                 <button id="add-customer" class="btn btn-primary">
                     <i class="icon-plus icon-white"></i>
-                    <?php echo $this->lang->line('be_add'); ?>
+                    <?php echo $this->lang->line('add'); ?>
                 </button>
                 <?php } ?>
                 
                 <?php if ($privileges[PRIV_CUSTOMERS]['edit'] == TRUE) { ?>
                 <button id="edit-customer" class="btn" disabled="disabled">
                     <i class="icon-pencil"></i>
-                    <?php echo $this->lang->line('be_edit'); ?>
+                    <?php echo $this->lang->line('edit'); ?>
                 </button>
                 <?php }?>
                 
                 <?php if ($privileges[PRIV_CUSTOMERS]['delete'] == TRUE) { ?>
                 <button id="delete-customer" class="btn" disabled="disabled">
                     <i class="icon-remove"></i>
-                    <?php echo $this->lang->line('be_delete'); ?>
+                    <?php echo $this->lang->line('delete'); ?>
                 </button>
                 <?php } ?>
             </div>
@@ -69,11 +69,11 @@
             <div id="save-cancel-group" class="btn-group" style="display:none;">
                 <button id="save-customer" class="btn btn-primary">
                     <i class="icon-ok icon-white"></i>
-                    <?php echo $this->lang->line('be_save'); ?>
+                    <?php echo $this->lang->line('save'); ?>
                 </button>
                 <button id="cancel-customer" class="btn">
                     <i class="icon-ban-circle"></i>
-                    <?php echo $this->lang->line('be_cancel'); ?>
+                    <?php echo $this->lang->line('cancel'); ?>
                 </button>
             </div>
         </div>
@@ -81,40 +81,40 @@
         <input id="customer-id" type="hidden" />
         
         <div class="span6" style="margin-left: 0;">
-            <h2><?php echo $this->lang->line('be_details'); ?></h2>
+            <h2><?php echo $this->lang->line('details'); ?></h2>
             <div id="form-message" class="alert" style="display:none;"></div>
             
-            <label for="first-name"><?php echo $this->lang->line('fe_first_name'); ?> *</label>
+            <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
             <input type="text" id="first-name" class="span11 required" />
 
-            <label for="last-name"><?php echo $this->lang->line('fe_last_name'); ?> *</label>
+            <label for="last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
             <input type="text" id="last-name" class="span11 required" />
 
-            <label for="email"><?php echo $this->lang->line('fe_email'); ?> *</label>
+            <label for="email"><?php echo $this->lang->line('email'); ?> *</label>
             <input type="text" id="email" class="span11 required" />
 
-            <label for="phone-number"><?php echo $this->lang->line('fe_phone_number'); ?> *</label>
+            <label for="phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
             <input type="text" id="phone-number" class="span11 required" />
             
-            <label for="address"><?php echo $this->lang->line('fe_address'); ?></label>
+            <label for="address"><?php echo $this->lang->line('address'); ?></label>
             <input type="text" id="address" class="span11" />
 
-            <label for="city"><?php echo $this->lang->line('fe_city'); ?></label>
+            <label for="city"><?php echo $this->lang->line('city'); ?></label>
             <input type="text" id="city" class="span11" />
 
-            <label for="zip-code"><?php echo $this->lang->line('fe_zip_code'); ?></label>
+            <label for="zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
             <input type="text" id="zip-code" class="span11" />
 
-            <label for="notes"><?php echo $this->lang->line('fe_notes'); ?></label>
+            <label for="notes"><?php echo $this->lang->line('notes'); ?></label>
             <textarea id="notes" rows="4" class="span11"></textarea>
             
             <br/><br/>
             <center><em id="form-message" class="text-error">
-                <?php echo $this->lang->line('fe_fields_are_required'); ?></em></center>
+                <?php echo $this->lang->line('fields_are_required'); ?></em></center>
         </div> 
         
         <div class="span5">
-            <h2><?php echo $this->lang->line('be_appointments'); ?></h2>
+            <h2><?php echo $this->lang->line('appointments'); ?></h2>
             <div id="customer-appointments"></div>
             <div id="appointment-details"></div>
         </div>
diff --git a/src/application/views/backend/footer.php b/src/application/views/backend/footer.php
index 9992fc09..ae076553 100644
--- a/src/application/views/backend/footer.php
+++ b/src/application/views/backend/footer.php
@@ -12,11 +12,11 @@
                 }
             ?>
         </a> | 
-        <?php echo $this->lang->line('be_licensed_under'); ?> GPLv3
+        <?php echo $this->lang->line('licensed_under'); ?> GPLv3
     </div>
     
     <div id="footer-user-display-name">
-        <?php echo $this->lang->line('be_hello') . ', ' . $user_display_name; ?>!
+        <?php echo $this->lang->line('hello') . ', ' . $user_display_name; ?>!
     </div>
 </div>
 
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index cd40e12a..c748ec88 100644
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -79,8 +79,8 @@
         <?php $hidden = ($privileges[PRIV_APPOINTMENTS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_APPOINTMENTS) ? 'active' : ''; ?>
         <a href="<?php echo $base_url; ?>backend" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
-                title="<?php echo $this->lang->line('be_manage_appointment_record_hint'); ?>">
-            <?php echo $this->lang->line('be_calendar'); ?>
+                title="<?php echo $this->lang->line('manage_appointment_record_hint'); ?>">
+            <?php echo $this->lang->line('calendar'); ?>
         </a>
         
         <?php // CUSTOMERS MENU ITEM 
@@ -88,8 +88,8 @@
         <?php $hidden = ($privileges[PRIV_CUSTOMERS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_CUSTOMERS) ? 'active' : ''; ?>
         <a href="<?php echo $base_url; ?>backend/customers" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
-                title="<?php echo $this->lang->line('be_manage_customers_hint'); ?>">
-            <?php echo $this->lang->line('be_customers'); ?>
+                title="<?php echo $this->lang->line('manage_customers_hint'); ?>">
+            <?php echo $this->lang->line('customers'); ?>
         </a>
         
         <?php // SERVICES MENU ITEM 
@@ -97,8 +97,8 @@
         <?php $hidden = ($privileges[PRIV_SERVICES]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_SERVICES) ? 'active' : ''; ?>
         <a href="<?php echo $base_url; ?>backend/services" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
-                title="<?php echo $this->lang->line('be_manage_services_hint'); ?>">
-            <?php echo $this->lang->line('be_services'); ?>
+                title="<?php echo $this->lang->line('manage_services_hint'); ?>">
+            <?php echo $this->lang->line('services'); ?>
         </a>
         
         <?php // USERS MENU ITEM 
@@ -106,8 +106,8 @@
         <?php $hidden = ($privileges[PRIV_USERS]['view'] ==  TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_USERS) ? 'active' : ''; ?>
         <a href="<?php echo $base_url; ?>backend/users" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
-                title="<?php echo $this->lang->line('be_manage_users_hint'); ?>">
-            <?php echo $this->lang->line('be_users'); ?>
+                title="<?php echo $this->lang->line('manage_users_hint'); ?>">
+            <?php echo $this->lang->line('users'); ?>
         </a>
         
         <?php // SETTINGS MENU ITEM 
@@ -116,15 +116,15 @@
                 || $privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
         <?php $active = ($active_menu == PRIV_SYSTEM_SETTINGS) ? 'active' : ''; ?>
         <a href="<?php echo $base_url; ?>backend/settings" class="menu-item <?php echo $hidden; ?><?php echo $active; ?>"
-                title="<?php echo $this->lang->line('be_settings_hint'); ?>">
-            <?php echo $this->lang->line('be_settings'); ?>
+                title="<?php echo $this->lang->line('settings_hint'); ?>">
+            <?php echo $this->lang->line('settings'); ?>
         </a>
         
         <?php // LOGOUT MENU ITEM 
               // ------------------------------------------------------ ?>
         <a href="<?php echo $base_url; ?>user/logout" class="menu-item"
-                title="<?php echo $this->lang->line('be_log_out_hint'); ?>">
-            <?php echo $this->lang->line('be_log_out'); ?>
+                title="<?php echo $this->lang->line('log_out_hint'); ?>">
+            <?php echo $this->lang->line('log_out'); ?>
         </a>
         
     </div>
diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index 9ca7c701..8d6687a4 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -23,8 +23,8 @@
 
 <div id="services-page" class="row-fluid">
     <ul class="nav nav-tabs">
-        <li class="services-tab tab active"><a><?php echo $this->lang->line('be_services'); ?></a></li>
-        <li class="categories-tab tab"><a><?php echo $this->lang->line('be_categories'); ?></a></li>
+        <li class="services-tab tab active"><a><?php echo $this->lang->line('services'); ?></a></li>
+        <li class="categories-tab tab"><a><?php echo $this->lang->line('categories'); ?></a></li>
     </ul>
     
     <?php 
@@ -39,15 +39,15 @@
         <div id="filter-services" class="filter-records column span4">
             <form class="input-append">
                 <input class="key span12" type="text" />
-                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter'); ?>">
+                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear'); ?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear'); ?>">
                     <i class="icon-repeat"></i>
                 </button>
             </form>
             
-            <h2><?php echo $this->lang->line('be_services'); ?></h2>
+            <h2><?php echo $this->lang->line('services'); ?></h2>
             <div class="results"></div>
         </div>
 
@@ -56,56 +56,56 @@
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-service" class="btn btn-primary">
                         <i class="icon-plus icon-white"></i>
-                        <?php echo $this->lang->line('be_add'); ?>
+                        <?php echo $this->lang->line('add'); ?>
                     </button>
                     <button id="edit-service" class="btn" disabled="disabled">
                         <i class="icon-pencil"></i>
-                        <?php echo $this->lang->line('be_edit'); ?>
+                        <?php echo $this->lang->line('edit'); ?>
                     </button>
                     <button id="delete-service" class="btn" disabled="disabled">
                         <i class="icon-remove"></i>
-                        <?php echo $this->lang->line('be_delete'); ?>
+                        <?php echo $this->lang->line('delete'); ?>
                     </button>
                 </div>
 
                 <div class="save-cancel-group btn-group" style="display:none;">
                     <button id="save-service" class="btn btn-primary">
                         <i class="icon-ok icon-white"></i>
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <button id="cancel-service" class="btn">
                         <i class="icon-ban-circle"></i>
-                        <?php echo $this->lang->line('be_cancel'); ?>
+                        <?php echo $this->lang->line('cancel'); ?>
                     </button>
                 </div>
             </div>
             
-            <h2><?php echo $this->lang->line('be_details'); ?></h2>
+            <h2><?php echo $this->lang->line('details'); ?></h2>
             <div class="form-message alert" style="display:none;"></div>
             
             <input type="hidden" id="service-id" />
             
-            <label for="service-name"><?php echo $this->lang->line('fe_name'); ?> *</label>
+            <label for="service-name"><?php echo $this->lang->line('name'); ?> *</label>
             <input type="text" id="service-name" class="span12 required" />
             
-            <label for="service-duration"><?php echo $this->lang->line('be_duration_minutes'); ?> *</label>
+            <label for="service-duration"><?php echo $this->lang->line('duration_minutes'); ?> *</label>
             <input type="text" id="service-duration" class="required"  />
             
-            <label for="service-price"><?php echo $this->lang->line('fe_price'); ?> *</label>
+            <label for="service-price"><?php echo $this->lang->line('price'); ?> *</label>
             <input type="text" id="service-price" class="span12 required" />
             
-            <label for="service-currency"><?php echo $this->lang->line('be_currency'); ?></label>
+            <label for="service-currency"><?php echo $this->lang->line('currency'); ?></label>
             <input type="text" id="service-currency" class="span12" />
             
-            <label for="service-category"><?php echo $this->lang->line('be_category'); ?></label>
+            <label for="service-category"><?php echo $this->lang->line('category'); ?></label>
             <select id="service-category" class="span12"></select>
             
-            <label for="service-description"><?php echo $this->lang->line('be_description'); ?></label>
+            <label for="service-description"><?php echo $this->lang->line('description'); ?></label>
             <textarea id="service-description" rows="4" class="span12"></textarea>
             
             <br/><br/>
             <em id="form-message" class="text-error">
-                <?php echo $this->lang->line('fe_fields_are_required'); ?></em>
+                <?php echo $this->lang->line('fields_are_required'); ?></em>
         </div>
     </div>
     
@@ -120,15 +120,15 @@
         <div id="filter-categories" class="filter-records column span4">
             <form class="input-append">
                 <input class="key span12" type="text" />
-                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter'); ?>">
+                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear'); ?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear'); ?>">
                     <i class="icon-repeat"></i>
                 </button>
             </form>
 
-            <h2><?php echo $this->lang->line('be_categories'); ?></h2>
+            <h2><?php echo $this->lang->line('categories'); ?></h2>
             <div class="results"></div>
         </div>
 
@@ -137,39 +137,39 @@
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-category" class="btn btn-primary">
                         <i class="icon-plus icon-white"></i>
-                        <?php echo $this->lang->line('be_add'); ?>
+                        <?php echo $this->lang->line('add'); ?>
                     </button>
                     <button id="edit-category" class="btn" disabled="disabled">
                         <i class="icon-pencil"></i>
-                        <?php echo $this->lang->line('be_edit'); ?>
+                        <?php echo $this->lang->line('edit'); ?>
                     </button>
                     <button id="delete-category" class="btn" disabled="disabled">
                         <i class="icon-remove"></i>
-                        <?php echo $this->lang->line('be_delete'); ?>
+                        <?php echo $this->lang->line('delete'); ?>
                     </button>
                 </div>
 
                 <div class="save-cancel-group btn-group" style="display:none;">
                     <button id="save-category" class="btn btn-primary">
                         <i class="icon-ok icon-white"></i>
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <button id="cancel-category" class="btn">
                         <i class="icon-ban-circle"></i>
-                        <?php echo $this->lang->line('be_cancel'); ?>
+                        <?php echo $this->lang->line('cancel'); ?>
                     </button>
                 </div>
             </div>
             
-            <h2><?php echo $this->lang->line('be_details'); ?></h2>
+            <h2><?php echo $this->lang->line('details'); ?></h2>
             <div class="form-message alert" style="display:none;"></div>
             
             <input type="hidden" id="category-id" />
             
-            <label for="category-name"><?php echo $this->lang->line('fe_name'); ?> *</label>
+            <label for="category-name"><?php echo $this->lang->line('name'); ?> *</label>
             <input type="text" id="category-name" class="span12 required" />
             
-            <label for="category-description"><?php echo $this->lang->line('be_description'); ?></label>
+            <label for="category-description"><?php echo $this->lang->line('description'); ?></label>
             <textarea id="category-description" rows="4" class="span12"></textarea>
         </div>
     </div>
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index 37748794..193b2af8 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -33,18 +33,18 @@
 <div id="settings-page" class="row-fluid">
     <ul class="nav nav-tabs">
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) { ?>
-        <li class="general-tab tab"><a><?php echo $this->lang->line('be_general'); ?></a></li>
+        <li class="general-tab tab"><a><?php echo $this->lang->line('general'); ?></a></li>
         <?php } ?>
         
         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) { ?>
-        <li class="business-logic-tab tab"><a><?php echo $this->lang->line('be_business_logic'); ?></a></li>
+        <li class="business-logic-tab tab"><a><?php echo $this->lang->line('business_logic'); ?></a></li>
         <?php } ?>
         
         <?php if ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) { ?>
-        <li class="user-tab tab"><a><?php echo $this->lang->line('be_current_user'); ?></a></li>
+        <li class="user-tab tab"><a><?php echo $this->lang->line('current_user'); ?></a></li>
         <?php } ?>
         
-        <li class="about-tab tab"><a><?php echo $this->lang->line('be_about_ea'); ?></a></li>
+        <li class="about-tab tab"><a><?php echo $this->lang->line('about_ea'); ?></a></li>
     </ul>
     
     <?php 
@@ -59,42 +59,42 @@
         <form>
             <fieldset>
                 <legend>
-                    <?php echo $this->lang->line('be_general_settings'); ?>
+                    <?php echo $this->lang->line('general_settings'); ?>
                     <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE) { ?>
                     <button type="button" class="save-settings btn btn-primary btn-mini">
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <?php } ?>
                 </legend>
                 
                 <div class="wrapper">
-                    <label for="company-name"><?php echo $this->lang->line('be_company_name'); ?> *</label>
+                    <label for="company-name"><?php echo $this->lang->line('company_name'); ?> *</label>
                     <input type="text" id="company-name" data-field="company_name" class="required span12">
                     <span class="help-block">
-                        <?php echo $this->lang->line('be_company_name_hint'); ?>
+                        <?php echo $this->lang->line('company_name_hint'); ?>
                     </span>
 
                     <br>
 
-                    <label for="company-email"><?php echo $this->lang->line('be_company_email'); ?> *</label>
+                    <label for="company-email"><?php echo $this->lang->line('company_email'); ?> *</label>
                     <input type="text" id="company-email" data-field="company_email" class="required span12">
                     <span class="help-block">
-                        <?php echo $this->lang->line('be_company_email_hint'); ?>
+                        <?php echo $this->lang->line('company_email_hint'); ?>
                     </span>
 
                     <br>
 
-                    <label for="company-link"><?php echo $this->lang->line('be_company_link'); ?> *</label>
+                    <label for="company-link"><?php echo $this->lang->line('company_link'); ?> *</label>
                     <input type="text" id="company-link" data-field="company_link" class="required span12">
                     <span class="help-block">
-                        <?php echo $this->lang->line('be_company_link_hint'); ?>
+                        <?php echo $this->lang->line('company_link_hint'); ?>
                     </span>
 
                     <br>
 
                     <a href="<?php echo $this->config->base_url(); ?>" target="_blank" class="btn btn-info">
                         <i class="icon-calendar icon-white"></i>
-                        <?php echo $this->lang->line('be_go_to_booking_page'); ?>
+                        <?php echo $this->lang->line('go_to_booking_page'); ?>
                     </a>
                 </div>
             </fieldset>
@@ -113,62 +113,62 @@
         <form>
             <fieldset>
                 <legend>
-                    <?php echo $this->lang->line('be_business_logic'); ?>
+                    <?php echo $this->lang->line('business_logic'); ?>
                     <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE) { ?>
                     <button type="button" class="save-settings btn btn-primary btn-mini">
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <?php } ?>
                 </legend>
                 
                 <div class="row-fluid">
                     <div class="span7 working-plan-wrapper">
-                        <h4><?php echo $this->lang->line('be_working_plan'); ?></h4>
+                        <h4><?php echo $this->lang->line('working_plan'); ?></h4>
                         <span class="help-block">
-                            <?php echo $this->lang->line('be_edit_working_plan_hint'); ?>
+                            <?php echo $this->lang->line('edit_working_plan_hint'); ?>
                         </span>
                         
                         <table class="working-plan table table-striped">
                             <thead>
                                 <tr>
-                                    <th><?php echo $this->lang->line('be_day'); ?></th>
-                                    <th><?php echo $this->lang->line('fe_start'); ?></th>
-                                    <th><?php echo $this->lang->line('fe_end'); ?></th>
+                                    <th><?php echo $this->lang->line('day'); ?></th>
+                                    <th><?php echo $this->lang->line('start'); ?></th>
+                                    <th><?php echo $this->lang->line('end'); ?></th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="monday" /><?php echo $this->lang->line('be_monday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="monday" /><?php echo $this->lang->line('monday'); ?></label></td>
                                     <td><input type="text" id="monday-start" class="work-start" /></td>
                                     <td><input type="text" id="monday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="tuesday" /><?php echo $this->lang->line('be_tuesday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="tuesday" /><?php echo $this->lang->line('tuesday'); ?></label></td>
                                     <td><input type="text" id="tuesday-start" class="work-start" /></td>
                                     <td><input type="text" id="tuesday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="wednesday" /><?php echo $this->lang->line('be_wednesday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="wednesday" /><?php echo $this->lang->line('wednesday'); ?></label></td>
                                     <td><input type="text" id="wednesday-start" class="work-start" /></td>
                                     <td><input type="text" id="wednesday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="thursday" /><?php echo $this->lang->line('be_thursday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="thursday" /><?php echo $this->lang->line('thursday'); ?></label></td>
                                     <td><input type="text" id="thursday-start" class="work-start" /></td>
                                     <td><input type="text" id="thursday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="friday" /><?php echo $this->lang->line('be_friday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="friday" /><?php echo $this->lang->line('friday'); ?></label></td>
                                     <td><input type="text" id="friday-start" class="work-start" /></td>
                                     <td><input type="text" id="friday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="saturday" /><?php echo $this->lang->line('be_saturday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="saturday" /><?php echo $this->lang->line('saturday'); ?></label></td>
                                     <td><input type="text" id="saturday-start" class="work-start" /></td>
                                     <td><input type="text" id="saturday-end" class="work-end" /></td>
                                 </tr>
                                 <tr>
-                                    <td><label class="checkbox"><input type="checkbox" id="sunday" /><?php echo $this->lang->line('be_sunday'); ?></label></td>
+                                    <td><label class="checkbox"><input type="checkbox" id="sunday" /><?php echo $this->lang->line('sunday'); ?></label></td>
                                     <td><input type="text" id="sunday-start" class="work-start" /></td>
                                     <td><input type="text" id="sunday-end" class="work-end" /></td>
                                 </tr>
@@ -177,26 +177,26 @@
                         
                         <br>
                         
-                        <h4><?php echo $this->lang->line('be_book_advance_timeout'); ?></h4>
+                        <h4><?php echo $this->lang->line('book_advance_timeout'); ?></h4>
                         <span class="help-block">
-                            <?php echo $this->lang->line('be_book_advance_timeout_hint'); ?> 
+                            <?php echo $this->lang->line('book_advance_timeout_hint'); ?> 
                         </span>
                         
-                        <label for="book-advance-timeout"><?php echo $this->lang->line('be_timeout_minutes'); ?></label>
+                        <label for="book-advance-timeout"><?php echo $this->lang->line('timeout_minutes'); ?></label>
                         <input type="text" id="book-advance-timeout" data-field="book_advance_timeout" />
                         
                     </div>
                     <div class="span5 breaks-wrapper">
-                        <h4><?php echo $this->lang->line('be_breaks'); ?></h4>
+                        <h4><?php echo $this->lang->line('breaks'); ?></h4>
 
                         <span class="help-block">
-                            <?php echo $this->lang->line('be_edit_breaks_hint'); ?>
+                            <?php echo $this->lang->line('edit_breaks_hint'); ?>
                         </span>
 
                         <div>
                             <button type="button" class="add-break btn btn-primary">
                                 <i class="icon-white icon-plus"></i>
-                                <?php echo $this->lang->line('be_add_break');?>
+                                <?php echo $this->lang->line('add_break');?>
                             </button>
                         </div>
 
@@ -205,10 +205,10 @@
                         <table class="breaks table table-striped">
                             <thead>
                                 <tr>
-                                    <th><?php echo $this->lang->line('be_day'); ?></th>
-                                    <th><?php echo $this->lang->line('fe_start'); ?></th>
-                                    <th><?php echo $this->lang->line('fe_end'); ?></th>
-                                    <th><?php echo $this->lang->line('be_actions'); ?></th>
+                                    <th><?php echo $this->lang->line('day'); ?></th>
+                                    <th><?php echo $this->lang->line('start'); ?></th>
+                                    <th><?php echo $this->lang->line('end'); ?></th>
+                                    <th><?php echo $this->lang->line('actions'); ?></th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -232,64 +232,64 @@
         <form class="row-fluid">
             <fieldset class="span5 personal-info-wrapper">
                 <legend>
-                    <?php echo $this->lang->line('be_personal_information'); ?>
+                    <?php echo $this->lang->line('personal_information'); ?>
                     <?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE) { ?>
                     <button type="button" class="save-settings btn btn-primary btn-mini">
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <?php } ?>
                 </legend>
                 
                 <input type="hidden" id="user-id" />
                 
-                <label for="first-name"><?php echo $this->lang->line('fe_first_name'); ?> *</label>
+                <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
                 <input type="text" id="first-name" class="span9 required" />
                 
-                <label for="last-name"><?php echo $this->lang->line('fe_last_name'); ?> *</label>
+                <label for="last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
                 <input type="text" id="last-name" class="span9 required" />
                 
-                <label for="email"><?php echo $this->lang->line('fe_email'); ?> *</label>
+                <label for="email"><?php echo $this->lang->line('email'); ?> *</label>
                 <input type="text" id="email" class="span9 required" />
                 
-                <label for="mobile-number"><?php echo $this->lang->line('be_mobile_number'); ?></label>
+                <label for="mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
                 <input type="text" id="mobile-number" class="span9" />
                 
-                <label for="phone-number"><?php echo $this->lang->line('fe_phone_number'); ?> *</label>
+                <label for="phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
                 <input type="text" id="phone-number" class="span9 required" />
                 
-                <label for="address"><?php echo $this->lang->line('fe_address'); ?></label>
+                <label for="address"><?php echo $this->lang->line('address'); ?></label>
                 <input type="text" id="address" class="span9" />
                 
-                <label for="city"><?php echo $this->lang->line('fe_city'); ?></label>
+                <label for="city"><?php echo $this->lang->line('city'); ?></label>
                 <input type="text" id="city" class="span9" />
                 
-                <label for="state"><?php echo $this->lang->line('be_state'); ?></label>
+                <label for="state"><?php echo $this->lang->line('state'); ?></label>
                 <input type="text" id="state" class="span9" />
                 
-                <label for="zip-code"><?php echo $this->lang->line('fe_zip_code'); ?></label>
+                <label for="zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
                 <input type="text" id="zip-code" class="span9" />
                 
-                <label for="notes"><?php echo $this->lang->line('fe_notes'); ?></label>
+                <label for="notes"><?php echo $this->lang->line('notes'); ?></label>
                 <textarea id="notes" class="span9" rows="3"></textarea>
             </fieldset>
             
             <fieldset class="span5 miscellaneous-wrapper">
-                <legend><?php echo $this->lang->line('be_system_login'); ?></legend>
+                <legend><?php echo $this->lang->line('system_login'); ?></legend>
                 
-                <label for="username"><?php echo $this->lang->line('be_username'); ?> *</label>
+                <label for="username"><?php echo $this->lang->line('username'); ?> *</label>
                 <input type="text" id="username" class="required" />
                 
-                <label for="password"><?php echo $this->lang->line('be_password'); ?></label>
+                <label for="password"><?php echo $this->lang->line('password'); ?></label>
                 <input type="password" id="password" />
                 
-                <label for="retype-password"><?php echo $this->lang->line('be_retype_password'); ?></label>
+                <label for="retype-password"><?php echo $this->lang->line('retype_password'); ?></label>
                 <input type="password" id="retype-password" />
                 
                 <br>
                 
                 <button type="button" id="user-notifications" class="btn" data-toggle="button">
                     <i class="icon-envelope"></i>
-                    <?php echo $this->lang->line('be_receive_notifications'); ?>
+                    <?php echo $this->lang->line('receive_notifications'); ?>
                 </button>
             </fieldset>
         </form>
@@ -305,13 +305,13 @@
     <div id="about" class="tab-content">
         <h2>Easy!Appointments</h2>
         <p>
-            <?php echo $this->lang->line('be_about_ea_info'); ?>
+            <?php echo $this->lang->line('about_ea_info'); ?>
         </p>
         
         <br>
         
         <div class="current-version"> 
-            <?php echo $this->lang->line('be_current_version'); ?>
+            <?php echo $this->lang->line('current_version'); ?>
             <?php 
                 echo $this->config->item('ea_version') 
                         . ' ' . $this->config->item('ea_release_title'); 
@@ -320,32 +320,32 @@
         
 		<br>
 		
-        <h3><?php echo $this->lang->line('be_support'); ?></h3>
+        <h3><?php echo $this->lang->line('support'); ?></h3>
         <p>
-            <?php echo $this->lang->line('be_about_ea_support'); ?>
+            <?php echo $this->lang->line('about_ea_support'); ?>
             <br><br>
             <a href="http://easyappointments.org">
-                <?php echo $this->lang->line('be_official_website'); ?>
+                <?php echo $this->lang->line('official_website'); ?>
             </a>
             | 
             <a href="https://plus.google.com/communities/105333709485142846840">
-                <?php echo $this->lang->line('be_google_plus_community'); ?>
+                <?php echo $this->lang->line('google_plus_community'); ?>
             </a>
             | 
             <a href="https://groups.google.com/forum/#!forum/easy-appointments">
-                <?php echo $this->lang->line('be_support_group'); ?>
+                <?php echo $this->lang->line('support_group'); ?>
             </a>
             |
             <a href="https://code.google.com/p/easy-appointments/issues/list">
-                <?php echo $this->lang->line('be_project_issues'); ?>
+                <?php echo $this->lang->line('project_issues'); ?>
             </a>
         </p>
 		
 		<br>
 		
-		<h3><?php echo $this->lang->line('be_license'); ?></h3>
+		<h3><?php echo $this->lang->line('license'); ?></h3>
 		<p>
-            <?php echo $this->lang->line('be_about_ea_license'); ?>
+            <?php echo $this->lang->line('about_ea_license'); ?>
             <a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a>
         </p>
     </div>
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index 8b52f129..0d5687af 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -49,9 +49,9 @@
         // ---------------------------------------------------------------------
     ?>
     <ul class="nav nav-tabs">
-        <li class="admins-tab tab active"><a><?php echo $this->lang->line('be_admins'); ?></a></li>
-        <li class="providers-tab tab"><a><?php echo $this->lang->line('be_providers'); ?></a></li>
-        <li class="secretaries-tab tab"><a><?php echo $this->lang->line('be_secretaries'); ?></a></li>
+        <li class="admins-tab tab active"><a><?php echo $this->lang->line('admins'); ?></a></li>
+        <li class="providers-tab tab"><a><?php echo $this->lang->line('providers'); ?></a></li>
+        <li class="secretaries-tab tab"><a><?php echo $this->lang->line('secretaries'); ?></a></li>
     </ul>
     
     <?php 
@@ -65,15 +65,15 @@
         <div id="filter-admins" class="filter-records column span4">
             <form class="input-append">
                 <input class="key span12" type="text" />
-                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter'); ?>">
+                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear'); ?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear'); ?>">
                     <i class="icon-repeat"></i>
                 </button>
             </form>
             
-            <h2><?php echo $this->lang->line('be_admins'); ?></h2>
+            <h2><?php echo $this->lang->line('admins'); ?></h2>
             <div class="results"></div>
         </div>
         
@@ -82,31 +82,31 @@
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-admin" class="btn btn-primary">
                         <i class="icon-plus icon-white"></i>
-                        <?php echo $this->lang->line('be_add'); ?>
+                        <?php echo $this->lang->line('add'); ?>
                     </button>
                     <button id="edit-admin" class="btn" disabled="disabled">
                         <i class="icon-pencil"></i>
-                        <?php echo $this->lang->line('be_edit'); ?>
+                        <?php echo $this->lang->line('edit'); ?>
                     </button>
                     <button id="delete-admin" class="btn" disabled="disabled">
                         <i class="icon-remove"></i>
-                        <?php echo $this->lang->line('be_delete'); ?>
+                        <?php echo $this->lang->line('delete'); ?>
                     </button>
                 </div>
 
                 <div class="save-cancel-group btn-group" style="display:none;">
                     <button id="save-admin" class="btn btn-primary">
                         <i class="icon-ok icon-white"></i>
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <button id="cancel-admin" class="btn">
                         <i class="icon-ban-circle"></i>
-                        <?php echo $this->lang->line('be_cancel'); ?>
+                        <?php echo $this->lang->line('cancel'); ?>
                     </button>
                 </div>
             </div>
             
-            <h2><?php echo $this->lang->line('be_details'); ?></h2>
+            <h2><?php echo $this->lang->line('details'); ?></h2>
             
             <div class="form-message alert" style="display:none;"></div>
             
@@ -114,51 +114,51 @@
             
             <div class="row-fluid">
                 <div class="admin-details span6">
-                    <label for="first-name"><?php echo $this->lang->line('fe_first_name'); ?> *</label>
+                    <label for="first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
                     <input type="text" id="admin-first-name" class="span11 required" />
 
-                    <label for="admin-last-name"><?php echo $this->lang->line('fe_last_name'); ?> *</label>
+                    <label for="admin-last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
                     <input type="text" id="admin-last-name" class="span11 required" />
 
-                    <label for="admin-email"><?php echo $this->lang->line('fe_email'); ?> *</label>
+                    <label for="admin-email"><?php echo $this->lang->line('email'); ?> *</label>
                     <input type="text" id="admin-email" class="span11 required" />
 
-                    <label for="admin-mobile-number"><?php echo $this->lang->line('be_mobile_number'); ?></label>
+                    <label for="admin-mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
                     <input type="text" id="admin-mobile-number" class="span11" />
 
-                    <label for="admin-phone-number"><?php echo $this->lang->line('fe_phone_number'); ?> *</label>
+                    <label for="admin-phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
                     <input type="text" id="admin-phone-number" class="span11 required" />
 
-                    <label for="admin-address"><?php echo $this->lang->line('fe_address'); ?></label>
+                    <label for="admin-address"><?php echo $this->lang->line('address'); ?></label>
                     <input type="text" id="admin-address" class="span11" />
 
-                    <label for="admin-city"><?php echo $this->lang->line('fe_city'); ?></label>
+                    <label for="admin-city"><?php echo $this->lang->line('city'); ?></label>
                     <input type="text" id="admin-city" class="span11" />
 
-                    <label for="admin-state"><?php echo $this->lang->line('be_state'); ?></label>
+                    <label for="admin-state"><?php echo $this->lang->line('state'); ?></label>
                     <input type="text" id="admin-state" class="span11" />
 
-                    <label for="admin-zip-code"><?php echo $this->lang->line('fe_zip_code'); ?></label>
+                    <label for="admin-zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
                     <input type="text" id="admin-zip-code" class="span11" />
 
-                    <label for="admin-notes"><?php echo $this->lang->line('fe_notes'); ?></label>
+                    <label for="admin-notes"><?php echo $this->lang->line('notes'); ?></label>
                     <textarea id="admin-notes" class="span11" rows="3"></textarea>
                 </div>
                 <div class="admin-settings span6">
-                    <label for="admin-username"><?php echo $this->lang->line('be_username'); ?> *</label>
+                    <label for="admin-username"><?php echo $this->lang->line('username'); ?> *</label>
                     <input type="text" id="admin-username" class="span9 required" />
                     
-                    <label for="admin-password"><?php echo $this->lang->line('be_password'); ?> *</label>
+                    <label for="admin-password"><?php echo $this->lang->line('password'); ?> *</label>
                     <input type="password" id="admin-password" class="span9 required"/>
                     
-                    <label for="admin-password-confirm"><?php echo $this->lang->line('be_retype_password'); ?> *</label>
+                    <label for="admin-password-confirm"><?php echo $this->lang->line('retype_password'); ?> *</label>
                     <input type="password" id="admin-password-confirm" class="span9 required" />
                     
                     <br>
                     
                     <button type="button" id="admin-notifications" class="btn" data-toggle="button">
                         <i class="icon-envelope"></i>
-                        <span><?php echo $this->lang->line('be_receive_notifications'); ?></span>
+                        <span><?php echo $this->lang->line('receive_notifications'); ?></span>
                     </button>
                 </div>
             </div>
@@ -176,15 +176,15 @@
         <div id="filter-providers" class="filter-records column span4">
             <form class="input-append">
                 <input class="key span12" type="text" />
-                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter'); ?>">
+                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter'); ?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear'); ?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear'); ?>">
                     <i class="icon-repeat"></i>
                 </button>
             </form>
             
-            <h2><?php echo $this->lang->line('be_providers'); ?></h2>
+            <h2><?php echo $this->lang->line('providers'); ?></h2>
             <div class="results"></div>
         </div>
         
@@ -193,34 +193,34 @@
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-provider" class="btn btn-primary">
                         <i class="icon-plus icon-white"></i>
-                        <?php echo $this->lang->line('be_add'); ?>
+                        <?php echo $this->lang->line('add'); ?>
                     </button>
                     <button id="edit-provider" class="btn" disabled="disabled">
                         <i class="icon-pencil"></i>
-                        <?php echo $this->lang->line('be_edit'); ?>
+                        <?php echo $this->lang->line('edit'); ?>
                     </button>
                     <button id="delete-provider" class="btn" disabled="disabled">
                         <i class="icon-remove"></i>
-                        <?php echo $this->lang->line('be_delete'); ?>
+                        <?php echo $this->lang->line('delete'); ?>
                     </button>
                 </div>
 
                 <div class="save-cancel-group btn-group" style="display:none;">
                     <button id="save-provider" class="btn btn-primary">
                         <i class="icon-ok icon-white"></i>
-                        <?php echo $this->lang->line('be_save'); ?>
+                        <?php echo $this->lang->line('save'); ?>
                     </button>
                     <button id="cancel-provider" class="btn">
                         <i class="icon-ban-circle"></i>
-                        <?php echo $this->lang->line('be_cancel'); ?>
+                        <?php echo $this->lang->line('cancel'); ?>
                     </button>
                 </div>
             </div>
             
             <div class="switch-view pull-right">
-                <strong><?php echo $this->lang->line('be_current_view'); ?></strong>
-                <div class="display-details current"><?php echo $this->lang->line('be_details'); ?></div>
-                <div class="display-working-plan"><?php echo $this->lang->line('be_working_plan'); ?></div>
+                <strong><?php echo $this->lang->line('current_view'); ?></strong>
+                <div class="display-details current"><?php echo $this->lang->line('details'); ?></div>
+                <div class="display-working-plan"><?php echo $this->lang->line('working_plan'); ?></div>
             </div>
             
             <?php // This form message is outside the details view, so that it can be 
@@ -228,121 +228,121 @@
             <div class="form-message alert" style="display:none;"></div>
             
             <div class="details-view provider-view"> 
-                <h2><?php echo $this->lang->line('be_details'); ?></h2>
+                <h2><?php echo $this->lang->line('details'); ?></h2>
 
                 <input type="hidden" id="provider-id" class="record-id" />
 
                 <div class="row-fluid">
                     <div class="provider-details span6">
-                        <label for="provider-first-name"><?php echo $this->lang->line('fe_first_name'); ?> *</label>
+                        <label for="provider-first-name"><?php echo $this->lang->line('first_name'); ?> *</label>
                         <input type="text" id="provider-first-name" class="span11 required" />
 
-                        <label for="provider-last-name"><?php echo $this->lang->line('fe_last_name'); ?> *</label>
+                        <label for="provider-last-name"><?php echo $this->lang->line('last_name'); ?> *</label>
                         <input type="text" id="provider-last-name" class="span11 required" />
 
-                        <label for="provider-email"><?php echo $this->lang->line('fe_email'); ?> *</label>
+                        <label for="provider-email"><?php echo $this->lang->line('email'); ?> *</label>
                         <input type="text" id="provider-email" class="span11 required" />
 
-                        <label for="provider-mobile-number"><?php echo $this->lang->line('be_mobile_number'); ?></label>
+                        <label for="provider-mobile-number"><?php echo $this->lang->line('mobile_number'); ?></label>
                         <input type="text" id="provider-mobile-number" class="span11" />
 
-                        <label for="provider-phone-number"><?php echo $this->lang->line('fe_phone_number'); ?> *</label>
+                        <label for="provider-phone-number"><?php echo $this->lang->line('phone_number'); ?> *</label>
                         <input type="text" id="provider-phone-number" class="span11 required" />
 
-                        <label for="provider-address"><?php echo $this->lang->line('fe_address'); ?></label>
+                        <label for="provider-address"><?php echo $this->lang->line('address'); ?></label>
                         <input type="text" id="provider-address" class="span11" />
 
-                        <label for="provider-city"><?php echo $this->lang->line('fe_city'); ?></label>
+                        <label for="provider-city"><?php echo $this->lang->line('city'); ?></label>
                         <input type="text" id="provider-city" class="span11" />
 
-                        <label for="provider-state"><?php echo $this->lang->line('be_state'); ?></label>
+                        <label for="provider-state"><?php echo $this->lang->line('state'); ?></label>
                         <input type="text" id="provider-state" class="span11" />
 
-                        <label for="provider-zip-code"><?php echo $this->lang->line('fe_zip_code'); ?></label>
+                        <label for="provider-zip-code"><?php echo $this->lang->line('zip_code'); ?></label>
                         <input type="text" id="provider-zip-code" class="span11" />
 
-                        <label for="provider-notes"><?php echo $this->lang->line('fe_notes'); ?></label>
+                        <label for="provider-notes"><?php echo $this->lang->line('notes'); ?></label>
                         <textarea id="provider-notes" class="span11" rows="3"></textarea>
                     </div>
                     <div class="provider-settings span6">
-                        <label for="provider-username"><?php echo $this->lang->line('be_username'); ?> *</label>
+                        <label for="provider-username"><?php echo $this->lang->line('username'); ?> *</label>
                         <input type="text" id="provider-username" class="span9 required" />
 
-                        <label for="provider-password"><?php echo $this->lang->line('be_password'); ?> *</label>
+                        <label for="provider-password"><?php echo $this->lang->line('password'); ?> *</label>
                         <input type="password" id="provider-password" class="span9 required"/>
 
-                        <label for="provider-password-confirm"><?php echo $this->lang->line('be_retype_password'); ?> *</label>
+                        <label for="provider-password-confirm"><?php echo $this->lang->line('retype_password'); ?> *</label>
                         <input type="password" id="provider-password-confirm" class="span9 required" />
 
                         <br>
 
                         <button type="button" id="provider-notifications" class="btn" data-toggle="button">
                             <i class="icon-envelope"></i>
-                            <span><?php echo $this->lang->line('be_receive_notifications'); ?></span>
+                            <span><?php echo $this->lang->line('receive_notifications'); ?></span>
                         </button>
 
                         <br><br>
 
-                        <h4><?php echo $this->lang->line('be_services'); ?></h4>
+                        <h4><?php echo $this->lang->line('services'); ?></h4>
                         <div id="provider-services"></div>
                     </div>
                 </div>
             </div>
                 
             <div class="working-plan-view provider-view" style="display: none;">
-                <h2><?php echo $this->lang->line('be_working_plan'); ?></h2>
+                <h2><?php echo $this->lang->line('working_plan'); ?></h2>
                 <button id="reset-working-plan" class="btn btn-primary"
                         title="Reset the working plan back to the default values.">
                     <i class="icon-repeat icon-white"></i>
-                    <?php echo $this->lang->line('be_reset_plan'); ?></button>
+                    <?php echo $this->lang->line('reset_plan'); ?></button>
                 <table class="working-plan table table-striped">
                     <thead>
                         <tr>
-                            <th><?php echo $this->lang->line('be_day'); ?></th>
-                            <th><?php echo $this->lang->line('fe_start'); ?></th>
-                            <th><?php echo $this->lang->line('fe_end'); ?></th>
+                            <th><?php echo $this->lang->line('day'); ?></th>
+                            <th><?php echo $this->lang->line('start'); ?></th>
+                            <th><?php echo $this->lang->line('end'); ?></th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="monday" />
-                                    <?php echo $this->lang->line('be_monday'); ?></label></td>
+                                    <?php echo $this->lang->line('monday'); ?></label></td>
                             <td><input type="text" id="monday-start" class="work-start" /></td>
                             <td><input type="text" id="monday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="tuesday" />
-                                    <?php echo $this->lang->line('be_tuesday'); ?></label></td>
+                                    <?php echo $this->lang->line('tuesday'); ?></label></td>
                             <td><input type="text" id="tuesday-start" class="work-start" /></td>
                             <td><input type="text" id="tuesday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="wednesday" />
-                                    <?php echo $this->lang->line('be_wednesday'); ?></label></td>
+                                    <?php echo $this->lang->line('wednesday'); ?></label></td>
                             <td><input type="text" id="wednesday-start" class="work-start" /></td>
                             <td><input type="text" id="wednesday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="thursday" />
-                                    <?php echo $this->lang->line('be_tuesday'); ?></label></td>
+                                    <?php echo $this->lang->line('tuesday'); ?></label></td>
                             <td><input type="text" id="thursday-start" class="work-start" /></td>
                             <td><input type="text" id="thursday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="friday" />
-                                    <?php echo $this->lang->line('be_friday'); ?></label></td>
+                                    <?php echo $this->lang->line('friday'); ?></label></td>
                             <td><input type="text" id="friday-start" class="work-start" /></td>
                             <td><input type="text" id="friday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="saturday" />
-                                    <?php echo $this->lang->line('be_saturday'); ?></label></td>
+                                    <?php echo $this->lang->line('saturday'); ?></label></td>
                             <td><input type="text" id="saturday-start" class="work-start" /></td>
                             <td><input type="text" id="saturday-end" class="work-end" /></td>
                         </tr>
                         <tr>
                             <td><label class="checkbox"><input type="checkbox" id="sunday" />
-                                    <?php echo $this->lang->line('be_sunday'); ?></label></td>
+                                    <?php echo $this->lang->line('sunday'); ?></label></td>
                             <td><input type="text" id="sunday-start" class="work-start" /></td>
                             <td><input type="text" id="sunday-end" class="work-end" /></td>
                         </tr>
@@ -351,16 +351,16 @@
 
                 <br>
                 
-                <h2><?php echo $this->lang->line('be_breaks');?></h2>
+                <h2><?php echo $this->lang->line('breaks');?></h2>
 
                 <span class="help-block">
-                    <?php echo $this->lang->line('be_add_breaks_during_each_day');?>
+                    <?php echo $this->lang->line('add_breaks_during_each_day');?>
                 </span>
 
                 <div>
                     <button type="button" class="add-break btn btn-primary">
                         <i class="icon-white icon-plus"></i>
-                        <?php echo $this->lang->line('be_add_break');?>
+                        <?php echo $this->lang->line('add_break');?>
                     </button>
                 </div>
 
@@ -369,10 +369,10 @@
                 <table class="breaks table table-striped">
                     <thead>
                         <tr>
-                            <th><?php echo $this->lang->line('be_day');?></th>
-                            <th><?php echo $this->lang->line('fe_start');?></th>
-                            <th><?php echo $this->lang->line('fe_end');?></th>
-                            <th><?php echo $this->lang->line('be_actions');?></th>
+                            <th><?php echo $this->lang->line('day');?></th>
+                            <th><?php echo $this->lang->line('start');?></th>
+                            <th><?php echo $this->lang->line('end');?></th>
+                            <th><?php echo $this->lang->line('actions');?></th>
                         </tr>
                     </thead>
                     <tbody></tbody>
@@ -392,15 +392,15 @@
         <div id="filter-secretaries" class="filter-records column span4">
             <form class="input-append">
                 <input class="key span12" type="text" />
-                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('be_filter');?>">
+                <button class="filter btn" type="submit" title="<?php echo $this->lang->line('filter');?>">
                     <i class="icon-search"></i>
                 </button>
-                <button class="clear btn" type="button" title="<?php echo $this->lang->line('be_clear');?>">
+                <button class="clear btn" type="button" title="<?php echo $this->lang->line('clear');?>">
                     <i class="icon-repeat"></i>
                 </button>
             </form>
             
-            <h2><?php echo $this->lang->line('be_secretaries');?></h2>
+            <h2><?php echo $this->lang->line('secretaries');?></h2>
             <div class="results"></div>
         </div>
         
@@ -409,31 +409,31 @@
                 <div class="add-edit-delete-group btn-group">
                     <button id="add-secretary" class="btn btn-primary">
                         <i class="icon-plus icon-white"></i>
-                        <?php echo $this->lang->line('be_add');?>
+                        <?php echo $this->lang->line('add');?>
                     </button>
                     <button id="edit-secretary" class="btn" disabled="disabled">
                         <i class="icon-pencil"></i>
-                        <?php echo $this->lang->line('be_edit');?>
+                        <?php echo $this->lang->line('edit');?>
                     </button>
                     <button id="delete-secretary" class="btn" disabled="disabled">
                         <i class="icon-remove"></i>
-                        <?php echo $this->lang->line('be_delete');?>
+                        <?php echo $this->lang->line('delete');?>
                     </button>
                 </div>
 
                 <div class="save-cancel-group btn-group" style="display:none;">
                     <button id="save-secretary" class="btn btn-primary">
                         <i class="icon-ok icon-white"></i>
-                        <?php echo $this->lang->line('be_save');?>
+                        <?php echo $this->lang->line('save');?>
                     </button>
                     <button id="cancel-secretary" class="btn">
                         <i class="icon-ban-circle"></i>
-                        <?php echo $this->lang->line('be_cancel');?>
+                        <?php echo $this->lang->line('cancel');?>
                     </button>
                 </div>
             </div>
             
-            <h2><?php echo $this->lang->line('be_details');?></h2>
+            <h2><?php echo $this->lang->line('details');?></h2>
             
             <div class="form-message alert" style="display:none;"></div>
             
@@ -441,56 +441,56 @@
             
             <div class="row-fluid">
                 <div class="secretary-details span6">
-                    <label for="secretary-first-name"><?php echo $this->lang->line('fe_first_name');?> *</label>
+                    <label for="secretary-first-name"><?php echo $this->lang->line('first_name');?> *</label>
                     <input type="text" id="secretary-first-name" class="span11 required" />
 
-                    <label for="secretary-last-name"><?php echo $this->lang->line('fe_last_name');?> *</label>
+                    <label for="secretary-last-name"><?php echo $this->lang->line('last_name');?> *</label>
                     <input type="text" id="secretary-last-name" class="span11 required" />
 
-                    <label for="secretary-email"><?php echo $this->lang->line('fe_email');?> *</label>
+                    <label for="secretary-email"><?php echo $this->lang->line('email');?> *</label>
                     <input type="text" id="secretary-email" class="span11 required" />
 
-                    <label for="secretary-mobile-number"><?php echo $this->lang->line('be_mobile_number');?></label>
+                    <label for="secretary-mobile-number"><?php echo $this->lang->line('mobile_number');?></label>
                     <input type="text" id="secretary-mobile-number" class="span11" />
 
-                    <label for="secretary-phone-number"><?php echo $this->lang->line('fe_phone_number');?> *</label>
+                    <label for="secretary-phone-number"><?php echo $this->lang->line('phone_number');?> *</label>
                     <input type="text" id="secretary-phone-number" class="span11 required" />
 
-                    <label for="secretary-address"><?php echo $this->lang->line('fe_address');?></label>
+                    <label for="secretary-address"><?php echo $this->lang->line('address');?></label>
                     <input type="text" id="secretary-address" class="span11" />
 
-                    <label for="secretary-city"><?php echo $this->lang->line('fe_city');?></label>
+                    <label for="secretary-city"><?php echo $this->lang->line('city');?></label>
                     <input type="text" id="secretary-city" class="span11" />
 
-                    <label for="secretary-state"><?php echo $this->lang->line('be_state');?></label>
+                    <label for="secretary-state"><?php echo $this->lang->line('state');?></label>
                     <input type="text" id="secretary-state" class="span11" />
 
-                    <label for="secretary-zip-code"><?php echo $this->lang->line('fe_zip_code');?></label>
+                    <label for="secretary-zip-code"><?php echo $this->lang->line('zip_code');?></label>
                     <input type="text" id="secretary-zip-code" class="span11" />
 
-                    <label for="secretary-notes"><?php echo $this->lang->line('fe_notes');?></label>
+                    <label for="secretary-notes"><?php echo $this->lang->line('notes');?></label>
                     <textarea id="secretary-notes" class="span11" rows="3"></textarea>
                 </div>
                 <div class="secretary-settings span6">
-                    <label for="secretary-username"><?php echo $this->lang->line('be_username');?> *</label>
+                    <label for="secretary-username"><?php echo $this->lang->line('username');?> *</label>
                     <input type="text" id="secretary-username" class="span9 required" />
                    
-                    <label for="secretary-password"><?php echo $this->lang->line('be_password');?> *</label>
+                    <label for="secretary-password"><?php echo $this->lang->line('password');?> *</label>
                     <input type="password" id="secretary-password" class="span9 required"/>
                     
-                    <label for="secretary-password-confirm"><?php echo $this->lang->line('be_retype_password');?> *</label>
+                    <label for="secretary-password-confirm"><?php echo $this->lang->line('retype_password');?> *</label>
                     <input type="password" id="secretary-password-confirm" class="span9 required" />
                     
                     <br>
                     
                     <button type="button" id="secretary-notifications" class="btn" data-toggle="button">
                         <i class="icon-envelope"></i>
-                        <span><?php echo $this->lang->line('be_receive_notifications');?></span>
+                        <span><?php echo $this->lang->line('receive_notifications');?></span>
                     </button>
                     
                     <br><br>
                     
-                    <h4><?php echo $this->lang->line('be_providers');?></h4>
+                    <h4><?php echo $this->lang->line('providers');?></h4>
                     <div id="secretary-providers"></div>
                 </div>
             </div>
diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php
index 643cd787..61ff6c66 100644
--- a/src/application/views/general/error404.php
+++ b/src/application/views/general/error404.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('be_page_not_found') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('page_not_found') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -54,22 +54,22 @@
 </head>
 <body>
     <div id="message-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('be_page_not_found') 
-                . ' - ' . $this->lang->line('be_error') . ' 404' ?></h3>
+        <h3><?php echo $this->lang->line('page_not_found') 
+                . ' - ' . $this->lang->line('error') . ' 404' ?></h3>
         <p>
-            <?php echo $this->lang->line('be_page_not_found_message'); ?>
+            <?php echo $this->lang->line('page_not_found_message'); ?>
         </p>
         
         <br>
         
         <a href="<?php echo $this->config->base_url(); ?>" class="btn btn-primary btn-large">
             <i class="icon-calendar icon-white"></i>
-            <?php echo $this->lang->line('be_book_appointment_title'); ?>
+            <?php echo $this->lang->line('book_appointment_title'); ?>
         </a>
         
         <a href="<?php echo $this->config->base_url(); ?>backend" class="btn btn-danger btn-large">
             <i class="icon-wrench icon-white"></i>
-            <?php echo $this->lang->line('be_backend_section'); ?>
+            <?php echo $this->lang->line('backend_section'); ?>
         </a>
         
     </div>
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php
index 0fe1f206..78b38bfe 100644
--- a/src/application/views/user/forgot_password.php
+++ b/src/application/views/user/forgot_password.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('be_forgot_your_password') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('forgot_your_password') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -95,7 +95,7 @@
                     
                     if (response == GlobalVariables.AJAX_SUCCESS) {
                         $('.alert').addClass('alert-success');
-                        $('.alert').text(EALang['be_new_password_sent_with_email']);
+                        $('.alert').text(EALang['new_password_sent_with_email']);
                     } else {
                         $('.alert').text('The operation failed! Please enter a valid username '
                                 + 'and email address in order to get a new password.');
@@ -108,25 +108,25 @@
 </head>
 <body>
     <div id="forgot-password-frame" class="frame-container">
-        <h2><?php echo $this->lang->line('be_forgot_your_password'); ?></h2>
-        <p><?php echo $this->lang->line('be_type_username_and_email_for_new_password'); ?></p>  
+        <h2><?php echo $this->lang->line('forgot_your_password'); ?></h2>
+        <p><?php echo $this->lang->line('type_username_and_email_for_new_password'); ?></p>  
         <hr>
         <div class="alert hidden"></div>  
         <form>
-            <label for="username"><?php echo $this->lang->line('be_username'); ?></label>
-            <input type="text" id="username" placeholder="<?php echo $this->lang->line('be_enter_username_here'); ?>" class="span3" />
+            <label for="username"><?php echo $this->lang->line('username'); ?></label>
+            <input type="text" id="username" placeholder="<?php echo $this->lang->line('enter_username_here'); ?>" class="span3" />
             
-            <label for="email"><?php echo $this->lang->line('fe_email'); ?></label>
-            <input type="text" id="email" placeholder="<?php echo $this->lang->line('be_enter_email_here'); ?>" class="span3" />    
+            <label for="email"><?php echo $this->lang->line('email'); ?></label>
+            <input type="text" id="email" placeholder="<?php echo $this->lang->line('enter_email_here'); ?>" class="span3" />    
             
             <br><br>
             
             <button type="submit" id="get-new-password" class="btn btn-primary btn-large">
-                <?php echo $this->lang->line('be_regenerate_password'); ?>
+                <?php echo $this->lang->line('regenerate_password'); ?>
             </button> 
             
             <a href="<?php echo $base_url; ?>user/login" class="user-login">
-                <?php echo $this->lang->line('be_go_to_login'); ?>
+                <?php echo $this->lang->line('go_to_login'); ?>
             </a>
         </form>
     </div>
diff --git a/src/application/views/user/login.php b/src/application/views/user/login.php
index 9dbc1ee6..8259b77e 100644
--- a/src/application/views/user/login.php
+++ b/src/application/views/user/login.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('be_login') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('login') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -96,7 +96,7 @@
                     if (response == GlobalVariables.AJAX_SUCCESS) {
                         window.location.href = GlobalVariables.destUrl;
                     } else {
-                        $('.alert').text(EALang['be_login_failed']);
+                        $('.alert').text(EALang['login_failed']);
                         $('.alert').removeClass('hidden');
                     }
                 }, 'json');
@@ -106,22 +106,22 @@
 </head>
 <body>
     <div id="login-frame" class="frame-container">
-        <h2><?php echo $this->lang->line('be_backend_section'); ?></h2>
-        <p><?php echo $this->lang->line('be_you_need_to_login'); ?></p>  
+        <h2><?php echo $this->lang->line('backend_section'); ?></h2>
+        <p><?php echo $this->lang->line('you_need_to_login'); ?></p>  
         <hr>
         <div class="alert hidden"></div>  
         <form id="login-form">
-            <label for="username"><?php echo $this->lang->line('be_username'); ?></label>
-            <input type="text" id="username" placeholder="<?php echo $this->lang->line('be_enter_username_here'); ?>"  class="span3" />
+            <label for="username"><?php echo $this->lang->line('username'); ?></label>
+            <input type="text" id="username" placeholder="<?php echo $this->lang->line('enter_username_here'); ?>"  class="span3" />
             
-            <label for="password"><?php echo $this->lang->line('be_password'); ?></label>
-            <input type="password" id="password" placeholder="<?php echo $this->lang->line('be_enter_password_here'); ?>" class="span3" />    
+            <label for="password"><?php echo $this->lang->line('password'); ?></label>
+            <input type="password" id="password" placeholder="<?php echo $this->lang->line('enter_password_here'); ?>" class="span3" />    
             
             <br><br>
             
-            <button type="submit" id="login" class="btn btn-primary btn-large"><?php echo $this->lang->line('be_login'); ?></button> 
+            <button type="submit" id="login" class="btn btn-primary btn-large"><?php echo $this->lang->line('login'); ?></button> 
             
-            <a href="<?php echo $base_url; ?>user/forgot_password" class="forgot-password"><?php echo $this->lang->line('be_forgot_your_password'); ?></a>
+            <a href="<?php echo $base_url; ?>user/forgot_password" class="forgot-password"><?php echo $this->lang->line('forgot_your_password'); ?></a>
         </form>
     </div>
 
diff --git a/src/application/views/user/logout.php b/src/application/views/user/logout.php
index 12eb6854..3d3a2ee0 100644
--- a/src/application/views/user/logout.php
+++ b/src/application/views/user/logout.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('be_log_out') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('log_out') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -61,21 +61,21 @@
 </head>
 <body>
     <div id="logout-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('be_log_out'); ?></h3>
+        <h3><?php echo $this->lang->line('log_out'); ?></h3>
         <p>
-            <?php echo $this->lang->line('be_logout_success'); ?>
+            <?php echo $this->lang->line('logout_success'); ?>
         </p>  
         
         <br>
         
         <a href="<?php echo $this->config->base_url(); ?>" class="btn btn-primary btn-large">
             <i class="icon-calendar icon-white"></i>
-            <?php echo $this->lang->line('be_book_appointment_title'); ?>
+            <?php echo $this->lang->line('book_appointment_title'); ?>
         </a>
         
         <a href="<?php echo $this->config->base_url(); ?>backend" class="btn btn-danger btn-large">
             <i class="icon-home icon-white"></i>
-            <?php echo $this->lang->line('be_backend_section'); ?>
+            <?php echo $this->lang->line('backend_section'); ?>
         </a>
     </div>
 </body>
diff --git a/src/application/views/user/no_privileges.php b/src/application/views/user/no_privileges.php
index 247b2de8..8eb73a2b 100644
--- a/src/application/views/user/no_privileges.php
+++ b/src/application/views/user/no_privileges.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title><?php echo $this->lang->line('be_no_privileges') . ' - ' . $company_name; ?></title>
+    <title><?php echo $this->lang->line('no_privileges') . ' - ' . $company_name; ?></title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     
     <?php // INCLUDE JS FILES ?>
@@ -57,16 +57,16 @@
 </head>
 <body>
     <div id="no-priv-frame" class="frame-container">
-        <h3><?php echo $this->lang->line('be_no_privileges'); ?></h3>
+        <h3><?php echo $this->lang->line('no_privileges'); ?></h3>
         <p>
-            <?php echo $this->lang->line('be_no_provileges_message'); ?>
+            <?php echo $this->lang->line('no_provileges_message'); ?>
         </p>  
         
         <br>
         
         <a href="<?php echo $this->config->base_url(); ?>backend" class="btn btn-success btn-large">
             <i class="icon-calendar icon-white"></i>
-            <?php echo $this->lang->line('be_backend_calendar'); ?>
+            <?php echo $this->lang->line('backend_calendar'); ?>
         </a>
     </div>
 </body>
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index d53b6b29..8f1e5fc7 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -32,7 +32,7 @@ var BackendCalendar = {
             'snapMinutes': 15,
             'axisFormat': 'HH:mm',
             'timeFormat': 'HH:mm{ - HH:mm}',
-            'allDayText': EALang['be_all_day'], 
+            'allDayText': EALang['all_day'], 
             'columnFormat': {
                 'month': 'ddd',
                 'week': 'ddd d/M',
@@ -142,7 +142,7 @@ var BackendCalendar = {
             var appointment = GlobalVariables.editAppointment;
             BackendCalendar.resetAppointmentDialog();
             
-            $dialog.find('.modal-header h3').text(EALang['be_edit_appointment_title']);
+            $dialog.find('.modal-header h3').text(EALang['edit_appointment_title']);
             $dialog.find('#appointment-id').val(appointment['id']);
             $dialog.find('#select-service').val(appointment['id_services']).change();
             $dialog.find('#select-provider').val(appointment['id_users_provider']);
@@ -236,12 +236,12 @@ var BackendCalendar = {
                 if ($('#select-filter-item option:selected').attr('google-sync') === 'true') {
                     $('#enable-sync').addClass('btn-success enabled');
                     $('#enable-sync i').addClass('icon-white');
-                    $('#enable-sync span').text(EALang['be_disable_sync']);
+                    $('#enable-sync span').text(EALang['disable_sync']);
                     $('#google-sync').prop('disabled', false);
                 } else {
                     $('#enable-sync').removeClass('btn-success enabled');
                     $('#enable-sync i').removeClass('icon-white');
-                    $('#enable-sync span').text(EALang['be_enable_sync']);
+                    $('#enable-sync span').text(EALang['enable_sync']);
                     $('#google-sync').prop('disabled', true);
                 }
             }
@@ -322,7 +322,7 @@ var BackendCalendar = {
                 BackendCalendar.resetAppointmentDialog();
 
                 // :: APPLY APPOINTMENT DATA AND SHOW TO MODAL DIALOG
-                $dialog.find('.modal-header h3').text(EALang['be_edit_appointment_title']);
+                $dialog.find('.modal-header h3').text(EALang['edit_appointment_title']);
                 $dialog.find('#appointment-id').val(appointment['id']);
                 $dialog.find('#select-service').val(appointment['id_services']).trigger('change');
                 $dialog.find('#select-provider').val(appointment['id_users_provider']);
@@ -414,13 +414,13 @@ var BackendCalendar = {
                     }, 'json');
                 };
                 
-                messageButtons[EALang['be_cancel']] = function() {
+                messageButtons[EALang['cancel']] = function() {
                     $('#message_box').dialog('close');
                 };
                 
 
-                GeneralFunctions.displayMessageBox(EALang['be_delete_appointment_title'], 
-                        EALang['be_write_appointment_removal_reason'], messageButtons);
+                GeneralFunctions.displayMessageBox(EALang['delete_appointment_title'], 
+                        EALang['write_appointment_removal_reason'], messageButtons);
                 $('#message_box').append('<textarea id="delete-reason" rows="3"></textarea>');
                 $('#delete-reason').css('width', '353px');
             } else {
@@ -523,14 +523,14 @@ var BackendCalendar = {
             // :: DEFINE SUCCESS EVENT CALLBACK
             var successCallback = function(response) {                
                 if (!GeneralFunctions.handleAjaxExceptions(response)) {
-                    $dialog.find('.modal-message').text(EALang['be_unexpected_issues_occurred']);
+                    $dialog.find('.modal-message').text(EALang['unexpected_issues_occurred']);
                     $dialog.find('.modal-message').addClass('alert-error');
                     $dialog.find('.modal-message').fadeIn();
                     return;
                 }
                 
                 // Display success message to the user.
-                $dialog.find('.modal-message').text(EALang['be_appointment_saved']);
+                $dialog.find('.modal-message').text(EALang['appointment_saved']);
                 $dialog.find('.modal-message').addClass('alert-success').removeClass('alert-error');
                 $dialog.find('.modal-message').fadeIn();
                 $dialog.find('.modal-body').scrollTop(0);
@@ -546,7 +546,7 @@ var BackendCalendar = {
             
             // :: DEFINE AJAX ERROR EVENT CALLBACK
             var errorCallback = function() {
-                $dialog.find('.modal-message').text(EALang['be_server_communication_error']);
+                $dialog.find('.modal-message').text(EALang['server_communication_error']);
                 $dialog.find('.modal-message').addClass('alert-error');
                 $dialog.find('.modal-message').fadeIn();
                 $dialog.find('.modal-body').scrollTop(0);
@@ -570,7 +570,7 @@ var BackendCalendar = {
             
             if (start > end) {
                 // Start time is after end time - display message to user.
-                $dialog.find('.modal-message').text(EALang['be_start_date_before_end_error']);
+                $dialog.find('.modal-message').text(EALang['start_date_before_end_error']);
                 $dialog.find('.modal-message').addClass('alert-error');
                 $dialog.find('.modal-message').fadeIn();
                 return;
@@ -599,7 +599,7 @@ var BackendCalendar = {
                     GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
                     $('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
                     
-                    $dialog.find('.modal-message').text(EALang['be_unexpected_issues_occurred']);
+                    $dialog.find('.modal-message').text(EALang['unexpected_issues_occurred']);
                     $dialog.find('.modal-message').addClass('alert-error');
                     $dialog.find('.modal-message').fadeIn();
                     
@@ -613,7 +613,7 @@ var BackendCalendar = {
                 }
                 
                 // Display success message to the user.
-                $dialog.find('.modal-message').text(EALang['be_unavailabled_saved']);
+                $dialog.find('.modal-message').text(EALang['unavailabled_saved']);
                 $dialog.find('.modal-message').removeClass('alert-error');
                 $dialog.find('.modal-message').addClass('alert-success');
                 $dialog.find('.modal-message').fadeIn();
@@ -635,7 +635,7 @@ var BackendCalendar = {
                 GeneralFunctions.displayMessageBox('Communication Error', 'Unfortunately ' +
                         'the operation could not complete due to server communication errors.');
                 
-                $dialog.find('.modal-message').txt(EALang['be_service_communication_error']);
+                $dialog.find('.modal-message').txt(EALang['service_communication_error']);
                 $dialog.find('.modal-message').addClass('alert-error');
                 $dialog.find('.modal-message').fadeIn();
             };
@@ -681,7 +681,7 @@ var BackendCalendar = {
                             window.clearInterval(authInterval);
                             $('#enable-sync').addClass('btn-success enabled');
                             $('#enable-sync i').addClass('icon-white');
-                            $('#enable-sync span').text(EALang['be_disable_sync']);
+                            $('#enable-sync span').text(EALang['disable_sync']);
                             $('#google-sync').prop('disabled', false);
                             $('#select-filter-item option:selected').attr('google-sync', 'true');
                         }
@@ -701,7 +701,7 @@ var BackendCalendar = {
                         
                         $('#enable-sync').removeClass('btn-success enabled');
                         $('#enable-sync i').removeClass('icon-white');
-                        $('#enable-sync span').text(EALang['be_enable_sync']);
+                        $('#enable-sync span').text(EALang['enable_sync']);
                         $('#google-sync').prop('disabled', true);
                         $('#select-filter-item option:selected').attr('google-sync', 'false');
                         
@@ -763,7 +763,7 @@ var BackendCalendar = {
             $dialog.find('#end-datetime').val(start.addMinutes(serviceDuration).toString('dd/MM/yyyy HH:mm'));
             
             // Display modal form.
-            $dialog.find('.modal-header h3').text(EALang['be_new_appointment_title']);
+            $dialog.find('.modal-header h3').text(EALang['new_appointment_title']);
             $dialog.modal('show');
         });
         
@@ -793,7 +793,7 @@ var BackendCalendar = {
             $dialog.find('#unavailable-start').val(start.toString('dd/MM/yyyy HH:mm'));
             $dialog.find('#unavailable-end').val(start.addHours(1).toString('dd/MM/yyyy HH:mm'));
             
-            $dialog.find('.modal-header h3').text(EALang['be_new_unavailable_title']);
+            $dialog.find('.modal-header h3').text(EALang['new_unavailable_title']);
             $dialog.modal('show');
         });
         
@@ -804,7 +804,7 @@ var BackendCalendar = {
             var $list = $('#existing-customers-list');
             
             if (!$list.is(':visible')) {
-                $(this).text(EALang['be_hide']);
+                $(this).text(EALang['hide']);
                 $list.empty();
                 $list.slideDown('slow');
                 $('#filter-existing-customers').fadeIn('slow');
@@ -816,7 +816,7 @@ var BackendCalendar = {
             } else {
                 $list.slideUp('slow');
                 $('#filter-existing-customers').fadeOut('slow');
-                $(this).text(EALang['be_select']);
+                $(this).text(EALang['select']);
             }
         });
         
@@ -984,7 +984,7 @@ var BackendCalendar = {
                                 
                                 if (calendarDateStart < workDateStart) {
                                     unavailablePeriod = {
-                                        'title': EALang['be_not_working'],
+                                        'title': EALang['not_working'],
                                         'start': calendarDateStart,
                                         'end': workDateStart,
                                         'allDay': false,
@@ -1003,7 +1003,7 @@ var BackendCalendar = {
                                         'dd/MM/yyyy HH:mm'); // Use calendarDateStart ***
                                 if (calendarDateEnd > workDateEnd) {
                                     var unavailablePeriod = {
-                                        'title': EALang['be_not_working'],
+                                        'title': EALang['not_working'],
                                         'start': workDateEnd,
                                         'end': calendarDateEnd,
                                         'allDay': false,
@@ -1022,7 +1022,7 @@ var BackendCalendar = {
                                     breakEnd = Date.parseExact(calendarDateStart.toString('dd/MM/yyyy') 
                                             + ' ' + currBreak.end, 'dd/MM/yyyy HH:mm');
                                     var unavailablePeriod = {
-                                        'title': EALang['be_break'],
+                                        'title': EALang['break'],
                                         'start': breakStart,
                                         'end': breakEnd,
                                         'allDay': false,
@@ -1036,7 +1036,7 @@ var BackendCalendar = {
                                 // Add custom unavailable periods.
                                 $.each(response.unavailables, function(index, unavailable) {
                                     var unavailablePeriod = {
-                                        'title': EALang['be_unavailable'] + ' <br><small>' + ((unavailable.notes.length > 30) 
+                                        'title': EALang['unavailable'] + ' <br><small>' + ((unavailable.notes.length > 30) 
                                                         ? unavailable.notes.substring(0, 30) + '...'
                                                         : unavailable.notes) + '</small>',
                                         'start': Date.parse(unavailable.start_datetime),
@@ -1063,7 +1063,7 @@ var BackendCalendar = {
                                         if (currDateStart.toString('dd/MM/yyyy') 
                                             === Date.parse(unavailable.start_datetime).toString('dd/MM/yyyy')) {
                                             var unavailablePeriod = {
-                                                'title': EALang['be_unavailable'] + ' <br><small>' + ((unavailable.notes.length > 30) 
+                                                'title': EALang['unavailable'] + ' <br><small>' + ((unavailable.notes.length > 30) 
                                                         ? unavailable.notes.substring(0, 30) + '...'
                                                         : unavailable.notes) + '</small>',
                                                 'start': Date.parse(unavailable.start_datetime),
@@ -1081,7 +1081,7 @@ var BackendCalendar = {
                                     if (workingDay == null) {
                                         // Add a full day unavailable event.
                                         unavailablePeriod = {
-                                            'title': EALang['be_not_working'],
+                                            'title': EALang['not_working'],
                                             'start': GeneralFunctions.clone(currDateStart),
                                             'end': GeneralFunctions.clone(currDateEnd),
                                             'allDay': false,
@@ -1102,7 +1102,7 @@ var BackendCalendar = {
                                             + ' ' + workingDay.start, 'dd/MM/yyyy HH:mm');
                                     if (currDateStart < start) {
                                         unavailablePeriod = {
-                                            'title': EALang['be_not_working'],
+                                            'title': EALang['not_working'],
                                             'start': GeneralFunctions.clone(currDateStart),
                                             'end': GeneralFunctions.clone(start),
                                             'allDay': false,
@@ -1118,7 +1118,7 @@ var BackendCalendar = {
                                             + ' ' + workingDay.end, 'dd/MM/yyyy HH:mm');
                                     if (currDateEnd > end) {
                                         unavailablePeriod = {
-                                            'title': EALang['be_not_working'],
+                                            'title': EALang['not_working'],
                                             'start': GeneralFunctions.clone(end),
                                             'end': GeneralFunctions.clone(currDateEnd),
                                             'allDay': false,
@@ -1137,7 +1137,7 @@ var BackendCalendar = {
                                         breakEnd = Date.parseExact(currDateStart.toString('dd/MM/yyyy') 
                                                 + ' ' + currBreak.end, 'dd/MM/yyyy HH:mm');
                                         var unavailablePeriod = {
-                                            'title': EALang['be_break'],
+                                            'title': EALang['break'],
                                             'start': breakStart,
                                             'end': breakEnd,
                                             'allDay': false,
@@ -1248,7 +1248,7 @@ var BackendCalendar = {
             jsEvent, ui, view) {
         if (GlobalVariables.user.privileges.appointments.edit == false) {
             revertFunc();
-            Backend.displayNotification(EALang['be_no_privileges_edit_appointments']);
+            Backend.displayNotification(EALang['no_privileges_edit_appointments']);
             return;
         }
                 
@@ -1303,7 +1303,7 @@ var BackendCalendar = {
                     });
                 };
 
-                Backend.displayNotification(EALang['be_appointment_updated'], [
+                Backend.displayNotification(EALang['appointment_updated'], [
                     {
                         'label': 'Undo',
                         'function': undoFunction
@@ -1356,7 +1356,7 @@ var BackendCalendar = {
                     });
                 };
 
-                Backend.displayNotification(EALang['be_unavailable_updated'], [
+                Backend.displayNotification(EALang['unavailable_updated'], [
                     {
                         'label': 'Undo',
                         'function': undoFunction
@@ -1430,18 +1430,18 @@ var BackendCalendar = {
                         + '.popover-content strong {min-width: 80px; display:inline-block;}' 
                         + '.popover-content button {margin-right: 10px;}'
                         + '</style>' +
-                    '<strong>' + EALang['fe_start'] + '</strong> ' 
+                    '<strong>' + EALang['start'] + '</strong> ' 
                         + event.start.toString('dd/MM/yyyy HH:mm') 
                         + '<br>' + 
-                    '<strong>' + EALang['fe_end'] + '</strong> ' 
+                    '<strong>' + EALang['end'] + '</strong> ' 
                         + event.end.toString('dd/MM/yyyy HH:mm') 
                         + '<br>'  
                         + notes 
                         + '<hr>' +
                     '<center>' + 
-                        '<button class="edit-popover btn btn-primary ' + displayEdit + '">' + EALang['be_edit'] + '</button>' +
-                        '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang['be_delete'] + '</button>' +
-                        '<button class="close-popover btn" data-po=' + jsEvent.target + '>' + EALang['be_close'] + '</button>' +
+                        '<button class="edit-popover btn btn-primary ' + displayEdit + '">' + EALang['edit'] + '</button>' +
+                        '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang['delete'] + '</button>' +
+                        '<button class="close-popover btn" data-po=' + jsEvent.target + '>' + EALang['close'] + '</button>' +
                     '</center>';
         } else {   
             displayEdit = (GlobalVariables.user.privileges.appointments.edit == true) 
@@ -1454,27 +1454,27 @@ var BackendCalendar = {
                         + '.popover-content strong {min-width: 80px; display:inline-block;}' 
                         + '.popover-content button {margin-right: 10px;}'
                         + '</style>' +
-                    '<strong>' + EALang['fe_start'] + '</strong> ' 
+                    '<strong>' + EALang['start'] + '</strong> ' 
                         + event.start.toString('dd/MM/yyyy HH:mm') 
                         + '<br>' + 
-                    '<strong>' + EALang['fe_end'] + '</strong> ' 
+                    '<strong>' + EALang['end'] + '</strong> ' 
                         + event.end.toString('dd/MM/yyyy HH:mm') 
                         + '<br>' + 
-                    '<strong>' + EALang['fe_service'] + '</strong> ' 
+                    '<strong>' + EALang['service'] + '</strong> ' 
                         + event.data['service']['name'] 
                         + '<br>' +  
-                    '<strong>' + EALang['fe_provider'] + '</strong> ' 
+                    '<strong>' + EALang['provider'] + '</strong> ' 
                         + event.data['provider']['first_name'] + ' ' 
                         + event.data['provider']['last_name'] 
                         + '<br>' +
-                    '<strong>' + EALang['fe_customer'] + '</strong> ' 
+                    '<strong>' + EALang['customer'] + '</strong> ' 
                         + event.data['customer']['first_name'] + ' ' 
                         + event.data['customer']['last_name'] 
                         + '<hr>' +
                     '<center>' + 
-                        '<button class="edit-popover btn btn-primary ' + displayEdit + '">' + EALang['be_edit'] + '</button>' +
-                        '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang['be_delete'] + '</button>' +
-                        '<button class="close-popover btn" data-po=' + jsEvent.target + '>' + EALang['be_close'] + '</button>' +
+                        '<button class="edit-popover btn btn-primary ' + displayEdit + '">' + EALang['edit'] + '</button>' +
+                        '<button class="delete-popover btn btn-danger ' + displayDelete + '">' + EALang['delete'] + '</button>' +
+                        '<button class="close-popover btn" data-po=' + jsEvent.target + '>' + EALang['close'] + '</button>' +
                     '</center>';
         }
                 
@@ -1505,7 +1505,7 @@ var BackendCalendar = {
             revertFunc, jsEvent, ui, view) {
         if (GlobalVariables.user.privileges.appointments.edit == false) {
             revertFunc();
-            Backend.displayNotification(EALang['be_no_privileges_edit_appointments']);
+            Backend.displayNotification(EALang['no_privileges_edit_appointments']);
             return;
         }
                 
@@ -1578,7 +1578,7 @@ var BackendCalendar = {
                     });
                 };
 
-                Backend.displayNotification(EALang['be_appointment_updated'], [
+                Backend.displayNotification(EALang['appointment_updated'], [
                     {
                         'label': 'Undo',
                         'function': undoFunction
@@ -1640,7 +1640,7 @@ var BackendCalendar = {
                     });
                 };
                 
-                Backend.displayNotification(EALang['be_unavailable_updated'], [
+                Backend.displayNotification(EALang['unavailable_updated'], [
                     {
                         'label': 'Undo',
                         'function': undoFunction
@@ -1748,7 +1748,7 @@ var BackendCalendar = {
         // :: CLOSE EXISTING CUSTOMERS FILTER FRAME
         $('#existing-customers-list').slideUp('slow');
         $('#filter-existing-customers').fadeOut('slow');
-        $('#select-customer').text(EALang['be_select']);
+        $('#select-customer').text(EALang['select']);
             
         // :: SETUP START AND END DATETIME PICKERS
         // Get the selected service duration. It will be needed in order to calculate
@@ -1767,12 +1767,56 @@ var BackendCalendar = {
                 .addMinutes(serviceDuration).toString('dd/MM/yyyy HH:mm');
         
         $dialog.find('#start-datetime').datetimepicker({
-            'dateFormat': 'dd/mm/yy'
+            'dateFormat': 'dd/mm/yy',
+            // Translation
+            dayNames: [EALang['sunday'], EALang['monday'], EALang['tuesday'], EALang['wednesday'], 
+                    EALang['thursday'], EALang['friday'], EALang['saturday']],
+            dayNamesShort: [EALang['sunday'].substr(0,3), EALang['monday'].substr(0,3), 
+                    EALang['tuesday'].substr(0,3), EALang['wednesday'].substr(0,3), 
+                    EALang['thursday'].substr(0,3), EALang['friday'].substr(0,3),
+                    EALang['saturday'].substr(0,3)],
+            dayNamesMin: [EALang['sunday'].substr(0,2), EALang['monday'].substr(0,2), 
+                    EALang['tuesday'].substr(0,2), EALang['wednesday'].substr(0,2), 
+                    EALang['thursday'].substr(0,2), EALang['friday'].substr(0,2),
+                    EALang['saturday'].substr(0,2)],
+            monthNames: [EALang['january'], EALang['february'], EALang['march'], EALang['april'],
+                    EALang['may'], EALang['june'], EALang['july'], EALang['august'], EALang['september'],
+                    EALang['october'], EALang['november'], EALang['december']],
+            prevText: EALang['previous'],
+            nextText: EALang['next'],
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes']
         });
         $dialog.find('#start-datetime').val(startDatetime);
         
         $dialog.find('#end-datetime').datetimepicker({
-            'dateFormat': 'dd/mm/yy'
+            'dateFormat': 'dd/mm/yy',
+            // Translation
+            dayNames: [EALang['sunday'], EALang['monday'], EALang['tuesday'], EALang['wednesday'], 
+                    EALang['thursday'], EALang['friday'], EALang['saturday']],
+            dayNamesShort: [EALang['sunday'].substr(0,3), EALang['monday'].substr(0,3), 
+                    EALang['tuesday'].substr(0,3), EALang['wednesday'].substr(0,3), 
+                    EALang['thursday'].substr(0,3), EALang['friday'].substr(0,3),
+                    EALang['saturday'].substr(0,3)],
+            dayNamesMin: [EALang['sunday'].substr(0,2), EALang['monday'].substr(0,2), 
+                    EALang['tuesday'].substr(0,2), EALang['wednesday'].substr(0,2), 
+                    EALang['thursday'].substr(0,2), EALang['friday'].substr(0,2),
+                    EALang['saturday'].substr(0,2)],
+            monthNames: [EALang['january'], EALang['february'], EALang['march'], EALang['april'],
+                    EALang['may'], EALang['june'], EALang['july'], EALang['august'], EALang['september'],
+                    EALang['october'], EALang['november'], EALang['december']],
+            prevText: EALang['previous'],
+            nextText: EALang['next'],
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes']
         });
         $dialog.find('#end-datetime').val(endDatetime);
     },
@@ -1837,12 +1881,56 @@ var BackendCalendar = {
         var end = new Date().addHours(1).toString('dd/MM/yyyy HH:mm');
         
         $dialog.find('#unavailable-start').datetimepicker({
-            'dateFormat': 'dd/mm/yy'
+            'dateFormat': 'dd/mm/yy',
+            // Translation
+            dayNames: [EALang['sunday'], EALang['monday'], EALang['tuesday'], EALang['wednesday'], 
+                    EALang['thursday'], EALang['friday'], EALang['saturday']],
+            dayNamesShort: [EALang['sunday'].substr(0,3), EALang['monday'].substr(0,3), 
+                    EALang['tuesday'].substr(0,3), EALang['wednesday'].substr(0,3), 
+                    EALang['thursday'].substr(0,3), EALang['friday'].substr(0,3),
+                    EALang['saturday'].substr(0,3)],
+            dayNamesMin: [EALang['sunday'].substr(0,2), EALang['monday'].substr(0,2), 
+                    EALang['tuesday'].substr(0,2), EALang['wednesday'].substr(0,2), 
+                    EALang['thursday'].substr(0,2), EALang['friday'].substr(0,2),
+                    EALang['saturday'].substr(0,2)],
+            monthNames: [EALang['january'], EALang['february'], EALang['march'], EALang['april'],
+                    EALang['may'], EALang['june'], EALang['july'], EALang['august'], EALang['september'],
+                    EALang['october'], EALang['november'], EALang['december']],
+            prevText: EALang['previous'],
+            nextText: EALang['next'],
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes']
         });
         $dialog.find('#unavailable-start').val(start);
         
         $dialog.find('#unavailable-end').datetimepicker({
-            'dateFormat': 'dd/mm/yy'
+            'dateFormat': 'dd/mm/yy',
+            // Translation
+            dayNames: [EALang['sunday'], EALang['monday'], EALang['tuesday'], EALang['wednesday'], 
+                    EALang['thursday'], EALang['friday'], EALang['saturday']],
+            dayNamesShort: [EALang['sunday'].substr(0,3), EALang['monday'].substr(0,3), 
+                    EALang['tuesday'].substr(0,3), EALang['wednesday'].substr(0,3), 
+                    EALang['thursday'].substr(0,3), EALang['friday'].substr(0,3),
+                    EALang['saturday'].substr(0,3)],
+            dayNamesMin: [EALang['sunday'].substr(0,2), EALang['monday'].substr(0,2), 
+                    EALang['tuesday'].substr(0,2), EALang['wednesday'].substr(0,2), 
+                    EALang['thursday'].substr(0,2), EALang['friday'].substr(0,2),
+                    EALang['saturday'].substr(0,2)],
+            monthNames: [EALang['january'], EALang['february'], EALang['march'], EALang['april'],
+                    EALang['may'], EALang['june'], EALang['july'], EALang['august'], EALang['september'],
+                    EALang['october'], EALang['november'], EALang['december']],
+            prevText: EALang['previous'],
+            nextText: EALang['next'],
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes']
         });
         $dialog.find('#unavailable-end').val(end);
         
diff --git a/src/assets/js/backend_customers.js b/src/assets/js/backend_customers.js
index ff4aa680..f4275d03 100644
--- a/src/assets/js/backend_customers.js
+++ b/src/assets/js/backend_customers.js
@@ -196,16 +196,16 @@ CustomersHelper.prototype.bindEventHandlers = function() {
         var customerId = $('#customer-id').val();
         
         var messageBtns = {};
-        messageBtns[EALang['be_delete']] = function() {        
+        messageBtns[EALang['delete']] = function() {        
             BackendCustomers.helper.delete(customerId);
             $('#message_box').dialog('close');
         };
-        messageBtns[EALang['fe_cancel']] = function() {
+        messageBtns[EALang['cancel']] = function() {
             $('#message_box').dialog('close');
         };
 
-        GeneralFunctions.displayMessageBox(EALang['be_delete_customer'], 
-                EALang['be_delete_record_prompt'], messageBtns);
+        GeneralFunctions.displayMessageBox(EALang['delete_customer'], 
+                EALang['delete_record_prompt'], messageBtns);
     });
 };
 
@@ -225,7 +225,7 @@ CustomersHelper.prototype.save = function(customer) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_customer_saved']);
+        Backend.displayNotification(EALang['customer_saved']);
         BackendCustomers.helper.resetForm();
         $('#filter-customers .key').val('');
         BackendCustomers.helper.filter('', response.id, true);
@@ -248,7 +248,7 @@ CustomersHelper.prototype.delete = function(id) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_customer_deleted']);
+        Backend.displayNotification(EALang['customer_deleted']);
         BackendCustomers.helper.resetForm();
         BackendCustomers.helper.filter($('#filter-customers .key').val());
     }, 'json');
@@ -273,13 +273,13 @@ CustomersHelper.prototype.validate = function(customer) {
             }
         });
         if (missingRequired) {
-            throw EALang['fe_fields_are_required'];
+            throw EALang['fields_are_required'];
         }
 
         // Validate email address.
         if (!GeneralFunctions.validateEmail($('#email').val())) {
             $('#email').css('border', '2px solid red');
-            throw EALang['be_invalid_email'];
+            throw EALang['invalid_email'];
         }
 
         return true;
@@ -378,7 +378,7 @@ CustomersHelper.prototype.filter = function(key, selectId, display) {
         $('#filter-customers .results').jScrollPane({ mouseWheelSpeed: 70 });
         
         if (response.length == 0) {
-            $('#filter-customers .results').html('<em>' + EALang['be_no_records_found'] + '</em>');
+            $('#filter-customers .results').html('<em>' + EALang['no_records_found'] + '</em>');
         }
         
         if (selectId != undefined) {
diff --git a/src/assets/js/backend_services.js b/src/assets/js/backend_services.js
index 2122d53f..dd56f8e9 100644
--- a/src/assets/js/backend_services.js
+++ b/src/assets/js/backend_services.js
@@ -25,7 +25,7 @@ var BackendServices = {
             var option = new Option(category.name, category.id);
             $('#service-category').append(option);
         });
-        $('#service-category').append(new Option('- ' + EALang['be_no_category'] + ' -', null)).val('null');
+        $('#service-category').append(new Option('- ' + EALang['no_category'] + ' -', null)).val('null');
         
         $('#service-duration').spinner({
             'min': 0,
@@ -99,7 +99,7 @@ var BackendServices = {
                 var option = new Option(category.name, category.id);
                 $select.append(option);
             });
-            $select.append(new Option('- ' + EALang['be_no_category'] + ' -', null)).val('null');
+            $select.append(new Option('- ' + EALang['no_category'] + ' -', null)).val('null');
         }, 'json');
     }
 };
@@ -234,17 +234,17 @@ ServicesHelper.prototype.bindEventHandlers = function() {
         var serviceId = $('#service-id').val();
 
         var messageBtns = {};
-        messageBtns[EALang['be_delete']] = function() {
+        messageBtns[EALang['delete']] = function() {
             BackendServices.helper.delete(serviceId);
             $('#message_box').dialog('close');
         };
 
-        messageBtns[EALang['fe_cancel']] = function() {
+        messageBtns[EALang['cancel']] = function() {
             $('#message_box').dialog('close');
         };
 
-        GeneralFunctions.displayMessageBox(EALang['be_delete_service'], 
-                EALang['be_delete_record_prompt'], messageBtns);
+        GeneralFunctions.displayMessageBox(EALang['delete_service'], 
+                EALang['delete_record_prompt'], messageBtns);
     });
 };
 
@@ -268,7 +268,7 @@ ServicesHelper.prototype.save = function(service) {
         //////////////////////////////////////////////////
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_service_saved']);
+        Backend.displayNotification(EALang['service_saved']);
         BackendServices.helper.resetForm();
         $('#filter-services .key').val('');
         BackendServices.helper.filter('', response.id, true);
@@ -291,7 +291,7 @@ ServicesHelper.prototype.delete = function(id) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_service_deleted']);
+        Backend.displayNotification(EALang['service_deleted']);
         
         BackendServices.helper.resetForm();
         BackendServices.helper.filter($('#filter-services .key').val());
@@ -317,7 +317,7 @@ ServicesHelper.prototype.validate = function(service) {
             }
         });
         if (missingRequired) {
-            throw EALang['fe_fields_are_required'];
+            throw EALang['fields_are_required'];
         }
         
         return true;
@@ -395,7 +395,7 @@ ServicesHelper.prototype.filter = function(key, selectId, display) {
         $('#filter-services .results').jScrollPane({ mouseWheelSpeed: 70 });
         
         if (response.length == 0) {
-            $('#filter-services .results').html('<em>' + EALang['be_no_records_found'] + '</em>');
+            $('#filter-services .results').html('<em>' + EALang['no_records_found'] + '</em>');
         }
         
         if (selectId != undefined) {
@@ -551,8 +551,8 @@ CategoriesHelper.prototype.bindEventHandlers = function() {
             }
         };
 
-        GeneralFunctions.displayMessageBox(EALang['be_delete_category'], 
-                EALang['be_delete_record_prompt'], messageBtns);
+        GeneralFunctions.displayMessageBox(EALang['delete_category'], 
+                EALang['delete_record_prompt'], messageBtns);
     });
     
     /**
@@ -616,7 +616,7 @@ CategoriesHelper.prototype.filter = function(key, selectId, display) {
         $('#filter-categories .results').jScrollPane({ mouseWheelSpeed: 70 });
         
         if (response.length == 0) {
-            $('#filter-categories .results').html('<em>' + EALang['be_no_records_found'] + '</em>');
+            $('#filter-categories .results').html('<em>' + EALang['no_records_found'] + '</em>');
         }
         
         if (selectId != undefined) {
@@ -642,7 +642,7 @@ CategoriesHelper.prototype.save = function(category) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_category_saved']);
+        Backend.displayNotification(EALang['category_saved']);
         BackendServices.helper.resetForm();
         $('#filter-categories .key').val('');
         BackendServices.helper.filter('', response.id, true);
@@ -666,7 +666,7 @@ CategoriesHelper.prototype.delete = function(id) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
         
-        Backend.displayNotification(EALang['be_category_deleted']);
+        Backend.displayNotification(EALang['category_deleted']);
         
         BackendServices.helper.resetForm();
         BackendServices.helper.filter($('#filter-categories .key').val());
@@ -701,7 +701,7 @@ CategoriesHelper.prototype.validate = function(category) {
                 missingRequired = true;
             }
         });
-        if (missingRequired) throw EALang['fe_fields_are_required'];
+        if (missingRequired) throw EALang['fields_are_required'];
         
         return true;
         
diff --git a/src/assets/js/backend_settings.js b/src/assets/js/backend_settings.js
index a11f1e36..cbabc926 100644
--- a/src/assets/js/backend_settings.js
+++ b/src/assets/js/backend_settings.js
@@ -181,7 +181,7 @@ var BackendSettings = {
                 if (!GeneralFunctions.handleAjaxExceptions(response)) return;
                 if (response == false) {
                     $input.css('border', '2px solid red');
-                    Backend.displayNotification(EALang['be_username_already_exists']);
+                    Backend.displayNotification(EALang['username_already_exists']);
                     $input.attr('already-exists', 'true');
                 } else {
                     $input.css('border', '');
@@ -218,7 +218,7 @@ SystemSettings.prototype.save = function(settings) {
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
        
-        Backend.displayNotification(EALang['be_settings_saved']);
+        Backend.displayNotification(EALang['settings_saved']);
         
         // Update the logo title on the header.
         $('#header-logo span').text($('#company-name').val());
@@ -282,13 +282,13 @@ SystemSettings.prototype.validate = function() {
             }
         });
         if (missingRequired) {
-            throw EALang['fe_fields_are_required'];
+            throw EALang['fields_are_required'];
         }
         
         // Validate company email address.
         if (!GeneralFunctions.validateEmail($('#company-email').val())) {
             $('#company-email').css('border', '2px solid red');
-            throw EALang['be_invalid_email'];
+            throw EALang['invalid_email'];
         }
         
         return true;
@@ -342,7 +342,7 @@ UserSettings.prototype.get = function() {
  */
 UserSettings.prototype.save = function(settings) {
     if (!BackendSettings.settings.validate(settings)) {
-        Backend.displayNotification(EALang['be_user_settings_are_invalid']);
+        Backend.displayNotification(EALang['user_settings_are_invalid']);
         return; // Validation failed, do not procceed.
     }
     
@@ -358,7 +358,7 @@ UserSettings.prototype.save = function(settings) {
         //////////////////////////////////////////////////////////
         
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
-        Backend.displayNotification(EALang['be_settings_saved']);
+        Backend.displayNotification(EALang['settings_saved']);
         
         // Update footer greetings.
         $('#footer-user-display-name').text('Hello, ' + $('#first-name').val() + ' ' + $('#last-name').val() + '!');
@@ -386,24 +386,24 @@ UserSettings.prototype.validate = function() {
             }
         });
         if (missingRequired) {
-            throw EALang['fe_fields_are_required'];
+            throw EALang['fields_are_required'];
         }
         
         // Validate passwords (if provided).
         if ($('#password').val() != $('#retype-password').val()) {
             $('#password, #retype-password').css('border', '2px solid red');
-            throw EALang['be_passwords_mismatch'];
+            throw EALang['passwords_mismatch'];
         }
         
         // Validate user email.
         if (!GeneralFunctions.validateEmail($('#email').val())) {
             $('#email').css('border', '2px solid red');
-            throw EALang['be_invalid_email'];
+            throw EALang['invalid_email'];
         }
         
         if ($('#username').attr('already-exists') === 'true') {
             $('#username').css('border', '2px solid red');
-            throw EALang['be_username_already_exists'];
+            throw EALang['username_already_exists'];
         }
         
         return true;
diff --git a/src/assets/js/backend_users.js b/src/assets/js/backend_users.js
index 62e044e4..44822222 100644
--- a/src/assets/js/backend_users.js
+++ b/src/assets/js/backend_users.js
@@ -155,12 +155,12 @@ var BackendUsers = {
                 if (response == false) {
                     $input.css('border', '2px solid red');
                     $input.attr('already-exists', 'true');
-                    $input.parents().eq(3).find('.form-message').text(EALang['be_username_already_exists']);
+                    $input.parents().eq(3).find('.form-message').text(EALang['username_already_exists']);
                     $input.parents().eq(3).find('.form-message').show();
                 } else {
                     $input.css('border', '');
                     $input.attr('already-exists', 'false');
-                    if ($input.parents().eq(3).find('.form-message').text() == EALang['be_username_already_exists']) {
+                    if ($input.parents().eq(3).find('.form-message').text() == EALang['username_already_exists']) {
                         $input.parents().eq(3).find('.form-message').hide();
                     }
                 }
diff --git a/src/assets/js/backend_users_admins.js b/src/assets/js/backend_users_admins.js
index 96bf2b74..e3146b08 100644
--- a/src/assets/js/backend_users_admins.js
+++ b/src/assets/js/backend_users_admins.js
@@ -95,16 +95,16 @@ AdminsHelper.prototype.bindEventHandlers = function() {
         var adminId = $('#admin-id').val();
 
         var messageBtns = {};
-        messageBtns[EALang['be_delete']] = function() {
+        messageBtns[EALang['delete']] = function() {
             BackendUsers.helper.delete(adminId);
             $('#message_box').dialog('close');
         };
-        messageBtns[EALang['be_cancel']] = function() {
+        messageBtns[EALang['cancel']] = function() {
             $('#message_box').dialog('close');
         };
 
-        GeneralFunctions.displayMessageBox(EALang['be_delete_admin'], 
-                EALang['be_delete_record_prompt'], messageBtns);
+        GeneralFunctions.displayMessageBox(EALang['delete_admin'], 
+                EALang['delete_record_prompt'], messageBtns);
     });
 
     /**
@@ -176,7 +176,7 @@ AdminsHelper.prototype.save = function(admin) {
         //console.log('Save Admin Response:', response);
         ////////////////////////////////////////////////
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
-        Backend.displayNotification(EALang['be_admin_saved']);
+        Backend.displayNotification(EALang['admin_saved']);
         BackendUsers.helper.resetForm();
         $('#filter-admins .key').val('');
         BackendUsers.helper.filter('', response.id, true); 
@@ -197,7 +197,7 @@ AdminsHelper.prototype.delete = function(id) {
         //console.log('Delete admin response:', response);
         //////////////////////////////////////////////////
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
-        Backend.displayNotification(EALang['be_admin_deleted']);
+        Backend.displayNotification(EALang['admin_deleted']);
         BackendUsers.helper.resetForm();
         BackendUsers.helper.filter($('#filter-admins .key').val());
     }, 'json');
@@ -229,26 +229,26 @@ AdminsHelper.prototype.validate = function(admin) {
         // Validate passwords.
         if ($('#admin-password').val() != $('#admin-password-confirm').val()) {
             $('#admin-password, #admin-password-confirm').css('border', '2px solid red');
-            throw EALang['be_passwords_mismatch'];
+            throw EALang['passwords_mismatch'];
         }
         
         if ($('#admin-password').val().length < BackendUsers.MIN_PASSWORD_LENGTH
                 && $('#admin-password').val() != '') {
             $('#admin-password, #admin-password-confirm').css('border', '2px solid red');
             
-            throw EALang['be_password_length_notice'].replace('$number', BackendUsers.MIN_PASSWORD_LENGTH);
+            throw EALang['password_length_notice'].replace('$number', BackendUsers.MIN_PASSWORD_LENGTH);
         }
         
         // Validate user email.
         if (!GeneralFunctions.validateEmail($('#admin-email').val())) {
             $('#admin-email').css('border', '2px solid red');
-            throw EALang['be_invalid_email'];
+            throw EALang['invalid_email'];
         }
         
         // Check if username exists
         if ($('#admin-username').attr('already-exists') ==  'true') {
             $('#admin-username').css('border', '2px solid red');
-            throw EALang['be_username_already_exists'];
+            throw EALang['username_already_exists'];
         } 
         
         return true;
@@ -338,7 +338,7 @@ AdminsHelper.prototype.filter = function(key, selectId, display) {
         $('#filter-admins .results').jScrollPane({ mouseWheelSpeed: 70 });
         
         if (response.length == 0) {
-            $('#filter-admins .results').html('<em>' + EALang['be_no_records_found'] + '</em>')
+            $('#filter-admins .results').html('<em>' + EALang['no_records_found'] + '</em>')
         }
         
         if (selectId != undefined) {
diff --git a/src/assets/js/backend_users_providers.js b/src/assets/js/backend_users_providers.js
index fb2be0e0..9b4a38c7 100644
--- a/src/assets/js/backend_users_providers.js
+++ b/src/assets/js/backend_users_providers.js
@@ -105,16 +105,16 @@ ProvidersHelper.prototype.bindEventHandlers = function() {
         var providerId = $('#provider-id').val();
 
         var messageBtns = {};
-        messageBtns[EALang['be_delete']] = function() {
+        messageBtns[EALang['delete']] = function() {
             BackendUsers.helper.delete(providerId);
             $('#message_box').dialog('close');
         };
-        messageBtns[EALang['be_cancel']] = function() {
+        messageBtns[EALang['cancel']] = function() {
             $('#message_box').dialog('close');
         };
 
-        GeneralFunctions.displayMessageBox(EALang['be_delete_provider'], 
-                EALang['be_delete_record_prompt'], messageBtns);
+        GeneralFunctions.displayMessageBox(EALang['delete_provider'], 
+                EALang['delete_record_prompt'], messageBtns);
     });
 
     /**
@@ -227,7 +227,7 @@ ProvidersHelper.prototype.save = function(provider) {
         //console.log('Save Provider Response:', response);
         ///////////////////////////////////////////////////
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
-        Backend.displayNotification(EALang['be_provider_saved']);
+        Backend.displayNotification(EALang['provider_saved']);
         BackendUsers.helper.resetForm();
         $('#filter-providers .key').val('');
         BackendUsers.helper.filter('', response.id, true); 
@@ -248,7 +248,7 @@ ProvidersHelper.prototype.delete = function(id) {
         //console.log('Delete provider response:', response);
         /////////////////////////////////////////////////////
         if (!GeneralFunctions.handleAjaxExceptions(response)) return;
-        Backend.displayNotification(EALang['be_provider_deleted']);
+        Backend.displayNotification(EALang['provider_deleted']);
         BackendUsers.helper.resetForm();
         BackendUsers.helper.filter($('#filter-providers .key').val());
     }, 'json');
@@ -274,31 +274,31 @@ ProvidersHelper.prototype.validate = function(provider) {
             }
         });
         if (missingRequired) {
-            throw EALang['fe_fields_are_required'];
+            throw EALang['fields_are_required'];
         }
         
         // Validate passwords.
         if ($('#provider-password').val() != $('#provider-password-confirm').val()) {
             $('#provider-password, #provider-password-confirm').css('border', '2px solid red');
-            throw EALang['be_passwords_mismatch'];
+            throw EALang['passwords_mismatch'];
         }
         
         if ($('#provider-password').val().length < BackendUsers.MIN_PASSWORD_LENGTH
                 && $('#provider-password').val() != '') {
             $('#provider-password, #provider-password-confirm').css('border', '2px solid red');
-            throw EALang['be_password_length_notice'].replace('$number', BackendUsers.MIN_PASSWORD_LENGTH);
+            throw EALang['password_length_notice'].replace('$number', BackendUsers.MIN_PASSWORD_LENGTH);
         }
         
         // Validate user email.
         if (!GeneralFunctions.validateEmail($('#provider-email').val())) {
             $('#provider-email').css('border', '2px solid red');
-            throw EALang['be_invalid_email'];
+            throw EALang['invalid_email'];
         }
         
         // Check if username exists
         if ($('#provider-username').attr('already-exists') ==  'true') {
             $('#provider-username').css('border', '2px solid red');
-            throw EALang['be_username_already_exists'];
+            throw EALang['username_already_exists'];
         } 
         
         return true;
@@ -415,7 +415,7 @@ ProvidersHelper.prototype.filter = function(key, selectId, display) {
         $('#filter-providers .results').jScrollPane({ mouseWheelSpeed: 70 });
         
         if (response.length == 0) {
-            $('#filter-providers .results').html('<em>' + EALang['be_no_records_found'] + '</em>')
+            $('#filter-providers .results').html('<em>' + EALang['no_records_found'] + '</em>')
         }
         
         if (selectId != undefined) {
@@ -454,13 +454,13 @@ ProvidersHelper.prototype.getFilterHtml = function(provider) {
  */
 ProvidersHelper.prototype.editableBreakDay = function($selector) {
     var weekDays = {};
-    weekDays[EALang['be_monday']] = 'Monday';
-    weekDays[EALang['be_tuesday']] = 'Tuesday';
-    weekDays[EALang['be_wednesday']] = 'Wednesday';
-    weekDays[EALang['be_thursday']] = 'Thursday';
-    weekDays[EALang['be_friday']] = 'Friday';
-    weekDays[EALang['be_saturday']] = 'Saturday';
-    weekDays[EALang['be_sunday']] = 'Sunday';
+    weekDays[EALang['monday']] = 'Monday';
+    weekDays[EALang['tuesday']] = 'Tuesday';
+    weekDays[EALang['wednesday']] = 'Wednesday';
+    weekDays[EALang['thursday']] = 'Thursday';
+    weekDays[EALang['friday']] = 'Friday';
+    weekDays[EALang['saturday']] = 'Saturday';
+    weekDays[EALang['sunday']] = 'Sunday';
 
 
     $selector.editable(function(value, settings) {
diff --git a/src/assets/js/frontend_book.js b/src/assets/js/frontend_book.js
index 846eae52..e1e9cbb6 100644
--- a/src/assets/js/frontend_book.js
+++ b/src/assets/js/frontend_book.js
@@ -48,11 +48,30 @@ var FrontendBook = {
             firstDay: 1, // Monday
             minDate: 0,
             defaultDate: Date.today(),
+           
+            dayNames: [EALang['sunday'], EALang['monday'], EALang['tuesday'], EALang['wednesday'], EALang['thursday'], EALang['friday'], EALang['saturday']],
+            dayNamesShort: [EALang['sunday'].substr(0,3), EALang['monday'].substr(0,3), 
+                    EALang['tuesday'].substr(0,3), EALang['wednesday'].substr(0,3), 
+                    EALang['thursday'].substr(0,3), EALang['friday'].substr(0,3),
+                    EALang['saturday'].substr(0,3)],
+            dayNamesMin: [EALang['sunday'].substr(0,2), EALang['monday'].substr(0,2), 
+                    EALang['tuesday'].substr(0,2), EALang['wednesday'].substr(0,2), 
+                    EALang['thursday'].substr(0,2), EALang['friday'].substr(0,2),
+                    EALang['saturday'].substr(0,2)],
+            monthNames: [EALang['january'], EALang['february'], EALang['march'], EALang['april'],
+                    EALang['may'], EALang['june'], EALang['july'], EALang['august'], EALang['september'],
+                    EALang['october'], EALang['november'], EALang['december']],
+            prevText: EALang['previous'],
+            nextText: EALang['next'],
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            
             onSelect: function(dateText, instance) {
                 FrontendBook.getAvailableHours(dateText);
                 FrontendBook.updateConfirmFrame();
             }
         });
+
        
         // Bind the event handlers (might not be necessary every time
         // we use this class).
@@ -129,7 +148,7 @@ var FrontendBook = {
                     if ($('#select-hour-prompt').length == 0) {
                         $('#available-hours').append('<br><br>'
                                 + '<strong id="select-hour-prompt" class="text-error">'
-                                + EALang['fe_appointment_hour_missing'] 
+                                + EALang['appointment_hour_missing'] 
                                 + '</strong>');
                     }
                     return;
@@ -206,12 +225,12 @@ var FrontendBook = {
                     $('#cancel-appointment-form').submit();
                 };
                     
-                dialogButtons[EALang['fe_cancel']] = function() {
+                dialogButtons[EALang['cancel']] = function() {
                     $('#message_box').dialog('close');
                 };
                 
-                GeneralFunctions.displayMessageBox(EALang['fe_cancel_appointment_title'], 
-                        EALang['be_write_appointment_removal_reason'], dialogButtons);
+                GeneralFunctions.displayMessageBox(EALang['cancel_appointment_title'], 
+                        EALang['write_appointment_removal_reason'], dialogButtons);
                         
                 $('#message_box').append('<textarea id="cancel-reason" rows="3"></textarea>');
                 $('#cancel-reason').css('width', '353px');
@@ -342,7 +361,7 @@ var FrontendBook = {
                 FrontendBook.updateConfirmFrame();
                 
             } else {
-                $('#available-hours').text(EALang['fe_no_available_hours']);
+                $('#available-hours').text(EALang['no_available_hours']);
             }
         }, 'json');
     },
@@ -366,13 +385,13 @@ var FrontendBook = {
                 }
             });
             if (missingRequiredField) {
-                throw EALang['fe_fields_are_required'];
+                throw EALang['fields_are_required'];
             }
             
             // Validate email address.
             if (!GeneralFunctions.validateEmail($('#email').val())) {
                 $('#email').css('border', '2px solid red');
-                throw EALang['be_invalid_email'];
+                throw EALang['invalid_email'];
             }
             
             return true;
@@ -419,15 +438,15 @@ var FrontendBook = {
         $('#customer-details').html(
             '<h4>' + $('#first-name').val() + ' ' + $('#last-name').val() + '</h4>' + 
             '<p>' + 
-            	EALang['fe_phone'] + ': ' + $('#phone-number').val() + 
+            	EALang['phone'] + ': ' + $('#phone-number').val() + 
             	'<br/>' + 
-            	EALang['fe_email'] + ': ' + $('#email').val() + 
+            	EALang['email'] + ': ' + $('#email').val() + 
             	'<br/>' + 
-            	EALang['fe_address'] + ': ' + $('#address').val() + 
+            	EALang['address'] + ': ' + $('#address').val() + 
             	'<br/>' + 
-            	EALang['fe_city'] + ': ' + $('#city').val() + 
+            	EALang['city'] + ': ' + $('#city').val() + 
             	'<br/>' + 
-            	EALang['fe_zip_code'] + ': ' + $('#zip-code').val() + 
+            	EALang['zip_code'] + ': ' + $('#zip-code').val() + 
         	'</p>'
         );
             
@@ -559,12 +578,12 @@ var FrontendBook = {
                 }
                 
                 if (service.duration != '' && service.duration != null) {
-                    html += '[' + EALang['fe_duration'] + ' ' + service.duration 
-                            + ' ' + EALang['fe_minutes'] + '] ';
+                    html += '[' + EALang['duration'] + ' ' + service.duration 
+                            + ' ' + EALang['minutes'] + '] ';
                 }
                 
                 if (service.price != '' && service.price != null) {
-                    html += '[' + EALang['fe_price'] + ' ' + service.price + ' ' + service.currency  + ']';
+                    html += '[' + EALang['price'] + ' ' + service.price + ' ' + service.currency  + ']';
                 }   
                 
                 html += '<br>';
diff --git a/src/assets/js/general_functions.js b/src/assets/js/general_functions.js
index a530f874..070dadc0 100644
--- a/src/assets/js/general_functions.js
+++ b/src/assets/js/general_functions.js
@@ -9,10 +9,10 @@ var GeneralFunctions = {
     /**
      * General Functions Constants
      */
-    EXCEPTIONS_TITLE: EALang['be_unexpected_issues'],
-    EXCEPTIONS_MESSAGE: EALang['be_unexpected_issues_message'],
-    WARNINGS_TITLE: EALang['be_unexpected_warnings'],
-    WARNINGS_MESSAGE: EALang['be_unexpected_warnings_message'],
+    EXCEPTIONS_TITLE: EALang['unexpected_issues'],
+    EXCEPTIONS_MESSAGE: EALang['unexpected_issues_message'],
+    WARNINGS_TITLE: EALang['unexpected_warnings'],
+    WARNINGS_MESSAGE: EALang['unexpected_warnings_message'],
     
     /**
      * This functions displays a message box in
@@ -36,7 +36,7 @@ var GeneralFunctions = {
 
         if (messageButtons == undefined) {
             messageButtons = {};
-            messageButtons[EALang['be_close']] = function() {
+            messageButtons[EALang['close']] = function() {
                 jQuery("#message_box").dialog("close");
             };
         }
diff --git a/src/assets/js/working_plan.js b/src/assets/js/working_plan.js
index 3c53af68..f48ad7c4 100644
--- a/src/assets/js/working_plan.js
+++ b/src/assets/js/working_plan.js
@@ -44,16 +44,16 @@ WorkingPlan.prototype.setup = function(workingPlan) {
                             '<td class="break-start editable">' + brk.start + '</td>' +
                             '<td class="break-end editable">' + brk.end + '</td>' +
                             '<td>' + 
-                                '<button type="button" class="btn edit-break" title="' + EALang['be_edit'] + '">' +
+                                '<button type="button" class="btn edit-break" title="' + EALang['edit'] + '">' +
                                     '<i class="icon-pencil"></i>' +
                                 '</button>' +
-                                '<button type="button" class="btn delete-break" title="' + EALang['be_delete'] + '">' +
+                                '<button type="button" class="btn delete-break" title="' + EALang['delete'] + '">' +
                                     '<i class="icon-remove"></i>' +
                                 '</button>' +
-                                '<button type="button" class="btn save-break hidden" title="' + EALang['be_save'] + '">' +
+                                '<button type="button" class="btn save-break hidden" title="' + EALang['save'] + '">' +
                                     '<i class="icon-ok"></i>' +
                                 '</button>' +
-                                '<button type="button" class="btn cancel-break hidden" title="' + EALang['be_cancel'] + '">' +
+                                '<button type="button" class="btn cancel-break hidden" title="' + EALang['cancel'] + '">' +
                                     '<i class="icon-ban-circle"></i>' +
                                 '</button>' +
                             '</td>' +
@@ -79,13 +79,13 @@ WorkingPlan.prototype.setup = function(workingPlan) {
  */
 WorkingPlan.prototype.editableBreakDay = function($selector) {
     var weekDays = {};
-    weekDays[EALang['be_monday']] = EALang['be_monday']; //'Monday';
-    weekDays[EALang['be_tuesday']] = EALang['be_tuesday']; //'Tuesday';
-    weekDays[EALang['be_wednesday']] = EALang['be_wednesday']; //'Wednesday';
-    weekDays[EALang['be_thursday']] = EALang['be_thursday']; //'Thursday';
-    weekDays[EALang['be_friday']] = EALang['be_friday']; //'Friday';
-    weekDays[EALang['be_saturday']] = EALang['be_saturday']; //'Saturday';
-    weekDays[EALang['be_sunday']] = EALang['be_sunday']; //'Sunday';
+    weekDays[EALang['monday']] = EALang['monday']; //'Monday';
+    weekDays[EALang['tuesday']] = EALang['tuesday']; //'Tuesday';
+    weekDays[EALang['wednesday']] = EALang['wednesday']; //'Wednesday';
+    weekDays[EALang['thursday']] = EALang['thursday']; //'Thursday';
+    weekDays[EALang['friday']] = EALang['friday']; //'Friday';
+    weekDays[EALang['saturday']] = EALang['saturday']; //'Saturday';
+    weekDays[EALang['sunday']] = EALang['sunday']; //'Sunday';
 
     $selector.editable(function(value, settings) {
         return value;
@@ -163,20 +163,20 @@ WorkingPlan.prototype.bindEventHandlers = function() {
     $('.add-break').click(function() {
         var tr = 
                 '<tr>' + 
-                    '<td class="break-day editable">' + EALang['be_monday'] + '</td>' +
+                    '<td class="break-day editable">' + EALang['monday'] + '</td>' +
                     '<td class="break-start editable">09:00</td>' +
                     '<td class="break-end editable">10:00</td>' +
                     '<td>' + 
-                        '<button type="button" class="btn edit-break" title="' + EALang['be_edit'] + '">' +
+                        '<button type="button" class="btn edit-break" title="' + EALang['edit'] + '">' +
                             '<i class="icon-pencil"></i>' +
                         '</button>' +
-                        '<button type="button" class="btn delete-break" title="' + EALang['be_delete'] + '">' +
+                        '<button type="button" class="btn delete-break" title="' + EALang['delete'] + '">' +
                             '<i class="icon-remove"></i>' +
                         '</button>' +
-                        '<button type="button" class="btn save-break hidden" title="' + EALang['be_save'] + '">' +
+                        '<button type="button" class="btn save-break hidden" title="' + EALang['save'] + '">' +
                             '<i class="icon-ok"></i>' +
                         '</button>' +
-                        '<button type="button" class="btn cancel-break hidden" title="' + EALang['be_cancel'] + '">' +
+                        '<button type="button" class="btn cancel-break hidden" title="' + EALang['cancel'] + '">' +
                             '<i class="icon-ban-circle"></i>' +
                         '</button>' +
                     '</td>' +
@@ -205,7 +205,14 @@ WorkingPlan.prototype.bindEventHandlers = function() {
 
         // Make all cells in current row editable.
         $(this).parent().parent().children().trigger('edit');
-        $(this).parent().parent().find('.break-start input, .break-end input').timepicker();
+        $(this).parent().parent().find('.break-start input, .break-end input').timepicker({
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes']
+        });
         $(this).parent().parent().find('.break-day select').focus();
 
         // Show save - cancel buttons.
@@ -313,6 +320,14 @@ WorkingPlan.prototype.timepickers = function(disabled) {
         // Set timepickers where needed.
         $('.working-plan input[type="text"]').timepicker({
             'timeFormat': 'HH:mm',
+            
+            currentText: EALang['now'],
+            closeText: EALang['close'],
+            timeOnlyTitle: EALang['select_time'],
+            timeText: EALang['time'],
+            hourText: EALang['hour'],
+            minuteText: EALang['minutes'],
+            
             'onSelect': function(datetime, inst) {
                 // Start time must be earlier than end time. 
                 var start = Date.parse($(this).parent().parent().find('.work-start').val());
@@ -343,25 +358,25 @@ WorkingPlan.prototype.reset = function() {
 WorkingPlan.prototype.convertValueToDay = function(value) {
     switch (value) {
         case 'monday': 
-            return EALang['be_monday'];
+            return EALang['monday'];
             break;
         case 'tuesday': 
-            return EALang['be_tuesday'];
+            return EALang['tuesday'];
             break;
         case 'wednesday': 
-            return EALang['be_wednesday'];
+            return EALang['wednesday'];
             break;
         case 'thursday': 
-            return EALang['be_thursday'];
+            return EALang['thursday'];
             break;
         case 'friday': 
-            return EALang['be_friday'];
+            return EALang['friday'];
             break;
         case 'saturday': 
-            return EALang['be_saturday'];
+            return EALang['saturday'];
             break;
         case 'sunday': 
-            return EALang['be_sunday'];
+            return EALang['sunday'];
             break;
     }
 };
@@ -373,25 +388,25 @@ WorkingPlan.prototype.convertValueToDay = function(value) {
  */
 WorkingPlan.prototype.convertDayToValue = function(day) {
     switch (day) {
-        case EALang['be_monday']: 
+        case EALang['monday']: 
             return 'monday';
             break;
-        case EALang['be_tuesday']: 
+        case EALang['tuesday']: 
             return 'tuesday';
             break;
-        case EALang['be_wednesday']: 
+        case EALang['wednesday']: 
             return 'wednesday';
             break;
-        case EALang['be_thursday']: 
+        case EALang['thursday']: 
             return 'thursday';
             break;
-        case EALang['be_friday']: 
+        case EALang['friday']: 
             return 'friday';
             break;
-        case EALang['be_saturday']: 
+        case EALang['saturday']: 
             return 'saturday';
             break;
-        case EALang['be_sunday']: 
+        case EALang['sunday']: 
             return 'sunday';
             break;
     }