--- old/two-col-old.tpl.php	2012-10-26 13:05:32.843359716 +0200
+++ new/two-col.tpl.php	2012-10-26 11:25:24.143613339 +0200
@@ -1,24 +1,24 @@
 <?php
 /**
- * @file
- * Template for a 2 column layout.
- *
- * This template provides a two column display layout, with each column equal in
- * width.
- *
- * Variables:
- * - $content: An array of content, each item in the array is keyed to one
- *   region of the layout. This layout supports the following sections:
- *   - $content['left']: Content in the left column.
- *   - $content['right']: Content in the right column.
- */
+* @file
+* Template for a 2 column layout.
+*
+* This template provides a two column display layout, with each column equal in
+* width.
+*
+* Variables:
+* - $content: An array of content, each item in the array is keyed to one
+*   region of the layout. This layout supports the following sections:
+*   - $content['left']: Content in the left column.
+*   - $content['right']: Content in the right column.
+*/
 ?>
-<div class="layout-display layout-two-col clearfix">
-  <div class="layout-region layout-col-left">
-    <div class="inside"><?php print $content['left']; ?></div>
+<div <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>  class="layout-two-col">
+  <div class="column col-1">
+    <?php print $content['left']; ?>
   </div>
 
-  <div class="layout-region layout-col-right">
-    <div class="inside"><?php print $content['right']; ?></div>
+  <div class="column col-2">
+    <?php print $content['right']; ?>
   </div>
 </div>