diff --git a/extension.driver.php b/extension.driver.php
index 3b3c747..3c91f36 100644
--- a/extension.driver.php
+++ b/extension.driver.php
@@ -74,8 +74,8 @@ public function saveEssentials(&$context) {
 				}
 			}
 
-			$default_values .= PHP_EOL . str_repeat("\t", 2) . ');';
-			$default_values .= PHP_EOL . PHP_EOL . str_repeat("\t", 2) . 'public $eParamFILTERS';
+			$default_values .= PHP_EOL . '    );';
+			$default_values .= PHP_EOL . PHP_EOL . '    public $eParamFILTERS';
 
 			$context['contents'] = preg_replace('/public \$eParamFILTERS/i', $default_values, $context['contents']);
 		}
@@ -205,16 +205,15 @@ private static function addCustomDefaultValue($custom) {
 		}
 
 		private static function addDefaultValue($name, $value) {
-			return sprintf('
-			"%s" => array(
-				%s
-				%s
-				%s
-			),',
+			return sprintf("
+        '%s' => array(
+            %s
+            %s%s
+        ),",
 				$name,
 				isset($value['value']) ? "'value' => '" . $value['value'] . "'," : null,
 				isset($value['override']) ? "'override' => '" . $value['override'] . "',"  : null,
-				isset($value['custom']) ? "'custom' => '" . $value['custom'] . "'"	: null
+				isset($value['custom']) ? PHP_EOL . "            'custom' => '" . $value['custom'] . "'"	: null
 			);
 		}
 
@@ -257,7 +256,7 @@ private function injectDefault(XMLElement &$form) {
 			);
 
 			$fieldset->appendChild($div);
-			$form->insertChildAt(1, $fieldset);
+			$form->insertChildAt(2, $fieldset);
 		}
 
 		private function injectDefaultValues(XMLElement &$form, Event $event, Section $section) {
@@ -278,8 +277,10 @@ private function injectDefaultValues(XMLElement &$form, Event $event, Section $s
 			);
 
 			// Create Duplicators
+			$frame = new XMLElement('div');
+			$frame->setAttribute('class', 'filters-duplicator frame');
+			$frame->setAttribute('data-interactive', 'true');
 			$ol = new XMLElement('ol');
-			$ol->setAttribute('class', 'filters-duplicator');
 
 			$custom_default_values = $event->eDefaultValues;
 
@@ -309,9 +310,10 @@ private function injectDefaultValues(XMLElement &$form, Event $event, Section $s
 				}
 			}
 
-			$div->appendChild($ol);
+			$frame->appendChild($ol);
+			$div->appendChild($frame);
 			$fieldset->appendChild($div);
-			$form->insertChildAt(1, $fieldset);
+			$form->insertChildAt(2, $fieldset);
 		}
 
 	/*-------------------------------------------------------------------------
@@ -362,6 +364,7 @@ private function createDuplicatorTemplate(XMLElement $wrapper, $label, $name, ar
 		private function createCustomValueDuplicatorTemplate(XMLElement $wrapper, $name = 'Custom', array $values = null) {
 			// Create duplicator template
 			$li = new XMLElement('li');
+			$li->setAttribute('data-type', 'custom');
 			$header = new XMLElement('header');
 			$header->appendChild(new XMLElement('h4', $name));
 			$li->appendChild($header);
diff --git a/extension.meta.xml b/extension.meta.xml
index d6ae984..ba3d953 100644
--- a/extension.meta.xml
+++ b/extension.meta.xml
@@ -17,7 +17,10 @@
 		<item type="image" url="http://symphonyextensions.com/brendo/default_event_values/media/default_event_values.png">Default Event Values: Adds the ability to default values for your Events.</item>
 	</media>
 	<releases>
-		<release version="0.6" date="2012-05-29" min="2.3">
+		<release version="0.7.0" date="2014-07-13" min="2.4">
+			- Symphony 2.4 compatibility
+		</release>
+		<release version="0.6.0" date="2012-05-29" min="2.3">
 			- Update for Symphony 2.3
 		</release>
 		<release version="0.5.1" date="2011-06-08" min="2.2" />