diff --git a/setup.php b/setup.php
index 7793690c..c486c8e1 100644
--- a/setup.php
+++ b/setup.php
@@ -215,171 +215,118 @@ $countries_array = array(
 $currencies_array = array(
     'ALL' => 'Albania Lek',
     'AFN' => 'Afghanistan Afghani',
-    'AMD' => 'Armenian Dram',
-    'ANG' => 'Netherlands Antillean Guilder',
-    'AOA' => 'Angola Kwanza',
     'ARS' => 'Argentina Peso',
-    'AUD' => 'Australia Dollar',
     'AWG' => 'Aruba Guilder',
+    'AUD' => 'Australia Dollar',
     'AZN' => 'Azerbaijan New Manat',
-    'BAM' => 'Bosnia and Herzegovina Convertible Marka',
-    'BBD' => 'Barbados Dollar',
-    'BDT' => 'Bangladesh Taka',
-    'BGN' => 'Bulgaria Lev',
-    'BHD' => 'Bahraini Dinar',
-    'BIF' => 'Burundi Franc',
-    'BMD' => 'Bermuda Dollar',
-    'BND' => 'Brunei Darussalam Dollar',
-    'BOB' => 'Bolivia Boliviano',
-    'BRL' => 'Brazil Real',
     'BSD' => 'Bahamas Dollar',
-    'BTN' => 'Bhutan Ngultrum',
-    'BWP' => 'Botswana Pula',
-    'BYN' => 'Belarus Ruble',
+    'BBD' => 'Barbados Dollar',
+    'BDT' => 'Bangladeshi taka',
+    'BYR' => 'Belarus Ruble',
     'BZD' => 'Belize Dollar',
+    'BMD' => 'Bermuda Dollar',
+    'BOB' => 'Bolivia Boliviano',
+    'BAM' => 'Bosnia and Herzegovina Convertible Marka',
+    'BWP' => 'Botswana Pula',
+    'BGN' => 'Bulgaria Lev',
+    'BRL' => 'Brazil Real',
+    'BND' => 'Brunei Darussalam Dollar',
+    'KHR' => 'Cambodia Riel',
     'CAD' => 'Canada Dollar',
-    'CDF' => 'Congolese Franc',
-    'CHF' => 'Switzerland Franc',
-    'CLF' => 'Unidad de Fomento',
+    'KYD' => 'Cayman Islands Dollar',
     'CLP' => 'Chile Peso',
-    'CNH' => 'China Yuan (offshore)',
     'CNY' => 'China Yuan Renminbi',
     'COP' => 'Colombia Peso',
-    'CUC' => 'Cuban Convertible Peso',
+    'CRC' => 'Costa Rica Colon',
+    'HRK' => 'Croatia Kuna',
     'CUP' => 'Cuba Peso',
-    'CVE' => 'Cape Verde Escudo',
     'CZK' => 'Czech Republic Koruna',
-    'DJF' => 'Djibouti Franc',
     'DKK' => 'Denmark Krone',
     'DOP' => 'Dominican Republic Peso',
-    'DZD' => 'Algeria Dinar',
+    'XCD' => 'East Caribbean Dollar',
     'EGP' => 'Egypt Pound',
-    'ERN' => 'Eritrea Nakfa',
-    'ETB' => 'Ethiopian Birr',
+    'SVC' => 'El Salvador Colon',
+    'EEK' => 'Estonia Kroon',
     'EUR' => 'Euro Member Countries',
+    'FKP' => 'Falkland Islands (Malvinas) Pound',
     'FJD' => 'Fiji Dollar',
-    'FKP' => 'Falkland Islands Pound',
-    'GBP' => 'United Kingdom Pound',
-    'GEL' => 'Georgia Lari',
-    'GGP' => 'Guernsey Pound',
-    'GHS' => 'Ghana Cedi',
+    'GHC' => 'Ghana Cedis',
     'GIP' => 'Gibraltar Pound',
-    'GMD' => 'Gambia Dalasi',
-    'GNF' => 'Guinea Franc',
     'GTQ' => 'Guatemala Quetzal',
+    'GGP' => 'Guernsey Pound',
     'GYD' => 'Guyana Dollar',
-    'HKD' => 'Hong Kong Dollar',
     'HNL' => 'Honduras Lempira',
-    'HRK' => 'Croatia Kuna',
-    'HTG' => 'Haiti Gourde',
+    'HKD' => 'Hong Kong Dollar',
     'HUF' => 'Hungary Forint',
-    'IDR' => 'Indonesia Rupiah',
-    'ILS' => 'Israel Shekel',
-    'IMP' => 'Isle of Man Pound',
-    'INR' => 'India Rupee',
-    'IQD' => 'Iraq Dinar',
-    'IRR' => 'Iran Rial',
     'ISK' => 'Iceland Krona',
-    'JEP' => 'Jersey Pound',
+    'INR' => 'India Rupee',
+    'IDR' => 'Indonesia Rupiah',
+    'IRR' => 'Iran Rial',
+    'IMP' => 'Isle of Man Pound',
+    'ILS' => 'Israel Shekel',
     'JMD' => 'Jamaica Dollar',
-    'JOD' => 'Jordan Dinar',
     'JPY' => 'Japan Yen',
-    'KES' => 'Kenya Shilling',
-    'KGS' => 'Kyrgyzstan Som',
-    'KHR' => 'Cambodia Riel',
-    'KMF' => 'Comoros Franc',
+    'JEP' => 'Jersey Pound',
+    'KZT' => 'Kazakhstan Tenge',
     'KPW' => 'Korea (North) Won',
     'KRW' => 'Korea (South) Won',
-    'KWD' => 'Kuwaiti Dinar',
-    'KYD' => 'Cayman Islands Dollar',
-    'KZT' => 'Kazakhstan Tenge',
+    'KGS' => 'Kyrgyzstan Som',
     'LAK' => 'Laos Kip',
+    'LVL' => 'Latvia Lat',
     'LBP' => 'Lebanon Pound',
-    'LKR' => 'Sri Lanka Rupee',
     'LRD' => 'Liberia Dollar',
-    'LSL' => 'Lesotho Loti',
-    'LYD' => 'Libya Dinar',
-    'MAD' => 'Morocco Dirham',
-    'MDL' => 'Moldova Leu',
-    'MGA' => 'Madagascar Ariary',
+    'LTL' => 'Lithuania Litas',
     'MKD' => 'Macedonia Denar',
-    'MMK' => 'Myanmar Kyat',
-    'MNT' => 'Mongolia Tughrik',
-    'MOP' => 'Macau Pataca',
-    'MRO' => 'Mauritania Ouguiya',
-    'MUR' => 'Mauritius Rupee',
-    'MVR' => 'Maldives Rufiyaa',
-    'MWK' => 'Malawi Kwacha',
-    'MXN' => 'Mexico Peso',
     'MYR' => 'Malaysia Ringgit',
+    'MUR' => 'Mauritius Rupee',
+    'MXN' => 'Mexico Peso',
+    'MNT' => 'Mongolia Tughrik',
     'MZN' => 'Mozambique Metical',
     'NAD' => 'Namibia Dollar',
-    'NGN' => 'Nigeria Naira',
-    'NIO' => 'Nicaragua Cordoba',
-    'NOK' => 'Norway Krone',
     'NPR' => 'Nepal Rupee',
+    'ANG' => 'Netherlands Antilles Guilder',
     'NZD' => 'New Zealand Dollar',
+    'NIO' => 'Nicaragua Cordoba',
+    'NGN' => 'Nigeria Naira',
+    'NOK' => 'Norway Krone',
     'OMR' => 'Oman Rial',
-    'PAB' => 'Panama Balboa',
-    'PEN' => 'Peru Sol',
-    'PGK' => 'Papua New Guinea Kina',
-    'PHP' => 'Philippines Peso',
     'PKR' => 'Pakistan Rupee',
-    'PLN' => 'Poland Zloty',
+    'PAB' => 'Panama Balboa',
     'PYG' => 'Paraguay Guarani',
+    'PEN' => 'Peru Nuevo Sol',
+    'PHP' => 'Philippines Peso',
+    'PLN' => 'Poland Zloty',
     'QAR' => 'Qatar Riyal',
-    'RON' => 'Romania Leu',
-    'RSD' => 'Serbia Dinar',
+    'RON' => 'Romania New Leu',
     'RUB' => 'Russia Ruble',
-    'RWF' => 'Rwanda Franc',
-    'SAR' => 'Saudi Arabia Riyal',
-    'SBD' => 'Solomon Islands Dollar',
-    'SCR' => 'Seychelles Rupee',
-    'SDG' => 'Sudan Pound',
-    'SEK' => 'Sweden Krona',
-    'SGD' => 'Singapore Dollar',
     'SHP' => 'Saint Helena Pound',
-    'SLL' => 'Sierra Leone Leone',
+    'SAR' => 'Saudi Arabia Riyal',
+    'RSD' => 'Serbia Dinar',
+    'SCR' => 'Seychelles Rupee',
+    'SGD' => 'Singapore Dollar',
+    'SBD' => 'Solomon Islands Dollar',
     'SOS' => 'Somalia Shilling',
-    'SPL' => 'Seborga Luigino',
+    'ZAR' => 'South Africa Rand',
+    'LKR' => 'Sri Lanka Rupee',
+    'SEK' => 'Sweden Krona',
+    'CHF' => 'Switzerland Franc',
     'SRD' => 'Suriname Dollar',
-    'STD' => 'São Tomé and Príncipe Dobra',
-    'SVC' => 'El Salvador Colon',
     'SYP' => 'Syria Pound',
-    'SZL' => 'Swaziland Lilangeni',
-    'THB' => 'Thailand Baht',
-    'TJS' => 'Tajikistan Somoni',
-    'TMT' => 'Turkmenistan Manat',
-    'TND' => 'Tunisia Dinar',
-    'TOP' => 'Tonga Pa\'anga',
-    'TRY' => 'Turkey Lira',
-    'TTD' => 'Trinidad and Tobago Dollar',
-    'TVD' => 'Tuvalu Dollar',
     'TWD' => 'Taiwan New Dollar',
-    'TZS' => 'Tanzania Shilling',
-    'UAH' => 'Ukraine Hryvnia',
-    'UGX' => 'Uganda Shilling',
+    'THB' => 'Thailand Baht',
+    'TTD' => 'Trinidad and Tobago Dollar',
+    'TRY' => 'Turkey Lira',
+    'TRL' => 'Turkey Lira',
+    'TVD' => 'Tuvalu Dollar',
+    'UAH' => 'Ukraine Hryvna',
+    'GBP' => 'United Kingdom Pound',
     'USD' => 'United States Dollar',
     'UYU' => 'Uruguay Peso',
     'UZS' => 'Uzbekistan Som',
-    'VEF' => 'Venezuela Bolívar',
+    'VEF' => 'Venezuela Bolivar',
     'VND' => 'Viet Nam Dong',
-    'VUV' => 'Vanuatu Vatu',
-    'WST' => 'Samoa Tala',
-    'XAF' => 'Communauté Financière Africaine (BEAC) CFA Franc BEAC',
-    'XAG' => 'Silver Ounce',
-    'XAU' => 'Gold Ounce',
-    'XCD' => 'East Caribbean Dollar',
-    'XDR' => 'International Monetary Fund (IMF) Special Drawing Rights',
-    'XOF' => 'Communauté Financière Africaine (BCEAO) Franc',
-    'XPD' => 'Palladium Ounce',
-    'XPF' => 'CFP Franc',
-    'XPT' => 'Platinum Ounce',
     'YER' => 'Yemen Rial',
-    'ZAR' => 'South Africa Rand',
-    'ZMW' => 'Zambia Kwacha',
-    'ZWL' => 'Zimbabwe Dollar'
-    
+    'ZWD' => 'Zimbabwe Dollar'
 );
 
 // List of locales