diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2ccbe465
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 00000000..9914b156
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,39 @@
+/*global module:false*/
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    // Metadata.
+    pkg: grunt.file.readJSON('package.json'),
+    banner: '/**\n' + 
+      ' * <%= pkg.title || pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+      '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
+      ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;' + ' License: <%= pkg.license %>\n' +
+      ' */',
+    cssmin: {
+      combine: {
+         options: {
+          banner: '<%= banner %>'
+        },
+        files: {
+          'css/dist/cmb.min.css': [ 
+            'css/src/layout.css', 
+            'css/src/generic.css', 
+            'css/src/repeatable.css', 
+            'css/src/sortable.css', 
+            'css/src/group.css', 
+            'css/src/file.css', 
+            'css/src/misc-fields.css' 
+          ]
+        }
+      }
+    }
+  });
+
+  // These plugins provide necessary tasks.
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
+
+  // Default task.
+  grunt.registerTask('default', [ 'cssmin' ] );
+
+};
diff --git a/class.cmb-meta-box.php b/class.cmb-meta-box.php
index e7fd6263..59d50d54 100644
--- a/class.cmb-meta-box.php
+++ b/class.cmb-meta-box.php
@@ -117,7 +117,12 @@ function enqueue_scripts() {
 
 	function enqueue_styles() {
 
-		wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'style.css' );
+		$suffix = CMB_DEV ? '' : '.min';
+
+		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) )
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
+		else
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
 
 		foreach ( $this->fields as $field )
 			$field->enqueue_styles();
@@ -221,7 +226,7 @@ function show() { ?>
 	 */
 	static function layout_fields( array $fields ) { ?>
 
-		<table class="form-table cmb_metabox">
+		<div class="cmb_metabox">
 
 			<?php $current_colspan = 0;
 
@@ -229,49 +234,52 @@ static function layout_fields( array $fields ) { ?>
 
 				if ( $current_colspan == 0 ) : ?>
 
-					<tr>
+					<div class="cmb-row">
 
 				<?php endif;
 
 				$current_colspan += $field->args['cols'];
 
-				$classes = array('field');
+				$classes = array( 'field', get_class($field) );
 
 				if ( ! empty( $field->args['repeatable'] ) )
 					$classes[] = 'repeatable';
 
-				$classes[] = get_class($field);
-
-				$classes = 'class="' . esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) . '"';
+				if ( ! empty( $field->args['sortable'] ) )
+					$classes[] = 'cmb-sortable';
 
-				$attrs = array();
+				$attrs = array(
+					sprintf( 'id="%s"', sanitize_html_class( $field->id ) ),
+					sprintf( 'class="%s"', esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) )
+				);
 
+				// Field Repeatable Max.
 				if ( isset( $field->args['repeatable_max']  ) )
-					$attrs[] = 'data-rep-max="' . intval( $field->args['repeatable_max'] ) . '"';
-
-				$attrs = implode( ' ', $attrs );
+					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
 
 				?>
 
-				<td style="width: <?php esc_attr_e( $field->args['cols'] / 12 * 100 ); ?>%" colspan="<?php esc_attr_e( $field->args['cols'] ); ?>">
-					<div <?php echo $classes; ?> <?php echo $attrs; ?>>
-						<?php $field->display(); ?>
-					</div>
-				</td>
+				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?>">
+					
+						<div <?php echo implode( ' ', $attrs ); ?>>
+							<?php $field->display(); ?>
+						</div>
+
+						<input type="hidden" name="_cmb_present_<?php esc_attr_e( $field->id ); ?>" value="1" />
 
-				<?php if ( $current_colspan == 12 ) :
+				</div>
+
+				<?php if ( $current_colspan == 12 || $field === end( $fields ) ) :
 
 					$current_colspan = 0; ?>
 
-					</tr>
+					</div><!-- .cmb-row -->
 
 				<?php endif; ?>
 
-				<input type="hidden" name="_cmb_present_<?php esc_attr_e( $field->id ); ?>" value="1" />
-
 			<?php endforeach; ?>
-
-		</table>
+			
+		</div>
 
 	<?php }
 
diff --git a/classes.fields.php b/classes.fields.php
index 4bc362a5..8f767d61 100644
--- a/classes.fields.php
+++ b/classes.fields.php
@@ -67,6 +67,10 @@ public function __construct( $name, $title, array $values, $args = array() ) {
 	 * @uses wp_enqueue_script()
 	 */
 	public function enqueue_scripts() {
+
+		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] )
+			wp_enqueue_script( 'jquery-ui-sortable' );
+
 	}
 
 	/**
@@ -325,7 +329,7 @@ public function display() {
 			<div class="field-item" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
 			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
+				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span></button>
 			<?php endif; ?>
 
 			<?php $this->html(); ?>
@@ -344,7 +348,7 @@ public function display() {
 			$this->field_index = 'x'; // x used to distinguish hidden fields.
 			$this->value = ''; ?>
 
-			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative">
+			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
 			<?php if ( $this->args['repeatable'] ) : ?>
 				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
@@ -369,9 +373,7 @@ public function display() {
  */
 class CMB_Text_Field extends CMB_Field {
 
-	public function html() { 
-
-		?>
+	public function html() { ?>
 
 		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
 
@@ -541,7 +543,7 @@ private function parse_image_size( $size ) {
 
 		// Handle default WP size format. 
 		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) )
-			$size = array( 'width' => $size[0], 'height' => $size[0] );
+			$size = array( 'width' => $size[0], 'height' => $size[1] );
 
 		return wp_parse_args( $size, array(
 			'width'  => get_option( 'thumbnail_size_w' ),
@@ -598,10 +600,10 @@ public function html() { ?>
 class CMB_Date_Field extends CMB_Field {
 
 	public function enqueue_scripts() {
-		
+
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
 	}
@@ -619,7 +621,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
@@ -643,7 +645,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );		
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
@@ -1268,7 +1270,7 @@ function cmb_ajax_post_select() {
 class CMB_Group_Field extends CMB_Field {
 
 	static $added_js;
-	public $fields = array();
+	private $fields = array();
 
 	function __construct() {
 
@@ -1309,11 +1311,11 @@ public function enqueue_styles() {
 		parent::enqueue_styles();
 
 		foreach ( $this->args['fields'] as $f ) {
-
 			$class = _cmb_field_class_for_type( $f['type'] );
 			$field = new $class( '', '', array(), $f );
 			$field->enqueue_styles();
 		}
+
 	}
 
 	public function display() {
@@ -1325,8 +1327,14 @@ public function display() {
 		$this->title();
 		$this->description();
 
+		// if there are no values and it's not repeateble, we want to do one with empty string
+		if ( ! $this->get_values() && ! $this->args['repeatable'] )
+			$values = array( '' );
+		else
+			$values = $this->get_values();
+
 		$i = 0;
-		foreach ( $this->get_values() as $value ) {
+		foreach ( $values as $value ) {
 
 			$this->field_index = $i;
 			$this->value = $value; 	
@@ -1354,27 +1362,16 @@ public function display() {
 
 				</div>
 
-				<button class="button repeat-field"><?php esc_html_e( 'Add New', 'cmb' ); ?></button>
+				<button class="button repeat-field"><?php esc_html_e( 'Add New Group', 'cmb' ); ?></button>
 
 		<?php }
 
 	}
 
-	public function add_field( CMB_Field $field ) {
-			
-		$field->parent = &$this;
-		$this->fields[$field->id] = $field;
-
-	}
-
-	public function &get_fields() {
-		return $this->fields;
-	}
-
 	public function html() {
 
 		$fields = &$this->get_fields();
-		$value  = $this->value;
+		$value = $this->value;
 
 		if ( ! empty( $value ) ) {
 			foreach ( $value as $field_id => $field_value ) {
@@ -1391,15 +1388,11 @@ public function html() {
 
 		?>
 
-		<div class="group <?php echo ! empty( $this->args['repeatable'] ) ? 'cloneable' : '' ?>" style="position: relative">
-
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
-			<?php endif; ?>
-
-			<?php CMB_Meta_Box::layout_fields( $fields ); ?>
+		<?php if ( $this->args['repeatable'] ) : ?>
+			<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
+		<?php endif; ?>
 
-		</div>
+		<?php CMB_Meta_Box::layout_fields( $fields ); ?>
 
 	<?php }
 
@@ -1407,7 +1400,7 @@ public function parse_save_values() {
 
 		$fields = &$this->get_fields();
 		$values = &$this->get_values();
-		
+
 		foreach ( $values as &$group_value ) {
 			foreach ( $group_value as $field_id => &$field_value ) {
 
@@ -1415,16 +1408,29 @@ public function parse_save_values() {
 					$field_value = array();
 					continue;
 				}
-
+				
 				$field = $fields[$field_id];
 				$field->values = $field_value;
 				$field->parse_save_values();
-				
+
 				$field_value = $field->get_values();
 
+				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
+				// just store the first (and only) one directly
+				if ( ! $field->args['repeatable'] )
+					$field_value = reset( $field_value );
 			}
 		}
-		
+
+	}
+
+	public function add_field( CMB_Field $field ) {
+		$field->parent = $this;
+		$this->fields[$field->id] = $field;
+	}
+
+	public function &get_fields() {
+		return $this->fields;
 	}
 
 	public function set_values( array $values ) {
@@ -1440,4 +1446,4 @@ public function set_values( array $values ) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/css/dist/cmb.css b/css/dist/cmb.css
new file mode 100644
index 00000000..305a295f
--- /dev/null
+++ b/css/dist/cmb.css
@@ -0,0 +1,18 @@
+/**
+ * CMB Styles
+ *
+ * This file is used for development only and is loaded when CMB_DEV is defined as true.
+ * cmb.min.css is generated by the Grunt build process.
+ */
+
+@import '../src/layout.css';
+@import '../src/generic.css';
+
+/** Features **/
+@import '../src/repeatable.css';
+@import '../src/sortable.css';
+
+/** Fields **/
+@import '../src/group.css';
+@import '../src/file.css';
+@import '../src/misc-fields.css'; 
\ No newline at end of file
diff --git a/css/dist/cmb.min.css b/css/dist/cmb.min.css
new file mode 100644
index 00000000..e5345866
--- /dev/null
+++ b/css/dist/cmb.min.css
@@ -0,0 +1,6 @@
+/**
+ * Custom-Meta-Boxes - v0.1.0-beta - 2014-02-22
+ * https://github.com/humanmade/Custom-Meta-Boxes/
+ * Copyright (c) 2014 Human Made Limited; License: GPL
+ */
+.cmb_metabox .field{overflow:hidden;padding:16px 0;border-bottom:1px solid #DFDFDF}.cmb-row:last-child>[class*=cmb-cell-]>.field{border-bottom:0}.postbox>.inside>.cmb_metabox{margin:-10px 0}.cmb_metabox .cmb-row{overflow:hidden;margin:0 -5px;zoom:1}.cmb_metabox .cmb-row:after,.cmb_metabox .cmb-row:before{content:"";display:table}.cmb_metabox .cmb-row:after{clear:both}.cmb_metabox [class*=cmb-cell-]{float:left;padding:0 5px;-moz-box-sizing:border-box;box-sizing:border-box}.cmb_metabox .cmb-cell-1{width:8.333333333%}.cmb_metabox .cmb-cell-2{width:16.666666667%}.cmb_metabox .cmb-cell-3{width:25%}.cmb_metabox .cmb-cell-4{width:33.333333333%}.cmb_metabox .cmb-cell-5{width:41.666666667%}.cmb_metabox .cmb-cell-6{width:50%}.cmb_metabox .cmb-cell-7{width:58.333333333%}.cmb_metabox .cmb-cell-8{width:66.666666667%}.cmb_metabox .cmb-cell-9{width:75%}.cmb_metabox .cmb-cell-10{width:83.333333333%}.cmb_metabox .cmb-cell-11{width:91.666666667%}.cmb_metabox .cmb-cell-12{width:100%}@media all and (max-width:850px){.cmb_metabox [class*=cmb-cell-]{width:100%}}.cmb_metabox .field-item{position:relative}.cmb_metabox_description{color:#AAA;font-style:italic;margin:0 0 16px!important}.cmb_metabox input[type=text],.cmb_metabox select,.cmb_metabox textarea{width:100%;margin:0}.cmb_metabox input.cmb_text_small{width:100px}.cmb_metabox input.cmb_text_medium{width:230px;margin-right:15px}.cmb_metabox input[type=checkbox],.cmb_metabox input[type=radio]{margin:0 5px 0 0;padding:0}.cmb_metabox .field-title{margin-bottom:16px;margin-top:0;font-weight:700}.cmb_metabox .field-title label{vertical-align:baseline}.cmb_metabox .field.repeatable>.field-item{padding-right:30px;margin-bottom:10px}.cmb_metabox .repeat-field{display:block!important;clear:both}.CMB_Date_Field.repeatable .field-item,.CMB_Date_Timestamp_Field.repeatable .field-item,.CMB_Datetime_Timestamp_Field.repeatable .field-item,.CMB_Text_Small_Field.repeatable .field-item,.CMB_Time_Field.repeatable .field-item{float:left;clear:both}.cmb-delete-field{display:inline-block;text-decoration:none;font-size:11px;line-height:20px;height:22px;width:22px;margin:0;padding:0;cursor:pointer;border-width:1px;border-style:solid;-webkit-border-radius:3px;-webkit-appearance:none;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#555;border-color:#ccc;background:#f7f7f7;-webkit-box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);box-shadow:inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);vertical-align:top;position:absolute;top:3px;right:0;text-indent:100%;overflow:hidden;white-space:nowrap}.cmb-delete-field:active,.cmb-delete-field:focus,.cmb-delete-field:hover{background:#fafafa;border-color:#999;color:#222}.cmb-delete-field .cmb-delete-field-icon{content:' ';display:block;position:absolute;height:8px;width:8px;top:50%;left:50%;margin-top:-4px;margin-left:-4px;background-image:url( '../../images/cmb-icon-remove.png');background-repeat:no-repeat;text-indent:8px;overflow:hidden}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-delete-field .cmb-delete-field-icon{background-image:url( '../../images/cmb-icon-remove@2x.png');background-size:8px 8px}}.cmb-sortable>.field-item{padding-left:15px}.cmb-sortable .cmb-handle{height:100%;width:3px;position:absolute;top:0;left:0;background:0 0;cursor:move;border-left:3px solid #DFDFDF;border-right:3px solid #DFDFDF}.cmb-sortable .ui-sortable-helper{opacity:.75}.cmb-sortable .ui-sortable-helper:before{content:' ';position:absolute;width:100%;height:100%;top:-6px;left:-6px;background-color:#F8F8F8;border:1px solid #DEDEDE;padding:5px;z-index:-1}.cmb-sortable>.ui-sortable-placeholder{border:1px dashed #DDD!important;background:transparent!important;visibility:visible!important;margin-bottom:8px!important}* Group **/ .cmb_metabox .CMB_Group_Field>.field-title{font-size:1.5em;clear:left;color:#464646;font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",sans-serif;font-weight:lighter}.cmb_metabox .CMB_Group_Field>.field-title h2{margin:8px 5px!important}.cmb_metabox .CMB_Group_Field.repeatable>.field-item{padding:30px 10px 0;margin-bottom:16px;border:1px solid #DDD;background:#FAFAFA;position:relative}.cmb_metabox .CMB_Group_Field.repeatable>.field-item:before{content:' ';display:block;position:absolute;top:0;left:0;right:0;height:33px;border-bottom:1px solid #DDD}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field{top:5px;right:5px;width:auto;text-indent:0;padding-left:24px;padding-right:8px;height:22px;line-height:20px;font-size:11px;z-index:1}.cmb_metabox .CMB_Group_Field.repeatable>.field-item>.cmb-delete-field .cmb-delete-field-icon{left:12px}.CMB_Group_Field.cmb-sortable>.field-item{position:relative;padding-top:30px}.CMB_Group_Field.cmb-sortable>.field-item>.cmb-handle{top:-1px;left:-1px;right:-1px;height:34px;width:auto;border:0;border-bottom:1px solid #DDD}.CMB_Group_Field.cmb-sortable>.field-item.ui-sortable-helper>.cmb-handle{padding:0 5px}.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable>.field-item:before{display:none!important}.CMB_Group_Field.cmb-sortable>.ui-sortable-placeholder{margin-bottom:16px!important}.CMB_File_Field .field-item,.CMB_Image_Field .field-item{float:left;margin:0 16px 16px 0!important;text-align:center;padding:0!important;z-index:1}.cmb-file-wrap{position:relative;overflow:hidden;width:150px;height:150px;line-height:150px}.cmb-file-wrap-placeholder{content:' ';position:absolute;top:0;left:0;display:block;height:142px;width:142px;border:4px dashed #DDD;z-index:-1}.cmb-file-wrap-placeholder .dimensions{line-height:normal;position:absolute;bottom:10px;right:10px;font-size:18px;font-weight:700;opacity:.2}.cmb-file-holder{position:relative;overflow:hidden;box-shadow:inset 0 0 15px rgba(0,0,0,.1),inset 0 0 0 1px rgba(0,0,0,.05);background:#eee;width:100%;height:100%}.cmb-file-holder.type-file img{position:absolute;top:43%;margin-top:-30px;left:50%;margin-left:-23px}.cmb-file-holder.type-img img{width:100%;height:auto;margin-top:0;vertical-align:top}.cmb-file-holder.type-img::after{content:'';display:block;position:absolute;top:0;left:0;right:0;bottom:0;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1);overflow:hidden;z-index:1}.cmb-file-name{position:absolute;left:0;right:0;bottom:0;line-height:1.4;overflow:hidden;max-height:100%;word-wrap:break-word;text-align:center;font-weight:700;background:rgba(255,255,255,.8);box-shadow:inset 0 0 0 1px rgba(0,0,0,.15)}.cmb-file-name strong{padding:5px 10px;display:block}.CMB_File_Field .cmb-delete-field,.CMB_Image_Field .cmb-delete-field{z-index:10;top:10px;right:10px}.CMB_File_Field .cmb-remove-file,.CMB_Image_Field .cmb-remove-file{position:absolute;z-index:1;top:5px;right:5px}.CMB_File_Field.repeatable .cmb-remove-file,.CMB_Image_Field.repeatable .cmb-remove-file{display:none!important}.cmb-file-wrap .cmb-file-upload{vertical-align:middle}.cmb-loading::before{content:' ';display:block;background:url( '../../images/wpspin.gif' ) no-repeat;width:16px;height:16px;position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}@media only screen and (-webkit-min-device-pixel-ratio :1.5),only screen and (min-device-pixel-ratio :1.5){.cmb-loading::before{background-image:url( '../../images/wpspin-2x.gif');background-size:16px 16px}}.CMB_File_Field.cmb-sortable .cmb-handle,.CMB_Image_Field.cmb-sortable .cmb-handle{border:0;background:0 0;height:100%;width:100%;z-index:1}.CMB_File_Field.cmb-sortable .cmb-file-upload,.CMB_Image_Field.cmb-sortable .cmb-file-upload{position:relative;z-index:5}.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before{top:0;left:0;padding:0;border:0;background:#F9F9F9}.CMB_Title .field-title{margin:8px 0!important}.CMB_Title h2{margin:0!important;padding:0!important}.CMB_Color_Picker .field-item{float:left;clear:both}.CMB_Color_Picker:after,.CMB_Color_Picker:before{content:"";display:table}.CMB_Color_Picker:after{clear:both}.CMB_Color_Picker{zoom:1}div.time-picker{position:absolute;height:191px;width:4em;overflow:auto;background:#fff;border:1px solid #aaa;z-index:99;margin:0}div.time-picker-12hours{width:6em}div.time-picker ul{list-style-type:none;margin:0;padding:0}div.time-picker li{cursor:pointer;height:10px;font:12px/1 Helvetica,Arial,sans-serif;padding:4px 3px}div.time-picker li.selected{background:#0063CE;color:#fff}.cmb_metabox input.cmb_timepicker{width:100px;margin-right:0}.CMB_Datetime_Timestamp_Field input+input{margin-left:4px}.cmb_select{width:100%}.select2-offscreen{display:none}
\ No newline at end of file
diff --git a/style.css b/css/legacy.css
similarity index 73%
rename from style.css
rename to css/legacy.css
index 6e736ba9..580bf9f3 100644
--- a/style.css
+++ b/css/legacy.css
@@ -32,7 +32,7 @@ span.cmb_metabox_description { color: #AAA; font-style: italic;}
 .cmb_metabox .cmb_upload_status {  margin: 10px 0 0 0;}
 .cmb_metabox .cmb_upload_status .img_status {  position: relative; }
 .cmb_metabox .cmb_upload_status .img_status img { border:1px solid #DFDFDF; background: #FAFAFA; max-width:350px; padding: 5px; -moz-border-radius: 2px; border-radius: 2px;}
-.cmb_remove_file_button { text-indent: -9999px; background: url(images/ico-delete.png); width: 16px; height: 16px; position: absolute; top: -5px; left: -5px;}
+.cmb_remove_file_button { text-indent: -9999px; background: url(../images/ico-delete.png); width: 16px; height: 16px; position: absolute; top: -5px; left: -5px;}
 /* Sidebar placement adjustments */
 .inner-sidebar table.cmb_metabox input[type=text], table.cmb_metabox textarea { width: 100%; }
 .inner-sidebar table.cmb_metabox .cmb_upload_status .img_status img { width: 90%; }
@@ -102,14 +102,14 @@ div.time-picker li.selected { background: #0063CE; color: #fff; }
 	left: 50%;
 	margin-top: -4px;
 	margin-left: -4px;
-	background-image: url('images/cmb-icon-remove.png');
+	background-image: url( '../images/cmb-icon-remove.png');
 	background-repeat: no-repeat;
 }
 
 @media only screen and (-webkit-min-device-pixel-ratio : 1.5), only screen and (min-device-pixel-ratio : 1.5) {
 
 	.cmb-delete-field .cmb-delete-field-icon {
-		background-image: url('images/cmb-icon-remove@2x.png');
+		background-image: url( '../images/cmb-icon-remove@2x.png');
 		background-size: 8px 8px;
 	}
 
@@ -133,9 +133,9 @@ button.repeat-field { display: block !important; clear: both; }
 .CMB_Datetime_Timestamp_Field input + input { margin-left: 4px; }
 
 #poststuff .CMB_Group_Field h2 { padding: 0; margin: 8px 5px; }
-.CMB_Group_Field.repeatable > .field-item { padding: 0 9px; margin-bottom: 16px ; border: 1px solid #DDD; background: #ECECEC; border-radius: 3px; }
-.CMB_Group_Field .cmb_element { display: block; height: 0;  }
-.CMB_Group_Field .cmb_element .ui-state-default { /*display: none;*/ margin-right: -3px; margin-top: -5px; }
+.CMB_Group_Field.repeatable > .field-item { padding: 0 9px; margin-bottom: 16px ; border: 1px solid #DDD; background: #F9F9F9; border-radius: 3px; }
+
+.CMB_Group_Field.repeatable > .field-item.ui-sortable-placeholder { margin-bottom: 16px !important; }
 
 .CMB_Group_Field > .field-title { 
 	margin-top: 20px;
@@ -149,12 +149,10 @@ button.repeat-field { display: block !important; clear: both; }
 	font-weight: lighter;
 }
 
-
 .CMB_Group_Field.repeatable > .field-item { 
 	padding: 0 9px; 
 	margin-bottom: 16px; 
 	border: 1px solid #DDD; 
-	background: #ECECEC; 
 	border-radius: 3px; 
 }
 
@@ -200,7 +198,122 @@ button.repeat-field { display: block !important; clear: both; }
 .CMB_Color_Picker .iris-picker .iris-strip .ui-slider-handle { margin-bottom: 0; }
 .CMB_Color_Picker .iris-picker .iris-strip .ui-slider-handle:focus { outline: none; }
 
-.loading::before { content: ' '; display: block; background: url( 'images/wpspin.gif' ) no-repeat; width: 16px; height: 16px; position: absolute; top: 50%; left: 50%; margin-top: -8px; margin-left: -8px; }
+.cmb-loading:before { content: ' '; display: block; background: url( '../images/wpspin.gif' ) no-repeat; width: 16px; height: 16px; position: absolute; top: 50%; left: 50%; margin-top: -8px; margin-left: -8px; }
 @media only screen and (-webkit-min-device-pixel-ratio : 1.5), only screen and (min-device-pixel-ratio : 1.5) {
-	.loading::before { background-image: url( 'images/wpspin-2x.gif'); background-size: 16px 16px; }
+	.cmb-loading:before { background-image: url( 'images/wpspin-2x.gif'); background-size: 16px 16px; }
+}
+
+.cmb-sortable > .field-item { 
+	padding-left: 16px; 
+}
+
+.cmb-sortable .cmb-handle { 
+	height: 100%; 
+	width: 2px; 
+	position: absolute; 
+	top: 0; 
+	left: 0; 
+	background: transparent; 
+	cursor: move; 
+	border-left: 2px solid #DFDFDF; 
+	border-right: 2px solid #DFDFDF; 
+}
+
+.cmb-sortable .cmb-handle:after { 
+	position: absolute;
+	content: ' ';
+	height: 100%; 
+	width: 0; 
+	position: absolute; 
+	top: 0; 
+	left: 100%;
+	margin-left: 4px; 
+	background: transparent; 
+	cursor: move; 
+	border-left: 2px solid #DFDFDF; 
+}
+
+.cmb-sortable .ui-sortable-helper { 
+	opacity: 0.75;
+}
+
+
+.cmb-sortable .ui-sortable-helper:before { 
+	content: ' ';
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: -6px;
+	left: -6px;
+	background-color: #F8F8F8; 
+	border: 1px solid #DEDEDE;
+	padding: 5px; 
+	z-index: -1;
+}
+
+.cmb-sortable .ui-sortable-placeholder { 
+	border: 1px dashed #DDD !important;
+	background: transparent !important; 
+	visibility: visible !important; 
+	margin-bottom: 6px !important; 
+	margin-right: 6px !important; 
+}
+
+.CMB_File_Field.cmb-sortable .cmb-handle,
+.CMB_Image_Field.cmb-sortable .cmb-handle { 
+	background: transparent; 
+	width: 100%; 
+	z-index: 1; 
+}
+
+.CMB_File_Field.cmb-sortable .cmb-file-upload,
+.CMB_Image_Field.cmb-sortable .cmb-file-upload { 
+	position: relative; 
+	z-index: 5; 
+}
+
+.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,
+.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before { 
+	top: 0;
+	left: 0;
+	padding: 0;
+	border: none;
+	background: #F9F9F9;
+}
+
+.CMB_Group_Field.cmb-sortable > .field-item { 
+	position: relative; 
+	padding-top: 30px; 
+}
+
+.CMB_Group_Field.cmb-sortable > .field-item > .cmb-handle { 
+	top: -1px; 
+	left: -1px; 
+	right: -1px; 
+	height: 30px; 
+	width: auto; 
+	border: 1px solid #dfdfdf;
+	border-radius: 3px 3px 0 0;
+	background: #f1f1f1;
+	background-image: -webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));
+	background-image: -webkit-linear-gradient(bottom,#ececec,#f9f9f9);
+	background-image: -moz-linear-gradient(bottom,#ececec,#f9f9f9);
+	background-image: -o-linear-gradient(bottom,#ececec,#f9f9f9);
+	background-image: linear-gradient(to top,#ececec,#f9f9f9);
+}
+
+.CMB_Group_Field.cmb-sortable .cmb-handle:after {
+	display: none;
+}
+
+.CMB_Group_Field.cmb-sortable .group > .cmb-delete-field { 
+	top: -33px;
+	right: -5px;
+	width: auto;
+	height: auto;
+	padding: 2px 5px 2px 20px;
+	text-indent: 0;
+	font-size: 12px;
+	line-height: 14px;
+	z-index: 1;
 }
\ No newline at end of file
diff --git a/css/src/file.css b/css/src/file.css
new file mode 100644
index 00000000..ce5f8d4d
--- /dev/null
+++ b/css/src/file.css
@@ -0,0 +1,166 @@
+
+.CMB_File_Field .field-item,
+.CMB_Image_Field .field-item { 
+	float: left; 
+	margin: 0 16px 16px 0 !important; 
+	text-align: center; 
+	padding: 0 !important; 
+	z-index: 1; 
+}
+
+.cmb-file-wrap { 
+	position: relative; 
+	overflow: hidden; 
+	width: 150px; 
+	height: 150px; 
+	line-height: 150px; 
+}
+
+.cmb-file-wrap-placeholder { 
+	content: ' '; 
+	position: absolute; 
+	top: 0; 
+	left: 0; 
+	display: block; 
+	height: 142px; 
+	width: 142px; 
+	border: 4px dashed #DDD; 
+	z-index: -1; 
+}
+
+.cmb-file-wrap-placeholder .dimensions { 
+	line-height: normal; 
+	position: absolute; 
+	bottom: 10px; 
+	right: 10px; 
+	font-size: 18px; 
+	font-weight: bold; 
+	opacity: 0.2;
+}
+
+.cmb-file-holder { 
+	position: relative; 
+	overflow: hidden; 
+	box-shadow: inset 0 0 15px rgba(0,0,0,0.1), inset 0 0 0 1px rgba(0,0,0,0.05); 
+	background: #eee; 
+	width: 100%; 
+	height: 100%; 
+}
+
+.cmb-file-holder.type-file img { 
+	position: absolute; 
+	top: 43%; 
+	margin-top: -30px; 
+	left: 50%; 
+	margin-left: -23px; 
+}
+
+.cmb-file-holder.type-img img { 
+	width: 100%; 
+	height: auto; 
+	margin-top: 0; 
+	vertical-align: top; 
+}
+
+.cmb-file-holder.type-img::after { 
+	content: ''; 
+	display: block; 
+	position: absolute; 
+	top: 0; 
+	left: 0; 
+	right: 0; 
+	bottom: 0; 
+	box-shadow: inset 0 0 0 1px rgba(0,0,0,0.1); 
+	overflow: hidden; 
+	z-index: 1; 
+}
+
+.cmb-file-name { 
+	position: absolute; 
+	left: 0; 
+	right: 0; 
+	bottom: 0; 
+	line-height: 1.4; 
+	overflow: hidden; 
+	max-height: 100%; 
+	word-wrap: break-word; 
+	text-align: center; 
+	font-weight: bold; 
+	background: rgba(255,255,255,0.8); 
+	box-shadow: inset 0 0 0 1px rgba(0,0,0,0.15); 
+}
+
+.cmb-file-name strong { 
+	padding: 5px 10px; 
+	display: block;
+}
+
+.CMB_File_Field .cmb-delete-field,
+.CMB_Image_Field .cmb-delete-field { 
+	z-index: 10;  
+	top: 10px; 
+	right: 10px; 
+}
+
+.CMB_File_Field .cmb-remove-file,
+.CMB_Image_Field .cmb-remove-file { 
+	position: absolute; 
+	z-index: 1; 
+	top: 5px; 
+	right: 5px; 
+}
+
+.CMB_File_Field.repeatable .cmb-remove-file,
+.CMB_Image_Field.repeatable .cmb-remove-file { 
+	display: none !important; 
+}
+
+.cmb-file-wrap .cmb-file-upload { 
+	vertical-align: middle; 
+}
+
+.cmb-loading::before { 
+	content: ' '; 
+	display: block; 
+	background: url( '../../images/wpspin.gif' ) no-repeat; 
+	width: 16px; 
+	height: 16px; 
+	position: absolute; 
+	top: 50%; 
+	left: 50%; 
+	margin-top: -8px; 
+	margin-left: -8px; 
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio : 1.5), only screen and (min-device-pixel-ratio : 1.5) {
+	
+	.cmb-loading::before { 
+		background-image: url( '../../images/wpspin-2x.gif'); 
+		background-size: 16px 16px; 
+	}
+
+}
+
+.CMB_File_Field.cmb-sortable .cmb-handle,
+.CMB_Image_Field.cmb-sortable .cmb-handle { 
+	border: none;
+	background: transparent;
+	height: 100%;
+	width: 100%;
+	z-index: 1;
+}
+
+.CMB_File_Field.cmb-sortable .cmb-file-upload,
+.CMB_Image_Field.cmb-sortable .cmb-file-upload { 
+	position: relative; 
+	z-index: 5; 
+}
+
+.CMB_File_Field.cmb-sortable .ui-sortable-helper:before,
+.CMB_Image_Field.cmb-sortable .ui-sortable-helper:before { 
+	top: 0;
+	left: 0;
+	padding: 0;
+	border: none;
+	background: #F9F9F9;
+}
\ No newline at end of file
diff --git a/css/src/generic.css b/css/src/generic.css
new file mode 100644
index 00000000..f2060bc8
--- /dev/null
+++ b/css/src/generic.css
@@ -0,0 +1,46 @@
+.cmb_metabox .field-item {
+	position: relative;
+}
+
+.cmb_metabox_description { 
+	color: #AAA; 
+	font-style: italic; 
+	margin: 0 0 16px !important;
+}
+
+.cmb_metabox input[type=text], 
+.cmb_metabox textarea, 
+.cmb_metabox select { 
+	width: 100%;
+	margin: 0;
+}
+
+.cmb_metabox input.cmb_text_small { 
+	width: 100px; 
+}
+
+.cmb_metabox input.cmb_text_medium {
+	width: 230px; 
+	margin-right: 15px;
+}
+
+.cmb_metabox input[type="radio"] { 
+	margin: 0 5px 0 0; 
+	padding: 0;
+}
+
+.cmb_metabox input[type="checkbox"] { 
+	margin: 0 5px 0 0; 
+	padding: 0;
+}
+
+.cmb_metabox .field-title { 
+	margin-top: -4px; 
+	margin-bottom: 16px; 
+	margin-top: 0; 
+	font-weight: bold; 
+}
+
+.cmb_metabox .field-title label {
+	vertical-align: baseline;
+}
\ No newline at end of file
diff --git a/css/src/group.css b/css/src/group.css
new file mode 100644
index 00000000..7988c516
--- /dev/null
+++ b/css/src/group.css
@@ -0,0 +1,77 @@
+* Group **/
+
+.cmb_metabox .CMB_Group_Field > .field-title { 
+	font-size: 1.5em;
+	clear: left;
+	color: #464646;
+	font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;
+	font-weight: lighter;
+}
+
+.cmb_metabox .CMB_Group_Field > .field-title h2 { 
+	margin: 8px 5px !important; 
+}
+
+.cmb_metabox .CMB_Group_Field.repeatable > .field-item { 
+	padding: 30px 10px 0; 
+	margin-bottom: 16px; 
+	border: 1px solid #DDD; 
+	background: #FAFAFA; 
+	position: relative;
+}
+
+.cmb_metabox .CMB_Group_Field.repeatable > .field-item:before {
+	content: ' ';
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 33px;
+	border-bottom: 1px solid #DDDDDD;	
+}
+
+.cmb_metabox .CMB_Group_Field.repeatable > .field-item > .cmb-delete-field { 
+	top: 5px;
+	right: 5px;
+	width: auto;
+	text-indent: 0;
+	padding-left: 24px;
+	padding-right: 8px;
+	height: 22px;
+	line-height: 20px;
+	font-size: 11px;
+	z-index: 1;
+}
+
+.cmb_metabox .CMB_Group_Field.repeatable > .field-item > .cmb-delete-field .cmb-delete-field-icon { 
+	left: 12px;
+}
+
+
+.CMB_Group_Field.cmb-sortable > .field-item { 
+	position: relative; 
+	padding-top: 30px; 
+}
+
+.CMB_Group_Field.cmb-sortable > .field-item > .cmb-handle { 
+	top: -1px; 
+	left: -1px; 
+	right: -1px; 
+	height: 34px; 
+	width: auto; 
+	border: none;
+	border-bottom: 1px solid #DDDDDD;
+}
+
+.CMB_Group_Field.cmb-sortable > .field-item.ui-sortable-helper > .cmb-handle { 
+	padding: 0 5px;
+}
+
+.cmb_metabox .CMB_Group_Field.repeatable.cmb-sortable > .field-item:before {
+	display: none !important;
+}
+
+.CMB_Group_Field.cmb-sortable > .ui-sortable-placeholder { 
+	margin-bottom: 16px !important;
+}
\ No newline at end of file
diff --git a/css/src/layout.css b/css/src/layout.css
new file mode 100644
index 00000000..b1a9f016
--- /dev/null
+++ b/css/src/layout.css
@@ -0,0 +1,57 @@
+/** CMB Layout **/
+
+.cmb_metabox .field { 
+    overflow: hidden;
+	padding: 16px 0;
+	border-bottom: 1px solid #DFDFDF;
+}
+
+.cmb-row:last-child > [class*="cmb-cell-"]  > .field { 
+	border-bottom: 0; 
+}
+
+/* Neaten up the margins when metaboxes are within the standard postbox. */
+.postbox > .inside > .cmb_metabox {
+	margin: -10px 0; 
+}
+
+.cmb_metabox .cmb-row { 
+	overflow: hidden; 
+	margin: 0 -5px; 
+	zoom: 1;
+}
+
+.cmb_metabox .cmb-row:before,
+.cmb_metabox .cmb-row:after {
+    content: "";
+    display: table;
+} 
+.cmb_metabox .cmb-row:after {
+    clear: both;
+}
+
+.cmb_metabox [class*="cmb-cell-"] { 
+	float: left; 
+	padding: 0 5px;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.cmb_metabox .cmb-cell-1  { width: 8.333333333%; }
+.cmb_metabox .cmb-cell-2  { width: 16.666666667%; }
+.cmb_metabox .cmb-cell-3  { width: 25%; }
+.cmb_metabox .cmb-cell-4  { width: 33.333333333%; }
+.cmb_metabox .cmb-cell-5  { width: 41.666666667%; }
+.cmb_metabox .cmb-cell-6  { width: 50%; }
+.cmb_metabox .cmb-cell-7  { width: 58.333333333%; }
+.cmb_metabox .cmb-cell-8  { width: 66.666666667%; }
+.cmb_metabox .cmb-cell-9  { width: 75%; }
+.cmb_metabox .cmb-cell-10 { width: 83.333333333%; }
+.cmb_metabox .cmb-cell-11 { width: 91.666666667%; }
+.cmb_metabox .cmb-cell-12 { width: 100%; }
+
+@media all and ( max-width: 850px ) {
+
+	.cmb_metabox [class*="cmb-cell-"] { width: 100%; }
+
+}
diff --git a/css/src/misc-fields.css b/css/src/misc-fields.css
new file mode 100644
index 00000000..bc66bdc1
--- /dev/null
+++ b/css/src/misc-fields.css
@@ -0,0 +1,65 @@
+/** 
+ * Title Field
+ */
+.CMB_Title .field-title { 
+	margin: 8px 0 !important; 
+}
+
+.CMB_Title h2 { 
+	margin: 0 !important; 
+	padding: 0 !important; 
+}
+
+
+/** 
+ * Color Picker
+ */
+.CMB_Color_Picker .field-item { 
+	float: left; 
+	clear: both; 
+}
+
+.CMB_Color_Picker:before,
+.CMB_Color_Picker:after {
+    content: "";
+    display: table;
+} 
+
+.CMB_Color_Picker:after {
+    clear: both;
+}
+
+.CMB_Color_Picker {
+    zoom: 1;
+}
+
+
+/**
+ * Timepicker
+ */
+div.time-picker { position: absolute; height: 191px; width:4em; /* needed for IE */ overflow: auto; background: #fff; border: 1px solid #aaa; z-index: 99; margin: 0; }
+div.time-picker-12hours { width:6em; /* needed for IE */ }
+div.time-picker ul { list-style-type: none; margin: 0; padding: 0; }
+div.time-picker li { cursor: pointer; height: 10px; font: 12px/1 Helvetica, Arial, sans-serif; padding: 4px 3px; }
+div.time-picker li.selected { background: #0063CE; color: #fff; }
+
+.cmb_metabox input.cmb_timepicker { 
+	width: 100px; 
+	margin-right: 0;
+}
+
+.CMB_Datetime_Timestamp_Field input + input { 
+	margin-left: 4px; 
+}
+
+/**
+ * Select Fields
+ */
+
+.cmb_select { 
+	width: 100%; 
+}
+
+.select2-offscreen { 
+	display: none; 
+} 
diff --git a/css/src/repeatable.css b/css/src/repeatable.css
new file mode 100644
index 00000000..e88bf3aa
--- /dev/null
+++ b/css/src/repeatable.css
@@ -0,0 +1,88 @@
+/** 
+ * Repeatable
+ */
+
+.cmb_metabox .field.repeatable > .field-item { 
+ 	padding-right: 30px; 
+ 	margin-bottom: 10px; 
+ }
+
+.cmb_metabox .repeat-field { 
+	display: block !important; 
+	clear: both; 
+}
+
+.CMB_Text_Small_Field.repeatable .field-item,
+.CMB_Date_Field.repeatable .field-item,
+.CMB_Time_Field.repeatable .field-item,
+.CMB_Date_Timestamp_Field.repeatable .field-item,
+.CMB_Date_Timestamp_Field.repeatable .field-item,
+.CMB_Datetime_Timestamp_Field.repeatable .field-item {
+	float: left; clear: both;
+}
+
+.cmb-delete-field { 
+	display: inline-block;
+	text-decoration: none;
+	font-size: 11px;
+	line-height: 20px;
+	height: 22px;
+	width: 22px;
+	margin: 0;
+	padding: 0;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-webkit-border-radius: 3px;
+	-webkit-appearance: none;
+	border-radius: 3px;
+	white-space: nowrap;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	color: #555;
+	border-color: #ccc;
+	background: #f7f7f7;
+	-webkit-box-shadow: inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);
+	box-shadow: inset 0 1px 0 #fff,0 1px 0 rgba(0,0,0,.08);
+	vertical-align: top;
+	position: absolute;
+	top: 3px;
+	right: 0;
+	text-indent: 100%;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+.cmb-delete-field:hover,
+.cmb-delete-field:focus,
+.cmb-delete-field:active {
+	background: #fafafa;
+	border-color: #999;
+	color: #222;
+}
+
+.cmb-delete-field .cmb-delete-field-icon {
+	content: ' ';
+	display: block;
+	position: absolute;
+	height: 8px;
+	width: 8px;
+	top: 50%;
+	left: 50%;
+	margin-top: -4px;
+	margin-left: -4px;
+	background-image: url( '../../images/cmb-icon-remove.png');
+	background-repeat: no-repeat;
+	text-indent: 8px;
+	overflow: hidden;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio : 1.5), only screen and (min-device-pixel-ratio : 1.5) {
+
+	.cmb-delete-field .cmb-delete-field-icon {
+		background-image: url( '../../images/cmb-icon-remove@2x.png');
+		background-size: 8px 8px;
+	}
+
+}
\ No newline at end of file
diff --git a/css/src/sortable.css b/css/src/sortable.css
new file mode 100644
index 00000000..adc9844c
--- /dev/null
+++ b/css/src/sortable.css
@@ -0,0 +1,40 @@
+
+.cmb-sortable > .field-item { 
+	padding-left: 15px; 
+}
+
+.cmb-sortable .cmb-handle { 
+	height: 100%; 
+	width: 3px; 
+	position: absolute; 
+	top: 0; 
+	left: 0; 
+	background: transparent; 
+	cursor: move; 
+	border-left: 3px solid #DFDFDF; 
+	border-right: 3px solid #DFDFDF; 
+}
+
+.cmb-sortable .ui-sortable-helper { 
+	opacity: 0.75;
+}
+
+.cmb-sortable .ui-sortable-helper:before { 
+	content: ' ';
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	top: -6px;
+	left: -6px;
+	background-color: #F8F8F8; 
+	border: 1px solid #DEDEDE;
+	padding: 5px; 
+	z-index: -1;
+}
+
+.cmb-sortable > .ui-sortable-placeholder { 
+	border: 1px dashed #DDD !important;
+	background: transparent !important; 
+	visibility: visible !important; 
+	margin-bottom: 8px !important;
+}
\ No newline at end of file
diff --git a/css/vendor/jquery-ui/images/animated-overlay.gif b/css/vendor/jquery-ui/images/animated-overlay.gif
new file mode 100644
index 00000000..d441f75e
Binary files /dev/null and b/css/vendor/jquery-ui/images/animated-overlay.gif differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 00000000..87f812d7
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png b/css/vendor/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 00000000..4cb0d6d1
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png b/css/vendor/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 00000000..bfe89745
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png b/css/vendor/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 00000000..168a1821
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png b/css/vendor/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 00000000..25bf099b
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png b/css/vendor/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 00000000..c5dc70ae
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png b/css/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 00000000..bf1f1645
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png differ
diff --git a/css/vendor/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/css/vendor/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 00000000..11c18416
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png b/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png
new file mode 100644
index 00000000..29433020
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-icons_222222_256x240.png differ
diff --git a/css/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png b/css/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 00000000..25dfde1f
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png differ
diff --git a/css/vendor/jquery-ui/images/ui-icons_454545_256x240.png b/css/vendor/jquery-ui/images/ui-icons_454545_256x240.png
new file mode 100644
index 00000000..0063819c
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-icons_454545_256x240.png differ
diff --git a/css/vendor/jquery-ui/images/ui-icons_888888_256x240.png b/css/vendor/jquery-ui/images/ui-icons_888888_256x240.png
new file mode 100644
index 00000000..53aaf6f3
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-icons_888888_256x240.png differ
diff --git a/css/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png b/css/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 00000000..145e3d3c
Binary files /dev/null and b/css/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/css/jquery-ui.css b/css/vendor/jquery-ui/jquery-ui.css
similarity index 95%
rename from css/jquery-ui.css
rename to css/vendor/jquery-ui/jquery-ui.css
index c4882a95..29931f0b 100644
--- a/css/jquery-ui.css
+++ b/css/vendor/jquery-ui/jquery-ui.css
@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.10.3 - 2013-05-03
+/*! jQuery UI - v1.10.2 - 2013-03-14
 * http://jqueryui.com
 * Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
 * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
@@ -466,8 +466,6 @@ button.ui-button::-moz-focus-inner {
 	margin: 0;
 	padding: 0;
 	width: 100%;
-	/* support: IE10, see #8844 */
-	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
 }
 .ui-menu .ui-menu-divider {
 	margin: 5px -2px 5px -2px;
@@ -801,7 +799,7 @@ body .ui-tooltip {
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa;
-	background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
 	color: #222222;
 }
 .ui-widget-content a {
@@ -809,7 +807,7 @@ body .ui-tooltip {
 }
 .ui-widget-header {
 	border: 1px solid #aaaaaa;
-	background: #cccccc url(../images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
 	color: #222222;
 	font-weight: bold;
 }
@@ -823,7 +821,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #555555;
 }
@@ -840,7 +838,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-focus,
 .ui-widget-header .ui-state-focus {
 	border: 1px solid #999999;
-	background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -855,7 +853,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
 	border: 1px solid #aaaaaa;
-	background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -872,7 +870,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid #fcefa1;
-	background: #fbf9ee url(../images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
+	background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
 	color: #363636;
 }
 .ui-state-highlight a,
@@ -884,7 +882,7 @@ body .ui-tooltip {
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a;
-	background: #fef1ec url(../images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
+	background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
 	color: #cd0a0a;
 }
 .ui-state-error a,
@@ -930,27 +928,27 @@ body .ui-tooltip {
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: url(../images/ui-icons_222222_256x240.png);
+	background-image: url(images/ui-icons_222222_256x240.png);
 }
 .ui-widget-header .ui-icon {
-	background-image: url(../images/ui-icons_222222_256x240.png);
+	background-image: url(images/ui-icons_222222_256x240.png);
 }
 .ui-state-default .ui-icon {
-	background-image: url(../images/ui-icons_888888_256x240.png);
+	background-image: url(images/ui-icons_888888_256x240.png);
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: url(../images/ui-icons_454545_256x240.png);
+	background-image: url(images/ui-icons_454545_256x240.png);
 }
 .ui-state-active .ui-icon {
-	background-image: url(../images/ui-icons_454545_256x240.png);
+	background-image: url(images/ui-icons_454545_256x240.png);
 }
 .ui-state-highlight .ui-icon {
-	background-image: url(../images/ui-icons_2e83ff_256x240.png);
+	background-image: url(images/ui-icons_2e83ff_256x240.png);
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: url(../images/ui-icons_cd0a0a_256x240.png);
+	background-image: url(images/ui-icons_cd0a0a_256x240.png);
 }
 
 /* positioning */
@@ -1163,15 +1161,15 @@ body .ui-tooltip {
 
 /* Overlays */
 .ui-widget-overlay {
-	background: #aaaaaa url(../images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
 	opacity: .3;
 	filter: Alpha(Opacity=30);
 }
 .ui-widget-shadow {
 	margin: -8px 0 0 -8px;
 	padding: 8px;
-	background: #aaaaaa url(../images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
 	opacity: .3;
 	filter: Alpha(Opacity=30);
 	border-radius: 8px;
-}
\ No newline at end of file
+}
diff --git a/css/vendor/jquery-ui/jquery-ui.min.css b/css/vendor/jquery-ui/jquery-ui.min.css
new file mode 100644
index 00000000..572a6a98
--- /dev/null
+++ b/css/vendor/jquery-ui/jquery-ui.min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.10.2 - 2013-03-14
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:100%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:700;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:0}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:400}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:400;margin:-1px}.ui-menu .ui-state-disabled{font-weight:400;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url(images/animated-overlay.gif);height:100%;filter:alpha(opacity=25);opacity:.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:0;background:0;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:0;border-bottom:0;border-right:0}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav li a{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active a,.ui-tabs .ui-tabs-nav li.ui-state-disabled a,.ui-tabs .ui-tabs-nav li.ui-tabs-loading a{cursor:text}.ui-tabs .ui-tabs-nav li a,.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:0}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_888888_256x240.png)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_2e83ff_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_cd0a0a_256x240.png)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/css/vendor/jquery-ui/jquery.ui.theme.css b/css/vendor/jquery-ui/jquery.ui.theme.css
new file mode 100644
index 00000000..3210fc73
--- /dev/null
+++ b/css/vendor/jquery-ui/jquery.ui.theme.css
@@ -0,0 +1,406 @@
+/*!
+ * jQuery UI CSS Framework 1.10.2
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #999999;
+	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(images/ui-icons_888888_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(images/ui-icons_2e83ff_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(images/ui-icons_cd0a0a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+}
+.ui-widget-shadow {
+	margin: -8px 0 0 -8px;
+	padding: 8px;
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+	border-radius: 8px;
+}
diff --git a/custom-meta-boxes.php b/custom-meta-boxes.php
index c588d4f1..6f5dc7f5 100755
--- a/custom-meta-boxes.php
+++ b/custom-meta-boxes.php
@@ -35,11 +35,15 @@
  * This may need to be filtered for local Window installations.
  * If resources do not load, please check the wiki for details.
  */
+
+if ( ! defined( 'CMB_DEV') )
+	define( 'CMB_DEV', false );
+
 if ( ! defined( 'CMB_PATH') )
-define( 'CMB_PATH', str_replace( '\\', '/', dirname( __FILE__ ) ) );
-if ( ! defined( 'CMB_URL' ) )
-define( 'CMB_URL', str_replace( str_replace( '\\', '/', WP_CONTENT_DIR ), str_replace( '\\', '/', WP_CONTENT_URL ), CMB_PATH ) );
+	define( 'CMB_PATH', str_replace( '\\', '/', dirname( __FILE__ ) ) );
 
+if ( ! defined( 'CMB_URL' ) )
+	define( 'CMB_URL', str_replace( str_replace( '\\', '/', WP_CONTENT_DIR ), str_replace( '\\', '/', WP_CONTENT_URL ), CMB_PATH ) );
 
 include_once( CMB_PATH . '/classes.fields.php' );
 include_once( CMB_PATH . '/class.cmb-meta-box.php' );
@@ -133,38 +137,36 @@ function _cmb_field_class_for_type( $type ) {
  * For the order of repeatable fields to be guaranteed, orderby meta_id needs to be set. 
  * Note usermeta has a different meta_id column name.
  * 
- * TODO
- * This is far from ideal as we are doing this on EVERY SINGLE QUERY.
- * But... no other way to modify this query, or re-order in PHP.
- * There is a trac ticket + patch that will fix this. http://core.trac.wordpress.org/ticket/25511
+ * Only do this for older versions as meta is now ordered by ID (since 3.8)
+ * See http://core.trac.wordpress.org/ticket/25511
  * 
  * @param  string $query
  * @return string $query
  */
 function cmb_fix_meta_query_order($query) {
 
-	$pattern = '/^SELECT (post_id|user_id), meta_key, meta_value FROM \w* WHERE post_id IN \([\d|,]*\)$/';
-	
-	if ( 
-		0 === strpos( $query, "SELECT post_id, meta_key, meta_value" ) &&  
-		preg_match( $pattern, $query, $matches ) 
-	) {
-			
-		if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
-			$meta_id_column = 'umeta_id';
-		else
-			$meta_id_column = 'meta_id';
-
-		$meta_query_orderby = ' ORDER BY ' . $meta_id_column;
-
-		if ( false === strpos( $query, $meta_query_orderby ) )
-			$query .= $meta_query_orderby;
-	
-	}
-	
-	return $query;
+    $pattern = '/^SELECT (post_id|user_id), meta_key, meta_value FROM \w* WHERE post_id IN \([\d|,]*\)$/';
+    
+    if ( 
+            0 === strpos( $query, "SELECT post_id, meta_key, meta_value" ) &&  
+            preg_match( $pattern, $query, $matches ) 
+    ) {        
+            
+            if ( isset( $matches[1] ) && 'user_id' == $matches[1] )
+                    $meta_id_column = 'umeta_id';
+            else
+                    $meta_id_column = 'meta_id';
+
+            $meta_query_orderby = ' ORDER BY ' . $meta_id_column;
+
+            if ( false === strpos( $query, $meta_query_orderby ) )
+                    $query .= $meta_query_orderby;
+    
+    }
+    
+    return $query;
 
 }
 
-if ( version_compare( get_bloginfo( 'version' ), '3.7', '<=' ) )
-	add_filter( 'query', 'cmb_fix_meta_query_order', 1 );     
\ No newline at end of file
+if ( version_compare( get_bloginfo( 'version' ), '3.8', '<' ) )
+	add_filter( 'query', 'cmb_fix_meta_query_order', 1 ); 
\ No newline at end of file
diff --git a/example-functions.php b/example-functions.php
index 530425b4..69f61b73 100644
--- a/example-functions.php
+++ b/example-functions.php
@@ -13,7 +13,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		
 		array( 'id' => 'field-1',  'name' => 'Text input field', 'type' => 'text' ),
 		array( 'id' => 'field-2', 'name' => 'Read-only text input field', 'type' => 'text', 'readonly' => true, 'default' => 'READ ONLY' ),
- 		array( 'id' => 'field-3', 'name' => 'Repeatable text input field', 'type' => 'text', 'desc' => 'Add up to 5 fields.', 'repeatable' => true, 'repeatable_max' => 5 ),
+ 		array( 'id' => 'field-3', 'name' => 'Repeatable text input field', 'type' => 'text', 'desc' => 'Add up to 5 fields.', 'repeatable' => true, 'repeatable_max' => 5, 'sortable' => true ),
 
 		array( 'id' => 'field-4',  'name' => 'Small text input field', 'type' => 'text_small' ),
 		array( 'id' => 'field-5',  'name' => 'URL field', 'type' => 'url' ),
@@ -21,7 +21,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		array( 'id' => 'field-6',  'name' => 'Radio input field', 'type' => 'radio', 'options' => array( 'Option 1', 'Option 2' ) ),
 		array( 'id' => 'field-7',  'name' => 'Checkbox field', 'type' => 'checkbox' ),
 		
-		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ) ),
+		array( 'id' => 'field-8',  'name' => 'WYSIWYG field', 'type' => 'wysiwyg', 'options' => array( 'editor_height' => '100' ), 'repeatable' => true, 'sortable' => true ),
 
 		array( 'id' => 'field-9',  'name' => 'Textarea field', 'type' => 'textarea' ),
 		array( 'id' => 'field-10',  'name' => 'Code textarea field', 'type' => 'textarea_code' ),
@@ -29,7 +29,7 @@ function cmb_sample_metaboxes( array $meta_boxes ) {
 		array( 'id' => 'field-11', 'name' => 'File field', 'type' => 'file', 'file_type' => 'image', 'repeatable' => 1, 'sortable' => 1 ),
 		array( 'id' => 'field-12', 'name' => 'Image upload field', 'type' => 'image', 'repeatable' => true, 'show_size' => true ),
 		
-		array( 'id' => 'field-13', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'allow_none' => true ),
+		array( 'id' => 'field-13', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'allow_none' => true, 'sortable' => true, 'repeatable' => true ),
 		array( 'id' => 'field-14', 'name' => 'Select field', 'type' => 'select', 'options' => array( 'option-1' => 'Option 1', 'option-2' => 'Option 2', 'option-3' => 'Option 3' ), 'multiple' => true ),
 		array( 'id' => 'field-15', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category' ),
 		array( 'id' => 'field-15b', 'name' => 'Select taxonomy field', 'type' => 'taxonomy_select',  'taxonomy' => 'category',  'multiple' => true ),
diff --git a/images/ico-delete.png b/images/ico-delete.png
deleted file mode 100644
index 08f24936..00000000
Binary files a/images/ico-delete.png and /dev/null differ
diff --git a/images/ui-bg_flat_0_aaaaaa_40x100.png b/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100755
index 5b5dab2a..00000000
Binary files a/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/images/ui-bg_flat_75_ffffff_40x100.png b/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100755
index ac8b229a..00000000
Binary files a/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/images/ui-bg_glass_55_fbf9ee_1x400.png b/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100755
index ad3d6346..00000000
Binary files a/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/images/ui-bg_glass_65_ffffff_1x400.png b/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100755
index 42ccba26..00000000
Binary files a/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/images/ui-bg_glass_75_dadada_1x400.png b/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100755
index 5a46b47c..00000000
Binary files a/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/images/ui-bg_glass_75_e6e6e6_1x400.png b/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100755
index 86c2baa6..00000000
Binary files a/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/images/ui-bg_glass_95_fef1ec_1x400.png b/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100755
index 4443fdc1..00000000
Binary files a/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100755
index 7c9fa6c6..00000000
Binary files a/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/images/ui-icons_222222_256x240.png b/images/ui-icons_222222_256x240.png
deleted file mode 100755
index b273ff11..00000000
Binary files a/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/images/ui-icons_2e83ff_256x240.png b/images/ui-icons_2e83ff_256x240.png
deleted file mode 100755
index 09d1cdc8..00000000
Binary files a/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/images/ui-icons_454545_256x240.png b/images/ui-icons_454545_256x240.png
deleted file mode 100755
index 59bd45b9..00000000
Binary files a/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/images/ui-icons_888888_256x240.png b/images/ui-icons_888888_256x240.png
deleted file mode 100755
index b680b5cf..00000000
Binary files a/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/images/ui-icons_cd0a0a_256x240.png b/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100755
index 2ab019b7..00000000
Binary files a/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/js/cmb.js b/js/cmb.js
index 7cc2f865..b44dc29c 100644
--- a/js/cmb.js
+++ b/js/cmb.js
@@ -13,6 +13,9 @@ var CMB = {
 	_clonedFieldCallbacks: [],
 	_deletedFieldCallbacks: [],
 
+	_sortStartCallbacks: [],
+	_sortEndCallbacks: [],
+	
 	init : function() {
 
 		jQuery( '.field.repeatable' ).each( function() {
@@ -29,33 +32,38 @@ var CMB = {
 
 		CMB.doneInit();
 
+		jQuery('.field.cmb-sortable' ).each( function() { 
+			CMB.sortableInit( jQuery(this) );
+		} );
+
+
 	},
 
 	repeatField : function( e ) {
 
-	    var templateField, newT, field, index, attr;
+		var templateField, newT, field, index, attr;
 
-	    field = jQuery( this ).closest('.field' );					
+		field = jQuery( this ).closest('.field' );					
 
 		e.preventDefault();
-		jQuery(this).blur();	
+		jQuery(this).blur();
 
 		if ( CMB.isMaxFields( field, 1 ) )
 			return;
 
-	    templateField = field.children( '.field-item.hidden' );
+		templateField = field.children( '.field-item.hidden' );
 
-	    newT = templateField.clone();
-	    newT.removeClass( 'hidden' );
-	    
-	    var excludeInputTypes = '[type=submit],[type=button],[type=checkbox],[type=radio],[readonly]';
-	    newT.find( 'input' ).not( excludeInputTypes ).val( '' );
+		newT = templateField.clone();
+		newT.removeClass( 'hidden' );
+		
+		var excludeInputTypes = '[type=submit],[type=button],[type=checkbox],[type=radio],[readonly]';
+		newT.find( 'input' ).not( excludeInputTypes ).val( '' );
 
-	    newT.find( '.cmb_upload_status' ).html('');
+		newT.find( '.cmb_upload_status' ).html('');
 
-	    newT.insertBefore( templateField );
+		newT.insertBefore( templateField );
 
-	    // Recalculate group ids & update the name fields..
+		 // Recalculate group ids & update the name fields..
 		index = 0;
 		attr  = ['id','name','for','data-id','data-name'];
 
@@ -76,7 +84,11 @@ var CMB = {
 
 		} );
 
-	    CMB.clonedField( newT );
+		CMB.clonedField( newT );
+
+		if ( field.hasClass( 'cmb-sortable' ) )
+			CMB.sortableInit( field );
+
 
 	},
 
@@ -86,7 +98,7 @@ var CMB = {
 
 		e.preventDefault();
 		jQuery(this).blur();
-		
+
 		fieldItem = jQuery( this ).closest('.field-item' );
 		field     = fieldItem.closest( '.field' );
 
@@ -128,8 +140,8 @@ var CMB = {
 		else 
 			addBtn.removeAttr( 'disabled' );
 
-	    if ( count > parseInt( max, 10 ) )
-	    	return true;
+		if ( count > parseInt( max, 10 ) )
+			return true;
 
 	},
 
@@ -214,8 +226,82 @@ var CMB = {
 					callbacks[a]( el )
 
 		})
-	}
+	},
+	
+	sortableInit : function( field ) {
+
+		var items = field.find(' > .field-item').not('.hidden');
+		
+		field.find( '> .field-item > .cmb-handle' ).remove();
+
+		items.each( function() {
+			jQuery(this).append( '<div class="cmb-handle"></div>' );
+		} );
+		
+		field.sortable( { 
+			handle: "> .cmb-handle" ,
+			cursor: "move",
+			items: " > .field-item",
+			beforeStop: function( event, ui ) { CMB.sortStart( jQuery( ui.item[0] ) ); },
+			deactivate: function( event, ui ) { CMB.sortEnd( jQuery( ui.item[0] ) ); },
+		} );
+		
+	},
+
+	sortStart : function ( el ) {
+		
+		// also check child elements
+		el.add( el.find( 'div[data-class]' ) ).each( function(i, el) {
+		
+			el = jQuery( el )
+			var callbacks = CMB._sortStartCallbacks[el.attr( 'data-class') ]
+		
+			if ( callbacks )
+				for ( var a = 0; a < callbacks.length; a++ )
+					callbacks[a]( el )
+				
+		})
+
+	},
+
+	addCallbackForSortStart: function( fieldName, callback ) {
+		
+		if ( jQuery.isArray( fieldName ) )
+			for ( var i = 0; i < fieldName.length; i++ )
+				CMB.addCallbackForSortStart( fieldName[i], callback );
+	
+		this._sortStartCallbacks[fieldName] = this._sortStartCallbacks[fieldName] ? this._sortStartCallbacks[fieldName] : []
+		this._sortStartCallbacks[fieldName].push( callback )
+	
+	},
+
+	sortEnd : function ( el ) {
 
+		// also check child elements
+		el.add( el.find( 'div[data-class]' ) ).each( function(i, el) {
+		
+			el = jQuery( el )
+			var callbacks = CMB._sortEndCallbacks[el.attr( 'data-class') ]
+		
+			if ( callbacks )
+				for ( var a = 0; a < callbacks.length; a++ )
+					callbacks[a]( el )
+				
+		})
+
+	},
+
+	addCallbackForSortEnd: function( fieldName, callback ) {
+
+		if ( jQuery.isArray( fieldName ) )
+			for ( var i = 0; i < fieldName.length; i++ )
+				CMB.addCallbackForSortEnd( fieldName[i], callback );
+	
+		this._sortEndCallbacks[fieldName] = this._sortEndCallbacks[fieldName] ? this._sortEndCallbacks[fieldName] : []
+		this._sortEndCallbacks[fieldName].push( callback )
+	
+	}
+	
 }
 
 jQuery(document).ready( function() {
diff --git a/js/field-wysiwyg.js b/js/field-wysiwyg.js
index ceaafb6e..b259fc6d 100644
--- a/js/field-wysiwyg.js
+++ b/js/field-wysiwyg.js
@@ -63,4 +63,28 @@ CMB.addCallbackForClonedField( 'CMB_wysiwyg', function( newT ) {
 
 	} );
 
-} );
\ No newline at end of file
+} );
+
+
+CMB.addCallbackForSortStart( 'CMB_wysiwyg', function( el ) {
+
+	el.find( '.wp-editor-area' ).each(function(){
+		var id = jQuery(this).attr('id');
+		tinyMCE.execCommand('mceRemoveControl', false, id);
+	});
+
+} );
+
+CMB.addCallbackForSortEnd( 'CMB_wysiwyg', function( el ) {
+
+	el.find( '.wp-editor-area' ).each(function(){
+		
+		var id   = jQuery(this).attr('id'),
+		    mode = jQuery(this).closest('.wp-editor-wrap').hasClass('tmce-active') ? 'tmce' : 'html';
+		
+		if ( 'tmce' === mode )
+			tinyMCE.execCommand('mceAddControl', false, id);
+	
+	});
+
+} );
diff --git a/js/field.colorpicker.js b/js/field.colorpicker.js
index 01bd32bc..a064e0db 100644
--- a/js/field.colorpicker.js
+++ b/js/field.colorpicker.js
@@ -15,4 +15,4 @@ CMB.addCallbackForClonedField( 'CMB_Color_Picker', function( newT ) {
     newT.find('.wp-color-result').remove();
 	newT.find('input:text.cmb_colorpicker').wpColorPicker();
 
-} );
+} );
\ No newline at end of file
diff --git a/js/file-upload.js b/js/file-upload.js
index 9310b03f..d03d0a4a 100644
--- a/js/file-upload.js
+++ b/js/file-upload.js
@@ -47,16 +47,16 @@ jQuery( document ).ready( function() {
 					nonce:  link.attr( 'data-nonce' )
 				}
 
-				fileHolder.addClass( 'loading' );
+				fileHolder.addClass( 'cmb-loading' );
 
 				jQuery.post( ajaxurl, data, function( src ) {
 					// Insert image
 					jQuery( '<img />', { src: src } ).prependTo( fileHolder );
-					fileHolder.removeClass( 'loading' );
+					fileHolder.removeClass( 'cmb-loading' );
 				}).fail( function() {
 					// Fallback - insert full size image.
 					jQuery( '<img />', { src: model.attributes.url } ).prependTo( fileHolder );
-					fileHolder.removeClass( 'loading' );
+					fileHolder.removeClass( 'cmb-loading' );
 				});
 
 			} else {
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..a6c0854e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "Custom-Meta-Boxes",
+  "version": "0.1.0-beta",
+  "description": "Custom Meta Boxes is a framework for easily adding custom fields to the WordPress post edit page.",
+  "homepage": "https://github.com/humanmade/Custom-Meta-Boxes/",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/humanmade/Custom-Meta-Boxes.git"
+  },
+  "author": "Human Made Limited",
+  "license": "GPL",
+  "readmeFilename": "readme.md",
+  "gitHead": "c94fbd6ddd89684e18670968c02abc383c640224",
+  "bugs": {
+    "url": "https://github.com/humanmade/Custom-Meta-Boxes/issues"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.2",
+    "grunt-contrib-cssmin": "~0.7.0"
+  }
+}
diff --git a/tests/testDateField.php b/tests/testDateField.php
index 4e16e612..f6d12e43 100644
--- a/tests/testDateField.php
+++ b/tests/testDateField.php
@@ -31,13 +31,13 @@ function testDateFieldAssets() {
 		$styles_output = get_echo( 'wp_print_styles' );
 
 		// Scripts
-		$this->assertContains( CMB_URL . '/js/field.datetime.js', $scripts_output );
-		$this->assertContains( CMB_URL . '/js/cmb.js', $scripts_output );
+		$this->assertContains( '/js/field.datetime.js', $scripts_output );
+		$this->assertContains( '/js/cmb.js', $scripts_output );
 		$this->assertContains( site_url() . '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', $scripts_output );
 		$this->assertContains( site_url() . '/wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js', $scripts_output );
 		
 		// Styles
-		$this->assertContains( CMB_URL . '/css/jquery-ui.css', $styles_output );
+		$this->assertContains( 'css/vendor/jquery-ui/jquery-ui.css', $styles_output );
 		
 	}
 
diff --git a/tests/testGroupField.php b/tests/testGroupField.php
index e638729a..3287be02 100644
--- a/tests/testGroupField.php
+++ b/tests/testGroupField.php
@@ -5,8 +5,8 @@ class GroupFieldTestCase extends WP_UnitTestCase {
 	function testAddField() {
 
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
-		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
-		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 3, 4 ) );
+		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
+		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 2, 3 ), array( 'repeatable' => true ) );
 
 		$group->add_field( $field1 );
 		$group->add_field( $field2 );
@@ -39,22 +39,29 @@ function testGetValues() {
 	function testParseSaveValues() {
 
 		$group  = new CMB_Group_Field( 'group', 'Group Title', array() );
-		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1, 2 ) );
-		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 3, 4 ) );
+		$field1 = new CMB_Text_Field( 'foo', 'Title', array( 1 ) );
+		$field2 = new CMB_Text_Field( 'bar', 'Title', array( 2, 3 ), array( 'repeatable' => true ) );
 	
 		$group->add_field( $field1 );
 		$group->add_field( $field2 );
 		
-		$group->set_values( $values = array( 
+		$group->set_values( array( 
 			'group' => array( 
-				'foo' => array( 1, 2 ) ,
-				'bar' => array( 1, 2 ) 
+				'foo' => array( 1 ),
+				'bar' => array( 2, 3 ) 
 			),
 		) );
 
+		$expected = array( 
+			'group' => array( 
+				'foo' => 1,
+				'bar' => array( 2, 3 ) 
+			)
+		);
+
 		$group->parse_save_values();
 
-		$this->assertEquals( $group->get_values(), $values );
+		$this->assertEquals( $group->get_values(), $expected );
 
 	}