diff --git a/omega/omega.info b/omega/omega.info
index 8b8a098..df38e07 100644
--- a/omega/omega.info
+++ b/omega/omega.info
@@ -92,6 +92,9 @@ libraries[omega_equalheights][description] = Allows you to force all regions of
 libraries[omega_equalheights][js][0][file] = omega-equalheights.js
 libraries[omega_equalheights][js][0][options][weight] = -18
 
+; PLUGINS
+plugins[panels][layouts] = panels/layouts
+
 ; THEME SETTINGS (DEFAULTS)
 
 settings[alpha_grid] = 'alpha_default'
@@ -405,4 +408,4 @@ settings[alpha_region_footer_second_prefix] = ''
 settings[alpha_region_footer_second_columns] = '12'
 settings[alpha_region_footer_second_suffix] = ''
 settings[alpha_region_footer_second_weight] = '2'
-settings[alpha_region_footer_second_css] = ''
\ No newline at end of file
+settings[alpha_region_footer_second_css] = ''
diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega-12-onecol.tpl.php b/omega/panels/layouts/omega_12/omega_12_onecol/omega-12-onecol.tpl.php
new file mode 100644
index 0000000..fcc0f60
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_onecol/omega-12-onecol.tpl.php
@@ -0,0 +1,9 @@
+<div class="panel-display omega-12-onecol" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.css b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc
new file mode 100644
index 0000000..01c88fa
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts()
+ */
+function omega_omega_12_onecol_panels_layouts() {
+  $items['omega_12_onecol'] = array(
+    'title' => t('Single column 12'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_onecol.png',
+    'theme' => 'omega_12_onecol',
+    'css' => 'omega_12_onecol.css',
+    'regions' => array('middle' => t('Middle column')),
+  );
+
+  return $items;
+}
+
diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png
new file mode 100644
index 0000000..176ed69
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega-12-threecol-4-4-4.tpl.php b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega-12-threecol-4-4-4.tpl.php
new file mode 100644
index 0000000..1cb9d22
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega-12-threecol-4-4-4.tpl.php
@@ -0,0 +1,17 @@
+<div class="panel-display omega-12-threecol-4-4-4" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-4 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.css b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.inc b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.inc
new file mode 100644
index 0000000..aee60cd
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.inc
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_threecol_4_4_4_panels_layouts() {
+  $items['omega_12_threecol_4_4_4'] = array(
+    'title' => t('Three column 4-4-4'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_threecol_4_4_4.png',
+    'theme' => 'omega_12_threecol_4_4_4',
+    'css' => 'omega_12_threecol_4_4_4.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png
new file mode 100644
index 0000000..468f8bb
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega-12-threecol-4-4-4-stacked.tpl.php b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega-12-threecol-4-4-4-stacked.tpl.php
new file mode 100644
index 0000000..74c0333
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega-12-threecol-4-4-4-stacked.tpl.php
@@ -0,0 +1,25 @@
+<div class="panel-display omega-12-threecol-4-4-4" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.css b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.inc b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.inc
new file mode 100644
index 0000000..bfb50be
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.inc
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_threecol_4_4_4_stacked_panels_layouts() {
+  $items['omega_12_threecol_4_4_4_stacked'] = array(
+    'title' => t('Three column 4-4-4 stacked'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_threecol_4_4_4_stacked.png',
+    'theme' => 'omega_12_threecol_4_4_4_stacked',
+    'css' => 'omega_12_threecol_4_4_4_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png
new file mode 100644
index 0000000..ffd1351
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega-12-twocol-3-9.tpl.php b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega-12-twocol-3-9.tpl.php
new file mode 100644
index 0000000..4b901c8
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega-12-twocol-3-9.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-12-twocol-3-9" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-3 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-9 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.css b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.inc b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.inc
new file mode 100644
index 0000000..0fb92e8
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_twocol_3_9_panels_layouts() {
+  $items['omega_12_twocol_3_9'] = array(
+    'title' => t('Two Column 3-9'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_twocol_3_9.png',
+    'theme' => 'omega_12_twocol_3_9',
+    'css' => 'omega_12_twocol_3_9.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png
new file mode 100644
index 0000000..efa3577
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega-12-twocol-6-6.tpl.php b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega-12-twocol-6-6.tpl.php
new file mode 100644
index 0000000..f7e8e11
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega-12-twocol-6-6.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-12-twocol-6-6" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-6 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.css b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.inc b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.inc
new file mode 100644
index 0000000..c4b7f45
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_twocol_6_6_panels_layouts() {
+  $items['omega_12_twocol_6_6'] = array(
+    'title' => t('Two Column 6-6'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_twocol_6_6.png',
+    'theme' => 'omega_12_twocol_6_6',
+    'css' => 'omega_12_twocol_6_6.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png
new file mode 100644
index 0000000..9d2965e
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega-12-twocol-6-6-bricks.tpl.php b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega-12-twocol-6-6-bricks.tpl.php
new file mode 100644
index 0000000..89042a8
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega-12-twocol-6-6-bricks.tpl.php
@@ -0,0 +1,33 @@
+<div class="panel-display omega-12-twocol-6-6-bricks" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 alpha">
+    <div class="inside"><?php print $content['left_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 omega">
+    <div class="inside"><?php print $content['right_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 alpha">
+    <div class="inside"><?php print $content['left_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 omega">
+    <div class="inside"><?php print $content['right_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.css b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.inc b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.inc
new file mode 100644
index 0000000..ce23304
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.inc
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_twocol_6_6_bricks_panels_layouts() {
+  $items['omega_12_twocol_6_6_bricks'] = array(
+    'title' => t('Two Column 6-6 bricks'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_twocol_6_6_bricks.png',
+    'theme' => 'omega_12_twocol_6_6_bricks',
+    'css' => 'omega_12_twocol_6_6_bricks.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left_above' => t('Left above'),
+      'right_above' => t('Right above'),
+      'middle' => t('Middle'),
+      'left_below' => t('Left below'),
+      'right_below' => t('Right below'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png
new file mode 100644
index 0000000..450395c
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega-12-twocol-6-6-stacked.tpl.php b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega-12-twocol-6-6-stacked.tpl.php
new file mode 100644
index 0000000..7f1bab3
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega-12-twocol-6-6-stacked.tpl.php
@@ -0,0 +1,21 @@
+<div class="panel-display omega-12-twocol-6-6-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.css b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.inc b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.inc
new file mode 100644
index 0000000..b5941b5
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.inc
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_twocol_6_6_stacked_panels_layouts() {
+  $items['omega_12_twocol_6_6_stacked'] = array(
+    'title' => t('Two Column 6-6 stacked'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_twocol_6_6_stacked.png',
+    'theme' => 'omega_12_twocol_6_6_stacked',
+    'css' => 'omega_12_twocol_6_6_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left'),
+      'right' => t('Right'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png
new file mode 100644
index 0000000..30ab8b6
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png differ
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega-12-twocol-9-3.tpl.php b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega-12-twocol-9-3.tpl.php
new file mode 100644
index 0000000..d1227f0
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega-12-twocol-9-3.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-12-twocol-9-3" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-9 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-3 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.css b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.inc b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.inc
new file mode 100644
index 0000000..78d2ed3
--- /dev/null
+++ b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_12_twocol_9_3_panels_layouts() {
+  $items['omega_12_twocol_9_3'] = array(
+    'title' => t('Two Column 9-3'),
+    'category' => t('Omega: 12 Column Grid'),
+    'icon' => 'omega_12_twocol_9_3.png',
+    'theme' => 'omega_12_twocol_9_3',
+    'css' => 'omega_12_twocol_9_3.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png
new file mode 100644
index 0000000..27de760
Binary files /dev/null and b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega-16-onecol.tpl.php b/omega/panels/layouts/omega_16/omega_16_onecol/omega-16-onecol.tpl.php
new file mode 100644
index 0000000..1f385d3
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_onecol/omega-16-onecol.tpl.php
@@ -0,0 +1,9 @@
+<div class="panel-display omega-16-onecol" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.css b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc
new file mode 100644
index 0000000..81f5384
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts()
+ */
+function omega_omega_16_onecol_panels_layouts() {
+  $items['omega_16_onecol'] = array(
+    'title' => t('Single column 16'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_onecol.png',
+    'theme' => 'omega_16_onecol',
+    'css' => 'omega_16_onecol.css',
+    'regions' => array('middle' => t('Middle column')),
+  );
+
+  return $items;
+}
+
diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png
new file mode 100644
index 0000000..176ed69
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega-16-threecol-5-6-5.tpl.php b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega-16-threecol-5-6-5.tpl.php
new file mode 100644
index 0000000..d531d39
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega-16-threecol-5-6-5.tpl.php
@@ -0,0 +1,17 @@
+<div class="panel-display omega-16-threecol-5-6-5" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-5 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-5 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.css b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.inc b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.inc
new file mode 100644
index 0000000..65be33f
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.inc
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_threecol_5_6_5_panels_layouts() {
+  $items['omega_16_threecol_5_6_5'] = array(
+    'title' => t('Three column 5-6-5'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_threecol_5_6_5.png',
+    'theme' => 'omega_16_threecol_5_6_5',
+    'css' => 'omega_16_threecol_5_6_5.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png
new file mode 100644
index 0000000..468f8bb
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega-16-threecol-5-6-5-stacked.tpl.php b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega-16-threecol-5-6-5-stacked.tpl.php
new file mode 100644
index 0000000..d15a69e
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega-16-threecol-5-6-5-stacked.tpl.php
@@ -0,0 +1,25 @@
+<div class="panel-display omega-16-threecol-5-6-5" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-5 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-5 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.css b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.inc b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.inc
new file mode 100644
index 0000000..45175c9
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.inc
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_threecol_5_6_5_stacked_panels_layouts() {
+  $items['omega_16_threecol_5_6_5_stacked'] = array(
+    'title' => t('Three column 5-6-5 stacked'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_threecol_5_6_5_stacked.png',
+    'theme' => 'omega_16_threecol_5_6_5_stacked',
+    'css' => 'omega_16_threecol_5_6_5_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png
new file mode 100644
index 0000000..ffd1351
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega-16-twocol-12-4.tpl.php b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega-16-twocol-12-4.tpl.php
new file mode 100644
index 0000000..e885145
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega-16-twocol-12-4.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-16-twocol-12-4" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-12 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-4 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.css b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.inc b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.inc
new file mode 100644
index 0000000..9a06124
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_twocol_12_4_panels_layouts() {
+  $items['omega_16_twocol_12_4'] = array(
+    'title' => t('Two Column 12-4'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_twocol_12_4.png',
+    'theme' => 'omega_16_twocol_12_4',
+    'css' => 'omega_16_twocol_12_4.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png
new file mode 100644
index 0000000..27de760
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega-16-twocol-4-12.tpl.php b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega-16-twocol-4-12.tpl.php
new file mode 100644
index 0000000..21ccffb
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega-16-twocol-4-12.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-16-twocol-4-12" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-4 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.css b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.inc b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.inc
new file mode 100644
index 0000000..18401d1
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_twocol_4_12_panels_layouts() {
+  $items['omega_16_twocol_4_12'] = array(
+    'title' => t('Two Column 4-12'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_twocol_4_12.png',
+    'theme' => 'omega_16_twocol_4_12',
+    'css' => 'omega_16_twocol_4_12.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png
new file mode 100644
index 0000000..efa3577
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega-16-twocol-8-8.tpl.php b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega-16-twocol-8-8.tpl.php
new file mode 100644
index 0000000..3ae3b26
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega-16-twocol-8-8.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-16-twocol-8-8" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.css b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.inc b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.inc
new file mode 100644
index 0000000..4b85157
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_twocol_8_8_panels_layouts() {
+  $items['omega_16_twocol_8_8'] = array(
+    'title' => t('Two Column 8-8'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_twocol_8_8.png',
+    'theme' => 'omega_16_twocol_8_8',
+    'css' => 'omega_16_twocol_8_8.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png
new file mode 100644
index 0000000..9d2965e
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega-16-twocol-8-8-bricks.tpl.php b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega-16-twocol-8-8-bricks.tpl.php
new file mode 100644
index 0000000..addefab
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega-16-twocol-8-8-bricks.tpl.php
@@ -0,0 +1,33 @@
+<div class="panel-display omega-16-twocol-8-8-bricks" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.css b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.inc b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.inc
new file mode 100644
index 0000000..ddc5916
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.inc
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_twocol_8_8_bricks_panels_layouts() {
+  $items['omega_16_twocol_8_8_bricks'] = array(
+    'title' => t('Two Column 8-8 bricks'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_twocol_8_8_bricks.png',
+    'theme' => 'omega_16_twocol_8_8_bricks',
+    'css' => 'omega_16_twocol_8_8_bricks.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left_above' => t('Left above'),
+      'right_above' => t('Right above'),
+      'middle' => t('Middle'),
+      'left_below' => t('Left below'),
+      'right_below' => t('Right below'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png
new file mode 100644
index 0000000..450395c
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png differ
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega-16-twocol-8-8-stacked.tpl.php b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega-16-twocol-8-8-stacked.tpl.php
new file mode 100644
index 0000000..7239cf9
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega-16-twocol-8-8-stacked.tpl.php
@@ -0,0 +1,21 @@
+<div class="panel-display omega-16-twocol-8-8-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-16">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.css b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.inc b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.inc
new file mode 100644
index 0000000..a7974cb
--- /dev/null
+++ b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.inc
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_16_twocol_8_8_stacked_panels_layouts() {
+  $items['omega_16_twocol_8_8_stacked'] = array(
+    'title' => t('Two Column 8-8 stacked'),
+    'category' => t('Omega: 16 Column Grid'),
+    'icon' => 'omega_16_twocol_8_8_stacked.png',
+    'theme' => 'omega_16_twocol_8_8_stacked',
+    'css' => 'omega_16_twocol_8_8_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left'),
+      'right' => t('Right'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png
new file mode 100644
index 0000000..30ab8b6
Binary files /dev/null and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega-24-onecol.tpl.php b/omega/panels/layouts/omega_24/omega_24_onecol/omega-24-onecol.tpl.php
new file mode 100644
index 0000000..572f9ba
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_onecol/omega-24-onecol.tpl.php
@@ -0,0 +1,9 @@
+<div class="panel-display omega-24-onecol" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.css b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc
new file mode 100644
index 0000000..98490c5
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts()
+ */
+function omega_omega_24_onecol_panels_layouts() {
+  $items['omega_24_onecol'] = array(
+    'title' => t('Single column 24'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_onecol.png',
+    'theme' => 'omega_24_onecol',
+    'css' => 'omega_24_onecol.css',
+    'regions' => array('middle' => t('Middle column')),
+  );
+
+  return $items;
+}
+
diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png
new file mode 100644
index 0000000..176ed69
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega-24-threecol-8-8-8.tpl.php b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega-24-threecol-8-8-8.tpl.php
new file mode 100644
index 0000000..482b642
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega-24-threecol-8-8-8.tpl.php
@@ -0,0 +1,17 @@
+<div class="panel-display omega-24-threecol-8-8-8" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.css b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.inc b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.inc
new file mode 100644
index 0000000..2f929f7
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.inc
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_threecol_8_8_8_panels_layouts() {
+  $items['omega_24_threecol_8_8_8'] = array(
+    'title' => t('Three column 8-8-8'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_threecol_8_8_8.png',
+    'theme' => 'omega_24_threecol_8_8_8',
+    'css' => 'omega_24_threecol_8_8_8.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png
new file mode 100644
index 0000000..468f8bb
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega-24-threecol-8-8-8-stacked.tpl.php b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega-24-threecol-8-8-8-stacked.tpl.php
new file mode 100644
index 0000000..f10ac9a
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega-24-threecol-8-8-8-stacked.tpl.php
@@ -0,0 +1,25 @@
+<div class="panel-display omega-24-threecol-8-8-8-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-8 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.css b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.inc b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.inc
new file mode 100644
index 0000000..49529e0
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.inc
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_threecol_8_8_8_stacked_panels_layouts() {
+  $items['omega_24_threecol_8_8_8_stacked'] = array(
+    'title' => t('Three column 8-8-8 stacked'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_threecol_8_8_8_stacked.png',
+    'theme' => 'omega_24_threecol_8_8_8_stacked',
+    'css' => 'omega_24_threecol_8_8_8_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left side'),
+      'middle' => t('Middle column'),
+      'right' => t('Right side'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png
new file mode 100644
index 0000000..ffd1351
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega-24-twocol-12-12.tpl.php b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega-24-twocol-12-12.tpl.php
new file mode 100644
index 0000000..2b30d0f
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega-24-twocol-12-12.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-24-twocol-12-12" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-12 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.css b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.inc b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.inc
new file mode 100644
index 0000000..933bb66
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_twocol_12_12_panels_layouts() {
+  $items['omega_24_twocol_12_12'] = array(
+    'title' => t('Two Column 12-12'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_twocol_12_12.png',
+    'theme' => 'omega_24_twocol_12_12',
+    'css' => 'omega_24_twocol_12_12.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png
new file mode 100644
index 0000000..9d2965e
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega-24-twocol-12-12-bricks.tpl.php b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega-24-twocol-12-12-bricks.tpl.php
new file mode 100644
index 0000000..f3992ac
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega-24-twocol-12-12-bricks.tpl.php
@@ -0,0 +1,33 @@
+<div class="panel-display omega-24-twocol-12-12-bricks" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 alpha">
+    <div class="inside"><?php print $content['left_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 omega">
+    <div class="inside"><?php print $content['right_above']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['middle']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 alpha">
+    <div class="inside"><?php print $content['left_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 omega">
+    <div class="inside"><?php print $content['right_below']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.css b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.inc b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.inc
new file mode 100644
index 0000000..2c2434c
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.inc
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_twocol_12_12_bricks_panels_layouts() {
+  $items['omega_24_twocol_12_12_bricks'] = array(
+    'title' => t('Two Column 12-12 bricks'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_twocol_12_12_bricks.png',
+    'theme' => 'omega_24_twocol_12_12_bricks',
+    'css' => 'omega_24_twocol_12_12_bricks.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left_above' => t('Left above'),
+      'right_above' => t('Right above'),
+      'middle' => t('Middle'),
+      'left_below' => t('Left below'),
+      'right_below' => t('Right below'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png
new file mode 100644
index 0000000..450395c
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega-24-twocol-12-12-stacked.tpl.php b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega-24-twocol-12-12-stacked.tpl.php
new file mode 100644
index 0000000..5974e71
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega-24-twocol-12-12-stacked.tpl.php
@@ -0,0 +1,21 @@
+<div class="panel-display omega-24-twocol-12-12-stacked" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['top']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-12 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-24">
+    <div class="inside"><?php print $content['bottom']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.css b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.inc b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.inc
new file mode 100644
index 0000000..5d405a0
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.inc
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_twocol_12_12_stacked_panels_layouts() {
+  $items['omega_24_twocol_12_12_stacked'] = array(
+    'title' => t('Two Column 12-12 stacked'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_twocol_12_12_stacked.png',
+    'theme' => 'omega_24_twocol_12_12_stacked',
+    'css' => 'omega_24_twocol_12_12_stacked.css',
+    'regions' => array(
+      'top' => t('Top'),
+      'left' => t('Left'),
+      'right' => t('Right'),
+      'bottom' => t('Bottom'),
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png
new file mode 100644
index 0000000..30ab8b6
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega-24-twocol-18-6.tpl.php b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega-24-twocol-18-6.tpl.php
new file mode 100644
index 0000000..e493269
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega-24-twocol-18-6.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-24-twocol-6-18" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-18 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-6 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.css b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.inc b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.inc
new file mode 100644
index 0000000..dfb0b34
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_twocol_18_6_panels_layouts() {
+  $items['omega_24_twocol_18_6'] = array(
+    'title' => t('Two Column 18-6'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_twocol_18_6.png',
+    'theme' => 'omega_24_twocol_18_6',
+    'css' => 'omega_24_twocol_18_6.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png
new file mode 100644
index 0000000..27de760
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png differ
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega-24-twocol-6-18.tpl.php b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega-24-twocol-6-18.tpl.php
new file mode 100644
index 0000000..78a4e42
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega-24-twocol-6-18.tpl.php
@@ -0,0 +1,13 @@
+<div class="panel-display omega-24-twocol-6-18" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+
+  <div class="panel-panel grid-6 alpha">
+    <div class="inside"><?php print $content['left']; ?></div>
+  </div>
+
+  <div class="panel-panel grid-18 omega">
+    <div class="inside"><?php print $content['right']; ?></div>
+  </div>
+
+  <div class="clear"></div>
+
+</div>
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.css b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.css
new file mode 100644
index 0000000..e69de29
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.inc b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.inc
new file mode 100644
index 0000000..80b1654
--- /dev/null
+++ b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.inc
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Implements hook_panels_layouts().
+ */
+function omega_omega_24_twocol_6_18_panels_layouts() {
+  $items['omega_24_twocol_6_18'] = array(
+    'title' => t('Two Column 6-18'),
+    'category' => t('Omega: 24 Column Grid'),
+    'icon' => 'omega_24_twocol_6_18.png',
+    'theme' => 'omega_24_twocol_6_18',
+    'css' => 'omega_24_twocol_6_18.css',
+    'regions' => array(
+      'left' => t('Left side'),
+      'right' => t('Right side')
+    ),
+  );
+
+  return $items;
+}
diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png
new file mode 100644
index 0000000..efa3577
Binary files /dev/null and b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png differ