diff --git a/app/time_conditions/app_defaults.php b/app/time_conditions/app_defaults.php
index 3b45ef9aeb..13cb39b082 100644
--- a/app/time_conditions/app_defaults.php
+++ b/app/time_conditions/app_defaults.php
@@ -2,116 +2,183 @@
 
 if ($domains_processed == 1) {
 
-	//define holiday presets
-		$preset['usa'][] = json_encode(array("new_years_day" => array("mday" => "1", "mon" => "1")));
-		$preset['usa'][] = json_encode(array("martin_luther_king_jr_day" => array("wday" => "2", "mon" => "1", "mday" => "15-21")));
-		$preset['usa'][] = json_encode(array("presidents_day" => array("wday" => "2", "mon" => "2", "mday" => "15-21")));
-		$preset['usa'][] = json_encode(array("memorial_day" => array("mday" => "25-31", "wday" => "2", "mon" => "5")));
-		$preset['usa'][] = json_encode(array("independence_day" => array("mday" => "4", "mon" => "7")));
-		$preset['usa'][] = json_encode(array("labor_day" => array("wday" => "2", "mon" => "9", "mday" => "1-7")));
-		$preset['usa'][] = json_encode(array("columbus_day" => array("wday" => "2", "mon" => "10", "mday" => "8-14")));
-		$preset['usa'][] = json_encode(array("veterans_day" => array("mday" => "11", "mon" => "11")));
-		$preset['usa'][] = json_encode(array("thanksgiving_day" => array("wday" => "5-6", "mon" => "11", "mday" => "22-28")));
-		$preset['usa'][] = json_encode(array("christmas_day" => array("mday" => "25", "mon" => "12")));
-
-		$preset['england'][] = json_encode(array("new_years_day" => array("mday" => "1", "mon" => "1")));
-		$preset['england'][] = json_encode(array("christmas_day" => array("mday" => "25", "mon" => "12")));
-		$preset['england'][] = json_encode(array("boxing_day" => array("mday" => "26", "mon" => "12")));
-		$preset['england'][] = json_encode(array("may_day" => array("mon" => "5", "mday" => "1-7", "wday" => "2")));
-		$preset['england'][] = json_encode(array("spring_bank_holiday" => array("mon" => "5", "mday" => "25-31", "wday" => "2")));
-		$preset['england'][] = json_encode(array("august_bank_holiday" => array("mon" => "8", "mday" => "25-31", "wday" => "2")));
-
-	//iterate and migrate old presets first
-		$sql = "update v_default_settings ";
-		$sql .= "set default_setting_subcategory = 'preset_usa' ";
-		$sql .= ", default_setting_description = 'usa Holiday' ";
-		$sql .= "where default_setting_category = 'time_conditions' ";
-		$sql .= "and default_setting_subcategory = 'preset' ";
-		$prep_statement = $db->prepare($sql);
-		if ($prep_statement) {
-			$prep_statement->execute();
-			unset ($prep_statement, $sql);
-		}
-
-	//iterate and add each, if necessary
-		$x = 0;
-		foreach ($preset as $region => $data) {
-			$sql = "select * from v_default_settings ";
-			$sql .= "where default_setting_category = 'time_conditions' ";
-			$sql .= "and default_setting_subcategory = 'preset_$region' ";
-			$sql .= "and default_setting_name = 'array' ";
-			$prep_statement = $db->prepare($sql);
-			if ($prep_statement) {
-				$prep_statement->execute();
-				$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-				unset ($prep_statement, $sql);
-				foreach ($data as $json) {
-					$found = false;
-					$missing[$x]['default_setting_category'] = 'time_conditions';
-					$missing[$x]['default_setting_subcategory'] = "preset_$region";
-					$missing[$x]['default_setting_name'] = 'array';
-					$missing[$x]['default_setting_value'] = $json;
-					$missing[$x]['default_setting_enabled'] = 'true';
-					$missing[$x]['default_setting_description'] = "$region Holiday";
-					foreach ($default_settings as $row) {
-						if (trim($row['default_setting_value']) == trim($json)) {
-							$found = true;
-							//remove items from the array that were found
-							unset($missing[$x]);
-						}
-					}
-					$x++;
-				}
-			}
-		}
-
-	//add the missing default settings
-		if (count($missing) > 0) foreach ($missing as $row) {
-			//add the default settings
-			$orm = new orm;
-			$orm->name('default_settings');
-			$orm->save($row);
-			$message = $orm->message;
-			unset($orm);
-			//print_r($message);
-		}
-		unset($missing);
-
+	//define region presets
+		$array[$x]['default_setting_uuid'] = 'c8cbb0eb-850b-4afd-a918-cceaf8af3957';
 		$array[$x]['default_setting_category'] = 'time_conditions';
 		$array[$x]['default_setting_subcategory'] = 'region';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = 'usa';
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_description'] = 'What region to use by default when choosing Time Conditions';
+
+	//define English holiday presets
 		$x++;
+		$array[$x]['default_setting_uuid'] = '528ec73e-03bb-4ea1-9ce1-19b81fb3f584';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"new_years_day":{"mday":"1","mon":"1"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '420b7282-2e49-4d63-9eb3-48b3b96bc184';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"may_day":{"mon":"5","mday":"1-7","wday":"2"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = 'c9ab6e93-63e0-4098-9290-7a721e813450';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"spring_bank_holiday":{"mon":"5","mday":"25-31","wday":"2"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = 'b7eac3ac-a99d-4fc8-8e3e-682a17a5b463';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"august_bank_holiday":{"mon":"8","mday":"25-31","wday":"2"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = 'cde53fd6-713e-43f9-beed-3cace375de56';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '3ddfd3b3-5c2e-45ef-b3ca-7f361ecc0a93';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_england';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"boxing_day":{"mday":"26","mon":"12"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'England Holiday';
 
-	//iterate and add each, if necessary
-		foreach ($array as $index => $default_settings) {
+	//define USA holiday presets
+		$x++;
+		$array[$x]['default_setting_uuid'] = '3df036bb-ae96-4735-96da-a32e90b51940';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"new_years_day":{"mday":"1","mon":"1"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '7a12b17c-67d9-439e-98fb-70039d27cf21';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"martin_luther_king_jr_day":{"wday":"2","mon":"1","mday":"15-21"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '1ce5c94b-7181-4b33-92b0-2cf4a97f2fa3';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"presidents_day":{"wday":"2","mon":"2","mday":"15-21"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '0957bbc4-60e8-44d1-b51d-943de4ee5b2f';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"memorial_day":{"mday":"25-31","wday":"2","mon":"5"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '0aa94174-a339-47d6-b6ab-c264b3786074';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"independence_day":{"mday":"4","mon":"7"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = 'be512c08-029e-49a0-937d-1a62fc029609';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"labor_day":{"wday":"2","mon":"9","mday":"1-7"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '261a0ea4-26a3-4261-95e5-888afd221ca0';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"columbus_day":{"wday":"2","mon":"10","mday":"8-14"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '829d346b-b0ed-4690-8641-8ed01052e303';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"veterans_day":{"mday":"11","mon":"11"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = 'c1fdfebe-3544-4b01-8a83-d0fee8e9a47a';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"thanksgiving_day":{"wday":"5-6","mon":"11","mday":"22-28"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
+		$x++;
+		$array[$x]['default_setting_uuid'] = '82e3eb39-27a4-4d70-8436-11059d3e51e7';
+		$array[$x]['default_setting_category'] = 'time_conditions';
+		$array[$x]['default_setting_subcategory'] = 'preset_usa';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'USA Holiday';
 
-	//add the default setting
-			$sql = "select count(*) as num_rows from v_default_settings ";
-			$sql .= "where default_setting_category = '".$default_settings['default_setting_category']."' ";
-			$sql .= "and default_setting_subcategory = '".$default_settings['default_setting_subcategory']."' ";
-			$sql .= "and default_setting_name = '".$default_settings['default_setting_name']."' ";
-			$prep_statement = $db->prepare($sql);
-			if ($prep_statement) {
-				$prep_statement->execute();
-				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-				unset($prep_statement);
-				if ($row['num_rows'] == 0) {
-					$orm = new orm;
-					$orm->name('default_settings');
-					$orm->save($array[$index]);
-					$message = $orm->message;
-					//print_r($message);
+	//get an array of the default settings
+		$sql = "select * from v_default_settings ";
+		$sql .= "where default_setting_category = 'time_conditions' ";
+		$prep_statement = $db->prepare($sql);
+		$prep_statement->execute();
+		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		unset ($prep_statement, $sql);
+
+	//find the missing default settings
+		$x = 0;
+		foreach ($array as $setting) {
+			$found = false;
+			$missing[$x] = $setting;
+			foreach ($default_settings as $row) {
+				if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) {
+					$found = true;
+					//remove items from the array that were found
+					unset($missing[$x]);
 				}
-				unset($row);
 			}
-
+			$x++;
 		}
-
-	//unset the array variable
 		unset($array);
+
+	//update the array structure
+		$array['default_settings'] = $missing;
+		unset($missing);
+
+	//add the default settings
+		$database = new database;
+		$database->app_name = 'default_settings';
+		$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
+		$database->save($array);
+		$message = $database->message;
+		unset($database);
+
 }
 
 ?>