diff --git a/add_client_modal.php b/add_client_modal.php
index 810d4dd0..147822ca 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -149,12 +149,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <option value="">- State -</option>
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                 <input type="text" class="form-control" name="state" placeholder="State">
                 </div>
               </div>
               
diff --git a/add_company_modal.php b/add_company_modal.php
index 844a726e..c819aa19 100644
--- a/add_company_modal.php
+++ b/add_company_modal.php
@@ -46,12 +46,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
               </div>
-              <select class="form-control select2" name="state">
-                <option value="">- State -</option>
-                  <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                  <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                  <?php } ?>
-              </select>
+              <input type="text" class="form-control" name="state" placeholder="State">
             </div>
           </div>
 
diff --git a/add_location_modal.php b/add_location_modal.php
index 729aeadf..ad38b46e 100644
--- a/add_location_modal.php
+++ b/add_location_modal.php
@@ -70,12 +70,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <option value="">- State -</option>
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                  <input type="text" class="form-control" name="state" placeholder="State">
                 </div>
               </div>
               
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index ca4ecf25..98aef41e 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -94,12 +94,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <option value="">- State -</option>
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                  <input type="text" class="form-control" name="state" placeholder="State">
                 </div>
               </div>
               
diff --git a/edit_client_modal.php b/edit_client_modal.php
index e71a31c8..636cb07a 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -153,12 +153,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <option value="">- State -</option>
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option <?php if($location_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                  <input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $location_state; ?>">
                 </div>
               </div>
               
diff --git a/edit_company_modal.php b/edit_company_modal.php
index 94fdd5c1..7618d249 100644
--- a/edit_company_modal.php
+++ b/edit_company_modal.php
@@ -48,12 +48,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
               </div>
-              <select class="form-control select2" name="state">
-                <option value="">- State -</option>
-                <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                <option <?php if($company_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                <?php } ?>
-              </select>
+              <input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $company_state; ?>">
             </div>
           </div>
 
diff --git a/edit_location_modal.php b/edit_location_modal.php
index 125cbc56..9ef9e527 100644
--- a/edit_location_modal.php
+++ b/edit_location_modal.php
@@ -72,11 +72,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option <?php if($location_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                  <input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $location_state; ?>">
                 </div>
               </div>
               
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php
index e6b933f4..828b8c93 100644
--- a/edit_vendor_modal.php
+++ b/edit_vendor_modal.php
@@ -92,12 +92,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control select2" name="state">
-                    <option value="">- State -</option>
-                    <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                    <option <?php if($vendor_state == $state_abbr){ echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                    <?php } ?>
-                  </select>
+                  <input type="text" class="form-control" name="state" placeholder="State" value="<?php echo $vendor_state; ?>">
                 </div>
               </div>
               
diff --git a/get_settings.php b/get_settings.php
index 01bf14f9..0168713f 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -93,86 +93,200 @@ $net_terms_array = array(
 
 $records_per_page_array = array('5','10','15','20','30','50','100');
 
-$states_array = array(
-    'AL'=>'Alabama',
-    'AK'=>'Alaska',
-    'AZ'=>'Arizona',
-    'AR'=>'Arkansas',
-    'CA'=>'California',
-    'CO'=>'Colorado',
-    'CT'=>'Connecticut',
-    'DE'=>'Delaware',
-    'DC'=>'District of Columbia',
-    'FL'=>'Florida',
-    'GA'=>'Georgia',
-    'HI'=>'Hawaii',
-    'ID'=>'Idaho',
-    'IL'=>'Illinois',
-    'IN'=>'Indiana',
-    'IA'=>'Iowa',
-    'KS'=>'Kansas',
-    'KY'=>'Kentucky',
-    'LA'=>'Louisiana',
-    'ME'=>'Maine',
-    'MD'=>'Maryland',
-    'MA'=>'Massachusetts',
-    'MI'=>'Michigan',
-    'MN'=>'Minnesota',
-    'MS'=>'Mississippi',
-    'MO'=>'Missouri',
-    'MT'=>'Montana',
-    'NE'=>'Nebraska',
-    'NV'=>'Nevada',
-    'NH'=>'New Hampshire',
-    'NJ'=>'New Jersey',
-    'NM'=>'New Mexico',
-    'NY'=>'New York',
-    'NC'=>'North Carolina',
-    'ND'=>'North Dakota',
-    'OH'=>'Ohio',
-    'OK'=>'Oklahoma',
-    'OR'=>'Oregon',
-    'PA'=>'Pennsylvania',
-    'RI'=>'Rhode Island',
-    'SC'=>'South Carolina',
-    'SD'=>'South Dakota',
-    'TN'=>'Tennessee',
-    'TX'=>'Texas',
-    'UT'=>'Utah',
-    'VT'=>'Vermont',
-    'VA'=>'Virginia',
-    'WA'=>'Washington',
-    'WV'=>'West Virginia',
-    'WI'=>'Wisconsin',
-    'WY'=>'Wyoming',
-    'ON'=>'Ontario',
-    'QC'=>'Quebec',
-    'NS'=>'Nova Scotia',
-    'NB'=>'New Brunswick',
-    'MB'=>'Manitoba',
-    'BC'=>'British Columbia',
-    'PE'=>'Prince Edward Island',
-    'SK'=>'Saskatchewan',
-    'AB'=>'Alberta',
-    'NL'=>'Newfoundland and Labrador'
-);
-
-$canada_provinces_array = array(
-    'ON'=>'Ontario',
-    'QC'=>'Quebec',
-    'NS'=>'Nova Scotia',
-    'NB'=>'New Brunswick',
-    'MB'=>'Manitoba',
-    'BC'=>'British Columbia',
-    'PE'=>'Prince Edward Island',
-    'SK'=>'Saskatchewan',
-    'AB'=>'Alberta',
-    'NL'=>'Newfoundland and Labrador'
-);
-
 $countries_array = array(
-    'USA',
-    'Canada'
+    "Afghanistan",
+    "Albania",
+    "Algeria",
+    "Andorra",
+    "Angola",
+    "Antigua and Barbuda",
+    "Argentina",
+    "Armenia",
+    "Australia",
+    "Austria",
+    "Azerbaijan",
+    "Bahamas",
+    "Bahrain",
+    "Bangladesh",
+    "Barbados",
+    "Belarus",
+    "Belgium",
+    "Belize",
+    "Benin",
+    "Bhutan",
+    "Bolivia",
+    "Bosnia and Herzegovina",
+    "Botswana",
+    "Brazil",
+    "Brunei",
+    "Bulgaria",
+    "Burkina Faso",
+    "Burundi",
+    "Cambodia",
+    "Cameroon",
+    "Canada",
+    "Cape Verde",
+    "Central African Republic",
+    "Chad",
+    "Chile",
+    "China",
+    "Colombi",
+    "Comoros",
+    "Congo (Brazzaville)",
+    "Congo",
+    "Costa Rica",
+    "Cote d'Ivoire",
+    "Croatia",
+    "Cuba",
+    "Cyprus",
+    "Czech Republic",
+    "Denmark",
+    "Djibouti",
+    "Dominica",
+    "Dominican Republic",
+    "East Timor (Timor Timur)",
+    "Ecuador",
+    "Egypt",
+    "El Salvador",
+    "Equatorial Guinea",
+    "Eritrea",
+    "Estonia",
+    "Ethiopia",
+    "Fiji",
+    "Finland",
+    "France",
+    "Gabon",
+    "Gambia, The",
+    "Georgia",
+    "Germany",
+    "Ghana",
+    "Greece",
+    "Grenada",
+    "Guatemala",
+    "Guinea",
+    "Guinea-Bissau",
+    "Guyana",
+    "Haiti",
+    "Honduras",
+    "Hungary",
+    "Iceland",
+    "India",
+    "Indonesia",
+    "Iran",
+    "Iraq",
+    "Ireland",
+    "Israel",
+    "Italy",
+    "Jamaica",
+    "Japan",
+    "Jordan",
+    "Kazakhstan",
+    "Kenya",
+    "Kiribati",
+    "Korea, North",
+    "Korea, South",
+    "Kuwait",
+    "Kyrgyzstan",
+    "Laos",
+    "Latvia",
+    "Lebanon",
+    "Lesotho",
+    "Liberia",
+    "Libya",
+    "Liechtenstein",
+    "Lithuania",
+    "Luxembourg",
+    "Macedonia",
+    "Madagascar",
+    "Malawi",
+    "Malaysia",
+    "Maldives",
+    "Mali",
+    "Malta",
+    "Marshall Islands",
+    "Mauritania",
+    "Mauritius",
+    "Mexico",
+    "Micronesia",
+    "Moldova",
+    "Monaco",
+    "Mongolia",
+    "Morocco",
+    "Mozambique",
+    "Myanmar",
+    "Namibia",
+    "Nauru",
+    "Nepal",
+    "Netherlands",
+    "New Zealand",
+    "Nicaragua",
+    "Niger",
+    "Nigeria",
+    "Norway",
+    "Oman",
+    "Pakistan",
+    "Palau",
+    "Panama",
+    "Papua New Guinea",
+    "Paraguay",
+    "Peru",
+    "Philippines",
+    "Poland",
+    "Portugal",
+    "Qatar",
+    "Romania",
+    "Russia",
+    "Rwanda",
+    "Saint Kitts and Nevis",
+    "Saint Lucia",
+    "Saint Vincent",
+    "Samoa",
+    "San Marino",
+    "Sao Tome and Principe",
+    "Saudi Arabia",
+    "Senegal",
+    "Serbia and Montenegro",
+    "Seychelles",
+    "Sierra Leone",
+    "Singapore",
+    "Slovakia",
+    "Slovenia",
+    "Solomon Islands",
+    "Somalia",
+    "South Africa",
+    "Spain",
+    "Sri Lanka",
+    "Sudan",
+    "Suriname",
+    "Swaziland",
+    "Sweden",
+    "Switzerland",
+    "Syria",
+    "Taiwan",
+    "Tajikistan",
+    "Tanzania",
+    "Thailand",
+    "Togo",
+    "Tonga",
+    "Trinidad and Tobago",
+    "Tunisia",
+    "Turkey",
+    "Turkmenistan",
+    "Tuvalu",
+    "Uganda",
+    "Ukraine",
+    "United Arab Emirates",
+    "United Kingdom",
+    "United States",
+    "Uruguay",
+    "Uzbekistan",
+    "Vanuatu",
+    "Vatican City",
+    "Venezuela",
+    "Vietnam",
+    "Yemen",
+    "Zambia",
+    "Zimbabwe"
 );
 
 $timezones_array = array(
diff --git a/setup.php b/setup.php
index cca1892d..d53954a8 100644
--- a/setup.php
+++ b/setup.php
@@ -12,8 +12,199 @@ if($config_enable_setup == 0){
 }
 
 $countries_array = array(
-    'USA',
-    'Canada'
+  "Afghanistan",
+  "Albania",
+  "Algeria",
+  "Andorra",
+  "Angola",
+  "Antigua and Barbuda",
+  "Argentina",
+  "Armenia",
+  "Australia",
+  "Austria",
+  "Azerbaijan",
+  "Bahamas",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgium",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivia",
+  "Bosnia and Herzegovina",
+  "Botswana",
+  "Brazil",
+  "Brunei",
+  "Bulgaria",
+  "Burkina Faso",
+  "Burundi",
+  "Cambodia",
+  "Cameroon",
+  "Canada",
+  "Cape Verde",
+  "Central African Republic",
+  "Chad",
+  "Chile",
+  "China",
+  "Colombi",
+  "Comoros",
+  "Congo (Brazzaville)",
+  "Congo",
+  "Costa Rica",
+  "Cote d'Ivoire",
+  "Croatia",
+  "Cuba",
+  "Cyprus",
+  "Czech Republic",
+  "Denmark",
+  "Djibouti",
+  "Dominica",
+  "Dominican Republic",
+  "East Timor (Timor Timur)",
+  "Ecuador",
+  "Egypt",
+  "El Salvador",
+  "Equatorial Guinea",
+  "Eritrea",
+  "Estonia",
+  "Ethiopia",
+  "Fiji",
+  "Finland",
+  "France",
+  "Gabon",
+  "Gambia, The",
+  "Georgia",
+  "Germany",
+  "Ghana",
+  "Greece",
+  "Grenada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Honduras",
+  "Hungary",
+  "Iceland",
+  "India",
+  "Indonesia",
+  "Iran",
+  "Iraq",
+  "Ireland",
+  "Israel",
+  "Italy",
+  "Jamaica",
+  "Japan",
+  "Jordan",
+  "Kazakhstan",
+  "Kenya",
+  "Kiribati",
+  "Korea, North",
+  "Korea, South",
+  "Kuwait",
+  "Kyrgyzstan",
+  "Laos",
+  "Latvia",
+  "Lebanon",
+  "Lesotho",
+  "Liberia",
+  "Libya",
+  "Liechtenstein",
+  "Lithuania",
+  "Luxembourg",
+  "Macedonia",
+  "Madagascar",
+  "Malawi",
+  "Malaysia",
+  "Maldives",
+  "Mali",
+  "Malta",
+  "Marshall Islands",
+  "Mauritania",
+  "Mauritius",
+  "Mexico",
+  "Micronesia",
+  "Moldova",
+  "Monaco",
+  "Mongolia",
+  "Morocco",
+  "Mozambique",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Netherlands",
+  "New Zealand",
+  "Nicaragua",
+  "Niger",
+  "Nigeria",
+  "Norway",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Panama",
+  "Papua New Guinea",
+  "Paraguay",
+  "Peru",
+  "Philippines",
+  "Poland",
+  "Portugal",
+  "Qatar",
+  "Romania",
+  "Russia",
+  "Rwanda",
+  "Saint Kitts and Nevis",
+  "Saint Lucia",
+  "Saint Vincent",
+  "Samoa",
+  "San Marino",
+  "Sao Tome and Principe",
+  "Saudi Arabia",
+  "Senegal",
+  "Serbia and Montenegro",
+  "Seychelles",
+  "Sierra Leone",
+  "Singapore",
+  "Slovakia",
+  "Slovenia",
+  "Solomon Islands",
+  "Somalia",
+  "South Africa",
+  "Spain",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Swaziland",
+  "Sweden",
+  "Switzerland",
+  "Syria",
+  "Taiwan",
+  "Tajikistan",
+  "Tanzania",
+  "Thailand",
+  "Togo",
+  "Tonga",
+  "Trinidad and Tobago",
+  "Tunisia",
+  "Turkey",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukraine",
+  "United Arab Emirates",
+  "United Kingdom",
+  "United States",
+  "Uruguay",
+  "Uzbekistan",
+  "Vanuatu",
+  "Vatican City",
+  "Venezuela",
+  "Vietnam",
+  "Yemen",
+  "Zambia",
+  "Zimbabwe"
 );
 
 $currencies_array = array(
@@ -23,70 +214,6 @@ $currencies_array = array(
     'TRY'=>'Turkish Lira'
 );
 
-$states_array = array(
-    'AL'=>'Alabama',
-    'AK'=>'Alaska',
-    'AZ'=>'Arizona',
-    'AR'=>'Arkansas',
-    'CA'=>'California',
-    'CO'=>'Colorado',
-    'CT'=>'Connecticut',
-    'DE'=>'Delaware',
-    'DC'=>'District of Columbia',
-    'FL'=>'Florida',
-    'GA'=>'Georgia',
-    'HI'=>'Hawaii',
-    'ID'=>'Idaho',
-    'IL'=>'Illinois',
-    'IN'=>'Indiana',
-    'IA'=>'Iowa',
-    'KS'=>'Kansas',
-    'KY'=>'Kentucky',
-    'LA'=>'Louisiana',
-    'ME'=>'Maine',
-    'MD'=>'Maryland',
-    'MA'=>'Massachusetts',
-    'MI'=>'Michigan',
-    'MN'=>'Minnesota',
-    'MS'=>'Mississippi',
-    'MO'=>'Missouri',
-    'MT'=>'Montana',
-    'NE'=>'Nebraska',
-    'NV'=>'Nevada',
-    'NH'=>'New Hampshire',
-    'NJ'=>'New Jersey',
-    'NM'=>'New Mexico',
-    'NY'=>'New York',
-    'NC'=>'North Carolina',
-    'ND'=>'North Dakota',
-    'OH'=>'Ohio',
-    'OK'=>'Oklahoma',
-    'OR'=>'Oregon',
-    'PA'=>'Pennsylvania',
-    'RI'=>'Rhode Island',
-    'SC'=>'South Carolina',
-    'SD'=>'South Dakota',
-    'TN'=>'Tennessee',
-    'TX'=>'Texas',
-    'UT'=>'Utah',
-    'VT'=>'Vermont',
-    'VA'=>'Virginia',
-    'WA'=>'Washington',
-    'WV'=>'West Virginia',
-    'WI'=>'Wisconsin',
-    'WY'=>'Wyoming',
-    'ON'=>'Ontario',
-    'QC'=>'Quebec',
-    'NS'=>'Nova Scotia',
-    'NB'=>'New Brunswick',
-    'MB'=>'Manitoba',
-    'BC'=>'British Columbia',
-    'PE'=>'Prince Edward Island',
-    'SK'=>'Saskatchewan',
-    'AB'=>'Alberta',
-    'NL'=>'Newfoundland and Labrador'
-);
-
 if(isset($_POST['add_database'])){
 
   $host = $_POST['host'];
@@ -591,12 +718,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                     </div>
-                    <select class="form-control select2" name="state">
-                      <option value="">- State -</option>
-                        <?php foreach($states_array as $state_abbr => $state_name) { ?>
-                        <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-                        <?php } ?>
-                    </select>
+                    <input type="text" class="form-control" name="state" placeholder="State">
                   </div>
                 </div>