diff --git a/panels-layouts/zen_main_default/icon.png b/panels-layouts/zen_main_default/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..487297b5c2c4643a77c6d2be79a504f6d9f69f76
GIT binary patch
literal 864
zcmV-m1E2hfP)<h;3K|Lk000e1NJLTq001%o002t}0{{R31<WLh0002MP)t-svazh)
z-P%J#L)6pJiHV8q?CaOp)9~={y1KXY^z(CbbEBiB<mBVz<J95d-~0Ug+S%71A0L#I
zl<@A@=;-Lm#>U9V#$syE=jZ06&tl8W#>dCY&|_nys^r+%&-nNF?dsFq#KX+Y%*Mp0
z!otF?sj2a<t@rln(yXlY^WNg%$?53b*6^&&*Sy!?%FxZU$;YtN)5^8Vm)F+3?(O5v
z=9%^S@am<U<<`~4)vmjflY)7%W@csp00960|CyPYp`r~r00009a7bBm000XU000XU
z0RWnu7ytkO2XskIMF-sn9Ss^7*}eze0006rNkl<ZNXPA$3zM2K5XVVE5(sbPD77sp
zU_G_I?_G%B|65%mXGipKigvD@j{g}Zfz8j|&0=Ozcxx$VA!XU_lE|ioDulN|__@d#
zf&Evxv@hjZFU(GR)4KN8)N(1C(kl1YT#>(kG?uavY1AL}axLW*xgsZ#qJ?(I?;rUW
zB92dRs`-YP+UVB`lQ`QEa14&U0C!UuOcOH|`aXju=Lu5>Mans5g<p7())AVkMs6rf
zk^W3hJtpl8Q`JkjRzk$FXVej#vKvE%%om8m69|Qwdj7yLR9!5TaX|GTFjQ<(m8rOj
z*pnmi=vzwcJtR^Ll#66kB9kcz*D1%Pb_z+jn&+viCt`;NWhgKtorN5W%o+mYhWJ_8
zIEWOWv0+f85Wo^b!{Hi)N}|C69hXwy?!BYy7)Sc{2@2&H=z8EpI;EFZKj;dDVTepK
zz!ZO}geVRoGjeY#*)>G@TxqphJx^!TPnCZ5`?o?bUn{-T5bgf{ht%_QI-6OuZ<Pj5
zPko`=?^2JCgE}%_>v|&IG~xm?u(NE)`EZd1kqrPK4-aDRt*KH+7IO=Pgren=xHiZ#
zD<zXmvw@2c>I#!fmx}{rJR4iqWJnMaZoqs!ncUs27p4tjLb}#in5^*uGV1kuoz5_h
zV~LE#d^GCJB@)L=X&QA#bp$Duw5=C=cNf_%K_q{>?OyyxZi}=(l<J*BQ*(TxA!(0%
q%rX9t<x=a@-}^K;YT!TMQ}h)gIzGfmWbqLI0000<MNUMnLSTZy_p<l^

literal 0
HcmV?d00001

diff --git a/panels-layouts/zen_main_default/zen-main-default.tpl.php b/panels-layouts/zen_main_default/zen-main-default.tpl.php
new file mode 100644
index 0000000..b602f61
--- /dev/null
+++ b/panels-layouts/zen_main_default/zen-main-default.tpl.php
@@ -0,0 +1,34 @@
+<div id="main">
+
+  <div id="content" class="column" role="main">
+    <?php if ($content['highlighted']): ?>
+      <div class="region region-highlighted">
+        <?php print $content['highlighted']; ?>
+      </div>
+    <?php endif; ?>
+    <a id="main-content"></a>
+    <?php print $content['content']; ?>
+  </div>
+
+  <?php if ($content['navigation']): ?>
+    <div id="navigation">
+      <?php print $content['navigation']; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($content['sidebar_first'] || $content['sidebar_second']): ?>
+    <aside class="sidebars">
+      <?php if ($content['sidebar_first']): ?>
+        <section class="region region-sidebar-first column sidebar">
+          <?php print $content['sidebar_first']; ?>
+        </section>
+      <?php endif; ?>
+      <?php if ($content['sidebar_second']): ?>
+        <section class="region region-sidebar-second column sidebar">
+          <?php print $content['sidebar_second']; ?>
+        </section>
+      <?php endif; ?>
+    </aside>
+  <?php endif; ?>
+
+</div>
diff --git a/panels-layouts/zen_main_default/zen_main_default.inc b/panels-layouts/zen_main_default/zen_main_default.inc
new file mode 100644
index 0000000..176ae70
--- /dev/null
+++ b/panels-layouts/zen_main_default/zen_main_default.inc
@@ -0,0 +1,38 @@
+<?php
+
+$plugin = array(
+  'title' => t('Zen main layout'),
+  'category' => t('Columns: 3'),
+  'icon' => 'icon.png',
+  'theme' => 'zen_main_default',
+  'regions' => array(
+    'highlighted' => t('Highlighted'),
+    'content' => t('Content'),
+    'navigation' => t('Navigation'),
+    'sidebar_first' => t('First sidebar'),
+    'sidebar_second' => t('Second sidebar'),
+  ),
+);
+
+/**
+ * Preprocess variables for zen-main-default.tpl.php.
+ *
+ * Because of Panels' inside-out rendering method we can only detect empty
+ * sidebars at this stage. We then set a static variable so that we can add
+ * the appropriate body classes later.
+ */
+function zen_preprocess_zen_main_default(&$variables) {
+  $classes = &drupal_static('zen_panels_classes_array', array());
+  if (!empty($variables['content']['sidebar_first']) && !empty($variables['content']['sidebar_second'])) {
+    $classes[] = 'two-sidebars';
+  }
+  elseif (!empty($variables['content']['sidebar_first'])) {
+    $classes[] = 'one-sidebar sidebar-first';
+  }
+  elseif (!empty($variables['content']['sidebar_second'])) {
+    $classes[] = 'one-sidebar sidebar-second';
+  }
+  else {
+    $classes[] = 'no-sidebars';
+  }
+}
diff --git a/panels-layouts/zen_page_default/icon.png b/panels-layouts/zen_page_default/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffe7eb806a21a118b0759057f7758b24bd2e1a84
GIT binary patch
literal 811
zcmV+`1JwM9P)<h;3K|Lk000e1NJLTq001%o002t}0{{R31<WLh0002MP)t-svazh)
z-P%J#L)6pJiHV8q?CaOp)9~={y1KXY^z(CbbEBiB<mBVz<J95d-~0Ug+S%71A0L#I
zl<@A@=;-Lm#>U9V#$syE=jZ06&tl8W#>dCY&|_nys^r+%&-nNF?dsFq#KX+Y%*Mp0
z!otF?sj2a<t@rln(yXlY^WNg%$?53b*6^&&*Sy!?%FxZU$;YtN)5^8Vm)F+3?(O5v
z=9%^S@am<U<<`~4)vmjflY)7%W@csp00960|CyPYp`r~r00009a7bBm000XU000XU
z0RWnu7ytkO2XskIMF-sn9Ss`|t$5OR00060Nkl<ZNXPA$>ync&6oAQ{B;3m)RxK@1
zyKU`#??U?iZ)H+iXXvUU?u;`!e18%+e4Lzw$plMv#`+_r?nI*;JJ2hCPwBpt{Rh)4
zz0xba@((Lj2QJF*Z~1Rj{D_j=j->8-==&26^-nEO1ia1yf@39xt$P?ok${d;nZVO3
zSBi)#szS)x3M;WJr6nwr&rvKCCN2oWVW#XFB1J;kR!A;xB!(i=imx&Vb(n?GR7%YC
zgJv8MUkwaZ#~cexnh}Slr6D_)Bz~l%mPDm422)c^O%-Q~)b_8GOyRQ3G0*f2P3uH!
z$RtY?(UtvVU`p!O9@VJ?D31c_5@J|GD1Bu^Xk|96(Cek-r@8kzCnV*kJ18-2%z5mm
zoUymAemvA9NrD_FCX9S&K#atxlLj{pUQ4mwH|+QO=hb@kuHoxsa;tgy*znR)?ECvK
zhUe94y>{218m3QA6V2^s!{g($t!xgQXZlN{0dQikC}v8{wndzJ008>%py%FQS#4#z
zaX~^E+U;oIfueA8x-4uD1PGy_4h3wty;2tIh3hV76d|1kY!1ui-Q8j9cwj{7&|T<|
zySP&3<MDVfn2kmwqbziPJ|Aq1G8*knXg-*?6=XHor!3y(D)j=2XnDRIYUO+$>#~&R
pQ(qV5lBN5m)bITN(QiUmz5&3xKr8_Y%3c5f002ovPDHLkV1j6^q+9?1

literal 0
HcmV?d00001

diff --git a/panels-layouts/zen_page_default/zen-page-default.tpl.php b/panels-layouts/zen_page_default/zen-page-default.tpl.php
new file mode 100644
index 0000000..9c6a860
--- /dev/null
+++ b/panels-layouts/zen_page_default/zen-page-default.tpl.php
@@ -0,0 +1,21 @@
+<?php print $content['page_top']; ?>
+
+<div id="page">
+
+  <?php if ($content['header']): ?>
+    <header class="header" id="header" role="banner">
+      <?php print $content['header']; ?>
+    </header>
+  <?php endif; ?>
+
+  <?php print $content['main']; ?>
+
+  <?php if ($content['footer']): ?>
+    <footer id="footer" class="region region-footer">
+      <?php print $content['footer']; ?>
+    </footer>
+  <?php endif; ?>
+
+</div>
+
+<?php print $content['page_bottom']; ?>
diff --git a/panels-layouts/zen_page_default/zen_page_default.inc b/panels-layouts/zen_page_default/zen_page_default.inc
new file mode 100644
index 0000000..dd4c53a
--- /dev/null
+++ b/panels-layouts/zen_page_default/zen_page_default.inc
@@ -0,0 +1,15 @@
+<?php
+
+$plugin = array(
+  'title'  => t('Zen page template'),
+  'category' => t('Site templates'),
+  'icon' => 'icon.png',
+  'theme' => 'zen_page_default',
+  'regions' => array(
+    'page_top' => t('Page top'),
+    'header' => t('Header'),
+    'main' => t('Main'),
+    'footer' => t('Footer'),
+    'page_bottom' => t('Page bottom'),
+  ),
+);
diff --git a/template.php b/template.php
index 077d0b5..7f205e2 100644
--- a/template.php
+++ b/template.php
@@ -173,6 +173,27 @@ function zen_preprocess_html(&$variables, $hook) {
   if (theme_get_setting('zen_wireframes')) {
     $variables['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
   }
+
+  // Add Panels classes that were added by a layout specific preprocess.
+  // If Block module is disabled while using Panels the class will be set to
+  // 'no-sidebars', which migt be wrong.
+  // If Block module is enabled while using Panels the class will be set to
+  // what's configured for the theme, which might be wrong.
+  // We need to override this with what the actual Panels layout reflects.
+  //
+  // @see zen_preprocess_zen_main_default().
+  $panels_classes_array = drupal_static('zen_panels_classes_array', array());
+  if (!empty($panels_classes_array)) {
+    // Search the keys representing the sidebar state that we should remove.
+    foreach ($variables['classes_array'] as $key => $class) {
+      if (in_array($class, array('two-sidebars', 'one-sidebar sidebar-first', 'one-sidebar sidebar-second', 'no-sidebars'))) {
+        unset($variables['classes_array'][$key]);
+      }
+    }
+    // Merge in the classes from the Panels layout.
+    $variables['classes_array'] = array_merge($variables['classes_array'], $panels_classes_array);
+  }
+
   // Store the menu item since it has some useful information.
   $variables['menu_item'] = menu_get_item();
   if ($variables['menu_item']) {
@@ -700,3 +721,95 @@ function zen_mark($variables) {
 function zen_panels_default_style_render_region($variables) {
   return implode('', $variables['panes']);
 }
+
+/**
+ * Preprocess variables for panels-pane.tpl.php.
+ */
+function zen_preprocess_panels_pane(&$variables) {
+  // Use no pane wrapper for common page elements, like Zen without Panels.
+  if (theme_get_setting('zen_pane_no_wrapper')) {
+    switch ($variables['pane']->subtype) {
+      case 'page_content':
+      case 'pane_header':
+      case 'pane_navigation':
+      case 'pane_messages':
+        $variables['theme_hook_suggestions'][] = 'panels_pane__no_wrapper';
+        break;
+    }
+  }
+  // Make panes use block classes, similar to Zen without Panels.
+  if (theme_get_setting('zen_pane_block_classes')) {
+    // Set classes on panes similar to blocks.
+    $default_classes_array = array(
+      'block',
+      'block-' . drupal_clean_css_identifier($variables['pane']->subtype),
+      $variables['zebra'],
+    );
+    $variables['classes_array'] = array_merge($default_classes_array, $variables['pane']->css);
+    $variables['title_attributes_array']['class'] = array(
+      'block-title',
+    );
+  }
+}
+
+/**
+ * Process variables for pane-navigation.tpl.php.
+ */
+function zen_process_pane_navigation(&$variables) {
+  // Make this pane behave like default Zen without Panels.
+  if (theme_get_setting('zen_pane_navigation_menu')) {
+    $variables['main_menu'] = theme('links__system_main_menu', array(
+      'links' => menu_main_menu(),
+      'attributes' => array(
+        'class' => array('links', 'inline', 'clearfix'),
+      ),
+      'heading' => array(
+        'text' => t('Main menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      ),
+    ));
+    $variables['secondary_menu'] = '';
+    // Don't print the breadcrumb twice if it's included in the messages pane
+    // (where it's located in Zen without Panels).
+    if (theme_get_setting('zen_pane_messages_extras')) {
+      $variables['breadcrumb'] = '';
+    }
+  }
+}
+
+/**
+ * Process variables for pane-messages.tpl.php.
+ *
+ * For certain variables that are likely to be overridden by Panels we use
+ * CTools callback tokens to get around rendering order problems.
+ */
+function zen_preprocess_pane_messages(&$variables) {
+  $variables['breadcrumb'] = $variables['title'] = '';
+  // Make this pane include variables similar to Zen without Panels.
+  if (theme_get_setting('zen_pane_messages_extras')) {
+    $variables['breadcrumb'] = theme('breadcrumb', array('breadcrumb' => drupal_get_breadcrumb()));
+    $variables['title'] = ctools_set_callback_token('title', array('zen_ctools_callback_token_title', '<h1 class="page--title title" id="page-title">', '</h1>'));
+  }
+  $variables['action_links'] = ctools_set_callback_token('action_links', array('zen_ctools_callback_token_action_links', '<ul class="action-links">', '</ul>'));
+}
+
+/**
+ * CTools callback token for fetching the page title.
+ */
+function zen_ctools_callback_token_title(&$variables, $prefix, $suffix) {
+  $title = drupal_get_title();
+  if ($title) {
+    return $prefix . $title . $suffix;
+  }
+}
+
+/**
+ * CTools callback token for fetching action links.
+ */
+function zen_ctools_callback_token_action_links(&$variables, $prefix, $suffix) {
+  $action_links = menu_local_actions();
+  if ($action_links) {
+    return $prefix . render($action_links) . $suffix;
+  }
+}
diff --git a/templates/pane-messages.tpl.php b/templates/pane-messages.tpl.php
index dd057fa..9d56551 100644
--- a/templates/pane-messages.tpl.php
+++ b/templates/pane-messages.tpl.php
@@ -8,10 +8,11 @@
  */
 ?>
 
+<?php print $breadcrumb; ?>
+<?php print $title; ?>
 <?php print $messages; ?>
 <?php print render($tabs); ?>
 <?php print $help; ?>
-
 <?php if ($action_links): ?>
-  <ul class="action-links"><?php print render($action_links); ?></ul>
+  <?php print $action_links; ?>
 <?php endif; ?>
diff --git a/templates/panelizer-view-mode.tpl.php b/templates/panelizer-view-mode.tpl.php
new file mode 100644
index 0000000..473fdc6
--- /dev/null
+++ b/templates/panelizer-view-mode.tpl.php
@@ -0,0 +1,16 @@
+<article class="<?php print $classes; ?>"<?php print $attributes; ?>>
+  <?php print render($title_prefix); ?>
+  <?php if (!empty($title)): ?>
+    <header>
+      <<?php print $title_element;?> <?php print $title_attributes; ?>>
+        <?php if (!empty($entity_url)): ?>
+          <a href="<?php print $entity_url; ?>"><?php print $title; ?></a>
+        <?php else: ?>
+          <?php print $title; ?>
+        <?php endif; ?>
+      </<?php print $title_element;?>>
+    </header>
+  <?php endif; ?>
+  <?php print render($title_suffix); ?>
+  <?php print $content; ?>
+</article>
\ No newline at end of file
diff --git a/templates/panels-pane--no-wrapper.tpl.php b/templates/panels-pane--no-wrapper.tpl.php
new file mode 100644
index 0000000..5f566d8
--- /dev/null
+++ b/templates/panels-pane--no-wrapper.tpl.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @file
+ * Returns the HTML for a Panels pane without a wrapper.
+ */
+?>
+<?php print $pane_prefix; ?>
+<?php print $admin_links; ?>
+
+<?php print render($title_prefix); ?>
+<?php if ($title): ?>
+  <h2<?php print $title_attributes; ?>><?php print $title; ?></h2>
+<?php endif; ?>
+<?php print render($title_suffix); ?>
+
+<?php if ($feeds): ?>
+  <div class="feed">
+    <?php print $feeds; ?>
+  </div>
+<?php endif; ?>
+
+<?php print render($content); ?>
+
+<?php if ($links): ?>
+  <div class="links">
+    <?php print $links; ?>
+  </div>
+<?php endif; ?>
+
+<?php if ($more): ?>
+  <div class="more-link">
+    <?php print $more; ?>
+  </div>
+<?php endif; ?>
+<?php print $pane_suffix; ?>
diff --git a/theme-settings.php b/theme-settings.php
index 90f790b..1a2b0ca 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -111,6 +111,35 @@ function zen_form_system_theme_settings_alter(&$form, $form_state, $form_id = NU
     '#description'   => t('IE 6-8 require a JavaScript polyfill solution to add basic support of HTML5 and CSS3 media queries. If you prefer to use another polyfill solution, such as <a href="!link">Modernizr</a>, you can disable these options. Respond.js only works if <a href="@url">Aggregate CSS</a> is enabled. Mobile devices require a few meta tags for responsive designs.', array('!link' => 'http://www.modernizr.com/', '@url' => url('admin/config/development/performance'))),
   );
 
+  $form['panels'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Panels support'),
+  );
+  $form['panels']['zen_pane_block_classes'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Use block classes on Panels panes'),
+    '#default_value' => theme_get_setting('zen_pane_block_classes'),
+    '#description'   => t('This will make Panels panes use the block classes as in Zen without Panels. This is useful for preserving the default responsive rules.'),
+  );
+  $form['panels']['zen_pane_no_wrapper'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Use a no-wrapper template for common panes'),
+    '#default_value' => theme_get_setting('zen_pane_no_wrapper'),
+    '#description'   => t('This will make common panes like %header, %content, %messages and %navigation use a no-wrapper template. This is useful for preserving the default markup of these elements.', array('%header' => t('Page header'), '%content' => t('Page content'), '%messages' => t('Page messages'), '%navigation' => t('Page navigation'))),
+  );
+  $form['panels']['zen_pane_messages_extras'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Include title and breadcrumb in the %messages pane', array('%messages' => t('Page messages'))),
+    '#default_value' => theme_get_setting('zen_pane_messages_extras'),
+    '#description'   => t('This will make the %messages pane include all the same variables as Zen normally prints just above the content region. Separate panes will not be needed for these common page elements.', array('%messages' => t('Page messages'))),
+  );
+  $form['panels']['zen_pane_navigation_menu'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Make the %navigation pane work like default Zen', array('%navigation' => t('Page navigation'))),
+    '#default_value' => theme_get_setting('zen_pane_navigation_menu'),
+    '#description'   => t('This will make the %navigation pane work like Zen without Panels. It is useful for preserving the default navigation markup.', array('%navigation' => t('Page navigation'))),
+  );
+
   $form['themedev'] = array(
     '#type'          => 'fieldset',
     '#title'         => t('Theme development settings'),
diff --git a/zen.info b/zen.info
index 896ea71..9b796a0 100644
--- a/zen.info
+++ b/zen.info
@@ -34,5 +34,9 @@ settings[zen_html5_respond_meta][] = html5
 settings[zen_html5_respond_meta][] = meta
 settings[zen_rebuild_registry]     = 0
 settings[zen_wireframes]           = 0
+settings[zen_pane_block_classes]   = 0
+settings[zen_pane_no_wrapper]      = 0
+settings[zen_pane_messages_extras] = 0
+settings[zen_pane_navigation_menu] = 0
 
 plugins[panels][layouts] = panels-layouts