diff --git a/uc_store/countries/aland_islands_248_1.cif b/uc_store/countries/aland_islands_248_1.cif
new file mode 100644
index 0000000..707dca7
--- /dev/null
+++ b/uc_store/countries/aland_islands_248_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function aland_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (248,'Åland Islands','AX','ALA',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    248,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/albania_8_1.cif b/uc_store/countries/albania_8_1.cif
new file mode 100644
index 0000000..775c823
--- /dev/null
+++ b/uc_store/countries/albania_8_1.cif
@@ -0,0 +1,38 @@
+<?php
+
+function albania_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (8,'Albania','AL','ALB',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(8, '1', 'Berat county'),
+    array(8, '2', 'Durres county'),
+    array(8, '3', 'Elbasan county'),
+    array(8, '4', 'Fier county'),
+    array(8, '5', 'Gjirokaster county'),
+    array(8, '6', 'Korce county'),
+    array(8, '7', 'Kukes county'),
+    array(8, '8', 'Lezhe county'),
+    array(8, '9', 'Diber county'),
+    array(8, '10', 'Shkoder county'),
+    array(8, '11', 'Tirane county'),
+    array(8, '12', 'Vlore county'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    8,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/american_samoa_16_1.cif b/uc_store/countries/american_samoa_16_1.cif
new file mode 100644
index 0000000..bf96e60
--- /dev/null
+++ b/uc_store/countries/american_samoa_16_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function american_samoa_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (16,'American Samoa','AS','ASM',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    16,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/angola_24_1.cif b/uc_store/countries/angola_24_1.cif
new file mode 100644
index 0000000..263a547
--- /dev/null
+++ b/uc_store/countries/angola_24_1.cif
@@ -0,0 +1,44 @@
+<?php
+
+function angola_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (24,'Angola','AO','AGO',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(24, 'BGO', 'Bengo'),
+    array(24, 'BGU', 'Benguela'),
+    array(24, 'BIE', 'Bie'),
+    array(24, 'CAB', 'Cabinda'),
+    array(24, 'CCU', 'Cuando Cubango'),
+    array(24, 'CNO', 'Cuanza Norte'),
+    array(24, 'CUS', 'Cuanza Sul'),
+    array(24, 'CNN', 'Cunene'),
+    array(24, 'HUA', 'Huambo'),
+    array(24, 'HUI', 'Huila'),
+    array(24, 'LUA', 'Luanda'),
+    array(24, 'LNO', 'Lunda Norte'),
+    array(24, 'LSU', 'Lunda Sul'),
+    array(24, 'MAL', 'Malanje'),
+    array(24, 'MOX', 'Moxico'),
+    array(24, 'NAM', 'Namibe'),
+    array(24, 'UIG', 'Uige'),
+    array(24, 'ZAI', 'Zaire'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    24,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/anguilla_660_1.cif b/uc_store/countries/anguilla_660_1.cif
new file mode 100644
index 0000000..f93211d
--- /dev/null
+++ b/uc_store/countries/anguilla_660_1.cif
@@ -0,0 +1,40 @@
+<?php
+
+function anguilla_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (660,'Anguilla','AI','AIA',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(660, 'BP', 'Blowing Point'),
+    array(660, 'EE', 'East End'),
+    array(660, 'GH', 'George Hill'),
+    array(660, 'IH', 'Island Harbour'),
+    array(660, 'NH', 'North Hill'),
+    array(660, 'NS', 'North Side'),
+    array(660, 'SG', 'Sandy Ground'),
+    array(660, 'SH', 'Sandy Hill'),
+    array(660, 'SO', 'South Hill'),
+    array(660, 'ST', 'Stoney Ground'),
+    array(660, 'TF', 'The Farrington'),
+    array(660, 'TQ', 'The Quarter (including Rey Hill)'),
+    array(660, 'TV', 'The Valley (including Upper & South Valley)'),
+    array(660, 'WE', 'West End (including Long Bay)'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    660,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_code !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/antarctica_10_1.cif b/uc_store/countries/antarctica_10_1.cif
new file mode 100644
index 0000000..bf4d4b4
--- /dev/null
+++ b/uc_store/countries/antarctica_10_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function antarctica_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (10,'Antarctica','AQ','ATA',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    10,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/azerbaijan_31_1.cif b/uc_store/countries/azerbaijan_31_1.cif
new file mode 100644
index 0000000..bb2d5d1
--- /dev/null
+++ b/uc_store/countries/azerbaijan_31_1.cif
@@ -0,0 +1,103 @@
+<?php
+
+function azerbaijan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (31,'Azerbaijan','AZ','AZE',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(31, 'ABS', 'Absheron'),
+    array(31, 'AGM', 'Aghdam'),
+    array(31, 'AGS', 'Aghdash'),
+    array(31, 'AGC', 'Aghjabedi'),
+    array(31, 'AGA', 'Aghstafa'),
+    array(31, 'AGU', 'Aghsu'),
+    array(31, 'AB', 'Ali-Bairamly'),
+    array(31, 'AST', 'Astara'),
+    array(31, 'BAB', 'Babek'),
+    array(31, 'BA', 'Baku'),
+    array(31, 'BAL', 'Balaken'),
+    array(31, 'BAR', 'Barda'),
+    array(31, 'BEY', 'Beilagan'),
+    array(31, 'BIL', 'Bilasuvar'),
+    array(31, 'DAS', 'Dashkesan'),
+    array(31, 'DAV', 'Devechi'),
+    array(31, 'FUZ', 'Fizuli'),
+    array(31, 'QAB', 'Gabala'),
+    array(31, 'GAD', 'Gadabey'),
+    array(31, 'QAX', 'Gakh'),
+    array(31, 'GA', 'Ganja'),
+    array(31, 'QAZ', 'Gazakh'),
+    array(31, 'GOR', 'Geranboy'),
+    array(31, 'QOB', 'Gobustan'),
+    array(31, 'GOY', 'Goychay'),
+    array(31, 'QBA', 'Guba'),
+    array(31, 'QBI', 'Gubadly'),
+    array(31, 'QUS', 'Gusar'),
+    array(31, 'HAC', 'Hacuqabul'),
+    array(31, 'IMI', 'Imishli'),
+    array(31, 'ISM', 'Ismailly'),
+    array(31, 'CAL', 'Jalilabad'),
+    array(31, 'CAB', 'Jebrail'),
+    array(31, 'CUL', 'Julfa'),
+    array(31, 'KAL', 'Kelbajar'),
+    array(31, 'XAC', 'Khachmaz'),
+    array(31, 'XA', 'Khankendy'),
+    array(31, 'XAN', 'Khanlar'),
+    array(31, 'XCI', 'Khojaly'),
+    array(31, 'XVD', 'Khojavend'),
+    array(31, 'XIZ', 'Khyzy'),
+    array(31, 'KUR', 'Kyurdamir'),
+    array(31, 'LAC', 'Lachin'),
+    array(31, 'LAN', 'Lankaran district'),
+    array(31, 'LA', 'Lankaran city'),
+    array(31, 'LER', 'Lerik'),
+    array(31, 'MAS', 'Masally'),
+    array(31, 'MI', 'Mingechevir'),
+    array(31, 'NA', 'Naftalan'),
+    array(31, 'NX', 'Nakhchivan'),
+    array(31, 'NEF', 'Neftchala'),
+    array(31, 'OGU', 'Oghuz'),
+    array(31, 'ORD', 'Ordubad'),
+    array(31, 'SAT', 'Saatly'),
+    array(31, 'SAB', 'Sabirabad'),
+    array(31, 'SAL', 'Salyan'),
+    array(31, 'SMX', 'Samuh'),
+    array(31, 'SAD', 'Sedarak'),
+    array(31, 'SAH', 'Shahbuz'),
+    array(31, 'SMI', 'Shamakhy'),
+    array(31, 'SKR', 'Shamkir'),
+    array(31, 'SAK', 'Sheki district'),
+    array(31, 'SA', 'Sheki city'),
+    array(31, 'SAR', 'Sherur'),
+    array(31, 'SUS', 'Shusha district'),
+    array(31, 'SS', 'Shusha city'),
+    array(31, 'SIY', 'Siazan'),
+    array(31, 'SM', 'Sumgayit'),
+    array(31, 'TAR', 'Terter'),
+    array(31, 'TOV', 'Tovuz'),
+    array(31, 'UCA', 'Ujar'),
+    array(31, 'YAR', 'Yardymly'),
+    array(31, 'YEV', 'Yevlakh district'),
+    array(31, 'YE', 'Yevlakh city'),
+    array(31, 'ZAQ', 'Zagatala'),
+    array(31, 'ZAN', 'Zangilan'),
+    array(31, 'ZAR', 'Zerdab'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    31,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/bangladesh_50_1.cif b/uc_store/countries/bangladesh_50_1.cif
new file mode 100644
index 0000000..abe9142
--- /dev/null
+++ b/uc_store/countries/bangladesh_50_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function bangladesh_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (50,'Bangladesh','BD','BGD',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(50, '1', 'Barisal'),
+    array(50, '2', 'Chittagong'),
+    array(50, '3', 'Dhaka'),
+    array(50, '4', 'Khulna'),
+    array(50, '5', 'Rajshahi'),
+    array(50, '6', 'Sylhet'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    50,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/belarus_112_1.cif b/uc_store/countries/belarus_112_1.cif
new file mode 100644
index 0000000..14e895d
--- /dev/null
+++ b/uc_store/countries/belarus_112_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function belarus_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (112,'Belarus','BY','BLR',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(112, 'BR', 'Brest'),
+    array(112, 'HO', 'Homyel'),
+    array(112, 'HM', 'Horad Minsk'),
+    array(112, 'HR', 'Hrodna'),
+    array(112, 'MA', 'Mahilyow'),
+    array(112, 'MI', 'Minsk'),
+    array(112, 'VI', 'Vitsyebsk'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    112,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/benin_204_1.cif b/uc_store/countries/benin_204_1.cif
new file mode 100644
index 0000000..3197436
--- /dev/null
+++ b/uc_store/countries/benin_204_1.cif
@@ -0,0 +1,38 @@
+<?php
+
+function benin_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (204,'Benin','BJ','BEN',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(204, 'AL', 'Alibori'),
+    array(204, 'AK', 'Atacora'),
+    array(204, 'AQ', 'Atlantique'),
+    array(204, 'BO', 'Borgou'),
+    array(204, 'CO', 'Collines'),
+    array(204, 'KO', 'Couffo'),
+    array(204, 'DO', 'Donga'),
+    array(204, 'LI', 'Littoral'),
+    array(204, 'MO', 'Mono'),
+    array(204, 'OU', 'Ouémé'),
+    array(204, 'PL', 'Plateau'),
+    array(204, 'ZO', 'Zou'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    204,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/bhutan_64_1.cif b/uc_store/countries/bhutan_64_1.cif
new file mode 100644
index 0000000..a295ab9
--- /dev/null
+++ b/uc_store/countries/bhutan_64_1.cif
@@ -0,0 +1,45 @@
+<?php
+
+function bhutan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (64,'Bhutan','BT','BTN',1)");
+  // Make the entries in the zones table.
+  $zones = array(
+     array(64, 'GA', 'Gasa'),
+     array(64, 'TY', 'Tashi Yangtse'),
+     array(64, '11', 'Paro'),
+     array(64, '12', 'Chhukha'),
+     array(64, '13', 'Ha'),
+     array(64, '14', 'Samchi'),
+     array(64, '15', 'Thimphu'),
+     array(64, '21', 'Chirang'),
+     array(64, '22', 'Daga'),
+     array(64, '23', 'Punakha'),
+     array(64, '24', 'Wangdi Phodrang'),
+     array(64, '31', 'Geylegphug'),
+     array(64, '32', 'Tongsa'),
+     array(64, '33', 'Bumthang'),
+     array(64, '34', 'Shemgang'),
+     array(64, '41', 'Tashigang'),
+     array(64, '42', 'Mongar'),
+     array(64, '43', 'Pemagatsel'),
+     array(64, '44', 'Lhuntshi'),
+     array(64, '45', 'Samdrup Jongkhar'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    64,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_code  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/bolivia_68_1.cif b/uc_store/countries/bolivia_68_1.cif
new file mode 100644
index 0000000..24b56c1
--- /dev/null
+++ b/uc_store/countries/bolivia_68_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function bolivia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (68,'Bolivia, Plurinational State of','BO','BOL',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(68, 'BO-C', 'Cochabamba'),
+    array(68, 'BO-H', 'Chuquisaca'),
+    array(68, 'BO-B', 'El Beni'),
+    array(68, 'BO-L', 'La Paz'),
+    array(68, 'BO-O', 'Oruro'),
+    array(68, 'BO-N', 'Pando'),
+    array(68, 'BO-P', 'Potosí'),
+    array(68, 'BO-S', 'Santa Cruz'),
+    array(68, 'BO-T', 'Tarija'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    68,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/bonaire_535_1.cif b/uc_store/countries/bonaire_535_1.cif
new file mode 100644
index 0000000..cf06568
--- /dev/null
+++ b/uc_store/countries/bonaire_535_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function bonaire_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (535,'Bonaire, Saint Eustatius and Saba','BQ','BES',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    535,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/bosnia_herzegovina_70_2.cif b/uc_store/countries/bosnia_herzegovina_70_2.cif
new file mode 100644
index 0000000..1aad5c0
--- /dev/null
+++ b/uc_store/countries/bosnia_herzegovina_70_2.cif
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Implements hook_install() using the name of the country as the base of
+ * the function name.
+ */
+function bosnia_herzegovina_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (70, 'Bosnia and Herzegovina', 'BA', 'BIH', 2)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(70, 'BIH', 'Federacija Bosna i Hercegovina'),
+    array(70, 'SRP', 'Republika Srpska'),
+    array(70, '05', 'Bosansko-Podrinjski Kanton'),
+    array(70, '10', 'Hercegovacko-Bosanski Kanton'),
+    array(70, '07', 'Hercegovacko-Neretvanski Kanton'),
+    array(70, '09', 'Kanton Sarajevo'),
+    array(70, '02', 'Posavski Kanton'),
+    array(70, '06', 'Srednjobosanski Kanton'),
+    array(70, '03', 'Tuzlanski Kanton'),
+    array(70, '01', 'Unsko-Sanski Kanton'),
+    array(70, '08', 'Zapadno-Hercegovacki Kanton'),
+    array(70, '04', 'Zenicko-Dobojski Kanton'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    70,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city !zone_code !postal_code\r\n".
+    "!country_name_if"
+  );
+}
+
+function bosnia_herzegovina_update($version) {
+  switch ($version) {
+    case 2:
+      // Correct ISO-3166-1 country name
+      db_query("UPDATE {uc_countries} SET country_name = 'Bosnia and Herzegovina' WHERE country_id = 70");
+      break;
+  }
+}
diff --git a/uc_store/countries/bosniaherzegovina_70_1.cif b/uc_store/countries/bosniaherzegovina_70_1.cif
deleted file mode 100644
index 4cf3c10..0000000
--- a/uc_store/countries/bosniaherzegovina_70_1.cif
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * First implement hook_install() using the name of the country as the base of
- * the function name.
- */
-function bosniaherzegovina_install() {
-  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (70, 'Bosnia-Herzegovina', 'BA', 'BIH', 1)");
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(70, 'BIH', 'Federacija Bosna i Hercegovina'),
-    array(70, 'SRP', 'Republika Srpska'),
-    array(70, '05', 'Bosansko-Podrinjski Kanton'),
-    array(70, '10', 'Hercegovacko-Bosanski Kanton'),
-    array(70, '07', 'Hercegovacko-Neretvanski Kanton'),
-    array(70, '09', 'Kanton Sarajevo'),
-    array(70, '02', 'Posavski Kanton'),
-    array(70, '06', 'Srednjobosanski Kanton'),
-    array(70, '03', 'Tuzlanski Kanton'),
-    array(70, '01', 'Unsko-Sanski Kanton'),
-    array(70, '08', 'Zapadno-Hercegovacki Kanton'),
-    array(70, '04', 'Zenicko-Dobojski Kanton'),
-  );
-
-  foreach ($zones as $zone) {
-    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
-  }
-
-  uc_set_address_format(70,
-    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
-   ."\r\n!city !zone_code !postal_code\r\n!country_name_if");
-}
diff --git a/uc_store/countries/bouvet_island_74_1.cif b/uc_store/countries/bouvet_island_74_1.cif
new file mode 100644
index 0000000..97f6e7e
--- /dev/null
+++ b/uc_store/countries/bouvet_island_74_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function bouvet_island_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (74,'Bouvet Island','BV','BVT',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    74,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/british_indian_ocean_territory_86_1.cif b/uc_store/countries/british_indian_ocean_territory_86_1.cif
new file mode 100644
index 0000000..8c09b94
--- /dev/null
+++ b/uc_store/countries/british_indian_ocean_territory_86_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function british_indian_ocean_territory_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (86,'British Indian Ocean Territory','IO','IOT',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    86,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/brunei_darussalam_96_2.cif b/uc_store/countries/brunei_darussalam_96_2.cif
index c9a5b38..f6d0df2 100644
--- a/uc_store/countries/brunei_darussalam_96_2.cif
+++ b/uc_store/countries/brunei_darussalam_96_2.cif
@@ -2,18 +2,18 @@
 
 function brunei_darussalam_install() {
   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (96, 'Brunei', 'BN', 'BRN', 2)");
-   
+
   $zones = array(
     array(96, 'BN-BE', 'Belait'),
     array(96, 'BN-BM', 'Brunei-Muara'),
     array(96, 'BN-TE', 'Temburong'),
     array(96, 'BN-TU', 'Tutong'),
   );
-   
+
   foreach ($zones as $zone) {
     db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
   }
-   
+
   uc_set_address_format(96,
       "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n".
       "!city !postal_code\r\n!zone_name\r\n!country_name_if");
diff --git a/uc_store/countries/burkina_faso_854_1.cif b/uc_store/countries/burkina_faso_854_1.cif
new file mode 100644
index 0000000..96bb0cd
--- /dev/null
+++ b/uc_store/countries/burkina_faso_854_1.cif
@@ -0,0 +1,71 @@
+<?php
+
+function burkina_faso_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (854,'Burkina Faso','BF','BFA',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(854, 'BAL', 'Bale'),
+    array(854, 'BAM', 'Bam'),
+    array(854, 'BAN', 'Banwa'),
+    array(854, 'BAZ', 'Bazega'),
+    array(854, 'BGR', 'Bougouriba'),
+    array(854, 'BLG', 'Boulgou'),
+    array(854, 'BLK', 'Boulkiemde'),
+    array(854, 'COM', 'Comoe'),
+    array(854, 'GAN', 'Ganzourgou'),
+    array(854, 'GNA', 'Gnagna'),
+    array(854, 'GOU', 'Gourma'),
+    array(854, 'HOU', 'Houet'),
+    array(854, 'IOB', 'Ioba'),
+    array(854, 'KAD', 'Kadiogo'),
+    array(854, 'KEN', 'Kenedougou'),
+    array(854, 'KMD', 'Komandjoari'),
+    array(854, 'KMP', 'Kompienga'),
+    array(854, 'KOS', 'Kossi'),
+    array(854, 'KOP', 'Koulpelogo'),
+    array(854, 'KOT', 'Kouritenga'),
+    array(854, 'KOW', 'Kourweogo'),
+    array(854, 'LER', 'Leraba'),
+    array(854, 'LOR', 'Loroum'),
+    array(854, 'MOU', 'Mouhoun'),
+    array(854, 'NAO', 'Nahouri'),
+    array(854, 'NAM', 'Namentenga'),
+    array(854, 'NAY', 'Nayala'),
+    array(854, 'NOU', 'Noumbiel'),
+    array(854, 'OUB', 'Oubritenga'),
+    array(854, 'OUD', 'Oudalan'),
+    array(854, 'PAS', 'Passore'),
+    array(854, 'PON', 'Poni'),
+    array(854, 'SNG', 'Sanguie'),
+    array(854, 'SMT', 'Sanmatenga'),
+    array(854, 'SEN', 'Seno'),
+    array(854, 'SIS', 'Sissili'),
+    array(854, 'SOM', 'Soum'),
+    array(854, 'SOR', 'Sourou'),
+    array(854, 'TAP', 'Tapoa'),
+    array(854, 'TUI', 'Tuy'),
+    array(854, 'YAG', 'Yagha'),
+    array(854, 'YAT', 'Yatenga'),
+    array(854, 'ZIR', 'Ziro'),
+    array(854, 'ZON', 'Zondoma'),
+    array(854, 'ZOU', 'Zoundweogo'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    854,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_code  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/burundi_108_1.cif b/uc_store/countries/burundi_108_1.cif
new file mode 100644
index 0000000..171fbb3
--- /dev/null
+++ b/uc_store/countries/burundi_108_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function burundi_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (108,'Burundi','BI','BDI',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(108, 'BB', 'Bubanza'),
+    array(108, 'BM', 'Bujumbura Mairie'),
+    array(108, 'BJ', 'Bujumbura Rural'),
+    array(108, 'BR', 'Bururi'),
+    array(108, 'CA', 'Cankuzo'),
+    array(108, 'CI', 'Cibitoke'),
+    array(108, 'GI', 'Gitega'),
+    array(108, 'KR', 'Karuzi'),
+    array(108, 'KY', 'Kayanza'),
+    array(108, 'KI', 'Kirundo'),
+    array(108, 'MA', 'Makamba'),
+    array(108, 'MU', 'Muramvya'),
+    array(108, 'MY', 'Muyinga'),
+    array(108, 'MW', 'Mwaro'),
+    array(108, 'NG', 'Ngozi'),
+    array(108, 'RT', 'Rutana'),
+    array(108, 'RY', 'Ruyigi'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    108,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_code  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cameroon_120_1.cif b/uc_store/countries/cameroon_120_1.cif
new file mode 100644
index 0000000..97549f8
--- /dev/null
+++ b/uc_store/countries/cameroon_120_1.cif
@@ -0,0 +1,36 @@
+<?php
+
+function cameroon_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (120,'Cameroon','CM','CMR',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(120, 'CM-AD', 'Adamaoua'),
+    array(120, 'CM-CE', 'Centre'),
+    array(120, 'CM-ES', 'Est'),
+    array(120, 'CM-EN', 'Extreme-Nord'),
+    array(120, 'CM-LT', 'Littoral'),
+    array(120, 'CM-NO', 'Nord'),
+    array(120, 'CM-NW', 'Nord-Ouest'),
+    array(120, 'CM-OU', 'Ouest'),
+    array(120, 'CM-SU', 'Sud'),
+    array(120, 'CM-SW', 'Sud-Ouest'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    120,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cape_verde_132_1.cif b/uc_store/countries/cape_verde_132_1.cif
new file mode 100644
index 0000000..0423bb2
--- /dev/null
+++ b/uc_store/countries/cape_verde_132_1.cif
@@ -0,0 +1,48 @@
+<?php
+
+function cape_verde_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (132,'Cape Verde','CV','CPV',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(132, 'BV', 'Boa Vista'),
+    array(132, 'BR', 'Brava'),
+    array(132, 'MA', 'Maio'),
+    array(132, 'MO', 'Mosteiros'),
+    array(132, 'PA', 'Paul'),
+    array(132, 'PN', 'Porto Novo'),
+    array(132, 'PR', 'Praia'),
+    array(132, 'SN', 'Ribeira Brava'),
+    array(132, 'RG', 'Ribeira Grande'),
+    array(132, 'PR', 'Ribeira Grande de Santiago'),
+    array(132, 'SL', 'Sal'),
+    array(132, 'CA', 'Santa Catarina'),
+    array(132, 'SF', 'Santa Catarina do Fogo'),
+    array(132, 'CR', 'Santa Cruz'),
+    array(132, 'SD', 'Sao Domingos'),
+    array(132, 'SF', 'Sao Filipe'),
+    array(132, 'CR', 'Sao Lourenço dos Orgaos'),
+    array(132, 'CS', 'Sao Miguel'),
+    array(132, 'CA', 'Sao Salvador do Mundo'),
+    array(132, 'SV', 'Sao Vicente'),
+    array(132, 'TA', 'Tarrafal'),
+    array(132, 'TS', 'Tarrafal de Sao Nicolau'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    132,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cayman_islands_136_1.cif b/uc_store/countries/cayman_islands_136_1.cif
new file mode 100644
index 0000000..92a08c7
--- /dev/null
+++ b/uc_store/countries/cayman_islands_136_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function cayman_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (136,'Cayman Islands','KY','CYM',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(136, 'BT', 'Bodden Town'),
+    array(136, 'CB', 'Cayman Brac'),
+    array(136, 'EE', 'East End'),
+    array(136, 'GT', 'George Town'),
+    array(136, 'SO', 'Little Cayman'),
+    array(136, 'NS', 'North Side'),
+    array(136, 'WB', 'West Bay'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    136,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/central_african_republic_140_1.cif b/uc_store/countries/central_african_republic_140_1.cif
new file mode 100644
index 0000000..072f673
--- /dev/null
+++ b/uc_store/countries/central_african_republic_140_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function central_african_republic_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (140,'Central African Republic','CF','CAF',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(140, 'BB', 'Bamingui-Bangoran'),
+    array(140, 'BGF', 'Bangui'),
+    array(140, 'BK', 'Basse-Kotto'),
+    array(140, 'HK', 'Haute-Kotto'),
+    array(140, 'HM', 'Haut-Mbomou'),
+    array(140, 'KG', 'Kemo'),
+    array(140, 'LB', 'Lobaye'),
+    array(140, 'HS', 'Mambere-Kadei'),
+    array(140, 'MB', 'Mbomou'),
+    array(140, 'KB', 'Nana-Grebizi'),
+    array(140, 'NM', 'Nana-Mambere'),
+    array(140, 'MP', 'Ombella-M\'Poko'),
+    array(140, 'UK', 'Ouaka'),
+    array(140, 'AC', 'Ouham'),
+    array(140, 'OP', 'Ouham-Pende'),
+    array(140, 'SE', 'Sangha-Mbaere'),
+    array(140, 'VK', 'Vakaga'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    140,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/chad_148_1.cif b/uc_store/countries/chad_148_1.cif
new file mode 100644
index 0000000..127f12b
--- /dev/null
+++ b/uc_store/countries/chad_148_1.cif
@@ -0,0 +1,48 @@
+<?php
+
+function chad_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (148,'Chad','TD','TCD',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(148, 'KA', 'Barh el Ghazel'),
+    array(148, 'BA', 'Batha'),
+    array(148, 'BET', 'Borkou'),
+    array(148, 'CB', 'Chari-Baguirmi'),
+    array(148, 'BET', 'Ennedi'),
+    array(148, 'GR', 'Guera'),
+    array(148, 'HL', 'Hadjer-Lamis'),
+    array(148, 'KA', 'Kanem'),
+    array(148, 'LC', 'Lac'),
+    array(148, 'LO', 'Logone Occidental'),
+    array(148, 'LR', 'Logone Oriental'),
+    array(148, 'MA', 'Mandoul'),
+    array(148, 'ME', 'Mayo-Kebbi Est'),
+    array(148, 'MO', 'Mayo-Kebbi Ouest'),
+    array(148, 'MC', 'Moyen-Chari'),
+    array(148, 'OD', 'Ouaddai'),
+    array(148, 'SA', 'Salamat'),
+    array(148, 'OD', 'Sila'),
+    array(148, 'TA', 'Tandjile'),
+    array(148, 'BET', 'Tibesti'),
+    array(148, 'ND', "Ville de N'Djamena"),
+    array(148, 'WF', 'Wadi Fira'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    148,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/christmas_island_162_1.cif b/uc_store/countries/christmas_island_162_1.cif
new file mode 100644
index 0000000..e18cfcf
--- /dev/null
+++ b/uc_store/countries/christmas_island_162_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function christmas_island_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (162,'Christmas Island','CX','CXR',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    162,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cocos_islands_166_1.cif b/uc_store/countries/cocos_islands_166_1.cif
new file mode 100644
index 0000000..103f878
--- /dev/null
+++ b/uc_store/countries/cocos_islands_166_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function cocos_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (166,'Cocos (Keeling) Islands','CC','CCK',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    166,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/comoros_174_1.cif b/uc_store/countries/comoros_174_1.cif
new file mode 100644
index 0000000..9ca7d9c
--- /dev/null
+++ b/uc_store/countries/comoros_174_1.cif
@@ -0,0 +1,29 @@
+<?php
+
+function comoros_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (174,'Comoros','KM','COM',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(174, 'A', 'Anjouan'),
+    array(174, 'G', 'Grande Comore'),
+    array(174, 'M', 'Moheli'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    174,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/congo_178_1.cif b/uc_store/countries/congo_178_1.cif
new file mode 100644
index 0000000..84ce204
--- /dev/null
+++ b/uc_store/countries/congo_178_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function congo_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (178,'Congo','CG','COG',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(178, '11', 'Bouenza'),
+    array(178, 'BZV', 'Brazzaville'),
+    array(178, '8', 'Cuvette'),
+    array(178, '15', 'Cuvette-Ouest'),
+    array(178, '5', 'Kouilou'),
+    array(178, '2', 'Lekoumou'),
+    array(178, '7', 'Likouala'),
+    array(178, '9', 'Niari'),
+    array(178, '14', 'Plateaux'),
+    array(178, '12', 'Pool'),
+    array(178, '13', 'Sangha'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    178,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/congo_democratic_republic_of_180_1.cif b/uc_store/countries/congo_democratic_republic_of_180_1.cif
new file mode 100644
index 0000000..9697d5d
--- /dev/null
+++ b/uc_store/countries/congo_democratic_republic_of_180_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function congo_democratic_republic_of_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (180,'Congo, the Democratic Republic of the','CD','COD',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(180, 'CD-KN', 'Kinshasa'),
+    array(180, 'CD-BN', 'Bandundu'),
+    array(180, 'CD-BC', 'Bas-Congo'),
+    array(180, 'CD-EQ', 'Equateur'),
+    array(180, 'CD-KW', 'Kasai-Occidental'),
+    array(180, 'CD-KE', 'Kasai-Oriental'),
+    array(180, 'CD-KA', 'Katanga'),
+    array(180, 'CD-MA', 'Maniema'),
+    array(180, 'CD-NK', 'Nord-Kivu'),
+    array(180, 'CD-OR', 'Orientale'),
+    array(180, 'CD-SK', 'Sud-Kivu'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    180,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cook_islands_184_1.cif b/uc_store/countries/cook_islands_184_1.cif
new file mode 100644
index 0000000..7f38bdd
--- /dev/null
+++ b/uc_store/countries/cook_islands_184_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function cook_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (184,'Cook Islands','CK','COK',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    184,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/costa_rica_188_2.cif b/uc_store/countries/costa_rica_188_2.cif
index 0983138..da01d7d 100644
--- a/uc_store/countries/costa_rica_188_2.cif
+++ b/uc_store/countries/costa_rica_188_2.cif
@@ -7,7 +7,7 @@
 function costa_rica_install() {
   // Make the entry in the country table.
   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (188, 'Costa Rica', 'CR', 'CRA', 1)");
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (188, 'Costa Rica', 'CR', 'CRI', 2)");
 
   // Make the entries in the zones table.
   $zones = array(
diff --git a/uc_store/countries/cote_d_ivoire_384_1.cif b/uc_store/countries/cote_d_ivoire_384_1.cif
new file mode 100644
index 0000000..1c0409f
--- /dev/null
+++ b/uc_store/countries/cote_d_ivoire_384_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function cote_d_ivoire_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (384,'Côte d\'Ivoire','CI','CIV',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    384,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/cuba_192_1.cif b/uc_store/countries/cuba_192_1.cif
new file mode 100644
index 0000000..742a49c
--- /dev/null
+++ b/uc_store/countries/cuba_192_1.cif
@@ -0,0 +1,41 @@
+<?php
+
+function cuba_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (192,'Cuba','CU','CUB',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(192, '01', 'Pinar del Rio'),
+    array(192, '02', 'La Habana'),
+    array(192, '03', 'Ciudad de la Habana'),
+    array(192, '04', 'Matanzas'),
+    array(192, '05', 'Villa Clara'),
+    array(192, '06', 'Cienfuegos'),
+    array(192, '07', 'Sancti Spiritus'),
+    array(192, '08', 'Ciego de Avila'),
+    array(192, '09', 'Camaguey'),
+    array(192, '10', 'Las Tunas'),
+    array(192, '11', 'Holguin'),
+    array(192, '12', 'Granma'),
+    array(192, '13', 'Santiago de Cuba'),
+    array(192, '14', 'Sancti Spiritus'),
+    array(192, '99', 'Isla de la Juventud'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    192,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/curacao_531_1.cif b/uc_store/countries/curacao_531_1.cif
new file mode 100644
index 0000000..c9dacb3
--- /dev/null
+++ b/uc_store/countries/curacao_531_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function curacao_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (531,'Curaçao','CW','CUW',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    531,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/djibouti_262_1.cif b/uc_store/countries/djibouti_262_1.cif
new file mode 100644
index 0000000..ab20a87
--- /dev/null
+++ b/uc_store/countries/djibouti_262_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function djibouti_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (262,'Djibouti','DJ','DJI',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(262, 'AS', 'Ali Sabieh'),
+    array(262, 'AR', 'Arta'),
+    array(262, 'DI', 'Dikhil'),
+    array(262, 'DJ', 'Djibouti'),
+    array(262, 'OB', 'Obock'),
+    array(262, 'TA', 'Tadjourah'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    262,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/dominica_212_1.cif b/uc_store/countries/dominica_212_1.cif
new file mode 100644
index 0000000..bb75e15
--- /dev/null
+++ b/uc_store/countries/dominica_212_1.cif
@@ -0,0 +1,36 @@
+<?php
+
+function dominica_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (212,'Dominica','DM','DMA',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(212, '02', 'Saint Andrew'),
+    array(212, '03', 'Saint David'),
+    array(212, '04', 'Saint George'),
+    array(212, '05', 'Saint John'),
+    array(212, '06', 'Saint Joseph'),
+    array(212, '07', 'Saint Luke'),
+    array(212, '08', 'Saint Mark'),
+    array(212, '09', 'Saint Patrick'),
+    array(212, '10', 'Saint Paul'),
+    array(212, '11', 'Saint Peter'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    212,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/equatorial_guinea_226_1.cif b/uc_store/countries/equatorial_guinea_226_1.cif
new file mode 100644
index 0000000..918d67e
--- /dev/null
+++ b/uc_store/countries/equatorial_guinea_226_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function equatorial_guinea_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (226,'Equatorial Guinea','GQ','GNQ',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(226, 'GQ-AN', 'Annobon'),
+    array(226, 'GQ-BN', 'Bioko Norte'),
+    array(226, 'GQ-BS', 'Bioko Sur'),
+    array(226, 'GQ-CS', 'Centro Sur'),
+    array(226, 'GQ-KN', 'Kie-Ntem'),
+    array(226, 'GQ-LI', 'Litoral'),
+    array(226, 'GQ-WN', 'Wele-Nzas'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    226,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/eritrea_232_1.cif b/uc_store/countries/eritrea_232_1.cif
new file mode 100644
index 0000000..359a25b
--- /dev/null
+++ b/uc_store/countries/eritrea_232_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function eritrea_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (232,'Eritrea','ER','ERI',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(232, 'AN', 'Anseba'),
+    array(232, 'DU', 'Debub'),
+    array(232, 'DK', 'Debubawi Keyih Bahri'),
+    array(232, 'GB', 'Gash Barka'),
+    array(232, 'MA', 'Maekel'),
+    array(232, 'Sk', 'Semenawi Keyih Bahri'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    232,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/ethiopia_231_1.cif b/uc_store/countries/ethiopia_231_1.cif
new file mode 100644
index 0000000..8c609cf
--- /dev/null
+++ b/uc_store/countries/ethiopia_231_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function ethiopia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (231,'Ethiopia','ET','ETH',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(231, 'ET-AA', 'Addis Ababa'),
+    array(231, 'ET-DD', 'Dire Dawa'),
+    array(231, 'ET-AF', 'Afar'),
+    array(231, 'ET-AM', 'Amara'),
+    array(231, 'ET-BE', 'Benshangul-Gumaz'),
+    array(231, 'ET-GA', 'Gambela Peoples'),
+    array(231, 'ET-HA', 'Harari People'),
+    array(231, 'ET-OR', 'Oromia'),
+    array(231, 'ET-SO', 'Somali'),
+    array(231, 'ET-TI', 'Tigrai'),
+    array(231, 'ET-SN', 'Southern Nations, Nationalities and Peoples'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    231,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/falkland_islands_238_1.cif b/uc_store/countries/falkland_islands_238_1.cif
new file mode 100644
index 0000000..edeb0f9
--- /dev/null
+++ b/uc_store/countries/falkland_islands_238_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function falkland_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (238,'Falkland Islands','FK','FLK',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    238,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/faroe_islands_234_1.cif b/uc_store/countries/faroe_islands_234_1.cif
new file mode 100644
index 0000000..b020cd5
--- /dev/null
+++ b/uc_store/countries/faroe_islands_234_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function faroe_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (234,'Faroe Islands','FO','FRO',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(234, 'NO', 'Norderoerne'),
+    array(234, 'OS', 'Ostero'),
+    array(234, 'SA', 'Sando'),
+    array(234, 'ST', 'Stromo'),
+    array(234, 'SN', 'Sudero Nordre'),
+    array(234, 'SS', 'Sudero Sondre'),
+    array(234, 'VG', 'Vago'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    234,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/fiji_242_1.cif b/uc_store/countries/fiji_242_1.cif
new file mode 100644
index 0000000..fb6c23f
--- /dev/null
+++ b/uc_store/countries/fiji_242_1.cif
@@ -0,0 +1,41 @@
+<?php
+
+function fiji_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (242,'Fiji','FJ','FJI',1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(242, 'BA', 'Ba'),
+    array(242, 'BU', 'Bua'),
+    array(242, 'Ck', 'Cakaudrove'),
+    array(242, 'KD', 'Kadavu'),
+    array(242, 'LU', 'Lau'),
+    array(242, 'LM', 'Lomaiviti'),
+    array(242, 'MC', 'Macuata'),
+    array(242, 'NN', 'Nadroga-Navosa'),
+    array(242, 'NT', 'Naitasiri'),
+    array(242, 'NM', 'Namosi'),
+    array(242, 'RA', 'Ra'),
+    array(242, 'RW', 'Rewa'),
+    array(242, 'RT', 'Rotuma'),
+    array(242, 'SR', 'Serua'),
+    array(242, 'TL', 'Tailevu'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    242,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/french_guiana_254_1.cif b/uc_store/countries/french_guiana_254_1.cif
new file mode 100644
index 0000000..650dd92
--- /dev/null
+++ b/uc_store/countries/french_guiana_254_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function french_guiana_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (254,'French Guiana','GF','GUF',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    254,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/french_polynesia_258_1.cif b/uc_store/countries/french_polynesia_258_1.cif
new file mode 100644
index 0000000..286564a
--- /dev/null
+++ b/uc_store/countries/french_polynesia_258_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function french_polynesia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (258,'French Polynesia','PF','PYF',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    258,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/french_southern_territories_260_1.cif b/uc_store/countries/french_southern_territories_260_1.cif
new file mode 100644
index 0000000..85a3a54
--- /dev/null
+++ b/uc_store/countries/french_southern_territories_260_1.cif
@@ -0,0 +1,20 @@
+<?php
+
+function french_southern_territories_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (260,'French Southern Territories','TF','ATF',1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    260,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/gabon_266_1.cif b/uc_store/countries/gabon_266_1.cif
new file mode 100644
index 0000000..8868b04
--- /dev/null
+++ b/uc_store/countries/gabon_266_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function gabon_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('266', 'Gabon', 'GA', 'GAB', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(266, '1', 'Estuaire'),
+    array(266, '2', 'Haut-Ogooue'),
+    array(266, '3', 'Moyen-Ogooue'),
+    array(266, '4', 'Ngounie'),
+    array(266, '5', 'Nyanga'),
+    array(266, '6', 'Ogooue-Ivindo'),
+    array(266, '7', 'OgoouE-Lolo'),
+    array(266, '8', 'Ogooue-Maritime'),
+    array(266, '9', 'Woleu-Ntem'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(266,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/gambia_270_1.cif b/uc_store/countries/gambia_270_1.cif
new file mode 100644
index 0000000..ba5f03f
--- /dev/null
+++ b/uc_store/countries/gambia_270_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function gambia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('270', 'Gambia', 'GM', 'GMB', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(270,
+  "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+ ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/ghana_288_1.cif b/uc_store/countries/ghana_288_1.cif
new file mode 100644
index 0000000..591738b
--- /dev/null
+++ b/uc_store/countries/ghana_288_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function ghana_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('288', 'Ghana', 'GH', 'GHA', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(288, 'GH-AH', 'Ashanti'),
+    array(288, 'GH-BA', 'Brong-Ahafo'),
+    array(288, 'GH-CP', 'Central'),
+    array(288, 'GH-EP', 'Eastern'),
+    array(288, 'GH-AA', 'Greater Accra'),
+    array(288, 'GH-NP', 'Northern'),
+    array(288, 'GH-UE', 'Upper East'),
+    array(288, 'GH-UW', 'Upper West'),
+    array(288, 'GH-TV', 'Volta'),
+    array(288, 'GH-WP', 'Western'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(288,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/grenada_308_1.cif b/uc_store/countries/grenada_308_1.cif
new file mode 100644
index 0000000..cb7a92a
--- /dev/null
+++ b/uc_store/countries/grenada_308_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function grenada_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('308', 'Grenada', 'GD', 'GRD', 1)");
+  // No zones
+
+  // Set address format
+  uc_set_address_format(308,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/guadeloupe_312_1.cif b/uc_store/countries/guadeloupe_312_1.cif
new file mode 100644
index 0000000..dab987e
--- /dev/null
+++ b/uc_store/countries/guadeloupe_312_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function guadeloupe_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('312', 'Guadeloupe', 'GP', 'GLP', 1)");
+  // No zones
+
+  // Set address format
+   uc_set_address_format(312,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/guatemala_320_1.cif b/uc_store/countries/guatemala_320_1.cif
new file mode 100644
index 0000000..984ad91
--- /dev/null
+++ b/uc_store/countries/guatemala_320_1.cif
@@ -0,0 +1,45 @@
+<?php
+
+function guatemala_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('320', 'Guatemala', 'GT', 'GTM', 1)");
+  // Make the entries in the zones table.
+  $zones = array(
+    array(320, 'AV', 'Alta Verapaz'),
+    array(320, 'BV', 'Baja Verapaz'),
+    array(320, 'CM', 'Chimaltenango'),
+    array(320, 'CQ', 'Chiquimula'),
+    array(320, 'PR', 'El Progreso'),
+    array(320, 'ES', 'Escuintla'),
+    array(320, 'GU', 'Guatemala'),
+    array(320, 'HU', 'Huehuetenango'),
+    array(320, 'IZ', 'Izabal'),
+    array(320, 'JA', 'Jalapa'),
+    array(320, 'JU', 'Jutiapa'),
+    array(320, 'PE', 'Peten'),
+    array(320, 'QZ', 'Quetzaltenango'),
+    array(320, 'QC', 'Quiche'),
+    array(320, 'RE', 'Retalhuleu'),
+    array(320, 'SA', 'Sacatepequez'),
+    array(320, 'SM', 'San Marcos'),
+    array(320, 'SR', 'Santa Rosa'),
+    array(320, 'SO', 'Solola'),
+    array(320, 'SU', 'Suchitepequez'),
+    array(320, 'TO', 'Totonicapan'),
+    array(320, 'ZA', 'Zacapa'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(320,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/guernsey_831_1.cif b/uc_store/countries/guernsey_831_1.cif
new file mode 100644
index 0000000..753cdde
--- /dev/null
+++ b/uc_store/countries/guernsey_831_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function guernsey_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('831', 'Guernsey', 'GG', 'GGY', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(831,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/guinea_324_1.cif b/uc_store/countries/guinea_324_1.cif
new file mode 100644
index 0000000..03473cb
--- /dev/null
+++ b/uc_store/countries/guinea_324_1.cif
@@ -0,0 +1,57 @@
+<?php
+
+function guinea_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('324', 'Guinea', 'GN', 'GIN', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(324, 'GN-BE', 'Beyla'),
+    array(324, 'GN-BF', 'Boffa'),
+    array(324, 'GN-BK', 'Boké'),
+    array(324, 'GN-CO', 'Coyah'),
+    array(324, 'GN-DB', 'Dabola'),
+    array(324, 'GN-DL', 'Dalaba'),
+    array(324, 'GN-DI', 'Dinguiraye'),
+    array(324, 'GN-DU', 'Dubréka'),
+    array(324, 'GN-FA', 'Faranah'),
+    array(324, 'GN-FO', 'Forécariah'),
+    array(324, 'GN-FR', 'Fria'),
+    array(324, 'GN-GA', 'Gaoual'),
+    array(324, 'GN-GU', 'Guékédou'),
+    array(324, 'GN-KA', 'Kankan'),
+    array(324, 'GN-KE', 'Kérouané'),
+    array(324, 'GN-KD', 'Kindia'),
+    array(324, 'GN-KS', 'Kissidougou'),
+    array(324, 'GN-KB', 'Koubia'),
+    array(324, 'GN-KN', 'Koundara'),
+    array(324, 'GN-KO', 'Kouroussa'),
+    array(324, 'GN-LA', 'Labé'),
+    array(324, 'GN-LE', 'Lélouma'),
+    array(324, 'GN-LO', 'Lola'),
+    array(324, 'GN-MC', 'Macenta'),
+    array(324, 'GN-ML', 'Mali'),
+    array(324, 'GN-MM', 'Mamou'),
+    array(324, 'GN-MD', 'Mandiana'),
+    array(324, 'GN-NZ', 'Nzérékor'),
+    array(324, 'GN-PI', 'Pita'),
+    array(324, 'GN-SI', 'Siguiri'),
+    array(324, 'GN-TE', 'Télimélé'),
+    array(324, 'GN-TO', 'Tougué'),
+    array(324, 'GN-YO', 'Yomou'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(324,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/guinea_bissau_624_1.cif b/uc_store/countries/guinea_bissau_624_1.cif
new file mode 100644
index 0000000..c12d4fd
--- /dev/null
+++ b/uc_store/countries/guinea_bissau_624_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function guinea_bissau_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('624', 'Guinea-Bissau', 'GW', 'GNB', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(624, 'GW-BS', 'Bissau'),
+    array(624, 'GW-BA', 'Bafatá'),
+    array(624, 'GW-BM', 'Biombo'),
+    array(624, 'GW-BL', 'Bolama'),
+    array(624, 'GW-CA', 'Cacheu'),
+    array(624, 'GW-GA', 'Gabú'),
+    array(624, 'GW-OI', 'Oio'),
+    array(624, 'GW-QU', 'Quinara'),
+    array(624, 'GW-TO', 'Tombali'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(624,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/guyana_328_1.cif b/uc_store/countries/guyana_328_1.cif
new file mode 100644
index 0000000..01e5fab
--- /dev/null
+++ b/uc_store/countries/guyana_328_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function guyana_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('328', 'Guyana', 'GY', 'GUY', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(328, 'GY-BA', 'Barima-Waini'),
+    array(328, 'GY-CU', 'Cuyuni-Mazaruni'),
+    array(328, 'GY-DE', 'Demerara-Mahaica'),
+    array(328, 'GY-EB', 'East Berbice-Corentyne'),
+    array(328, 'GY-ES', 'Essequibo Islands-West Demerara'),
+    array(328, 'GY-MA', 'Mahaica-Berbice'),
+    array(328, 'GY-PM', 'Pomeroon-Supenaam'),
+    array(328, 'GY-PT', 'Potaro-Siparuni'),
+    array(328, 'GY-UD', 'Upper Demerara-Berbice'),
+    array(328, 'GY-UT', 'Upper Takutu-Upper Essequibo'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(328,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/haiti_332_1.cif b/uc_store/countries/haiti_332_1.cif
new file mode 100644
index 0000000..d75b887
--- /dev/null
+++ b/uc_store/countries/haiti_332_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function haiti_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('332', 'Haiti', 'HT', 'HTI', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(332, 'HT-AR', 'Artibonite'),
+    array(332, 'HT-CE', 'Centre'),
+    array(332, 'HT-GA', 'Grande-Anse'),
+    array(332, 'HT-NI', 'Nippes'),
+    array(332, 'HT-ND', 'Nord'),
+    array(332, 'HT-NE', 'Nord-Est'),
+    array(332, 'HT-NO', 'Nord-Ouest'),
+    array(332, 'HT-OU', 'Ouest'),
+    array(332, 'HT-SD', 'Sud'),
+    array(332, 'HT-SE', 'Sud-Est'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(332,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/heard_island_334_1.cif b/uc_store/countries/heard_island_334_1.cif
new file mode 100644
index 0000000..4d33d8d
--- /dev/null
+++ b/uc_store/countries/heard_island_334_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function heard_island_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('334', 'Heard Island and McDonald Islands', 'HM', 'HMD', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(334,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/holy_see_336_1.cif b/uc_store/countries/holy_see_336_1.cif
new file mode 100644
index 0000000..153358a
--- /dev/null
+++ b/uc_store/countries/holy_see_336_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function holy_see_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('336', 'Holy See (Vatican City State)', 'VA', 'VAT', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(336,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/honduras_340_1.cif b/uc_store/countries/honduras_340_1.cif
new file mode 100644
index 0000000..f17e160
--- /dev/null
+++ b/uc_store/countries/honduras_340_1.cif
@@ -0,0 +1,42 @@
+<?php
+
+function honduras_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('340', 'Honduras', 'AF', 'HND', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(340, 'HN-AT', 'Atlántida'),
+    array(340, 'HN-CL', 'Colón'),
+    array(340, 'HN-CM', 'Comayagua'),
+    array(340, 'HN-CP', 'Copán'),
+    array(340, 'HN-CR', 'Cortés'),
+    array(340, 'HN-CH', 'Choluteca'),
+    array(340, 'HN-EP', 'El Paraíso'),
+    array(340, 'HN-FM', 'Francisco Morazán'),
+    array(340, 'HN-GD', 'Gracias a Dios'),
+    array(340, 'HN-IN', 'Intibucá'),
+    array(340, 'HN-IB', 'Islas de la Bahía'),
+    array(340, 'HN-LP', 'La Paz'),
+    array(340, 'HN-LE', 'Lempira'),
+    array(340, 'HN-OC', 'Ocotepeque'),
+    array(340, 'HN-OL', 'Olancho'),
+    array(340, 'HN-SB', 'Santa Bárbara'),
+    array(340, 'HN-VA', 'Valle'),
+    array(340, 'HN-YO', 'Yoro'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(340,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/iceland_352_1.cif b/uc_store/countries/iceland_352_1.cif
new file mode 100644
index 0000000..995bad5
--- /dev/null
+++ b/uc_store/countries/iceland_352_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function iceland_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('352', 'Iceland', 'IS', 'ISL', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(352, 'IS-7', 'Austurland'),
+    array(352, 'IS-1', 'Höfuðborgarsvæði utan Reykjavíkur'),
+    array(352, 'IS-6', 'Norðurland eystra'),
+    array(352, 'IS-5', 'Norðurland vestra'),
+    array(352, 'IS-0', 'Reykjavík'),
+    array(352, 'IS-8', 'Suðurland'),
+    array(352, 'IS-2', 'Suðurnes'),
+    array(352, 'IS-4', 'Vestfirðir'),
+    array(352, 'IS-3', 'Vesturland'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(352,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/iraq_368_1.cif b/uc_store/countries/iraq_368_1.cif
new file mode 100644
index 0000000..3f2325d
--- /dev/null
+++ b/uc_store/countries/iraq_368_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function iraq_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('368', 'Iraq', 'IQ', 'IRQ', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(368, 'IQ-AN', 'Al Anbār'),
+    array(368, 'IQ-BA', 'Al Başrah'),
+    array(368, 'IQ-MU', 'Al Muthanná'),
+    array(368, 'IQ-QA', 'Al Qādisīyah'),
+    array(368, 'IQ-NA', 'An Najaf'),
+    array(368, 'IQ-AR', 'Arbīl'),
+    array(368, 'IQ-SU', 'As Sulaymānīyah'),
+    array(368, 'IQ-TS', "At Ta'mīm"),
+    array(368, 'IQ-BB', 'Babil !Bābil'),
+    array(368, 'IQ-BG', 'Baghdād'),
+    array(368, 'IQ-DA', 'Dahūk'),
+    array(368, 'IQ-DQ', 'Dhī Qār'),
+    array(368, 'IQ-DI', 'Diyālá'),
+    array(368, 'IQ-KA', "Karbalā'"),
+    array(368, 'IQ-MA', 'Maysān'),
+    array(368, 'IQ-NI', 'Nīnawá'),
+    array(368, 'IQ-SD', 'Şalāḩ ad Dīn'),
+    array(368, 'IQ-WA', 'Wāsiţ'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(368,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/jersey_832_1.cif b/uc_store/countries/jersey_832_1.cif
new file mode 100644
index 0000000..48e0ad6
--- /dev/null
+++ b/uc_store/countries/jersey_832_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function jersey_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('832', 'Jersey', 'JE', 'JEY', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(832,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/jordan_400_1.cif b/uc_store/countries/jordan_400_1.cif
new file mode 100644
index 0000000..d773fd1
--- /dev/null
+++ b/uc_store/countries/jordan_400_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function jordan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('400', 'Jordan', 'JO', 'JOR', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(400, 'JO-AJ', "'Ajlūn"),
+    array(400, 'JO-AQ', "Al 'Aqaba"),
+    array(400, 'JO-BA', "Al Balqā'"),
+    array(400, 'JO-KA', 'Al Karak'),
+    array(400, 'JO-MA', 'Al Mafraq'),
+    array(400, 'JO-AM', "'Ammān"),
+    array(400, 'JO-AT', 'Aţ Ţafīlah'),
+    array(400, 'JO-AZ', "Az Zarqā'"),
+    array(400, 'JO-IR', 'Irbid'),
+    array(400, 'JO-JA', 'Jarash'),
+    array(400, 'JO-MN', "Ma'ٰān"),
+    array(400, 'JO-MD', 'Mādaba'),
+  );
+
+ foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(400,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/kiribati_296_1.cif b/uc_store/countries/kiribati_296_1.cif
new file mode 100644
index 0000000..3e4a137
--- /dev/null
+++ b/uc_store/countries/kiribati_296_1.cif
@@ -0,0 +1,27 @@
+<?php
+
+function kiribati_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('296', 'Kiribati', 'KI', 'KIR', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(296, 'KI-G', 'Gilbert Islands'),
+    array(296, 'KI-L', 'Line Islands'),
+    array(296, 'KI-P', 'Phoenix Islands'),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(296,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/korea_democratic_peoples_republic_of_408_1.cif b/uc_store/countries/korea_democratic_peoples_republic_of_408_1.cif
new file mode 100644
index 0000000..d096349
--- /dev/null
+++ b/uc_store/countries/korea_democratic_peoples_republic_of_408_1.cif
@@ -0,0 +1,36 @@
+<?php
+
+function korea_democratic_peoples_republic_of_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('408', 'Korea, Democratic People\'s Republic_of', 'KP', 'PRK', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(408, 'KP-01', 'P’yŏngyang'),
+    array(408, 'KP-13', 'Nasŏn (Najin-Sŏnbong'),
+    array(408, 'KP-02', 'P’yŏngan-namdo'),
+    array(408, 'KP-03', 'P’yŏngan-bukto'),
+    array(408, 'KP-04', 'Chagang-do'),
+    array(408, 'KP-05', 'Hwanghae-namdo'),
+    array(408, 'KP-06', 'Hwanghae-bukto'),
+    array(408, 'KP-07', 'Kangwŏn-do'),
+    array(408, 'KP-08', 'Hamgyŏng-namdo'),
+    array(408, 'KP-09', 'Hamgyŏng-bukto'),
+    array(408, 'KP-10', 'Yanggang-do'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(408,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/kuwait_414_1.cif b/uc_store/countries/kuwait_414_1.cif
new file mode 100644
index 0000000..d527a68
--- /dev/null
+++ b/uc_store/countries/kuwait_414_1.cif
@@ -0,0 +1,30 @@
+<?php
+
+function kuwait_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('414', 'Kuwait', 'KW', 'KWT', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(414, 'KW-AH', 'Al Aḩmadi'),
+    array(414, 'KW-FA', 'Al Farwānīyah'),
+    array(414, 'KW-JA', 'Al Jahrah'),
+    array(414, 'KW-KU', 'Al Kuwayt'),
+    array(414, 'KW-HA', 'Hawallī !Ḩawallī'),
+    array(414, 'KW-MU', 'Mubārak al Kabīr'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(414,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/kyrgyzstan_417_1.cif b/uc_store/countries/kyrgyzstan_417_1.cif
new file mode 100644
index 0000000..2efd160
--- /dev/null
+++ b/uc_store/countries/kyrgyzstan_417_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function kyrgyzstan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('417', 'Kyrgyzstan', 'KG', 'KGZ', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(417, 'KG-GB', 'Bishkek'),
+    array(417, 'KG-B', 'Batken'),
+    array(417, 'KG-C', 'Chü'),
+    array(417, 'KG-J', 'Jalal-Abad'),
+    array(417, 'KG-N', 'Naryn'),
+    array(417, 'KG-O', 'Osh'),
+    array(417, 'KG-T', 'Talas'),
+    array(417, 'KG-Y', 'Ysyk-Köl'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(417,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/laos_418_1.cif b/uc_store/countries/laos_418_1.cif
new file mode 100644
index 0000000..8809fc5
--- /dev/null
+++ b/uc_store/countries/laos_418_1.cif
@@ -0,0 +1,42 @@
+<?php
+
+function laos_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query('INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ("418", "Lao People\'s Democratic Republic", "LA", "LAO", 1)');
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(418, 'LA-VT', 'Vientiane'),
+    array(418, 'LA-AT', 'Attapu [Attopeu]'),
+    array(418, 'LA-BK', 'Bokè'),
+    array(418, 'LA-BL', 'Bolikhamxai [Borikhane]'),
+    array(418, 'LA-CH', 'Champasak [Champassak]'),
+    array(418, 'LA-HO', 'Houaphan'),
+    array(418, 'LA-KH', 'Khammouan'),
+    array(418, 'LA-LM', 'Louang Namtha'),
+    array(418, 'LA-LP', 'Louangphabang [Louang Prabang]'),
+    array(418, 'LA-OU', 'Oudômxai [Oudomsai]'),
+    array(418, 'LA-PH', 'Phôngsali [Phong Saly]'),
+    array(418, 'LA-SL', 'Salavan [Saravane]'),
+    array(418, 'LA-SV', 'Savannakhé'),
+    array(418, 'LA-VI', 'Vientiane'),
+    array(418, 'LA-XA', 'Xaignabouli'),
+    array(418, 'LA-XE', 'Xekong'),
+    array(418, 'LA-XI', 'Xiangkhoang [Xieng Khouang]'),
+    array(418, 'LA-XN', 'Xaisômbou'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(418,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/lebanon_422_1.cif b/uc_store/countries/lebanon_422_1.cif
new file mode 100644
index 0000000..ae8d70a
--- /dev/null
+++ b/uc_store/countries/lebanon_422_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function lebanon_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('422', 'Lebanon', 'LB', 'LBN', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(422, 'LB-AK', 'Aakkâr'),
+    array(422, 'LB-BH', 'Baalbek-Hermel'),
+    array(422, 'LB-BI', 'Beqaa'),
+    array(422, 'LB-BA', 'Beyrouth'),
+    array(422, 'LB-AS', 'Liban-Nord'),
+    array(422, 'LB-JA', 'Liban-Sud'),
+    array(422, 'LB-JL', 'Mont-Liban'),
+    array(422, 'LB-NA', 'Nabatîyé'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(422,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/lesotho_426_1.cif b/uc_store/countries/lesotho_426_1.cif
new file mode 100644
index 0000000..0cfcd2e
--- /dev/null
+++ b/uc_store/countries/lesotho_426_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function lesotho_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('426', 'Lesotho', 'LS', 'LSO', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(426, 'LS-D', 'Berea'),
+    array(426, 'LS-B', 'Butha-Buthe'),
+    array(426, 'LS-C', 'Leribe'),
+    array(426, 'LS-E', 'Mafeteng'),
+    array(426, 'LS-A', 'Maseru'),
+    array(426, 'LS-F', "Mohale's Hoek"),
+    array(426, 'LS-J', 'Mokhotlong'),
+    array(426, 'LS-H', "Qacha's Nek"),
+    array(426, 'LS-G', 'Quthing'),
+    array(426, 'LS-K', 'Thaba-Tseka'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(426,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/liberia_430_1.cif b/uc_store/countries/liberia_430_1.cif
new file mode 100644
index 0000000..4f5db34
--- /dev/null
+++ b/uc_store/countries/liberia_430_1.cif
@@ -0,0 +1,40 @@
+<?php
+
+function liberia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('430', 'Liberia', 'LR', 'LBR', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(430, 'LR-BM', 'Bomi'),
+    array(430, 'LR-BG', 'Bong'),
+    array(430, 'LR-GP', 'Gbarpolu'),
+    array(430, 'LR-GB', 'Grand Bassa'),
+    array(430, 'LR-CM', 'Grand Cape Mount'),
+    array(430, 'LR-GG', 'Grand Gedeh'),
+    array(430, 'LR-GK', 'Grand Kru'),
+    array(430, 'LR-LO', 'Lofa'),
+    array(430, 'LR-MG', 'Margibi'),
+    array(430, 'LR-MY', 'Maryland'),
+    array(430, 'LR-MO', 'Montserrado'),
+    array(430, 'LR-NI', 'Nimba'),
+    array(430, 'LR-RI', 'Rivercess'),
+    array(430, 'LR-RG', 'RiverGee'),
+    array(430, 'LR-SI', 'Sinoe'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(430,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/libya_434_1.cif b/uc_store/countries/libya_434_1.cif
new file mode 100644
index 0000000..7c13a40
--- /dev/null
+++ b/uc_store/countries/libya_434_1.cif
@@ -0,0 +1,47 @@
+<?php
+
+function libya_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('434', 'Libyan Arab Jamahiriya', 'LY', 'LBY', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(434, 'LY-BU', 'Al Buţnān'),
+    array(434, 'LY-JA', 'Al Jabal al Akhḑar'),
+    array(434, 'LY-JG', 'Al Jabal al Gharbī'),
+    array(434, 'LY-JI', 'Al Jifārah'),
+    array(434, 'LY-JU', 'Al Jufrah'),
+    array(434, 'LY-KF', 'Al Kufrah'),
+    array(434, 'LY-MJ', 'Al Marj'),
+    array(434, 'LY-MB', 'Al Marqab'),
+    array(434, 'LY-WA', 'Al Wāḩāt'),
+    array(434, 'LY-NQ', 'An Nuqaţ al Khams'),
+    array(434, 'LY-ZA', 'Az Zāwiyah'),
+    array(434, 'LY-BA', 'Banghāzī'),
+    array(434, 'LY-DR', 'Darnah'),
+    array(434, 'LY-GT', 'Ghāt'),
+    array(434, 'LY-MI', 'Mişrātah'),
+    array(434, 'LY-MQ', 'Murzuq'),
+    array(434, 'LY-NL', 'Nālūt'),
+    array(434, 'LY-SB', 'Sabhā'),
+    array(434, 'LY-SR', 'Surt'),
+    array(434, 'LY-TB', 'Tarābulus'),
+    array(434, 'LY-WD', 'Wādī al Ḩayāt'),
+    array(434, 'LY-WS', 'Wādī ash Shāţiʾ'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(434,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/liechtenstein_438_1.cif b/uc_store/countries/liechtenstein_438_1.cif
new file mode 100644
index 0000000..b6cb2ec
--- /dev/null
+++ b/uc_store/countries/liechtenstein_438_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function liechtenstein_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('438', 'Liechtenstein', 'LI', 'LIE', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(438, 'LI-01', 'Balzers'),
+    array(438, 'LI-02', 'Eschen'),
+    array(438, 'LI-03', 'Gamprin'),
+    array(438, 'LI-04', 'Mauren'),
+    array(438, 'LI-05', 'Planken'),
+    array(438, 'LI-06', 'Ruggell'),
+    array(438, 'LI-07', 'Schaan'),
+    array(438, 'LI-08', 'Schellenberg'),
+    array(438, 'LI-09', 'Triesen'),
+    array(438, 'LI-10', 'Triesenberg'),
+    array(438, 'LI-11', 'Vaduz'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(438,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/madagascar_450_1.cif b/uc_store/countries/madagascar_450_1.cif
new file mode 100644
index 0000000..22d62cb
--- /dev/null
+++ b/uc_store/countries/madagascar_450_1.cif
@@ -0,0 +1,30 @@
+<?php
+
+function madagascar_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('450', 'Madagascar', 'MG', 'MDG', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(450, 'MG-T', 'Antananarivo'),
+    array(450, 'MG-D', 'Antsiranana'),
+    array(450, 'MG-F', 'Fianarantsoa'),
+    array(450, 'MG-M', 'Mahajanga'),
+    array(450, 'MG-A', 'Toamasina'),
+    array(450, 'MG-U', 'Toliara'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(450,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/malawi_454_1.cif b/uc_store/countries/malawi_454_1.cif
new file mode 100644
index 0000000..e39dae6
--- /dev/null
+++ b/uc_store/countries/malawi_454_1.cif
@@ -0,0 +1,52 @@
+<?php
+
+function malawi_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('454', 'Malawi', 'MW', 'MWI', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(454, 'MW-BA', 'Balaka'),
+    array(454, 'MW-BL', 'Blantyre'),
+    array(454, 'MW-CK', 'Chikwawa'),
+    array(454, 'MW-CR', 'Chiradzulu'),
+    array(454, 'MW-CT', 'Chitipa'),
+    array(454, 'MW-DE', 'Dedza'),
+    array(454, 'MW-DO', 'Dowa'),
+    array(454, 'MW-KR', 'Karonga'),
+    array(454, 'MW-KS', 'Kasungu'),
+    array(454, 'MW-LK', 'Likoma'),
+    array(454, 'MW-LI', 'Lilongwe'),
+    array(454, 'MW-MH', 'Machinga'),
+    array(454, 'MW-MG', 'Mangochi'),
+    array(454, 'MW-MC', 'Mchinji'),
+    array(454, 'MW-MU', 'Mulanje'),
+    array(454, 'MW-MW', 'Mwanza'),
+    array(454, 'MW-MZ', 'Mzimba'),
+    array(454, 'MW-NE', 'Neno'),
+    array(454, 'MW-NB', 'Nkhata Bay'),
+    array(454, 'MW-NK', 'Nkhotakota'),
+    array(454, 'MW-NS', 'Nsanje'),
+    array(454, 'MW-NU', 'Ntcheu'),
+    array(454, 'MW-NI', 'Ntchisi'),
+    array(454, 'MW-PH', 'Phalombe'),
+    array(454, 'MW-RU', 'Rumphi'),
+    array(454, 'MW-SA', 'Salima'),
+    array(454, 'MW-TH', 'Thyolo'),
+    array(454, 'MW-ZO', 'Zomba'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(454,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/maldives_462_1.cif b/uc_store/countries/maldives_462_1.cif
new file mode 100644
index 0000000..e81cf1a
--- /dev/null
+++ b/uc_store/countries/maldives_462_1.cif
@@ -0,0 +1,44 @@
+<?php
+
+function maldives_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('462', 'Maldives', 'MV', 'MDV', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(462, 'MV-MLE', 'Male'),
+    array(462, 'MV-02', 'Alif'),
+    array(462, 'MV-20', 'Baa'),
+    array(462, 'MV-17', 'Dhaalu'),
+    array(462, 'MV-14', 'Faafu'),
+    array(462, 'MV-27', 'Gaaf Alif'),
+    array(462, 'MV-28', 'Gaafu Dhaalu'),
+    array(462, 'MV-29', 'Gnaviyani'),
+    array(462, 'MV-07', 'Haa Alif'),
+    array(462, 'MV-23', 'Haa Dhaalu'),
+    array(462, 'MV-26', 'Kaafu'),
+    array(462, 'MV-05', 'Laamu'),
+    array(462, 'MV-03', 'Lhaviyani'),
+    array(462, 'MV-12', 'Meemu'),
+    array(462, 'MV-25', 'Noonu'),
+    array(462, 'MV-13', 'Raa'),
+    array(462, 'MV-01', 'Seenu'),
+    array(462, 'MV-24', 'Shaviyani'),
+    array(462, 'MV-08', 'Thaa'),
+    array(462, 'MV-04', 'Vaavu'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(462,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/mali_466_1.cif b/uc_store/countries/mali_466_1.cif
new file mode 100644
index 0000000..82293f6
--- /dev/null
+++ b/uc_store/countries/mali_466_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function mali_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('466', 'Mali', 'ML', 'MLI', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(466, 'ML-BKO', 'Bamako'),
+    array(466, 'ML-7', 'Gao'),
+    array(466, 'ML-1', 'Kayes'),
+    array(466, 'ML-8', 'Kidal'),
+    array(466, 'ML-2', 'Koulikoro'),
+    array(466, 'ML-5', 'Mopti'),
+    array(466, 'ML-4', 'Ségou'),
+    array(466, 'ML-3', 'Sikasso'),
+    array(466, 'ML-6', 'Tombouctou'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(466,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/marshall_islands_584_1.cif b/uc_store/countries/marshall_islands_584_1.cif
new file mode 100644
index 0000000..ac825f2
--- /dev/null
+++ b/uc_store/countries/marshall_islands_584_1.cif
@@ -0,0 +1,48 @@
+<?php
+
+function marshall_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('584', 'Marshall Islands', 'MH', 'MHL', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(584, 'MH-ALL', 'Ailinglaplap'),
+    array(584, 'MH-ALK', 'Ailuk'),
+    array(584, 'MH-ARN', 'Arno'),
+    array(584, 'MH-AUR', 'Aur'),
+    array(584, 'MH-EBO', 'Ebon'),
+    array(584, 'MH-ENI', 'Enewetak'),
+    array(584, 'MH-JAB', 'Jabat'),
+    array(584, 'MH-JAL', 'Jaluit'),
+    array(584, 'MH-KIL', 'Kili'),
+    array(584, 'MH-KWA', 'Kwajalein'),
+    array(584, 'MH-LAE', 'Lae'),
+    array(584, 'MH-LIB', 'Lib'),
+    array(584, 'MH-LIK', 'Likiep'),
+    array(584, 'MH-MAJ', 'Majuro'),
+    array(584, 'MH-MAL', 'Maloelap'),
+    array(584, 'MH-MEJ', 'Mejit'),
+    array(584, 'MH-MIL', 'Mili'),
+    array(584, 'MH-NMK', 'Namdrik'),
+    array(584, 'MH-NMU', 'Namu'),
+    array(584, 'MH-RON', 'Rongelap'),
+    array(584, 'MH-UJA', 'Ujae'),
+    array(584, 'MH-UTI', 'Utirik'),
+    array(584, 'MH-WTH', 'Wotho'),
+    array(584, 'MH-WTJ', 'Wotje'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(584,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/martinique_474_1.cif b/uc_store/countries/martinique_474_1.cif
new file mode 100644
index 0000000..7e4f6b5
--- /dev/null
+++ b/uc_store/countries/martinique_474_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function martinique_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('474', 'Martinique', 'MQ', 'MTQ', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(474,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/mauritania_478_1.cif b/uc_store/countries/mauritania_478_1.cif
new file mode 100644
index 0000000..91f3208
--- /dev/null
+++ b/uc_store/countries/mauritania_478_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function mauritania_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('478', 'Mauritania', 'MR', 'MRT', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(478, 'MR-NKC', 'Nouakchott'),
+    array(478, 'MR-07', 'Adrar'),
+    array(478, 'MR-03', 'Assaba'),
+    array(478, 'MR-05', 'Brakna'),
+    array(478, 'MR-08', 'Dakhlet Nouâdhibou'),
+    array(478, 'MR-04', 'Gorgol'),
+    array(478, 'MR-10', 'Guidimaka'),
+    array(478, 'MR-01', 'Hodh ech Chargui'),
+    array(478, 'MR-02', 'Hodh el Gharbi'),
+    array(478, 'MR-12', 'Inchiri'),
+    array(478, 'MR-09', 'Tagant'),
+    array(478, 'MR-11', 'Tiris Zemmour'),
+    array(478, 'MR-06', 'Trarza'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(478,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/mayotte_175_1.cif b/uc_store/countries/mayotte_175_1.cif
new file mode 100644
index 0000000..338d056
--- /dev/null
+++ b/uc_store/countries/mayotte_175_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function mayotte_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('175', 'Mayotte', 'YT', 'MYT', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(175,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/micronesia_583_1.cif b/uc_store/countries/micronesia_583_1.cif
new file mode 100644
index 0000000..7d96da1
--- /dev/null
+++ b/uc_store/countries/micronesia_583_1.cif
@@ -0,0 +1,28 @@
+<?php
+
+function micronesia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('583', 'Micronesia, Federated States of', 'FM', 'FSM', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(583, 'FM-TRK', 'Chuuk'),
+    array(583, 'FM-KSA', 'Kosrae'),
+    array(583, 'FM-PNI', 'Pohnpei'),
+    array(583, 'FM-YAP', 'Yap'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(583,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/mongolia_496_1.cif b/uc_store/countries/mongolia_496_1.cif
new file mode 100644
index 0000000..3f07a82
--- /dev/null
+++ b/uc_store/countries/mongolia_496_1.cif
@@ -0,0 +1,46 @@
+<?php
+
+function mongolia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('496', 'Mongolia', 'MN', 'MNG', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(496, 'MN-1', 'Ulaanbaatar'),
+    array(496, 'MN-073', 'Arhangay'),
+    array(496, 'MN-069', 'Bayanhongor'),
+    array(496, 'MN-071', 'Bayan-Ölgiy'),
+    array(496, 'MN-067', 'Bulgan'),
+    array(496, 'MN-037', 'Darhan uul'),
+    array(496, 'MN-061', 'Dornod'),
+    array(496, 'MN-063', 'Dornogovĭ'),
+    array(496, 'MN-059', 'Dundgovĭ'),
+    array(496, 'MN-057', 'Dzavhan'),
+    array(496, 'MN-065', 'Govĭ-Altay'),
+    array(496, 'MN-064', 'Govĭ-Sümber'),
+    array(496, 'MN-039', 'Hentiy'),
+    array(496, 'MN-043', 'Hovd'),
+    array(496, 'MN-041', 'Hövsgöl'),
+    array(496, 'MN-053', 'Ömnögovĭ'),
+    array(496, 'MN-035', 'Orhon'),
+    array(496, 'MN-055', 'Övörhangay'),
+    array(496, 'MN-049', 'Selenge'),
+    array(496, 'MN-051', 'Sühbaatar'),
+    array(496, 'MN-047', 'Töv'),
+    array(496, 'MN-046', 'Uvs'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(496,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/montserrat_500_1.cif b/uc_store/countries/montserrat_500_1.cif
new file mode 100644
index 0000000..630ebe4
--- /dev/null
+++ b/uc_store/countries/montserrat_500_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function montserrat_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('500', 'Montserrat', 'MS', 'MSR', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(500,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/namibia_516_1.cif b/uc_store/countries/namibia_516_1.cif
new file mode 100644
index 0000000..12fc4ea
--- /dev/null
+++ b/uc_store/countries/namibia_516_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function namibia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('516', 'Namibia', 'NA', 'NAM', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(516, 'NA-CA', 'Caprivi'),
+    array(516, 'NA-ER', 'Erongo'),
+    array(516, 'NA-HA', 'Hardap'),
+    array(516, 'NA-KA', 'Karas'),
+    array(516, 'NA-KH', 'Khomas'),
+    array(516, 'NA-KU', 'Kunene'),
+    array(516, 'NA-OW', 'Ohangwena'),
+    array(516, 'NA-OK', 'Okavango'),
+    array(516, 'NA-OH', 'Omaheke'),
+    array(516, 'NA-OS', 'Omusati'),
+    array(516, 'NA-ON', 'Oshana'),
+    array(516, 'NA-OT', 'Oshikoto'),
+    array(516, 'NA-OD', 'Otjozondjupa'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(516,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/nauru_520_1.cif b/uc_store/countries/nauru_520_1.cif
new file mode 100644
index 0000000..6c79d2c
--- /dev/null
+++ b/uc_store/countries/nauru_520_1.cif
@@ -0,0 +1,38 @@
+<?php
+
+function nauru_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('520', 'Nauru', 'NR', 'NRU', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(520, 'NR-01', 'Aiwo'),
+    array(520, 'NR-02', 'Anabar'),
+    array(520, 'NR-03', 'Anetan'),
+    array(520, 'NR-04', 'Anibare'),
+    array(520, 'NR-05', 'Baiti'),
+    array(520, 'NR-06', 'Boe'),
+    array(520, 'NR-07', 'Buada'),
+    array(520, 'NR-08', 'Denigomodu'),
+    array(520, 'NR-09', 'Ewa'),
+    array(520, 'NR-10', 'Ijuw'),
+    array(520, 'NR-11', 'Meneng'),
+    array(520, 'NR-12', 'Nibok'),
+    array(520, 'NR-13', 'Uaboe'),
+    array(520, 'NR-14', 'Yaren'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(520,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/niger_562_1.cif b/uc_store/countries/niger_562_1.cif
new file mode 100644
index 0000000..4c70380
--- /dev/null
+++ b/uc_store/countries/niger_562_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function niger_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('562', 'Niger', 'NE', 'NER', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(562, 'NE-8', 'Niamey'),
+    array(562, 'NE-1', 'Agadez'),
+    array(562, 'NE-2', 'Diffa'),
+    array(562, 'NE-3', 'Dosso'),
+    array(562, 'NE-4', 'Maradi'),
+    array(562, 'NE-5', 'Tahoua '),
+    array(562, 'NE-6', 'Tillabéri'),
+    array(562, 'NE-7', 'Zinder'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(562,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/niue_570_1.cif b/uc_store/countries/niue_570_1.cif
new file mode 100644
index 0000000..b832e62
--- /dev/null
+++ b/uc_store/countries/niue_570_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function niue_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('570', 'Niue', 'NU', 'NIU', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(570,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/norfolk_island_574_1.cif b/uc_store/countries/norfolk_island_574_1.cif
new file mode 100644
index 0000000..33f45d3
--- /dev/null
+++ b/uc_store/countries/norfolk_island_574_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function norfolk_island_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('574', 'Norfolk Island', 'NF', 'NFK', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(574,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/northern_mariana_islands_580_1.cif b/uc_store/countries/northern_mariana_islands_580_1.cif
new file mode 100644
index 0000000..e23c191
--- /dev/null
+++ b/uc_store/countries/northern_mariana_islands_580_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function northern_mariana_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('580', 'Northern Mariana Islands', 'MP', 'MNP', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(580,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/palau_585_1.cif b/uc_store/countries/palau_585_1.cif
new file mode 100644
index 0000000..1052cef
--- /dev/null
+++ b/uc_store/countries/palau_585_1.cif
@@ -0,0 +1,41 @@
+<?php
+
+function palau_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('585', 'Palau', 'PW', 'PLW', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(585, 'PW-002', 'Aimeliik'),
+    array(585, 'PW-004', 'Airai'),
+    array(585, 'PW-010', 'Angaur'),
+    array(585, 'PW-050', 'Hatobohei'),
+    array(585, 'PW-100', 'Kayangel'),
+    array(585, 'PW-150', 'Koror'),
+    array(585, 'PW-212', 'Melekeok'),
+    array(585, 'PW-214', 'Ngaraard'),
+    array(585, 'PW-218', 'Ngarchelong'),
+    array(585, 'PW-222', 'Ngardmau'),
+    array(585, 'PW-224', 'Ngatpang'),
+    array(585, 'PW-226', 'Ngchesar'),
+    array(585, 'PW-227', 'Ngeremlengui'),
+    array(585, 'PW-228', 'Ngiwal'),
+    array(585, 'PW-350', 'Peleliu'),
+    array(585, 'PW-370', 'Sonsorol'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(585,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+
+}
diff --git a/uc_store/countries/palestine_275_1.cif b/uc_store/countries/palestine_275_1.cif
new file mode 100644
index 0000000..9a8793d
--- /dev/null
+++ b/uc_store/countries/palestine_275_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function palestine_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('275', 'Palestinian Territory, Occupied', 'PS', 'PSE', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(275,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/paraguay_600_1.cif b/uc_store/countries/paraguay_600_1.cif
new file mode 100644
index 0000000..bba9f5c
--- /dev/null
+++ b/uc_store/countries/paraguay_600_1.cif
@@ -0,0 +1,42 @@
+<?php
+
+function paraguay_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('600', 'Paraguay', 'PY', 'PRY', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(600, 'PY-ASU', 'Asunción'),
+    array(600, 'PY-16', 'Alto Paraguay'),
+    array(600, 'PY-10', 'Alto Paraná'),
+    array(600, 'PY-13', 'Amambay'),
+    array(600, 'PY-19', 'Boquerón'),
+    array(600, 'PY-05', 'Caaguazú'),
+    array(600, 'PY-06', 'Caazapá'),
+    array(600, 'PY-14', 'Canindeyú'),
+    array(600, 'PY-11', 'Central'),
+    array(600, 'PY-01', 'Concepción'),
+    array(600, 'PY-03', 'Cordillera'),
+    array(600, 'PY-04', 'Guairá'),
+    array(600, 'PY-07', 'Itapúa'),
+    array(600, 'PY-08', 'Misiones'),
+    array(600, 'PY-12', 'Ñeembucú'),
+    array(600, 'PY-09', 'Paraguarí'),
+    array(600, 'PY-15', 'Presidente Hayes'),
+    array(600, 'PY-02', 'San Pedro'),
+  );
+
+ foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Use uc_set_address_format() with the country ID as the first argument and
+  // an address format string as the second.  Documentation on address formats
+  // is available at:
+  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
+  uc_set_address_format(600,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/pitcairn_612_1.cif b/uc_store/countries/pitcairn_612_1.cif
new file mode 100644
index 0000000..67e0a0d
--- /dev/null
+++ b/uc_store/countries/pitcairn_612_1.cif
@@ -0,0 +1,15 @@
+<?php
+
+function pitcairn_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+  VALUES ('612', 'Pitcairn', 'PN', 'PCN', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(612,
+    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
+   ."\r\n!city, !zone_code !postal_code\r\n!country_name_if");
+}
diff --git a/uc_store/countries/qatar_634_1.cif b/uc_store/countries/qatar_634_1.cif
new file mode 100644
index 0000000..a172f57
--- /dev/null
+++ b/uc_store/countries/qatar_634_1.cif
@@ -0,0 +1,39 @@
+<?php
+
+function qatar_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+     VALUES ('634', 'Qatar', 'QA', 'QAT', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(634, 'QA-DA', 'Ad Dawḩah'),
+    array(634, 'QA-GH', 'Al Ghuwayrīyah'),
+    array(634, 'QA-JU', 'Al Jumaylīyah'),
+    array(634, 'QA-KH', 'Al Khawr'),
+    array(634, 'QA-WA', 'Al Wakrah'),
+    array(634, 'QA-RA', 'Ar Rayyān'),
+    array(634, 'QA-JB', 'Jarīyān al Bāţnah'),
+    array(634, 'QA-MS', 'Madīnat ash Shamāl'),
+    array(634, 'QA-US', 'Umm Şalāl'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    634,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/reunion_638_1.cif b/uc_store/countries/reunion_638_1.cif
deleted file mode 100644
index 530f8ec..0000000
--- a/uc_store/countries/reunion_638_1.cif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * First implement hook_install() using the name of the country as the base of
- * the function name.
- */
-function reunion_install() {
-  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (638, 'Reunion', 'RE', 'REU', 1)");
-
-   uc_set_address_format(638,
-    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
-   ."\r\n!city !zone_code !postal_code\r\n!country_name_if");
-}
diff --git a/uc_store/countries/reunion_638_2.cif b/uc_store/countries/reunion_638_2.cif
new file mode 100644
index 0000000..1481f27
--- /dev/null
+++ b/uc_store/countries/reunion_638_2.cif
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Implements hook_install() using the name of the country as the base of
+ * the function name.
+ */
+function reunion_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (638, 'Réunion', 'RE', 'REU', 2)");
+
+  // No zones.
+
+  // Set address format.
+  uc_set_address_format(
+    638,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city !zone_code !postal_code\r\n".
+    "!country_name_if"
+  );
+}
+
+function reunion_update($version) {
+  switch ($version) {
+    case 2:
+      // Correct ISO-3166-1 country name
+      db_query("UPDATE {uc_countries} SET country_name = 'Réunion' WHERE country_id = 638");
+      break;
+  }
+}
diff --git a/uc_store/countries/rwanda_646_1.cif b/uc_store/countries/rwanda_646_1.cif
new file mode 100644
index 0000000..1e74bbb
--- /dev/null
+++ b/uc_store/countries/rwanda_646_1.cif
@@ -0,0 +1,33 @@
+<?php
+
+function rwanda_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('646', 'Rwanda', 'RW', 'RWA', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(646, 'RW-01', 'Ville de Kigali'),
+    array(646, 'RW-02', 'Est'),
+    array(646, 'RW-03', 'Nord'),
+    array(646, 'RW-04', 'Ouest'),
+    array(646, 'RW-05', 'Sud'),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    646,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_barthelemy_652_1.cif b/uc_store/countries/saint_barthelemy_652_1.cif
new file mode 100644
index 0000000..49b78a8
--- /dev/null
+++ b/uc_store/countries/saint_barthelemy_652_1.cif
@@ -0,0 +1,22 @@
+<?php
+
+function saint_barthelemy_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('652', 'Saint BarthElemy', 'BL', 'BLM', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    652,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_helena_654_1.cif b/uc_store/countries/saint_helena_654_1.cif
new file mode 100644
index 0000000..353126b
--- /dev/null
+++ b/uc_store/countries/saint_helena_654_1.cif
@@ -0,0 +1,23 @@
+<?php
+
+function saint_helena_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('654', 'Saint Helena, Ascension and Tristan da Cunha', 'SH', 'SHN', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    654,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_kitts_nevis_659_1.cif b/uc_store/countries/saint_kitts_nevis_659_1.cif
new file mode 100644
index 0000000..86e3fe0
--- /dev/null
+++ b/uc_store/countries/saint_kitts_nevis_659_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function saint_kitts_nevis_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('659', 'Saint Kitts and Nevis', 'KN', 'KNA', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(659, 'CCN', 'Christ Church Nichola Town'),
+    array(659, 'ASP', 'Saint Anne Sandy Point'),
+    array(659, 'GBA', 'Saint George Basseterre'),
+    array(659, 'GGI', 'Saint George Gingerland'),
+    array(659, 'JWI', 'Saint James Windward'),
+    array(659, 'JCA', 'Saint John Capisterre'),
+    array(659, 'JFI', 'Saint John Figtree'),
+    array(659, 'MCA', 'Saint Mary Cayon'),
+    array(659, 'PCA', 'Saint Paul Capisterre'),
+    array(659, 'PCH', 'Saint Paul Charlestown'),
+    array(659, 'PBS', 'Saint Peter Basseterre'),
+    array(659, 'TLO', 'Saint Thomas Lowland'),
+    array(659, 'TMI', 'Saint Thomas Middle Island'),
+    array(659, 'TPP', 'Trinity Palmetto Point'),
+  );
+
+foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    659,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_martin_663_1.cif b/uc_store/countries/saint_martin_663_1.cif
new file mode 100644
index 0000000..8d742c9
--- /dev/null
+++ b/uc_store/countries/saint_martin_663_1.cif
@@ -0,0 +1,23 @@
+<?php
+
+function saint_martin_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('663', 'Saint Martin (French part)', 'MF', 'MAF', 1)");
+
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    663,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_pierre_miquelon_666_1.cif b/uc_store/countries/saint_pierre_miquelon_666_1.cif
new file mode 100644
index 0000000..d51cb00
--- /dev/null
+++ b/uc_store/countries/saint_pierre_miquelon_666_1.cif
@@ -0,0 +1,24 @@
+<?php
+
+function saint_pierre_miquelon_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('666', 'Saint Pierre and Miquelon', 'PM', 'SPM', 1)");
+
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    666,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/saint_vincent_grenadines_670_1.cif b/uc_store/countries/saint_vincent_grenadines_670_1.cif
new file mode 100644
index 0000000..ecb84e3
--- /dev/null
+++ b/uc_store/countries/saint_vincent_grenadines_670_1.cif
@@ -0,0 +1,36 @@
+<?php
+
+function saint_vincent_grenadines_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('670', 'Saint Vincent and the Grenadines', 'VC', 'VCT', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(670, 'VC-01', 'Charlotte'),
+    array(670, 'VC-06', 'Grenadines'),
+    array(670, 'VC-02', 'Saint Andrew'),
+    array(670, 'VC-03', 'Saint David'),
+    array(670, 'VC-04', 'Saint George'),
+    array(670, 'VC-05', 'Saint Patrick'),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    670,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/samoa_882_1.cif b/uc_store/countries/samoa_882_1.cif
new file mode 100644
index 0000000..064f66c
--- /dev/null
+++ b/uc_store/countries/samoa_882_1.cif
@@ -0,0 +1,41 @@
+<?php
+
+function samoa_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('882', 'Samoa', 'WS', 'WSM', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(882, 'WS-AA', "A'ana"),
+    array(882, 'WS-AL', 'Aiga-i-le-Tai'),
+    array(882, 'WS-AT', 'Atua'),
+    array(882, 'WS-FA', "Fa'asaleleaga"),
+    array(882, 'WS-GE', "Gaga'emauga"),
+    array(882, 'WS-GI', 'Gagaifomauga'),
+    array(882, 'WS-PA', 'Palauli'),
+    array(882, 'WS-SA', "Satupa'itea"),
+    array(882, 'WS-TU', 'Tuamasaga'),
+    array(882, 'WS-VF', "Va'a-o-Fonoti"),
+    array(882, 'WS-VS', 'Vaisigano'),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    882,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/san_marino_674_1.cif b/uc_store/countries/san_marino_674_1.cif
new file mode 100644
index 0000000..47b29a3
--- /dev/null
+++ b/uc_store/countries/san_marino_674_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function san_marino_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('674', 'San Marino', 'SM', 'SMR', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(674, 'SM-01', 'Acquaviva'),
+    array(674, 'SM-06', 'Borgo Maggiore'),
+    array(674, 'SM-02', 'Chiesanuova'),
+    array(674, 'SM-03', 'Domagnano'),
+    array(674, 'SM-04', 'Faetano'),
+    array(674, 'SM-05', 'Fiorentino'),
+    array(674, 'SM-08', 'Montegiardino'),
+    array(674, 'SM-07', 'San Marino'),
+    array(674, 'SM-09', 'Serravalle'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    674,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/sao_tome_principe_678_1.cif b/uc_store/countries/sao_tome_principe_678_1.cif
new file mode 100644
index 0000000..6fcb332
--- /dev/null
+++ b/uc_store/countries/sao_tome_principe_678_1.cif
@@ -0,0 +1,30 @@
+<?php
+
+function sao_tome_principe_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('678', 'Sao Tome and Principe', 'ST', 'STP', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(678, 'ST-P', 'Príncipe'),
+    array(678, 'ST-S', 'São Tomé'),
+  );
+
+ foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    678,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/sierra_leone_694_1.cif b/uc_store/countries/sierra_leone_694_1.cif
new file mode 100644
index 0000000..338987c
--- /dev/null
+++ b/uc_store/countries/sierra_leone_694_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function sierra_leone_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('694', 'Sierra Leone', 'SL', 'SLE', 1)");
+
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(694, 'SL-W', 'Western Area (Freetown)'),
+    array(694, 'SL-E', 'Eastern'),
+    array(694, 'SL-N', 'Northern'),
+    array(694, 'SL-S', 'Southern'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    694,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/sint_maarten_534_1.cif b/uc_store/countries/sint_maarten_534_1.cif
new file mode 100644
index 0000000..4249469
--- /dev/null
+++ b/uc_store/countries/sint_maarten_534_1.cif
@@ -0,0 +1,64 @@
+<?php
+
+function sint_maarten_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('534', 'Sint Maarten', 'SX', 'SXM', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(534, 'AD', 'Almond Grove'),
+    array(534, 'BH', 'Beacon Hill'),
+    array(534, 'BV', 'Belvedere'),
+    array(534, 'CB', 'Cole Bay'),
+    array(534, 'CC', 'Cupecoy'),
+    array(534, 'CH', 'Cay Hill'),
+    array(534, 'DB', 'Dawn Beach'),
+    array(534, 'DC', 'Dutch Cul De Sac'),
+    array(534, 'DF', 'Defiance'),
+    array(534, 'DQ', 'Dutch Quarter'),
+    array(534, 'EZ', 'Ebenezer'),
+    array(534, 'FP', 'Fresh Pond'),
+    array(534, 'GB', 'Guana Bay'),
+    array(534, 'GR', 'Great Bay'),
+    array(534, 'HE', 'Hope Estate'),
+    array(534, 'KB', 'Cay Bay'),
+    array(534, 'LB', 'Little Bay'),
+    array(534, 'LL', 'Low Lands'),
+    array(534, 'LP', 'Lower Prince Quarter'),
+    array(534, 'MA', 'Marian Estate'),
+    array(534, 'MB', 'Mullet Bay'),
+    array(534, 'MD', 'Madam Estate'),
+    array(534, 'MH', 'Maho'),
+    array(534, 'ML', 'Middle Land'),
+    array(534, 'OP', 'Oyster Pond'),
+    array(534, 'PB', 'Point Blanche'),
+    array(534, 'PH', 'Philispburg'),
+    array(534, 'SB', 'Simpson Bay'),
+    array(534, 'SD', 'Saunders'),
+    array(534, 'SG', 'Sucker Garden'),
+    array(534, 'SP', 'St Peters'),
+    array(534, 'SR', 'South Reward'),
+    array(534, 'UP', 'Upper Prince Quarter'),
+    array(534, 'VY', 'Vineyard'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    534,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/solomon_islands_90_1.cif b/uc_store/countries/solomon_islands_90_1.cif
new file mode 100644
index 0000000..31d87af
--- /dev/null
+++ b/uc_store/countries/solomon_islands_90_1.cif
@@ -0,0 +1,41 @@
+<?php
+
+function solomon_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('90', 'Solomon Islands', 'SB', 'SLB', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(90, 'SB-CT', 'Capital Territory (Honiara)'),
+    array(90, 'SB-CE', 'Central'),
+    array(90, 'SB-CH', 'Choiseul'),
+    array(90, 'SB-GU', 'Guadalcanal'),
+    array(90, 'SB-IS', 'Isabel'),
+    array(90, 'SB-MK', 'Makira'),
+    array(90, 'SB-ML', 'Malaita'),
+    array(90, 'SB-RB', 'Rennell and Bellona'),
+    array(90, 'SB-TE', 'Temotu'),
+    array(90, 'SB-WE', 'Western'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    90,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/somalia_706_1.cif b/uc_store/countries/somalia_706_1.cif
new file mode 100644
index 0000000..2158523
--- /dev/null
+++ b/uc_store/countries/somalia_706_1.cif
@@ -0,0 +1,47 @@
+<?php
+
+function somalia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('706', 'Somalia', 'SO', 'SOM', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(706, 'SO-AW', 'Awdal'),
+    array(706, 'SO-BK', 'Bakool'),
+    array(706, 'SO-BN', 'Banaadir'),
+    array(706, 'SO-BR', 'Bari'),
+    array(706, 'SO-BY', 'Bay'),
+    array(706, 'SO-GA', 'Galguduud'),
+    array(706, 'SO-GE', 'Gedo'),
+    array(706, 'SO-HI', 'Hiiraan'),
+    array(706, 'SO-JD', 'Jubbada Dhexe'),
+    array(706, 'SO-JH', 'Jubbada Hoose'),
+    array(706, 'SO-MU', 'Mudug'),
+    array(706, 'SO-NU', 'Nugaal'),
+    array(706, 'SO-SA', 'Sanaag'),
+    array(706, 'SO-SD', 'Shabeellaha Dhexe'),
+    array(706, 'SO-SH', 'Shabeellaha Hoose'),
+    array(706, 'SO-SO', 'Sool'),
+    array(706, 'SO-TO', 'Togdheer'),
+    array(706, 'SO-WO', 'Woqooyi Galbeed'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    706,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif b/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif
new file mode 100644
index 0000000..3d3be56
--- /dev/null
+++ b/uc_store/countries/south_georgia_south_sandwich_islands_239_1.cif
@@ -0,0 +1,23 @@
+<?php
+
+function south_georgia_south_sandwich_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('239', 'South Georgia and the South Sandwich Islands', 'GS', 'SGS', 1)");
+
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    239,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/sudan_736_1.cif b/uc_store/countries/sudan_736_1.cif
new file mode 100644
index 0000000..78d9b03
--- /dev/null
+++ b/uc_store/countries/sudan_736_1.cif
@@ -0,0 +1,56 @@
+<?php
+
+function sudan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('736', 'Sudan', 'SD', 'SDN', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(736, 'SD-23', "Ā'ٰālī an Nīl"),
+    array(736, 'SD-26', 'Al Baḩr al Aḩmar'),
+    array(736, 'SD-18', 'Al Buḩayrāt'),
+    array(736, 'SD-07', 'Al Jazīrah'),
+    array(736, 'SD-03', 'Al Kharţūm'),
+    array(736, 'SD-06', 'Al Qaḑārif'),
+    array(736, 'SD-22', 'Al Waḩdah'),
+    array(736, 'SD-04', 'An Nīl'),
+    array(736, 'SD-08', 'An Nīl al Abyaḑ'),
+    array(736, 'SD-24', 'An Nīl al Azraq'),
+    array(736, 'SD-01', 'Ash Shamālīyah'),
+    array(736, 'SD-17', 'Baḩr al Jabal'),
+    array(736, 'SD-16', "Gharb al Istiwā'īyah"),
+    array(736, 'SD-14', 'Gharb Baḩr al Ghazāl'),
+    array(736, 'SD-12', 'Gharb Dārfūr'),
+    array(736, 'SD-11', 'Janūb Dārfūr'),
+    array(736, 'SD-13', 'Janūb Kurdufān'),
+    array(736, 'SD-20', 'Jūnqalī'),
+    array(736, 'SD-05', 'Kassalā'),
+    array(736, 'SD-15', 'Shamāl Baḩr al Ghazāl'),
+    array(736, 'SD-02', 'Shamāl Dārfūr'),
+    array(736, 'SD-09', 'Shamāl Kurdufān'),
+    array(736, 'SD-19', "Sharq al Istiwā'īyah"),
+    array(736, 'SD-25', 'Sinnār'),
+    array(736, 'SD-21', 'Wārāb'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    736,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/svalbard_jan_mayen_744_1.cif b/uc_store/countries/svalbard_jan_mayen_744_1.cif
new file mode 100644
index 0000000..585ace1
--- /dev/null
+++ b/uc_store/countries/svalbard_jan_mayen_744_1.cif
@@ -0,0 +1,23 @@
+<?php
+
+function svalbard_jan_mayen_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('744', 'Svalbard and Jan Mayen', 'SJ', 'SJM', 1)");
+
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    744,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/swaziland_748_1.cif b/uc_store/countries/swaziland_748_1.cif
new file mode 100644
index 0000000..df68d10
--- /dev/null
+++ b/uc_store/countries/swaziland_748_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function swaziland_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('748', 'Swaziland', 'SZ', 'SWZ', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(748, 'SZ-HH', 'Hhohho'),
+    array(748, 'SZ-LU', 'Lubombo'),
+    array(748, 'SZ-MA', 'Manzini'),
+    array(748, 'SZ-SH', 'Shiselweni'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    748,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/syria_760_1.cif b/uc_store/countries/syria_760_1.cif
new file mode 100644
index 0000000..edcdc6e
--- /dev/null
+++ b/uc_store/countries/syria_760_1.cif
@@ -0,0 +1,44 @@
+<?php
+
+function syria_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('760', 'Syrian Arab Republic', 'SY', 'SYR', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(760, 'SY-HA', 'Al Hasakah'),
+    array(760, 'SY-LA', 'Al Lādhiqīyah'),
+    array(760, 'SY-QU', 'Al Qunayţirah'),
+    array(760, 'SY-RA', 'Ar Raqqah'),
+    array(760, 'SY-SU', "As Suwaydā'"),
+    array(760, 'SY-DR', 'Darٰā'),
+    array(760, 'SY-DY', 'Dayr az Zawr'),
+    array(760, 'SY-DI', 'Dimashq'),
+    array(760, 'SY-HL', 'Halab'),
+    array(760, 'SY-HM', 'Hamāh'),
+    array(760, 'SY-HI', 'Himş'),
+    array(760, 'SY-ID', 'Idlib'),
+    array(760, 'SY-RD', 'Rīf Dimashq'),
+    array(760, 'SY-TA', 'Ţarţūs'),
+  );
+
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    760,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/tajikistan_762_1.cif b/uc_store/countries/tajikistan_762_1.cif
new file mode 100644
index 0000000..550d5ca
--- /dev/null
+++ b/uc_store/countries/tajikistan_762_1.cif
@@ -0,0 +1,32 @@
+<?php
+
+function tajikistan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('762', 'Tajikistan', 'TJ', 'TJK', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(762, 'TJ-GB', 'Gorno-Badakhshan'),
+    array(762, 'TJ-KT', 'Khatlon'),
+    array(762, 'TJ-SU', 'Sughd'),
+  );
+
+ foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    762,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/timor_leste_626_1.cif b/uc_store/countries/timor_leste_626_1.cif
new file mode 100644
index 0000000..3b68af5
--- /dev/null
+++ b/uc_store/countries/timor_leste_626_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function timor_leste_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('626', 'Timor-Leste', 'TL', 'TLS', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(626, 'TL-AL', 'Aileu'),
+    array(626, 'TL-AN', 'Ainaro'),
+    array(626, 'TL-BA', 'Baucau'),
+    array(626, 'TL-BO', 'Bobonaro'),
+    array(626, 'TL-CO', 'Cova Lima'),
+    array(626, 'TL-DI', 'Dili'),
+    array(626, 'TL-ER', 'Ermera'),
+    array(626, 'TL-LA', 'Lautem'),
+    array(626, 'TL-LI', 'Liquiça'),
+    array(626, 'TL-MT', 'Manatuto'),
+    array(626, 'TL-MF', 'Manufahi'),
+    array(626, 'TL-OE', 'Oecussi'),
+    array(626, 'TL-VI', 'Viqueque'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    626,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/togo_768_1.cif b/uc_store/countries/togo_768_1.cif
new file mode 100644
index 0000000..f979a9d
--- /dev/null
+++ b/uc_store/countries/togo_768_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function togo_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('768', 'Togo', 'TG', 'TGO', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(768, 'TG-C', 'Centre'),
+    array(768, 'TG-K', 'Kara'),
+    array(768, 'TG-M', 'Maritime (Région)'),
+    array(768, 'TG-P', 'Plateaux'),
+    array(768, 'TG-S', 'Savannes'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    768,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/tokelau_772_1.cif b/uc_store/countries/tokelau_772_1.cif
new file mode 100644
index 0000000..e213fc4
--- /dev/null
+++ b/uc_store/countries/tokelau_772_1.cif
@@ -0,0 +1,22 @@
+<?php
+
+function tokelau_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Versio
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('772', 'Tokelau', 'TK', 'TKL', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    772,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/tonga_776_1.cif b/uc_store/countries/tonga_776_1.cif
new file mode 100644
index 0000000..fc73145
--- /dev/null
+++ b/uc_store/countries/tonga_776_1.cif
@@ -0,0 +1,34 @@
+<?php
+
+function tonga_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('776', 'Tonga', 'TO', 'TON', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(776, 'TO-01', "'Eua"),
+    array(776, 'TO-02', "Ha'apai"),
+    array(776, 'TO-03', 'Niuas'),
+    array(776, 'TO-04', 'Tongatapu'),
+    array(776, 'TO-05', "Vava'u"),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    776,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/trinidad_tobago_780_1.cif b/uc_store/countries/trinidad_tobago_780_1.cif
new file mode 100644
index 0000000..6c44827
--- /dev/null
+++ b/uc_store/countries/trinidad_tobago_780_1.cif
@@ -0,0 +1,44 @@
+<?php
+
+function trinidad_tobago_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (780, 'Trinidad and Tobago', 'TT', 'TTO', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(780, 'TT-CTT', 'Couva-Tabaquite-Talparo'),
+    array(780, 'TT-DMN', 'Diego Martin'),
+    array(780, 'TT-ETO', 'Eastern Tobago'),
+    array(780, 'TT-PED', 'Penal-Debe'),
+    array(780, 'TT-PRT', 'Princes Town'),
+    array(780, 'TT-RCM', 'Rio Claro-Mayaro'),
+    array(780, 'TT-SGE', 'Sangre Grande'),
+    array(780, 'TT-SJL', 'San Juan-Laventille'),
+    array(780, 'TT-SIP', 'Siparia'),
+    array(780, 'TT-TUP', 'Tunapuna-Piarco'),
+    array(780, 'TT-WTO', 'Western Tobago'),
+    array(780, 'TT-ARI', 'Arima'),
+    array(780, 'TT-CHA', 'Chaguanas'),
+    array(780, 'TT-PTF', 'Point Fortin'),
+    array(780, 'TT-POS', 'Port of Spain'),
+    array(780, 'TT-SFO', 'San Fernando'),
+  );
+
+   foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    780,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/turkmenistan_795_1.cif b/uc_store/countries/turkmenistan_795_1.cif
new file mode 100644
index 0000000..45b03ea
--- /dev/null
+++ b/uc_store/countries/turkmenistan_795_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function turkmenistan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('795', 'Turkmenistan', 'TM', 'TKM', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(795, 'TM-A', 'Ahal'),
+    array(795, 'TM-B', 'Balkan'),
+    array(795, 'TM-D', 'Daşoguz'),
+    array(795, 'TM-L', 'Lebap'),
+    array(795, 'TM-M', 'Mary'),
+    array(795, 'TM-S', 'Aşgabat'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    795,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/turks_caicos_islands_796_1.cif b/uc_store/countries/turks_caicos_islands_796_1.cif
new file mode 100644
index 0000000..e6ddcf9
--- /dev/null
+++ b/uc_store/countries/turks_caicos_islands_796_1.cif
@@ -0,0 +1,23 @@
+<?php
+
+function turks_caicos_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('796', 'Turks and Caicos Islands', 'TC', 'TCA', 1)");
+
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    796,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/tuvalu_798_1.cif b/uc_store/countries/tuvalu_798_1.cif
new file mode 100644
index 0000000..40fc9fc
--- /dev/null
+++ b/uc_store/countries/tuvalu_798_1.cif
@@ -0,0 +1,36 @@
+<?php
+
+function tuvalu_install() {
+  // Make the entry in the country table.
+   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('798', 'Tuvalu', 'TV', 'TUV', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(798, 'TV-FUN', 'Funafuti'),
+    array(798, 'TV-NMG', 'Nanumanga'),
+    array(798, 'TV-NMA', 'Nanumea'),
+    array(798, 'TV-NIT', 'Niutao'),
+    array(798, 'TV-NUI', 'Nui'),
+    array(798, 'TV-NKF', 'Nukufetau'),
+    array(798, 'TV-NKL', 'Nukulaelae'),
+    array(798, 'TV-VAI', 'Vaitupu'),
+  );
+
+ foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    798,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/uganda_800_1.cif b/uc_store/countries/uganda_800_1.cif
new file mode 100644
index 0000000..f1aca12
--- /dev/null
+++ b/uc_store/countries/uganda_800_1.cif
@@ -0,0 +1,108 @@
+<?php
+
+function uganda_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('800', 'Uganda', 'UG', 'UGA', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(800, 'UG-317', 'Abim'),
+    array(800, 'UG-301', 'Adjumani'),
+    array(800, 'UG-314', 'Amolatar'),
+    array(800, 'UG-216', 'Amuria'),
+    array(800, 'UG-319', 'Amuru'),
+    array(800, 'UG-302', 'Apac'),
+    array(800, 'UG-303', 'Arua'),
+    array(800, 'UG-217', 'Budaka'),
+    array(800, 'UG-223', 'Bududa'),
+    array(800, 'UG-201', 'Bugiri'),
+    array(800, 'UG-224', 'Bukedea'),
+    array(800, 'UG-218', 'Bukwa'),
+    array(800, 'UG-419', 'Buliisa'),
+    array(800, 'UG-401', 'Bundibugyo'),
+    array(800, 'UG-402', 'Bushenyi'),
+    array(800, 'UG-202', 'Busia'),
+    array(800, 'UG-219', 'Butaleja'),
+    array(800, 'UG-318', 'Dokolo'),
+    array(800, 'UG-304', 'Gulu'),
+    array(800, 'UG-403', 'Hoima'),
+    array(800, 'UG-416', 'Ibanda'),
+    array(800, 'UG-203', 'Iganga'),
+    array(800, 'UG-417', 'Isingiro'),
+    array(800, 'UG-204', 'Jinja'),
+    array(800, 'UG-315', 'Kaabong'),
+    array(800, 'UG-404', 'Kabale'),
+    array(800, 'UG-405', 'Kabarole'),
+    array(800, 'UG-213', 'Kaberamaido'),
+    array(800, 'UG-101', 'Kalangala'),
+    array(800, 'UG-220', 'Kaliro'),
+    array(800, 'UG-102', 'Kampala'),
+    array(800, 'UG-205', 'Kamuli'),
+    array(800, 'UG-413', 'Kamwenge'),
+    array(800, 'UG-414', 'Kanungu'),
+    array(800, 'UG-206', 'Kapchorwa'),
+    array(800, 'UG-406', 'Kasese'),
+    array(800, 'UG-207', 'Katakwi'),
+    array(800, 'UG-112', 'Kayunga'),
+    array(800, 'UG-407', 'Kibaale'),
+    array(800, 'UG-103', 'Kiboga'),
+    array(800, 'UG-418', 'Kiruhura'),
+    array(800, 'UG-408', 'Kisoro'),
+    array(800, 'UG-305', 'Kitgum'),
+    array(800, 'UG-316', 'Koboko'),
+    array(800, 'UG-306', 'Kotido'),
+    array(800, 'UG-208', 'Kumi'),
+    array(800, 'UG-415', 'Kyenjojo'),
+    array(800, 'UG-307', 'Lira'),
+    array(800, 'UG-104', 'Luwero'),
+    array(800, 'UG-116', 'Lyantonde'),
+    array(800, 'UG-221', 'Manafwa'),
+    array(800, 'UG-320', 'Maracha'),
+    array(800, 'UG-105', 'Masaka'),
+    array(800, 'UG-409', 'Masindi'),
+    array(800, 'UG-214', 'Mayuge'),
+    array(800, 'UG-209', 'Mbale'),
+    array(800, 'UG-410', 'Mbarara'),
+    array(800, 'UG-114', 'Mityana'),
+    array(800, 'UG-308', 'Moroto'),
+    array(800, 'UG-309', 'Moyo'),
+    array(800, 'UG-106', 'Mpigi'),
+    array(800, 'UG-107', 'Mubende'),
+    array(800, 'UG-108', 'Mukono'),
+    array(800, 'UG-311', 'Nakapiripirit'),
+    array(800, 'UG-115', 'Nakaseke'),
+    array(800, 'UG-109', 'Nakasongola'),
+    array(800, 'UG-222', 'Namutumba'),
+    array(800, 'UG-310', 'Nebbi'),
+    array(800, 'UG-411', 'Ntungamo'),
+    array(800, 'UG-321', 'Oyam'),
+    array(800, 'UG-312', 'Pader'),
+    array(800, 'UG-210', 'Pallisa'),
+    array(800, 'UG-110', 'Rakai'),
+    array(800, 'UG-412', 'Rukungiri'),
+    array(800, 'UG-111', 'Sembabule'),
+    array(800, 'UG-215', 'Sironko'),
+    array(800, 'UG-211', 'Soroti'),
+    array(800, 'UG-212', 'Tororo'),
+    array(800, 'UG-113', 'Wakiso'),
+    array(800, 'UG-313', 'Yumbe'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    800,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/united_states_minor_outlying_islands_581_1.cif b/uc_store/countries/united_states_minor_outlying_islands_581_1.cif
new file mode 100644
index 0000000..ddbf8bc
--- /dev/null
+++ b/uc_store/countries/united_states_minor_outlying_islands_581_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function united_states_minor_outlying_islands_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('581', 'United States Minor Outlying Islands', 'UM', 'UMI', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(581, 'UM-81', 'Baker Island'),
+    array(581, 'UM-84', 'Howland Island'),
+    array(581, 'UM-86', 'Jarvis Island'),
+    array(581, 'UM-67', 'Johnston Atoll'),
+    array(581, 'UM-89', 'Kingman Reef'),
+    array(581, 'UM-71', 'Midway Islands'),
+    array(581, 'UM-76', 'Navassa Island'),
+    array(581, 'UM-95', 'Palmyra Atoll'),
+    array(581, 'UM-79', 'Wake Island'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    581,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/uzbekistan_860_1.cif b/uc_store/countries/uzbekistan_860_1.cif
new file mode 100644
index 0000000..4f38e52
--- /dev/null
+++ b/uc_store/countries/uzbekistan_860_1.cif
@@ -0,0 +1,43 @@
+<?php
+
+function uzbekistan_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('860', 'Uzbekistan', 'UZ', 'UZB', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(860, 'UZ-TK', 'Toshkent'),
+    array(860, 'UZ-AN', 'Andijon'),
+    array(860, 'UZ-BU', 'Buxoro'),
+    array(860, 'UZ-FA', 'Farg‘ona'),
+    array(860, 'UZ-JI', 'Jizzax'),
+    array(860, 'UZ-NG', 'Namangan'),
+    array(860, 'UZ-NW', 'Navoiy'),
+    array(860, 'UZ-QA', 'Qashqadaryo'),
+    array(860, 'UZ-SA', 'Samarqand'),
+    array(860, 'UZ-SI', 'Sirdaryo'),
+    array(860, 'UZ-SU', 'Surxondaryo'),
+    array(860, 'UZ-TO', 'Toshkent'),
+    array(860, 'UZ-XO', 'Xorazm'),
+    array(860, 'UZ-QR', 'Qoraqalpog‘iston Respublikasi'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    860,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/vanuatu_548_1.cif b/uc_store/countries/vanuatu_548_1.cif
new file mode 100644
index 0000000..81497f1
--- /dev/null
+++ b/uc_store/countries/vanuatu_548_1.cif
@@ -0,0 +1,35 @@
+<?php
+
+function vanuatu_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('548', 'Vanuatu', 'VU', 'VUT', 1)");
+
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(548, 'VU-MAP', 'Malampa'),
+    array(548, 'VU-PAM', 'Pénama'),
+    array(548, 'VU-SAM', 'Sanma'),
+    array(548, 'VU-SEE', 'Shéfa'),
+    array(548, 'VU-TAE', 'Taféa'),
+    array(548, 'VU-TOB', 'Torba'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    548,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/venezuela_862_1.cif b/uc_store/countries/venezuela_862_1.cif
deleted file mode 100644
index c7a3026..0000000
--- a/uc_store/countries/venezuela_862_1.cif
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * First implement hook_install() using the name of the country as the base of
- * the function name.
- */
-function venezuela_install() {
-  // Make the entry in the country table.
-  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
-  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES (862, 'Venezuela', 'VE', 'VEN', 1)");
-
-  // Make the entries in the zones table.
-  $zones = array(
-    array(862, 'AM', 'Amazonas'),
-    array(862, 'AN', 'Anzoátegui'),
-    array(862, 'AP', 'Apure'),
-    array(862, 'AR', 'Aragua'),
-    array(862, 'BA', 'Barinas'),
-    array(862, 'BO', 'Bolívar'),
-    array(862, 'CA', 'Carabobo'),
-    array(862, 'CO', 'Cojedes'),
-    array(862, 'DA', 'Delta Amacuro'),
-    array(862, 'DF', 'Dependencias Federales'),
-    array(862, 'DC', 'Distrito Capital'),
-    array(862, 'FA', 'Falcón'),
-    array(862, 'GU', 'Guárico'),
-    array(862, 'LA', 'Lara'),
-    array(862, 'ME', 'Mérida'),
-    array(862, 'MI', 'Miranda'),
-    array(862, 'MO', 'Monagas'),
-    array(862, 'NE', 'Nueva Esparta'),
-    array(862, 'PO', 'Portuguesa'),
-    array(862, 'SU', 'Sucre'),
-    array(862, 'TA', 'Táchira'),
-    array(862, 'TR', 'Trujillo'),
-    array(862, 'VA', 'Vargas'),
-    array(862, 'YA', 'Yaracuy'),
-    array(862, 'ZU', 'Zulia'),
-  );
-
-  foreach ($zones as $zone) {
-    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
-  }
-
-  // Use uc_set_address_format() with the country ID as the first argument and
-  // an address format string as the second.  Documentation on address formats
-  // is available at:
-  // http://www.ubercart.org/ubercart_users_guide/country_settings#address_format_docs
-  uc_set_address_format(862,
-    "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
-   ."\r\n!city !zone_code !postal_code\r\n!country_name_if");
-}
diff --git a/uc_store/countries/venezuela_862_2.cif b/uc_store/countries/venezuela_862_2.cif
new file mode 100644
index 0000000..b1aee3b
--- /dev/null
+++ b/uc_store/countries/venezuela_862_2.cif
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Implements hook_install() using the name of the country as the base of
+ * the function name.
+ */
+function venezuela_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+  db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version) VALUES ('862', 'Venezuela, Bolivarian Republic of', 'VE', 'VEN', 2)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(862, 'AM', 'Amazonas'),
+    array(862, 'AN', 'Anzoátegui'),
+    array(862, 'AP', 'Apure'),
+    array(862, 'AR', 'Aragua'),
+    array(862, 'BA', 'Barinas'),
+    array(862, 'BO', 'Bolívar'),
+    array(862, 'CA', 'Carabobo'),
+    array(862, 'CO', 'Cojedes'),
+    array(862, 'DA', 'Delta Amacuro'),
+    array(862, 'DF', 'Dependencias Federales'),
+    array(862, 'DC', 'Distrito Capital'),
+    array(862, 'FA', 'Falcón'),
+    array(862, 'GU', 'Guárico'),
+    array(862, 'LA', 'Lara'),
+    array(862, 'ME', 'Mérida'),
+    array(862, 'MI', 'Miranda'),
+    array(862, 'MO', 'Monagas'),
+    array(862, 'NE', 'Nueva Esparta'),
+    array(862, 'PO', 'Portuguesa'),
+    array(862, 'SU', 'Sucre'),
+    array(862, 'TA', 'Táchira'),
+    array(862, 'TR', 'Trujillo'),
+    array(862, 'VA', 'Vargas'),
+    array(862, 'YA', 'Yaracuy'),
+    array(862, 'ZU', 'Zulia'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    862,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city !zone_code !postal_code\r\n".
+    "!country_name_if"
+  );
+}
+
+function venezuela_update($version) {
+  switch ($version) {
+    case 2:
+      // Correct ISO-3166-1 country name
+      db_query("UPDATE {uc_countries} SET country_name = 'Venezuela, Bolivarian Republic of' WHERE country_id = 862");
+      break;
+  }
+}
diff --git a/uc_store/countries/wallis_futuna_876_1.cif b/uc_store/countries/wallis_futuna_876_1.cif
new file mode 100644
index 0000000..3d8428b
--- /dev/null
+++ b/uc_store/countries/wallis_futuna_876_1.cif
@@ -0,0 +1,22 @@
+<?php
+
+function wallis_futuna_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('876', 'Wallis and Futuna', 'WF', 'WLF', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    876,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/western_sahara_732_1.cif b/uc_store/countries/western_sahara_732_1.cif
new file mode 100644
index 0000000..a74744d
--- /dev/null
+++ b/uc_store/countries/western_sahara_732_1.cif
@@ -0,0 +1,22 @@
+<?php
+
+function western_sahara_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('732', 'Western Sahara', 'EH', 'ESH', 1)");
+
+  // No zones
+
+  // Set address format
+  uc_set_address_format(
+    732,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/yemen_887_1.cif b/uc_store/countries/yemen_887_1.cif
new file mode 100644
index 0000000..29e0cd8
--- /dev/null
+++ b/uc_store/countries/yemen_887_1.cif
@@ -0,0 +1,49 @@
+<?php
+
+function yemen_install() {
+  // Make the entry in the country table.
+
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('887', 'Yemen', 'YE', 'YEM', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(887, 'YE-SA', "Şan‘ā' [city]"),
+    array(887, 'YE-AB', 'Abyān'),
+    array(887, 'YE-AD', "'Adan"),
+    array(887, 'YE-DA', "Aḑ Ḑāli'"),
+    array(887, 'YE-BA', "Al Bayḑā'"),
+    array(887, 'YE-HU', 'Al Ḩudaydah'),
+    array(887, 'YE-JA', 'Al Jawf'),
+    array(887, 'YE-MR', 'Al Mahrah'),
+    array(887, 'YE-MW', 'Al Maḩwīt'),
+    array(887, 'YE-AM', "'Amrān"),
+    array(887, 'YE-DH', 'Dhamār'),
+    array(887, 'YE-HD', 'Ḩaḑramawt'),
+    array(887, 'YE-HJ', 'Ḩajjah'),
+    array(887, 'YE-IB', 'Ibb'),
+    array(887, 'YE-LA', 'Laḩij'),
+    array(887, 'YE-MA', "Ma'rib"),
+    array(887, 'YE-RA', 'Raymah'),
+    array(887, 'YE-SD', 'Şā‘dah'),
+    array(887, 'YE-SN', "Şan‘ā'"),
+    array(887, 'YE-SH', 'Shabwah'),
+    array(887, 'YE-TA', 'Tā‘izz'),
+  );
+
+foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    887,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}
diff --git a/uc_store/countries/zambia_894_1.cif b/uc_store/countries/zambia_894_1.cif
new file mode 100644
index 0000000..81cfcee
--- /dev/null
+++ b/uc_store/countries/zambia_894_1.cif
@@ -0,0 +1,37 @@
+<?php
+
+function zambia_install() {
+  // Make the entry in the country table.
+  // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
+
+   db_query("INSERT INTO {uc_countries} (country_id, country_name, country_iso_code_2, country_iso_code_3, version)
+    VALUES ('894', 'Zambia', 'ZM', 'ZMB', 1)");
+
+  // Make the entries in the zones table.
+  $zones = array(
+    array(894, 'ZM-02', 'Central'),
+    array(894, 'ZM-08', 'Copperbelt'),
+    array(894, 'ZM-03', 'Eastern'),
+    array(894, 'ZM-04', 'Luapula'),
+    array(894, 'ZM-09', 'Lusaka'),
+    array(894, 'ZM-05', 'Northern'),
+    array(894, 'ZM-06', 'NorthWestern'),
+    array(894, 'ZM-07', 'Southern'),
+    array(894, 'ZM-01', 'Western'),
+  );
+
+foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
+
+  // Set address format
+  uc_set_address_format(
+    894,
+    "!company\r\n".
+    "!first_name !last_name\r\n".
+    "!street1\r\n".
+    "!street2\r\n".
+    "!city, !zone_name  !postal_code\r\n".
+    "!country_name_if"
+  );
+}