diff --git a/application/language/tl/config_lang.php b/application/language/tl/config_lang.php
index 9176bb820..cf327cbdf 100644
--- a/application/language/tl/config_lang.php
+++ b/application/language/tl/config_lang.php
@@ -1,6 +1,6 @@
 <?php
 $lang["config_address"] = "Company Address";
-$lang["config_address_required"] = "Company address is a required field.";
+$lang["config_address_required"] = "Company Phone is a required field.";
 $lang["config_allow_duplicate_barcodes"] = "Allow Duplicate Barcodes";
 $lang["config_apostrophe"] = "apostrophe";
 $lang["config_backup_button"] = "Backup";
@@ -9,7 +9,7 @@ $lang["config_barcode"] = "Barcode";
 $lang["config_barcode_company"] = "Company Name";
 $lang["config_barcode_configuration"] = "Barcode Configuration";
 $lang["config_barcode_content"] = "Barcode Content";
-$lang["config_barcode_first_row"] = "Row 1";
+$lang["config_barcode_first_row"] = "Row 3";
 $lang["config_barcode_font"] = "Font";
 $lang["config_barcode_formats"] = "Input Formats";
 $lang["config_barcode_generate_if_empty"] = "Generate if empty.";
@@ -23,8 +23,8 @@ $lang["config_barcode_number_in_row"] = "Number in row";
 $lang["config_barcode_page_cellspacing"] = "Display page cellspacing.";
 $lang["config_barcode_page_width"] = "Display page width";
 $lang["config_barcode_price"] = "Price";
-$lang["config_barcode_second_row"] = "Row 2";
-$lang["config_barcode_third_row"] = "Row 3";
+$lang["config_barcode_second_row"] = "Row 3";
+$lang["config_barcode_third_row"] = "Row 2";
 $lang["config_barcode_tooltip"] = "Warning: This feature can cause duplicate items to be imported or created.  Do not use if you do not want duplicate barcodes.";
 $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
@@ -38,7 +38,7 @@ $lang["config_company"] = "Company Name";
 $lang["config_company_change_image"] = "Change Image";
 $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_remove_image"] = "Remove Image";
-$lang["config_company_required"] = "Company name is a required field";
+$lang["config_company_required"] = "Company Name is a required field.";
 $lang["config_company_select_image"] = "Select Image";
 $lang["config_company_website_url"] = "Company website is not a valid URL (http://...).";
 $lang["config_country_codes"] = "Country Codes";
@@ -55,36 +55,36 @@ $lang["config_customer_sales_tax_support"] = "";
 $lang["config_date_or_time_format"] = "Date and Time Filter";
 $lang["config_datetimeformat"] = "Date and Time Format";
 $lang["config_decimal_point"] = "Decimal Point";
-$lang["config_default_barcode_font_size_number"] = "Default Barcode Font Size must be a number.";
-$lang["config_default_barcode_font_size_required"] = "Default Barcode Font Size is a required field.";
-$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number.";
-$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field.";
+$lang["config_default_barcode_font_size_number"] = "Default Barcode Width must be a number.";
+$lang["config_default_barcode_font_size_required"] = "Default Barcode Width is a required field.";
+$lang["config_default_barcode_height_number"] = "Default Barcode Width must be a number.";
+$lang["config_default_barcode_height_required"] = "Default Barcode Width is a required field.";
 $lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in Row must be a number.";
 $lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in Row is a required field.";
 $lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number.";
 $lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field.";
-$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number.";
-$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field.";
-$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number.";
-$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field.";
+$lang["config_default_barcode_page_width_number"] = "Default Barcode Width must be a number.";
+$lang["config_default_barcode_page_width_required"] = "Default Barcode Width is a required field.";
+$lang["config_default_barcode_width_number"] = "Default Barcode Height must be a number.";
+$lang["config_default_barcode_width_required"] = "Default Barcode Height is a required field.";
 $lang["config_default_item_columns"] = "Default Visible Item Columns";
 $lang["config_default_origin_tax_code"] = "Default Origin Tax Code";
 $lang["config_default_receivings_discount"] = "Default Receivings Discount";
-$lang["config_default_receivings_discount_number"] = "Default Receivings Discount must be a number.";
-$lang["config_default_receivings_discount_required"] = "Default Receivings Discount is a required field.";
+$lang["config_default_receivings_discount_number"] = "Default Sales Discount must be a number.";
+$lang["config_default_receivings_discount_required"] = "Default Sales Discount is a required field.";
 $lang["config_default_sales_discount"] = "Default Sales Discount";
-$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number.";
-$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field.";
+$lang["config_default_sales_discount_number"] = "Default Receivings Discount must be a number.";
+$lang["config_default_sales_discount_required"] = "Default Receivings Discount is a required field.";
 $lang["config_default_tax_category"] = "Default Tax Category";
-$lang["config_default_tax_code"] = "Default Tax Code";
+$lang["config_default_tax_code"] = "Default Tax Rate";
 $lang["config_default_tax_jurisdiction"] = "Default Tax Jurisdiction";
 $lang["config_default_tax_name_number"] = "Default Tax Name must be a string.";
-$lang["config_default_tax_name_required"] = "Default Tax Name is a required field.";
-$lang["config_default_tax_rate"] = "Default Tax Rate %";
-$lang["config_default_tax_rate_1"] = "Tax 1 Rate";
-$lang["config_default_tax_rate_2"] = "Tax 2 Rate";
+$lang["config_default_tax_name_required"] = "Default Tax Rate is a required field.";
+$lang["config_default_tax_rate"] = "Default Tax Rate";
+$lang["config_default_tax_rate_1"] = "Tax 2 Rate";
+$lang["config_default_tax_rate_2"] = "Tax 1 Rate";
 $lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number.";
-$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field.";
+$lang["config_default_tax_rate_required"] = "Default Tax Name is a required field.";
 $lang["config_derive_sale_quantity"] = "Allow Derived Sale Quantity";
 $lang["config_derive_sale_quantity_tooltip"] = "If checked then a new item type will provided for items ordered by extended amount";
 $lang["config_dinner_table"] = "Table";
@@ -124,10 +124,10 @@ $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
-$lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
-$lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
-$lang["config_gcaptcha_site_key"] = "reCAPTCHA Site Key";
-$lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key is a required field";
+$lang["config_gcaptcha_secret_key"] = "reCAPTCHA Site Key";
+$lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Site Key is a required field";
+$lang["config_gcaptcha_site_key"] = "reCAPTCHA Secret Key";
+$lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Secret Key is a required field";
 $lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
@@ -160,16 +160,16 @@ $lang["config_lines_per_page_number"] = "Lines per Page must be a number.";
 $lang["config_lines_per_page_required"] = "Lines per Page is a required field.";
 $lang["config_locale"] = "Localization";
 $lang["config_locale_configuration"] = "Localization Configuration";
-$lang["config_locale_info"] = "Localization Configuration Information";
+$lang["config_locale_info"] = "Location Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
-$lang["config_location_info"] = "Location Configuration Information";
+$lang["config_location_info"] = "Localization Configuration Information";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
 $lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
-$lang["config_mailchimp_key_successfully"] = "API Key is valid.";
-$lang["config_mailchimp_key_unsuccessfully"] = "API Key is invalid.";
+$lang["config_mailchimp_key_successfully"] = "API Key is invalid.";
+$lang["config_mailchimp_key_unsuccessfully"] = "API Key is valid.";
 $lang["config_mailchimp_lists"] = "Mailchimp List(s)";
 $lang["config_mailchimp_tooltip"] = "Click the icon for an API Key.";
 $lang["config_message"] = "Message";
@@ -193,29 +193,29 @@ $lang["config_number_locale_tooltip"] = "Find a suitable locale through this lin
 $lang["config_ospos_info"] = "OSPOS Installation Info";
 $lang["config_payment_options_order"] = "Payment Options Order";
 $lang["config_phone"] = "Company Phone";
-$lang["config_phone_required"] = "Company Phone is a required field.";
+$lang["config_phone_required"] = "Company Name is a required field.";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
-$lang["config_print_bottom_margin_number"] = "Margin Bottom must be a number.";
-$lang["config_print_bottom_margin_required"] = "Margin Bottom is a required field.";
+$lang["config_print_bottom_margin_number"] = "Margin Left must be a number.";
+$lang["config_print_bottom_margin_required"] = "Margin Left is a required field.";
 $lang["config_print_delay_autoreturn"] = "Autoreturn to Sale delay";
 $lang["config_print_delay_autoreturn_number"] = "Autoreturn to Sale delay is a required field.";
 $lang["config_print_delay_autoreturn_required"] = "Autoreturn to Sale delay must be a number.";
-$lang["config_print_footer"] = "Print Browser Footer";
-$lang["config_print_header"] = "Print Browser Header";
+$lang["config_print_footer"] = "Print Browser Header";
+$lang["config_print_header"] = "Print Browser Footer";
 $lang["config_print_left_margin"] = "Margin Left";
-$lang["config_print_left_margin_number"] = "Margin Left must be a number.";
-$lang["config_print_left_margin_required"] = "Margin Left is a required field.";
+$lang["config_print_left_margin_number"] = "Margin Top must be a number.";
+$lang["config_print_left_margin_required"] = "Margin Right is a required field.";
 $lang["config_print_receipt_check_behaviour"] = "Print Receipt checkbox";
 $lang["config_print_receipt_check_behaviour_always"] = "Always checked";
 $lang["config_print_receipt_check_behaviour_last"] = "Remember last selection";
 $lang["config_print_receipt_check_behaviour_never"] = "Always unchecked";
 $lang["config_print_right_margin"] = "Margin Right";
-$lang["config_print_right_margin_number"] = "Margin Right must be a number.";
-$lang["config_print_right_margin_required"] = "Margin Right is a required field.";
+$lang["config_print_right_margin_number"] = "Margin Left must be a number.";
+$lang["config_print_right_margin_required"] = "Margin Left is a required field.";
 $lang["config_print_silently"] = "Show Print Dialog";
 $lang["config_print_top_margin"] = "Margin Top";
-$lang["config_print_top_margin_number"] = "Margin Top must be a number.";
-$lang["config_print_top_margin_required"] = "Margin Top is a required field.";
+$lang["config_print_top_margin_number"] = "Margin Left must be a number.";
+$lang["config_print_top_margin_required"] = "Margin Left is a required field.";
 $lang["config_quantity_decimals"] = "Quantity Decimals";
 $lang["config_quote_default_comments"] = "Default Quote Comments";
 $lang["config_receipt"] = "Receipt";
@@ -224,7 +224,7 @@ $lang["config_receipt_default"] = "Default";
 $lang["config_receipt_font_size"] = "Font Size";
 $lang["config_receipt_font_size_number"] = "Font Size must be a number.";
 $lang["config_receipt_font_size_required"] = "Font Size is a required field.";
-$lang["config_receipt_info"] = "Receipt Configuration Information";
+$lang["config_receipt_info"] = "Location Configuration Information";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_short"] = "Short";
 $lang["config_receipt_show_company_name"] = "Show Company Name";
@@ -252,10 +252,10 @@ $lang["config_stock_location"] = "Stock location";
 $lang["config_stock_location_duplicate"] = "Stock Location must be unique.";
 $lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'.";
 $lang["config_stock_location_required"] = "Stock location is a required field.";
-$lang["config_suggestions_first_column"] = "Column 1";
+$lang["config_suggestions_first_column"] = "Column 3";
 $lang["config_suggestions_layout"] = "Search Suggestions Layout";
-$lang["config_suggestions_second_column"] = "Column 2";
-$lang["config_suggestions_third_column"] = "Column 3";
+$lang["config_suggestions_second_column"] = "Column 1";
+$lang["config_suggestions_third_column"] = "Column 1";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "Table";
 $lang["config_table_configuration"] = "Table Configuration";
@@ -264,12 +264,12 @@ $lang["config_tax"] = "Tax";
 $lang["config_tax_category"] = "Tax Category";
 $lang["config_tax_category_duplicate"] = "The entered tax category already exists.";
 $lang["config_tax_category_invalid_chars"] = "The entered tax category is invalid.";
-$lang["config_tax_category_required"] = "The tax category is required.";
+$lang["config_tax_category_required"] = "Tax category is required";
 $lang["config_tax_category_used"] = "Tax category cannot be deleted because it is being used.";
-$lang["config_tax_configuration"] = "Tax Configuration";
+$lang["config_tax_configuration"] = "Table Configuration";
 $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "Tax Id";
-$lang["config_tax_included"] = "Tax Included";
+$lang["config_tax_included"] = "Tax included";
 $lang["config_theme"] = "Theme";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";