diff --git a/css/960.css b/css/960.css
index 4be95be073a6649a3d0bbe20fa76e0fba0f5ee1a..fe6ba837819952427cd6da287fcaf8c188c05313 100644
--- a/css/960.css
+++ b/css/960.css
@@ -13,7 +13,8 @@
 ----------------------------------------------------------------------------------------------------*/
 
 .container-12,
-.container-16 {
+.container-16,
+.container-24 {
   margin-left: auto;
   margin-right: auto;
   width: 960px;
@@ -45,6 +46,518 @@
   margin-right: 10px;
 }
 
+/* Adding 24 Column layout */
+.container-24 .grid-1,
+.container-24 .grid-2,
+.container-24 .grid-3,
+.container-24 .grid-4,
+.container-24 .grid-5,
+.container-24 .grid-6,
+.container-24 .grid-7,
+.container-24 .grid-8,
+.container-24 .grid-9,
+.container-24 .grid-10,
+.container-24 .grid-11,
+.container-24 .grid-12,
+.container-24 .grid-13,
+.container-24 .grid-14,
+.container-24 .grid-15,
+.container-24 .grid-16,
+.container-24 .grid-17,
+.container-24 .grid-18,
+.container-24 .grid-19,
+.container-24 .grid-20,
+.container-24 .grid-21,
+.container-24 .grid-22,
+.container-24 .grid-23,
+.container-24 .grid-24 {
+  display: inline;
+  float: left;
+  position: relative;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+/* Grid >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .grid-1 {
+  width: 30px;
+}
+
+.container-24 .grid-2 {
+  width: 70px;
+}
+
+.container-24 .grid-3 {
+  width: 110px;
+}
+
+.container-24 .grid-4 {
+  width: 150px;
+}
+
+.container-24 .grid-5 {
+  width: 190px;
+}
+
+.container-24 .grid-6 {
+  width: 230px;
+}
+
+.container-24 .grid-7 {
+  width: 270px;
+}
+
+.container-24 .grid-8 {
+  width: 310px;
+}
+
+.container-24 .grid-9 {
+  width: 350px;
+}
+
+.container-24 .grid-10 {
+  width: 390px;
+}
+
+.container-24 .grid-11 {
+  width: 430px;
+}
+
+.container-24 .grid-12 {
+  width: 470px;
+}
+
+.container-24 .grid-13 {
+  width: 510px;
+}
+
+.container-24 .grid-14 {
+  width: 550px;
+}
+
+.container-24 .grid-15 {
+  width: 590px;
+}
+
+.container-24 .grid-16 {
+  width: 630px;
+}
+
+.container-24 .grid-17 {
+  width: 670px;
+}
+
+.container-24 .grid-18 {
+  width: 710px;
+}
+
+.container-24 .grid-19 {
+  width: 750px;
+}
+
+.container-24 .grid-20 {
+  width: 790px;
+}
+
+.container-24 .grid-21 {
+  width: 830px;
+}
+
+.container-24 .grid-22 {
+  width: 870px;
+}
+
+.container-24 .grid-23 {
+  width: 910px;
+}
+
+.container-24 .grid-24 {
+  width: 950px;
+}
+
+/* Prefix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .prefix-1 {
+  padding-left: 40px;
+}
+
+.container-24 .prefix-2 {
+  padding-left: 80px;
+}
+
+.container-24 .prefix-3 {
+  padding-left: 120px;
+}
+
+.container-24 .prefix-4 {
+  padding-left: 160px;
+}
+
+.container-24 .prefix-5 {
+  padding-left: 200px;
+}
+
+.container-24 .prefix-6 {
+  padding-left: 240px;
+}
+
+.container-24 .prefix-7 {
+  padding-left: 280px;
+}
+
+.container-24 .prefix-8 {
+  padding-left: 320px;
+}
+
+.container-24 .prefix-9 {
+  padding-left: 360px;
+}
+
+.container-24 .prefix-10 {
+  padding-left: 400px;
+}
+
+.container-24 .prefix-11 {
+  padding-left: 440px;
+}
+
+.container-24 .prefix-12 {
+  padding-left: 480px;
+}
+
+.container-24 .prefix-13 {
+  padding-left: 520px;
+}
+
+.container-24 .prefix-14 {
+  padding-left: 560px;
+}
+
+.container-24 .prefix-15 {
+  padding-left: 600px;
+}
+
+.container-24 .prefix-16 {
+  padding-left: 640px;
+}
+
+.container-24 .prefix-17 {
+  padding-left: 680px;
+}
+
+.container-24 .prefix-18 {
+  padding-left: 720px;
+}
+
+.container-24 .prefix-19 {
+  padding-left: 760px;
+}
+
+.container-24 .prefix-20 {
+  padding-left: 800px;
+}
+
+.container-24 .prefix-21 {
+  padding-left: 840px;
+}
+
+.container-24 .prefix-22 {
+  padding-left: 880px;
+}
+
+.container-24 .prefix-23 {
+  padding-left: 920px;
+}
+
+/* Suffix Extra Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .suffix-1 {
+  padding-right: 40px;
+}
+
+.container-24 .suffix-2 {
+  padding-right: 80px;
+}
+
+.container-24 .suffix-3 {
+  padding-right: 120px;
+}
+
+.container-24 .suffix-4 {
+  padding-right: 160px;
+}
+
+.container-24 .suffix-5 {
+  padding-right: 200px;
+}
+
+.container-24 .suffix-6 {
+  padding-right: 240px;
+}
+
+.container-24 .suffix-7 {
+  padding-right: 280px;
+}
+
+.container-24 .suffix-8 {
+  padding-right: 320px;
+}
+
+.container-24 .suffix-9 {
+  padding-right: 360px;
+}
+
+.container-24 .suffix-10 {
+  padding-right: 400px;
+}
+
+.container-24 .suffix-11 {
+  padding-right: 440px;
+}
+
+.container-24 .suffix-12 {
+  padding-right: 480px;
+}
+
+.container-24 .suffix-13 {
+  padding-right: 520px;
+}
+
+.container-24 .suffix-14 {
+  padding-right: 560px;
+}
+
+.container-24 .suffix-15 {
+  padding-right: 600px;
+}
+
+.container-24 .suffix-16 {
+  padding-right: 640px;
+}
+
+.container-24 .suffix-17 {
+  padding-right: 680px;
+}
+
+.container-24 .suffix-18 {
+  padding-right: 720px;
+}
+
+.container-24 .suffix-19 {
+  padding-right: 760px;
+}
+
+.container-24 .suffix-20 {
+  padding-right: 800px;
+}
+
+.container-24 .suffix-21 {
+  padding-right: 840px;
+}
+
+.container-24 .suffix-22 {
+  padding-right: 880px;
+}
+
+.container-24 .suffix-23 {
+  padding-right: 920px;
+}
+
+/* Push Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .push-1 {
+  left: 40px;
+}
+
+.container-24 .push-2 {
+  left: 80px;
+}
+
+.container-24 .push-3 {
+  left: 120px;
+}
+
+.container-24 .push-4 {
+  left: 160px;
+}
+
+.container-24 .push-5 {
+  left: 200px;
+}
+
+.container-24 .push-6 {
+  left: 240px;
+}
+
+.container-24 .push-7 {
+  left: 280px;
+}
+
+.container-24 .push-8 {
+  left: 320px;
+}
+
+.container-24 .push-9 {
+  left: 360px;
+}
+
+.container-24 .push-10 {
+  left: 400px;
+}
+
+.container-24 .push-11 {
+  left: 440px;
+}
+
+.container-24 .push-12 {
+  left: 480px;
+}
+
+.container-24 .push-13 {
+  left: 520px;
+}
+
+.container-24 .push-14 {
+  left: 560px;
+}
+
+.container-24 .push-15 {
+  left: 600px;
+}
+
+.container-24 .push-16 {
+  left: 640px;
+}
+
+.container-24 .push-17 {
+  left: 680px;
+}
+
+.container-24 .push-18 {
+  left: 720px;
+}
+
+.container-24 .push-19 {
+  left: 760px;
+}
+
+.container-24 .push-20 {
+  left: 800px;
+}
+
+.container-24 .push-21 {
+  left: 840px;
+}
+
+.container-24 .push-22 {
+  left: 880px;
+}
+
+.container-24 .push-23 {
+  left: 920px;
+}
+
+/* Pull Space >> 24 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container-24 .pull-1 {
+  left: -40px;
+}
+
+.container-24 .pull-2 {
+  left: -80px;
+}
+
+.container-24 .pull-3 {
+  left: -120px;
+}
+
+.container-24 .pull-4 {
+  left: -160px;
+}
+
+.container-24 .pull-5 {
+  left: -200px;
+}
+
+.container-24 .pull-6 {
+  left: -240px;
+}
+
+.container-24 .pull-7 {
+  left: -280px;
+}
+
+.container-24 .pull-8 {
+  left: -320px;
+}
+
+.container-24 .pull-9 {
+  left: -360px;
+}
+
+.container-24 .pull-10 {
+  left: -400px;
+}
+
+.container-24 .pull-11 {
+  left: -440px;
+}
+
+.container-24 .pull-12 {
+  left: -480px;
+}
+
+.container-24 .pull-13 {
+  left: -520px;
+}
+
+.container-24 .pull-14 {
+  left: -560px;
+}
+
+.container-24 .pull-15 {
+  left: -600px;
+}
+
+.container-24 .pull-16 {
+  left: -640px;
+}
+
+.container-24 .pull-17 {
+  left: -680px;
+}
+
+.container-24 .pull-18 {
+  left: -720px;
+}
+
+.container-24 .pull-19 {
+  left: -760px;
+}
+
+.container-24 .pull-20 {
+  left: -800px;
+}
+
+.container-24 .pull-21 {
+  left: -840px;
+}
+
+.container-24 .pull-22 {
+  left: -880px;
+}
+
+.container-24 .pull-23 {
+  left: -920px;
+}
+
+/* end data for 24 column layout */
+
 .container-12 .grid-3,
 .container-16 .grid-4 {
   width: 220px;
diff --git a/css/custom.css b/css/custom.css
new file mode 100755
index 0000000000000000000000000000000000000000..52c05d6a6037ab8184daf441e36ae63003c5767c
--- /dev/null
+++ b/css/custom.css
@@ -0,0 +1,93 @@
+/* $Id$ */
+/**
+ * Omega, for Drupal 6.x
+ * Jake Strawn - http://himerus.com
+ * Project Page - http://drupal.org/project/omega
+ * 
+ * The custom.css provides overrides for module based CSS for various items.
+ * This is the last CSS to be included in the Omega base theme, unless using additional
+ * CSS in the sub theme level. 
+ *
+ * I prefer to keep this file light and ONLY module related, but in your sub theme, it could
+ * be a decent place for those final overrides you may need to do on any elements
+ *
+ * Omega CSS Table of Contents for custom.css
+ *
+ * 1.) Geshi Code Filter CSS
+ * 2.) Vertical Tabs CSS
+ * 3.) Block Layouts
+ * 4.) 
+ * 5.) 
+ * 6.) 
+ * 7.) 
+ */
+ 
+/** ################# Geshi Code Filter CSS ####################### */
+/**
+ * The main purpose for the Geshi Filter styles are for my personal use, and use in the demo version
+ * of the Omega theme to style up code snippets a bit more pretty.
+ */
+ 
+.geshifilter {
+	font-size: 9px;
+	margin: 0;
+  padding: 10px;
+  line-height: 1.2em;
+}
+
+.block code, .block .geshifilter {
+  margin: 0;  
+}
+
+/** ################# Vertical Tabs CSS ####################### */
+/**
+ * I found during development that the default vertical tabs positioning was breaking, so some overrides
+ * were in order in case the Omega theme, or a sub-theme is used for administrative tasks & content editing
+ * rather than using something like the admin module/slate theme.
+ */
+.vertical-tabs {
+	border:1px solid #CCCCCC;
+	margin:1em 0;
+	background: #FFF;
+}
+
+.vertical-tabs-list {
+	border-top:0;
+	float:left;
+	left:0;
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0 !important;
+	padding:0;
+	position:relative;
+	width:18em;
+}
+
+.vertical-tabs-panes {
+  padding: 0 !important;	
+}
+
+fieldset.vertical-tabs-pane {
+	background: #FFF;
+  padding: 0;
+  font-size: 0.9em;
+}
+
+.vertical-tabs-list li {
+	background:#EEEEEE none repeat scroll 0 0;
+	border-color:-moz-use-text-color #CCCCCC #CCCCCC;
+	border-style:none solid solid none;
+	border-width:0 1px 1px;
+	height:1%;
+	margin:0;
+	padding:0;
+}
+
+.vertical-tabs-list li.last { 
+  border-style: none solid none none;
+}
+
+.vertical-tabs-list li:hover { 
+  background: #D9FFF2;
+}
diff --git a/css/defaults.css b/css/defaults.css
index 9d70393c8423d1b1d77b54a5054d8f589fbb1671..b6788a29e8970703d50deaa115a1bde01bccac70 100644
--- a/css/defaults.css
+++ b/css/defaults.css
@@ -3,10 +3,10 @@
  * Omega, for Drupal 6.x
  * Jake Strawn - http://himerus.com
  * Project Page - http://drupal.org/project/omega
- * 
+ *
  * The defaults.css file is the default set of default styles
  * normally available with the Omega base theme.
- * All of these styles are easily overwritten, but here to give 
+ * All of these styles are easily overwritten, but here to give
  * a bit more "sexy" right out of the box.
  *
  *
@@ -17,13 +17,13 @@
  * 3.) Pager Navigation - Styling for pager navigation
  * 4.) clear-block code - default drupal clear-block definitions
  * 5.) Cleanup CSS - Primarily sizing & margins for default elements
- * 6.) 
- * 7.) 
+ * 6.)
+ * 7.)
  */
- 
+
 /** ################# 1.) Generic Page Elements ####################### */
 body {
-  background: #EEE; 
+  background: #FFF;
 }
 
 .description {
@@ -48,7 +48,7 @@ body {
 }
 
 #footer-message p {
-  margin: 0;  
+  margin: 0;
 }
 
 fieldset {
@@ -85,30 +85,30 @@ fieldset .form-text {
   border: 1px solid #b8d3e5;
 }
 
-.messages, 
-.status, 
-.warning, 
+.messages,
+.status,
+.warning,
 .error {
   padding: 10px;
 }
 
 .messages ul {
-  margin-left: 20px;  
+  margin-left: 20px;
 }
 
 .new {
   font-size: 1.5em;
   color: #FF0000;
   display: block;
-  text-align: right;  
+  text-align: right;
 }
 
 .indented {
-  margin-left: 30px;  
+  margin-left: 30px;
 }
 
 .comment-preview {
-  padding: 20px;  
+  padding: 20px;
 }
 
 .help {
@@ -122,7 +122,7 @@ fieldset .form-text {
 }
 
 .help p {
-  margin-bottom: 10px;  
+  margin-bottom: 10px;
 }
 
 .preview {
@@ -140,14 +140,14 @@ div.error, tr.error {
   background-color: #FFCCCC;
 }
 
-.form-item input.error, 
+.form-item input.error,
 .form-item textarea.error {
   border: 1px solid #c52020;
   color: #363636;
 }
 
 #branding img {
-  vertical-align: top;  
+  vertical-align: top;
 }
 
 #site-name {
@@ -175,11 +175,12 @@ div.error, tr.error {
 }
 
 #search-box {
-  text-align: right;  
+  text-align: right;
+  float: right;
 }
 
 #search-box label, #search-box .form-submit {
-  display: none;  
+  display: none;
 }
 
 #search-box .form-text {
@@ -189,7 +190,7 @@ div.error, tr.error {
 
 .breadcrumb {
   font-size: 1.2em;
-  padding: 0; 
+  padding: 0;
 }
 
 #slogan {
@@ -203,21 +204,21 @@ div.error, tr.error {
 }
 
 .block p {
-  margin: 0;  
+  margin: 0;
 }
 #mission {
   margin: 0 0 20px 0;
-  padding: 0;	
+  padding: 0;
 }
 #mission p {
 	margin: 0;
   padding: 0;
   font-style: italic;
-  font-size: 12px;  
+  font-size: 12px;
 }
 
 .sidebar .block {
-  margin-bottom: 20px;  
+  margin-bottom: 20px;
 }
 
 .sidebar ul {
@@ -228,24 +229,24 @@ div.error, tr.error {
 .sidebar ul li {
   list-style-position: outside;
   margin: 0;
-} 
+}
 
 .node {
   padding-bottom: 10px;
   margin-bottom: 20px;
-  border-bottom: 1px solid #38322B; 
+  border-bottom: 1px solid #38322B;
 }
 
 .block .content {
-  padding: 0; 
+  padding: 0;
 }
 
 /** ################# 2.) Content Tabs ####################### */
 
 #content-tabs {
   padding: 10px;
-  background-color: #fff;
-  border: 1px solid #b8d3e5;
+  background-color: #f2f2f2;
+  border: 1px solid #ddd;
   display: block;;
   margin: 0 0 20px 0;
   font-family: Georgia, serif;
@@ -342,7 +343,7 @@ div.error, tr.error {
   font-size: 0.8em;
   font-weight: bold;
   padding: 4px;
-  text-decoration: none; 
+  text-decoration: none;
 }
 
 .pager li.pager-current {
@@ -353,11 +354,11 @@ div.error, tr.error {
   padding: 8px;
   background-color: #D9DBCD;
   border: 1px solid #38322B;
-  
+
 }
 
 .pager li.pager-ellipsis {
-  display: none;  
+  display: none;
 }
 
 .pager-first,
@@ -410,10 +411,10 @@ div.error, tr.error {
 
 /* Fix the HORRIBLE styling of the default comment block */
 .block-comment .item-list,
-.block-comment .item-list ul, 
+.block-comment .item-list ul,
 .block-comment .item-list li {
   margin: 0;
-  padding: 0;	
+  padding: 0;
 }
 
 .block-comment .item-list li {
@@ -459,7 +460,7 @@ table {
   margin-left: 0;
 }
 
-#main-content ul.links li, 
+#main-content ul.links li,
 #main-content ul.links li a {
   padding-left: 0;
 }
\ No newline at end of file
diff --git a/node.tpl.php b/node.tpl.php
new file mode 100755
index 0000000000000000000000000000000000000000..37fe96977bf9dc5d0a6417ef7da615e5bb8a4b97
--- /dev/null
+++ b/node.tpl.php
@@ -0,0 +1,67 @@
+<?php
+// $Id$
+
+/**
+ * @file node.tpl.php
+ *
+ * Theme implementation to display a node.
+ *
+ * Available variables:
+ * - $title: the (sanitized) title of the node.
+ * - $content: Node body or teaser depending on $teaser flag.
+ * - $picture: The authors picture of the node output from
+ *   theme_user_picture().
+ * - $date: Formatted creation date (use $created to reformat with
+ *   format_date()).
+ * - $links: Themed links like "Read more", "Add new comment", etc. output
+ *   from theme_links().
+ * - $name: Themed username of node author output from theme_user().
+ * - $node_url: Direct url of the current node.
+ * - $terms: the themed list of taxonomy term links output from theme_links().
+ * - $submitted: themed submission information output from
+ *   theme_node_submitted().
+ *
+ * Other variables:
+ * - $node: Full node object. Contains data that may not be safe.
+ * - $type: Node type, i.e. story, page, blog, etc.
+ * - $comment_count: Number of comments attached to the node.
+ * - $uid: User ID of the node author.
+ * - $created: Time the node was published formatted in Unix timestamp.
+ * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
+ *   teaser listings.
+ * - $id: Position of the node. Increments each time it's output.
+ *
+ * Node status variables:
+ * - $teaser: Flag for the teaser state.
+ * - $page: Flag for the full page state.
+ * - $promote: Flag for front page promotion state.
+ * - $sticky: Flags for sticky post setting.
+ * - $status: Flag for published status.
+ * - $comment: State of comment settings for the node.
+ * - $readmore: Flags true if the teaser content of the node cannot hold the
+ *   main body content.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_node()
+ */
+?>
+<div<?php print $attributes; ?>>
+
+  <?php print $picture ?>
+
+  <?php if (!$page): ?>
+  <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+  <?php endif; ?>
+
+  <div class="submitted"><?php print $submitted ?></div>
+
+  
+
+  <?php print $content ?>
+  <div class="taxonomy"><?php print $terms ?></div>
+  <div class="node-links"><?php print $links; ?></div>
+
+</div>
\ No newline at end of file
diff --git a/omega.info b/omega.info
index b14c853f51d7dcc4ad3a62283ab25694ae0a3ce1..32c0b07cca9e791914a050311cb35c7b89c56b54 100644
--- a/omega.info
+++ b/omega.info
@@ -48,33 +48,62 @@ features[] = secondary_links
 
 
 ; Set the default settings to be used in theme-settings.php
-settings[omega_header_wrapper_width] = 12
+
+; Non-960gs default settings
+settings[front_page_title_display] = title_slogan
+settings[page_title_display_custom] = ''
+settings[other_page_title_display] = ptitle_stitle
+settings[other_page_title_display_custom] = ''
+settings[configurable_separator] = ' | '
+
+settings[omega_breadcrumb] = 'yes'
+settings[omega_breadcrumb_separator] = ' / '
+settings[omega_breadcrumb_home] = 1
+settings[omega_breadcrumb_trailing] = 1
+settings[omega_breadcrumb_title] = 1
+
+settings[mission_statement_pages] = home
+
+settings[sidebar_combine] = 1
+settings[sidebar_contain_pages] = ''
+; / Non-960gs default settings
+
+
+; 960gs default region settings
+settings[omega_default_container_width] = 16
+
+settings[omega_branding_wrapper_width] = 16
 settings[omega_header_logo_width] = 4
+settings[omega_header_menu_width] = 12
+
+settings[omega_header_wrapper_width] = 16
+settings[omega_header_first_width] = 8
+settings[omega_header_last_width] = 8
 
-settings[omega_header_first_width] = 6
-settings[omega_header_last_width] = 6
+settings[omega_internal_nav_wrapper_width] = 16
+settings[omega_breadcrumb_slogan_width] = 10
+settings[omega_search_width] = 6
 
-settings[omega_preface_first_width] = 4
+settings[omega_preface_wrapper_grids] = 16
+settings[omega_preface_first_width] = 8
 settings[omega_preface_middle_width] = 4
-settings[omega_preface_last_width] = 8
+settings[omega_preface_last_width] = 4
 
+settings[omega_content_layout] = first_content_last
+settings[omega_content_container_width] = 16
 settings[omega_sidebar_first_width] = 4
 settings[omega_content_main_width] = 8
 settings[omega_sidebar_last_width] = 4
 
+settings[omega_postscript_container_width] = 16 
 settings[omega_postscript_one_width] = 4
 settings[omega_postscript_two_width] = 4
 settings[omega_postscript_three_width] = 4
 settings[omega_postscript_four_width] = 4
 
-settings[omega_content_layout] = first_content_last
-settings[front_page_title_display] = title_slogan
-settings[page_title_display_custom] = ''
-settings[other_page_title_display] = ptitle_slogan
-settings[other_page_title_display_custom] = ''
+settings[omega_footer_container_width] = 16
+settings[omega_footer_first_width] = 16
+settings[omega_footer_last_width] = 16
 
-settings[configurable_separator] = ' | '
-settings[mission_statement_pages] = home
-settings[omega_jqueryui] = 0
-settings[sidebar_combine] = 1
-settings[sidebar_contain_pages] = ''
\ No newline at end of file
+
+; / 960gs default region settings
\ No newline at end of file
diff --git a/page.tpl.php b/page.tpl.php
index d8ca6f1526faa0db66c6c8291f51f8c59696d26b..939a6f00f0b9e8e209080d32d849cc789614a020 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
 
@@ -15,155 +15,157 @@
 <body class="<?php print $body_classes; ?>">
   <?php if (!empty($admin)) print $admin; ?>
   <div id="page" class="clear-block">
-  
+
     <div id="site-header" class="container-<?php print $branding_wrapper_width; ?> clear-block">
-      
+
       <div id="branding" class="grid-<?php print $header_logo_width; ?>">
-      <?php if ($linked_logo_img): ?>
-        <?php print $linked_logo_img; ?>
-      <?php endif; ?>
-      <?php if ($linked_site_name): ?>
-        <h1 id="site-name" class=""><?php print $linked_site_name; ?></h1>
-      <?php endif; ?>
+        <?php if ($linked_logo_img): ?>
+          <?php print $linked_logo_img; ?>
+        <?php endif; ?>
+        <?php if ($linked_site_name): ?>
+          <h1 id="site-name" class=""><?php print $linked_site_name; ?></h1>
+        <?php endif; ?>
       </div><!-- /#branding -->
-    
-      
-      
-    <?php if ($main_menu_links || $secondary_menu_links): ?>
-      <div id="site-menu" class="grid-<?php print $header_menu_width; ?>">
-        <div><?php print $main_menu_links; ?></div>
-        <div><?php print $secondary_menu_links; ?></div>
-      </div>
-    <?php endif; ?>
+
+      <?php if ($main_menu_links || $secondary_menu_links): ?>
+        <div id="site-menu" class="grid-<?php print $header_menu_width; ?>">
+          <div><?php print $main_menu_links; ?></div>
+          <div><?php print $secondary_menu_links; ?></div>
+        </div><!-- /#site-menu -->
+      <?php endif; ?>
     </div><!-- /#site-header -->
-    
+
     <div id="header-regions" class="container-<?php print $header_wrapper_width; ?> clear-block">
-	    <div id="header-first" class="<?php print $header_first_classes; ?>">
-	      <?php print $header_first; ?>
-	    </div>
-	    
-	    <div id="header-first" class="<?php print $header_last_classes; ?>">
-	      <?php print $header_last; ?>
-	    </div>
-    </div>
-    
-    
-    
-    
-    
-    
-    
-    
+      <?php if($header_first): ?>
+        <div id="header-first" class="<?php print $header_first_classes; ?>">
+          <?php print $header_first; ?>
+        </div><!-- /#header-first -->
+      <?php endif; ?>
+      <?php if($header_last): ?>
+        <div id="header-last" class="<?php print $header_last_classes; ?>">
+          <?php print $header_last; ?>
+        </div><!-- /#header-last -->
+      <?php endif; ?>
+    </div><!-- /#header-regions -->
+
     <div id="internal-nav" class="container-<?php print $internal_nav_wrapper_width; ?> clear-block">
       <div id="slogan-bcrumb" class="grid-<?php print $breadcrumb_slogan_width; ?>">
         <?php if ($site_slogan && $is_front): ?>
-          <div id="slogan"><?php print $site_slogan; ?></div>
+          <div id="slogan"><?php print $site_slogan; ?></div><!-- /#slogan -->
         <?php endif; ?>
         <?php if($breadcrumb): ?>
-          <div id="bcrumb"><?php print $breadcrumb; ?></div>
+          <div id="bcrumb"><?php print $breadcrumb; ?></div><!-- /#bcrumb -->
         <?php endif; ?>
       </div>
       <?php if ($search_box): ?>
-      <div id="search-box" class="grid-<?php print $search_width; ?>"><?php print $search_box; ?></div>
-    <?php endif; ?>
-      
-    </div>
+        <div id="search-box" class="grid-<?php print $search_width; ?>"><?php print $search_box; ?></div><!-- /#search-box -->
+      <?php endif; ?>
+    </div><!-- /#internal-nav -->
 
     <div id="preface-wrapper" class="container-<?php print $preface_wrapper_grids; ?>">
-      <div id="preface-first" class="preface <?php print $preface_first_classes; ?>">
-        <?php print $preface_first; ?>
-      </div>
-      <div id="preface-middle" class="preface <?php print $preface_middle_classes; ?>">
-        <?php print $preface_middle; ?>
-      </div>
-      <div id="preface-last" class="preface <?php print $preface_last_classes; ?>">
-        <?php print $preface_last; ?>
-      </div>
-    </div><!-- /preface-wrapper -->
-    
+      <?php if($preface_first): ?>
+        <div id="preface-first" class="preface <?php print $preface_first_classes; ?>">
+          <?php print $preface_first; ?>
+        </div><!-- /#preface-first -->
+      <?php endif; ?>
+      <?php if($preface_middle): ?>
+        <div id="preface-middle" class="preface <?php print $preface_middle_classes; ?>">
+          <?php print $preface_middle; ?>
+        </div><!-- /#preface-middle -->
+      <?php endif; ?>
+      <?php if($preface_last): ?>
+        <div id="preface-last" class="preface <?php print $preface_last_classes; ?>">
+          <?php print $preface_last; ?>
+        </div><!-- /#preface-last -->
+      <?php endif; ?>
+    </div><!-- /#preface-wrapper -->
+
     <div class="container-<?php print $default_container_width; ?> clear-block">
       <div class="grid-<?php print $default_container_width; ?>">
         <?php print $help; ?><?php print $messages; ?>
       </div>
-    </div>
-    
-    <div id="main-content-container" class="container-<?php print $content_container_width; ?> clear-block">
-    <div id="main-wrapper" class="column <?php print $main_content_classes; ?>">
-      
-
-	    <?php print $mission; ?>
+    </div><!-- /.container-xx -->
 
-      
-      <div id="content-top">
-        <?php print $content_top; ?>
-      </div>
-      
-      <?php if ($tabs): ?>
-        <div id="content-tabs" class=""><?php print $tabs; ?></div>
-      <?php endif; ?>
-      
-      <?php if ($title): ?>
-        <h1 class="title" id="page-title"><?php print $title; ?></h1>
-      <?php endif; ?>
-
-      <div id="main-content" class="region clear-block">
-        <?php print $content; ?>
-      </div>
-      
-      <div id="content-bottom">
-        <?php print $content_bottom; ?>
-      </div>
-    </div>
+    <div id="main-content-container" class="container-<?php print $content_container_width; ?> clear-block">
+      <div id="main-wrapper" class="column <?php print $main_content_classes; ?>">
+        <?php print $mission; ?>
     
+        <div id="content-top">
+          <?php print $content_top; ?>
+        </div><!-- /#content-top -->
     
+        <?php if ($tabs): ?>
+          <div id="content-tabs" class=""><?php print $tabs; ?></div><!-- /#content-tabs -->
+        <?php endif; ?>
     
+        <?php if ($title): ?>
+          <h1 class="title" id="page-title"><?php print $title; ?></h1>
+        <?php endif; ?>
     
+        <div id="main-content" class="region clear-block">
+          <?php print $content; ?>
+        </div><!-- /#main-content -->
     
-  <?php if ($sidebar_first): ?>
-    <div id="sidebar-first" class="column sidebar region <?php print $sidebar_first_classes; ?>">
-      <?php print $sidebar_first; ?>
-    </div>
-  <?php endif; ?>
-
-  <?php if ($sidebar_last): ?>
-    <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
-      <?php print $sidebar_last; ?>
-    </div>
-  <?php endif; ?>
-  </div>
-
-  <div id="postscript-wrapper" class="container-<?php print $postscript_container_width; ?> clear-block">
-    <div id="postscript-one" class="postscript <?php print $postscript_one_classes; ?>">
-      <?php print $postscript_one; ?>
-    </div>
-    <div id="postscript-two" class="postscript <?php print $postscript_two_classes; ?>">
-      <?php print $postscript_two; ?>
-    </div>
-    <div id="postscript-three" class="postscript <?php print $postscript_three_classes; ?>">
-      <?php print $postscript_three; ?>
-    </div>
-    <div id="postscript-four" class="postscript <?php print $postscript_four_classes; ?>">
-      <?php print $postscript_four; ?>
-    </div>
-  </div><!-- /postscript-wrapper -->
-  
-  
-  
-  <div id="footer-wrapper" class="container-<?php print $footer_container_width; ?>">
-	  <div id="footer-first" class="grid-<?php print $footer_first_classes; ?>">
-	    <?php print $footer_first; ?>
-	  </div>
-	  <div id="footer-last" class="grid-<?php print $footer_last_classes; ?>">
-	    <?php print $footer_last; ?>
-	    <?php if ($footer_message): ?>
-	      <div id="footer-message">
-	        <?php print $footer_message; ?>
-	      </div>
-	    <?php endif; ?>
-	  </div>
-  </div>
+        <div id="content-bottom">
+          <?php print $content_bottom; ?>
+        </div><!-- /#content-bottom -->
+      </div><!-- /#main-wrapper -->
+    
+      <?php if ($sidebar_first): ?>
+        <div id="sidebar-first" class="column sidebar region <?php print $sidebar_first_classes; ?>">
+          <?php print $sidebar_first; ?>
+        </div><!-- /#sidebar-first -->
+      <?php endif; ?>
+    
+      <?php if ($sidebar_last): ?>
+        <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
+          <?php print $sidebar_last; ?>
+        </div><!-- /#sidebar-last -->
+      <?php endif; ?>
+    </div><!-- /#main-content-container -->
+    
+    <div id="postscript-wrapper" class="container-<?php print $postscript_container_width; ?> clear-block">
+      <?php if($postscript_one): ?>
+        <div id="postscript-one" class="postscript <?php print $postscript_one_classes; ?>">
+          <?php print $postscript_one; ?>
+        </div><!-- /#postscript-one -->
+      <?php endif; ?>
+      <?php if($postscript_two): ?>
+        <div id="postscript-two" class="postscript <?php print $postscript_two_classes; ?>">
+          <?php print $postscript_two; ?>
+        </div><!-- /#postscript-two -->
+      <?php endif; ?>
+      <?php if($postscript_three): ?>
+        <div id="postscript-three" class="postscript <?php print $postscript_three_classes; ?>">
+          <?php print $postscript_three; ?>
+        </div><!-- /#postscript-three -->
+      <?php endif; ?>
+      <?php if($postscript_four): ?>
+        <div id="postscript-four" class="postscript <?php print $postscript_four_classes; ?>">
+          <?php print $postscript_four; ?>
+        </div><!-- /#postscript-four -->
+      <?php endif; ?>
+    </div><!-- /#postscript-wrapper -->
+    
+    <div id="footer-wrapper" class="container-<?php print $footer_container_width; ?> clearfix">
+      <?php if($footer_first): ?>
+        <div id="footer-first" class="grid-<?php print $footer_first_classes; ?>">
+          <?php print $footer_first; ?>
+        </div><!-- /#footer-first -->
+      <?php endif; ?>
+      <?php if($footer_last): ?>
+        <div id="footer-last" class="grid-<?php print $footer_last_classes; ?>">
+          <?php print $footer_last; ?>
+          <?php if ($footer_message): ?>
+            <div id="footer-message">
+              <?php print $footer_message; ?>
+            </div><!-- /#footer-message -->
+          <?php endif; ?>
+        </div><!-- /#footer-last -->
+      <?php endif; ?>
+    </div><!-- /#footer-wrapper -->
 
-  </div>
+  </div><!-- /#page -->
   <?php print $closure; ?>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/polished/favicon.ico b/polished/favicon.ico
deleted file mode 100644
index 0f9909a60cb8c1e3ed435472068fee39e4652c96..0000000000000000000000000000000000000000
Binary files a/polished/favicon.ico and /dev/null differ
diff --git a/polished/logo.png b/polished/logo.png
deleted file mode 100755
index ca82c943f674904b7fcd6f7a0710f5a1d258d69e..0000000000000000000000000000000000000000
Binary files a/polished/logo.png and /dev/null differ
diff --git a/polished/page.tpl.php b/polished/page.tpl.php
deleted file mode 100644
index b5a28ea451170ed9aeca5000a9a0f8ef89d2022c..0000000000000000000000000000000000000000
--- a/polished/page.tpl.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-// $Id$
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-
-<head>
-  <title><?php print $head_title; ?></title>
-  <?php print $head; ?>
-  <?php print $styles; ?>
-  <?php print $scripts; ?>
-</head>
-
-<body class="<?php print $body_classes; ?>">
-  <?php if (!empty($admin)) print $admin; ?>
-  <div id="page" class="container-16 clear-block">
-  
-    <div id="site-header" class="grid-16 clear-block">
-      
-      <div id="branding" class="grid-4 alpha">
-      <?php if ($linked_logo_img): ?>
-        <?php print $linked_logo_img; ?>
-      <?php endif; ?>
-      <?php if ($linked_site_name): ?>
-        <h1 id="site-name" class=""><?php print $linked_site_name; ?></h1>
-      <?php endif; ?>
-      </div><!-- /#branding -->
-    
-      
-      
-    <?php if ($main_menu_links || $secondary_menu_links): ?>
-      <div id="site-menu" class="grid-12 omega">
-        <?php print $main_menu_links; ?>
-        <?php print $secondary_menu_links; ?>
-      </div>
-    <?php endif; ?>
-    
-    <?php print $header_first; ?>
-    <?php print $header_last; ?>
-    </div><!-- /#site-header -->
-
-    <div id="internal-nav" class="grid-16">
-      <div id="slogan-bcrumb" class="grid-10 alpha">
-        <?php if ($site_slogan && $is_front): ?>
-          <div id="slogan"><?php print $site_slogan; ?></div>
-        <?php endif; ?>
-        <?php if($breadcrumb): ?>
-          <div id="bcrumb"><?php print $breadcrumb; ?></div>
-        <?php endif; ?>
-      </div>
-      <?php if ($search_box): ?>
-      <div id="search-box" class="grid-6 omega"><?php print $search_box; ?></div>
-    <?php endif; ?>
-      
-    </div>
-
-    <div id="preface-wrapper" class="grid-16">
-      <?php print $preface_first; ?>
-      <?php print $preface_middle; ?>
-      <?php print $preface_last; ?>
-    </div><!-- /preface-wrapper -->
-    
-    <div class="grid-16"><?php print $help; ?><?php print $messages; ?></div>
-    <div>
-    <div id="main-wrapper" class="column <?php print $main_content_classes; ?>">
-      
-
-	    <?php print $mission; ?>
-
-      
-      <div id="content-top">
-        <?php print $content_top; ?>
-      </div>
-      
-      <?php if ($tabs): ?>
-        <div id="content-tabs" class=""><?php print $tabs; ?></div>
-      <?php endif; ?>
-      
-      <?php if ($title): ?>
-        <h1 class="title" id="page-title"><?php print $title; ?></h1>
-      <?php endif; ?>
-
-      <div id="main-content" class="region clear-block">
-        <?php print $content; ?>
-      </div>
-      
-      <div id="content-bottom">
-        <?php print $content_bottom; ?>
-      </div>
-    </div>
-    </div>
-  <?php if ($sidebar_first): ?>
-    <div id="sidebar-first" class="column sidebar region <?php print $sidebar_first_classes; ?>">
-      <?php print $sidebar_first; ?>
-    </div>
-  <?php endif; ?>
-
-  <?php if ($sidebar_last): ?>
-    <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
-      <?php print $sidebar_last; ?>
-    </div>
-  <?php endif; ?>
-
-
-  <div id="postscript-wrapper" class="grid-16">
-      <?php print $postscript_one; ?>
-      <?php print $postscript_two; ?>
-      <?php print $postscript_three; ?>
-      <?php print $postscript_four; ?>
-  </div><!-- /postscript-wrapper -->
-  
-  
-  <div id="footer-first" class="grid-16 clear-block">
-    <?php print $footer_first; ?>
-  </div>
-  <div id="footer-last" class="grid-16 clear-block">
-    <?php print $footer_last; ?>
-    <?php if ($footer_message): ?>
-      <div id="footer-message">
-        <?php print $footer_message; ?>
-      </div>
-    <?php endif; ?>
-  </div>
-
-
-  </div>
-  <?php print $closure; ?>
-</body>
-</html>
diff --git a/polished/polished.info b/polished/polished.info
deleted file mode 100644
index 7c1a6771eafed6d67f7c60f88ef6e788110a7ccf..0000000000000000000000000000000000000000
--- a/polished/polished.info
+++ /dev/null
@@ -1,69 +0,0 @@
-; $Id$
-name        = Omega Polished
-description = Omega Sub-Theme with clean CSS styles
-screenshot = screenshot.png
-core       = 6.x
-base theme = omega
-
-regions[sidebar_first] = sidebar first
-regions[sidebar_last] = sidebar last
-
-regions[header_first] = header first
-regions[header_last] = header last
-
-regions[preface_first] = preface first
-regions[preface_middle] = preface middle
-regions[preface_last] = preface last
-
-regions[content_top] = content top
-regions[content_bottom] = content bottom
-
-regions[postscript_one] = postscript 1
-regions[postscript_two] = postscript 2
-regions[postscript_three] = postscript 3
-regions[postscript_four] = postscript 4
-
-regions[footer_first] = footer first
-regions[footer_last] = footer last
-
-features[] = logo
-features[] = name
-features[] = slogan
-features[] = mission
-features[] = node_user_picture
-features[] = comment_user_picture
-features[] = search
-features[] = favicon
-features[] = primary_links
-features[] = secondary_links
-
-
-; Set the default settings to be used in theme-settings.php
-
-settings[omega_header_first_width] = 6
-settings[omega_header_last_width] = 6
-
-settings[omega_preface_first_width] = 4
-settings[omega_preface_middle_width] = 4
-settings[omega_preface_last_width] = 8
-
-settings[omega_sidebar_first_width] = 4
-settings[omega_content_main_width] = 8
-settings[omega_sidebar_last_width] = 4
-
-settings[omega_postscript_one_width] = 4
-settings[omega_postscript_two_width] = 4
-settings[omega_postscript_three_width] = 4
-settings[omega_postscript_four_width] = 4
-
-settings[omega_content_layout] = first_content_last
-settings[front_page_title_display] = title_slogan
-settings[page_title_display_custom] = ''
-settings[other_page_title_display] = ptitle_slogan
-settings[other_page_title_display_custom] = ''
-
-settings[configurable_separator] = ' | '
-settings[mission_statement_pages] = home
-settings[omega_jqueryui] = 0
-settings[sidebar_combine] = 1
-settings[sidebar_contain_pages] = ''
\ No newline at end of file
diff --git a/polished/template.php b/polished/template.php
deleted file mode 100644
index 4644ae7a5cb53f1a1e7302bda8eb8e809d65b9cb..0000000000000000000000000000000000000000
--- a/polished/template.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-// $Id$
-
-/*
- * Add any conditional stylesheets you will need for this sub-theme.
- *
- * To add stylesheets that ALWAYS need to be included, you should add them to
- * your .info file instead. Only use this section if you are including
- * stylesheets based on certain conditions.
- */
-/* -- Delete this line if you want to use and modify this code
-// Example: optionally add a fixed width CSS file.
-if (theme_get_setting('polished_fixed')) {
-  drupal_add_css(path_to_theme() . '/layout-fixed.css', 'theme', 'all');
-}
-// */
-
-
-/**
- * Implementation of HOOK_theme().
- */
-function polished_theme(&$existing, $type, $theme, $path) {
-  $hooks = omega_theme($existing, $type, $theme, $path);
-  // Add your theme hooks like this:
-  /*
-  $hooks['hook_name_here'] = array( // Details go here );
-  */
-  // @TODO: Needs detailed comments. Patches welcome!
-  return $hooks;
-}
-
-/**
- * Override or insert variables into all templates.
- *
- * @param $vars
- *   An array of variables to pass to the theme template.
- * @param $hook
- *   The name of the template being rendered (name of the .tpl.php file.)
- */
-/* -- Delete this line if you want to use this function
-function polished_preprocess(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Override or insert variables into the page templates.
- *
- * @param $vars
- *   An array of variables to pass to the theme template.
- * @param $hook
- *   The name of the template being rendered ("page" in this case.)
- */
-/* -- Delete this line if you want to use this function
-function polished_preprocess_page(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Override or insert variables into the node templates.
- *
- * @param $vars
- *   An array of variables to pass to the theme template.
- * @param $hook
- *   The name of the template being rendered ("node" in this case.)
- */
-/* -- Delete this line if you want to use this function
-function polished_preprocess_node(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Override or insert variables into the comment templates.
- *
- * @param $vars
- *   An array of variables to pass to the theme template.
- * @param $hook
- *   The name of the template being rendered ("comment" in this case.)
- */
-/* -- Delete this line if you want to use this function
-function polished_preprocess_comment(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Override or insert variables into the block templates.
- *
- * @param $vars
- *   An array of variables to pass to the theme template.
- * @param $hook
- *   The name of the template being rendered ("block" in this case.)
- */
-/* -- Delete this line if you want to use this function
-function polished_preprocess_block(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
diff --git a/polished/theme-settings.php b/polished/theme-settings.php
deleted file mode 100644
index 294d0f7f8a2b18418e055c4fa8872664a9589dda..0000000000000000000000000000000000000000
--- a/polished/theme-settings.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// $Id$
-
-// Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'omega') . '/theme-settings.php';
-/**
- * Implementation of THEMEHOOK_settings() function.
- *
- * @param $saved_settings
- *   An array of saved settings for this theme.
- * @return
- *   A form array.
- */
-function polished_settings($saved_settings) {
-  // Get the default values from the .info file.
-  $defaults = omega_theme_get_default_settings('polished');
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
-  $form = array();
-  // Add the base theme's settings.
-  $form += omega_settings($saved_settings, $defaults);
-  // Return the form
-  return $form;
-}
diff --git a/preprocess/preprocess-node.inc b/preprocess/preprocess-node.inc
index 2389f3c9e5d2ad88e6d389182f5dd68d1a6473cc..a2c6be60727138052a053ee2f34f1d9632196376 100644
--- a/preprocess/preprocess-node.inc
+++ b/preprocess/preprocess-node.inc
@@ -1,6 +1,5 @@
 <?php
 // $Id$
-//krumo($vars);
 /**
  * Implementation of theme_preprocess_HOOK().
  * Passes varables to the node templates.
@@ -8,13 +7,7 @@
  * @return $vars
  */
 // Prepare the arrays to handle the classes and ids for the node container.
-if(!isset($vars['node']->attributes)) {
-  $vars['node_attributes'] = array();
-}
-else {
-  $vars['node_attributes'] = $vars['node']->attributes;
-}
-
+$vars['node_attributes'] = array();
 // Add an id to allow the styling of a specific node.
 $vars['node_attributes']['id'] = 'node-' . $vars['type'] . '-' . $vars['nid'];
 
diff --git a/preprocess/preprocess-page.inc b/preprocess/preprocess-page.inc
index ee3edb10842630ed68036347ce2e5d4822390d00..e6d9952a568ca417520e5e2e1daeee192d91eec4 100644
--- a/preprocess/preprocess-page.inc
+++ b/preprocess/preprocess-page.inc
@@ -1,13 +1,18 @@
 <?php
 // $Id$
+
 // Pull out some things from the page.tpl.php and make that code more consise.
 // $header_first
 global $theme_key;
 include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
 $settings = theme_get_settings($theme_key);
-$omega = omega_theme_get_default_settings('omega');
+//krumo($theme_key);
+//$omega = omega_theme_get_default_settings($theme_key);
+//krumo($settings);
+//krumo($omega);
 // Merge the saved variables and their default values.
-$settings = array_merge($omega, $settings);
+//$settings = array_merge($omega, $settings);
+
 /**
  * The $original_regions array is a set of the default values for the 
  * current regions available. This is great so that they can be manipulated
@@ -31,11 +36,12 @@ if ($settings['sidebar_contain_pages']) {
     $page_match = $page_match || drupal_match_path($_GET['q'], $settings['sidebar_contain_pages']);
   }
   $page_match = !($settings['sidebar_combine'] xor $page_match);
-  if($page_match && substr($_GET['q'], 0, 17) != 'admin/build/block') {
+  if ($page_match && substr($_GET['q'], 0, 17) != 'admin/build/block') {
     $vars['sidebar_first'] = $vars['sidebar_first']. $vars['sidebar_last'];
     unset($vars['sidebar_last']); 
   }
 }
+
 /**
  * Header Region
  * Depends on the width of the logo and title region, which is 4 grids by default.
@@ -60,12 +66,14 @@ $vars['search_width'] = $settings['omega_search_width'];
 
  
 if ($vars['header_first']) {
-  $vars['header_first_classes'] = ns('grid-'. $settings['omega_header_wrapper_width'], $vars['header_last'], $settings['omega_header_last_width']). $vars['omega']['header_first'];
+  $vars['header_first_classes'] = ns('grid-'. $settings['omega_header_wrapper_width'], $vars['header_last'], $settings['omega_header_last_width']);
 }
+
 // $header_last
 if ($vars['header_last']) {
-	$vars['header_last_classes'] = ns('grid-'. $settings['omega_header_wrapper_width'], $vars['header_first'], $settings['omega_header_first_width']). $vars['omega']['header_last'];
+	$vars['header_last_classes'] = ns('grid-'. $settings['omega_header_wrapper_width'], $vars['header_first'], $settings['omega_header_first_width']);
 }
+
 /**
  * Preface Region
  * Same as above, preparing the preface regions to accept settings configurations
@@ -87,10 +95,6 @@ if ($vars['preface_last']) {
         $vars['preface_middle'], $settings['omega_preface_middle_width']);
 }
 
-
-
-
-
 /**
  * Body Region
  * Configuration of $sidebar_first, $sidebar_last, and the main content zone
@@ -106,8 +110,10 @@ switch($settings['omega_content_layout']){
   default:
   case 'first_content_last':
   // FIRST - CONTENT - LAST
-  $sl_max_width = $omega['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
-  $sl_pull = $omega['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
+  $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
+  
+  $sl_pull = $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
+  
   if ($vars['sidebar_first']) {
     $vars['sidebar_first_classes'] = 
       ns('grid-'. $sl_max_width, 
@@ -123,7 +129,7 @@ switch($settings['omega_content_layout']){
       $vars['sidebar_first'] || !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
     );
   }
-  if($vars['content']) {
+  if ($vars['content']) {
     $vars['main_content_classes'] = 
       ns('grid-'. $vars['content_container_width'],  
       $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
@@ -133,6 +139,7 @@ switch($settings['omega_content_layout']){
     );
   }
   break;
+
   // CONTENT  - FIRST - LAST
   case 'content_first_last':
   $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
@@ -149,7 +156,7 @@ switch($settings['omega_content_layout']){
       $vars['sidebar_first'] || !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
     );
   }
-  if($vars['content']) {
+  if ($vars['content']) {
     $vars['main_content_classes'] = 
       ns('grid-'. $vars['content_container_width'],  
       $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
@@ -157,27 +164,30 @@ switch($settings['omega_content_layout']){
     );
   }
   break;
+
   // FIRST - LAST - CONTENT
   case 'first_last_content':
   $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
+  
   $sl_pull = $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
+  $sr_pull = $settings['omega_content_main_width'];
+  
   if ($vars['sidebar_first']) {
     $vars['sidebar_first_classes'] = 
       ns('grid-'. $sl_max_width, 
       $vars['sidebar_last'] || !$vars['sidebar_last'], $settings['omega_sidebar_last_width']
-    ). ' '. ns('pull-'. $sl_pull,
-      $vars['sidebar_last'], $settings['omega_sidebar_last_width']
+    ). ' '. ns('pull-'. $sr_pull
     );
   }
+  
   if ($vars['sidebar_last']) {
     $vars['sidebar_last_classes'] = 
-      ns('grid-'. $sl_max_width, 
-      $vars['sidebar_first'] || !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
-    ). ' '. ns('pull-'. $sl_pull,
-      $vars['sidebar_first'], $settings['omega_sidebar_first_width']
+      ns('grid-'. $settings['omega_sidebar_last_width']
+    ). ' '. ns('pull-'. $sr_pull
     );
   }
-  if($vars['content']) {
+  
+  if ($vars['content']) {
     $vars['main_content_classes'] = 
       ns('grid-'. $vars['content_container_width'],  
       $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
@@ -227,9 +237,6 @@ $vars['footer_container_width'] = $settings['omega_footer_container_width'];
 $vars['footer_first_classes'] = $settings['omega_footer_first_width'];
 $vars['footer_last_classes'] = $settings['omega_footer_last_width'];
 
-
-
-
 // ZEN - BODY CLASSES
 // Classes for body element. Allows advanced theming based on context
 // (home page, node of certain type, etc.)
@@ -257,15 +264,14 @@ if (!$vars['is_front']) {
 $vars['body_classes_array'] = $classes;
 $vars['body_classes'] = implode(' ', $classes); // Concatenate with spaces.
 
-
 $vars['logo_img'] = $vars['logo'] ? theme('image', substr($vars['logo'], strlen(base_path())), t($vars['site_name']), t($vars['site_name'])) : '';	
 
 // NINESIXTY - For easy printing of variables.
-
 $vars['linked_logo_img'] = $vars['logo_img'] ? l($vars['logo_img'], '<front>', array('rel' => 'home', 'title' => t($vars['site_name']), 'html' => TRUE)) : '';
 $vars['linked_site_name'] = $vars['site_name'] ? l($vars['site_name'], '<front>', array('rel' => 'home', 'title' => t('Home'))) : '';
 $vars['main_menu_links']      = theme('links', $vars['primary_links'], array('class' => 'links main-menu'));
 $vars['secondary_menu_links'] = theme('links', $vars['secondary_links'], array('class' => 'links secondary-menu'));
+
 // NINESIXTY - Make sure framework styles are placed above all others.
 $vars['css_alt'] = omega_css_reorder($vars['css']);
 $vars['styles'] = drupal_get_css($vars['css_alt']);
@@ -322,7 +328,7 @@ if (!module_exists('page_title')) {
 }
 // implement mission statement settings
 $vars['mission'] = t(variable_get('site_mission', ''));
-if ($settings['mission_statement_pages'] == 'all' || $vars['is_front'] && $settings['mission_statement_pages'] == 'home') {
+if ($vars['mission'] && ($settings['mission_statement_pages'] == 'all' || $vars['is_front'] && $settings['mission_statement_pages'] == 'home')) { 
   $vars['mission'] = '<div id="mission" class=""><p>' .$vars['mission']. '</p></div>';
 }
 else {
diff --git a/starterkit/polished.info b/starterkit/omega_starterkit.info
old mode 100644
new mode 100755
similarity index 56%
rename from starterkit/polished.info
rename to starterkit/omega_starterkit.info
index 7c1a6771eafed6d67f7c60f88ef6e788110a7ccf..6090244b0da60b98c0d692f76736569bdb474198
--- a/starterkit/polished.info
+++ b/starterkit/omega_starterkit.info
@@ -1,6 +1,6 @@
 ; $Id$
-name        = Omega Polished
-description = Omega Sub-Theme with clean CSS styles
+name        = Omega Starter Kit
+description = Omega Sub-Theme starter kit
 screenshot = screenshot.png
 core       = 6.x
 base theme = omega
@@ -37,33 +37,62 @@ features[] = favicon
 features[] = primary_links
 features[] = secondary_links
 
-
 ; Set the default settings to be used in theme-settings.php
 
-settings[omega_header_first_width] = 6
-settings[omega_header_last_width] = 6
+; Non-960gs default settings
+settings[front_page_title_display] = title_slogan
+settings[page_title_display_custom] = ''
+settings[other_page_title_display] = ptitle_stitle
+settings[other_page_title_display_custom] = ''
+settings[configurable_separator] = ' | '
+
+settings[omega_breadcrumb] = 'yes'
+settings[omega_breadcrumb_separator] = ' / '
+settings[omega_breadcrumb_home] = 1
+settings[omega_breadcrumb_trailing] = 1
+settings[omega_breadcrumb_title] = 1
+
+settings[mission_statement_pages] = home
+
+settings[sidebar_combine] = 1
+settings[sidebar_contain_pages] = ''
+; / Non-960gs default settings
+
+
+; 960gs default region settings
+settings[omega_default_container_width] = 16
 
-settings[omega_preface_first_width] = 4
+settings[omega_branding_wrapper_width] = 16
+settings[omega_header_logo_width] = 4
+settings[omega_header_menu_width] = 12
+
+settings[omega_header_wrapper_width] = 16
+settings[omega_header_first_width] = 8
+settings[omega_header_last_width] = 8
+
+settings[omega_internal_nav_wrapper_width] = 16
+settings[omega_breadcrumb_slogan_width] = 10
+settings[omega_search_width] = 6
+
+settings[omega_preface_wrapper_grids] = 16
+settings[omega_preface_first_width] = 8
 settings[omega_preface_middle_width] = 4
-settings[omega_preface_last_width] = 8
+settings[omega_preface_last_width] = 4
 
+settings[omega_content_layout] = first_content_last
+settings[omega_content_container_width] = 16
 settings[omega_sidebar_first_width] = 4
 settings[omega_content_main_width] = 8
 settings[omega_sidebar_last_width] = 4
 
+settings[omega_postscript_container_width] = 16
 settings[omega_postscript_one_width] = 4
 settings[omega_postscript_two_width] = 4
 settings[omega_postscript_three_width] = 4
 settings[omega_postscript_four_width] = 4
 
-settings[omega_content_layout] = first_content_last
-settings[front_page_title_display] = title_slogan
-settings[page_title_display_custom] = ''
-settings[other_page_title_display] = ptitle_slogan
-settings[other_page_title_display_custom] = ''
+settings[omega_footer_container_width] = 16
+settings[omega_footer_first_width] = 16
+settings[omega_footer_last_width] = 16
 
-settings[configurable_separator] = ' | '
-settings[mission_statement_pages] = home
-settings[omega_jqueryui] = 0
-settings[sidebar_combine] = 1
-settings[sidebar_contain_pages] = ''
\ No newline at end of file
+; / 960gs default region settings
\ No newline at end of file
diff --git a/starterkit/page.tpl.php b/starterkit/page.tpl.php
index b5a28ea451170ed9aeca5000a9a0f8ef89d2022c..939a6f00f0b9e8e209080d32d849cc789614a020 100644
--- a/starterkit/page.tpl.php
+++ b/starterkit/page.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
 
@@ -14,117 +14,158 @@
 
 <body class="<?php print $body_classes; ?>">
   <?php if (!empty($admin)) print $admin; ?>
-  <div id="page" class="container-16 clear-block">
-  
-    <div id="site-header" class="grid-16 clear-block">
-      
-      <div id="branding" class="grid-4 alpha">
-      <?php if ($linked_logo_img): ?>
-        <?php print $linked_logo_img; ?>
-      <?php endif; ?>
-      <?php if ($linked_site_name): ?>
-        <h1 id="site-name" class=""><?php print $linked_site_name; ?></h1>
-      <?php endif; ?>
+  <div id="page" class="clear-block">
+
+    <div id="site-header" class="container-<?php print $branding_wrapper_width; ?> clear-block">
+
+      <div id="branding" class="grid-<?php print $header_logo_width; ?>">
+        <?php if ($linked_logo_img): ?>
+          <?php print $linked_logo_img; ?>
+        <?php endif; ?>
+        <?php if ($linked_site_name): ?>
+          <h1 id="site-name" class=""><?php print $linked_site_name; ?></h1>
+        <?php endif; ?>
       </div><!-- /#branding -->
-    
-      
-      
-    <?php if ($main_menu_links || $secondary_menu_links): ?>
-      <div id="site-menu" class="grid-12 omega">
-        <?php print $main_menu_links; ?>
-        <?php print $secondary_menu_links; ?>
-      </div>
-    <?php endif; ?>
-    
-    <?php print $header_first; ?>
-    <?php print $header_last; ?>
+
+      <?php if ($main_menu_links || $secondary_menu_links): ?>
+        <div id="site-menu" class="grid-<?php print $header_menu_width; ?>">
+          <div><?php print $main_menu_links; ?></div>
+          <div><?php print $secondary_menu_links; ?></div>
+        </div><!-- /#site-menu -->
+      <?php endif; ?>
     </div><!-- /#site-header -->
 
-    <div id="internal-nav" class="grid-16">
-      <div id="slogan-bcrumb" class="grid-10 alpha">
+    <div id="header-regions" class="container-<?php print $header_wrapper_width; ?> clear-block">
+      <?php if($header_first): ?>
+        <div id="header-first" class="<?php print $header_first_classes; ?>">
+          <?php print $header_first; ?>
+        </div><!-- /#header-first -->
+      <?php endif; ?>
+      <?php if($header_last): ?>
+        <div id="header-last" class="<?php print $header_last_classes; ?>">
+          <?php print $header_last; ?>
+        </div><!-- /#header-last -->
+      <?php endif; ?>
+    </div><!-- /#header-regions -->
+
+    <div id="internal-nav" class="container-<?php print $internal_nav_wrapper_width; ?> clear-block">
+      <div id="slogan-bcrumb" class="grid-<?php print $breadcrumb_slogan_width; ?>">
         <?php if ($site_slogan && $is_front): ?>
-          <div id="slogan"><?php print $site_slogan; ?></div>
+          <div id="slogan"><?php print $site_slogan; ?></div><!-- /#slogan -->
         <?php endif; ?>
         <?php if($breadcrumb): ?>
-          <div id="bcrumb"><?php print $breadcrumb; ?></div>
+          <div id="bcrumb"><?php print $breadcrumb; ?></div><!-- /#bcrumb -->
         <?php endif; ?>
       </div>
       <?php if ($search_box): ?>
-      <div id="search-box" class="grid-6 omega"><?php print $search_box; ?></div>
-    <?php endif; ?>
-      
-    </div>
-
-    <div id="preface-wrapper" class="grid-16">
-      <?php print $preface_first; ?>
-      <?php print $preface_middle; ?>
-      <?php print $preface_last; ?>
-    </div><!-- /preface-wrapper -->
-    
-    <div class="grid-16"><?php print $help; ?><?php print $messages; ?></div>
-    <div>
-    <div id="main-wrapper" class="column <?php print $main_content_classes; ?>">
-      
-
-	    <?php print $mission; ?>
+        <div id="search-box" class="grid-<?php print $search_width; ?>"><?php print $search_box; ?></div><!-- /#search-box -->
+      <?php endif; ?>
+    </div><!-- /#internal-nav -->
 
-      
-      <div id="content-top">
-        <?php print $content_top; ?>
-      </div>
-      
-      <?php if ($tabs): ?>
-        <div id="content-tabs" class=""><?php print $tabs; ?></div>
+    <div id="preface-wrapper" class="container-<?php print $preface_wrapper_grids; ?>">
+      <?php if($preface_first): ?>
+        <div id="preface-first" class="preface <?php print $preface_first_classes; ?>">
+          <?php print $preface_first; ?>
+        </div><!-- /#preface-first -->
       <?php endif; ?>
-      
-      <?php if ($title): ?>
-        <h1 class="title" id="page-title"><?php print $title; ?></h1>
+      <?php if($preface_middle): ?>
+        <div id="preface-middle" class="preface <?php print $preface_middle_classes; ?>">
+          <?php print $preface_middle; ?>
+        </div><!-- /#preface-middle -->
       <?php endif; ?>
+      <?php if($preface_last): ?>
+        <div id="preface-last" class="preface <?php print $preface_last_classes; ?>">
+          <?php print $preface_last; ?>
+        </div><!-- /#preface-last -->
+      <?php endif; ?>
+    </div><!-- /#preface-wrapper -->
 
-      <div id="main-content" class="region clear-block">
-        <?php print $content; ?>
-      </div>
-      
-      <div id="content-bottom">
-        <?php print $content_bottom; ?>
-      </div>
-    </div>
-    </div>
-  <?php if ($sidebar_first): ?>
-    <div id="sidebar-first" class="column sidebar region <?php print $sidebar_first_classes; ?>">
-      <?php print $sidebar_first; ?>
-    </div>
-  <?php endif; ?>
-
-  <?php if ($sidebar_last): ?>
-    <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
-      <?php print $sidebar_last; ?>
-    </div>
-  <?php endif; ?>
-
-
-  <div id="postscript-wrapper" class="grid-16">
-      <?php print $postscript_one; ?>
-      <?php print $postscript_two; ?>
-      <?php print $postscript_three; ?>
-      <?php print $postscript_four; ?>
-  </div><!-- /postscript-wrapper -->
-  
-  
-  <div id="footer-first" class="grid-16 clear-block">
-    <?php print $footer_first; ?>
-  </div>
-  <div id="footer-last" class="grid-16 clear-block">
-    <?php print $footer_last; ?>
-    <?php if ($footer_message): ?>
-      <div id="footer-message">
-        <?php print $footer_message; ?>
+    <div class="container-<?php print $default_container_width; ?> clear-block">
+      <div class="grid-<?php print $default_container_width; ?>">
+        <?php print $help; ?><?php print $messages; ?>
       </div>
-    <?php endif; ?>
-  </div>
+    </div><!-- /.container-xx -->
 
+    <div id="main-content-container" class="container-<?php print $content_container_width; ?> clear-block">
+      <div id="main-wrapper" class="column <?php print $main_content_classes; ?>">
+        <?php print $mission; ?>
+    
+        <div id="content-top">
+          <?php print $content_top; ?>
+        </div><!-- /#content-top -->
+    
+        <?php if ($tabs): ?>
+          <div id="content-tabs" class=""><?php print $tabs; ?></div><!-- /#content-tabs -->
+        <?php endif; ?>
+    
+        <?php if ($title): ?>
+          <h1 class="title" id="page-title"><?php print $title; ?></h1>
+        <?php endif; ?>
+    
+        <div id="main-content" class="region clear-block">
+          <?php print $content; ?>
+        </div><!-- /#main-content -->
+    
+        <div id="content-bottom">
+          <?php print $content_bottom; ?>
+        </div><!-- /#content-bottom -->
+      </div><!-- /#main-wrapper -->
+    
+      <?php if ($sidebar_first): ?>
+        <div id="sidebar-first" class="column sidebar region <?php print $sidebar_first_classes; ?>">
+          <?php print $sidebar_first; ?>
+        </div><!-- /#sidebar-first -->
+      <?php endif; ?>
+    
+      <?php if ($sidebar_last): ?>
+        <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
+          <?php print $sidebar_last; ?>
+        </div><!-- /#sidebar-last -->
+      <?php endif; ?>
+    </div><!-- /#main-content-container -->
+    
+    <div id="postscript-wrapper" class="container-<?php print $postscript_container_width; ?> clear-block">
+      <?php if($postscript_one): ?>
+        <div id="postscript-one" class="postscript <?php print $postscript_one_classes; ?>">
+          <?php print $postscript_one; ?>
+        </div><!-- /#postscript-one -->
+      <?php endif; ?>
+      <?php if($postscript_two): ?>
+        <div id="postscript-two" class="postscript <?php print $postscript_two_classes; ?>">
+          <?php print $postscript_two; ?>
+        </div><!-- /#postscript-two -->
+      <?php endif; ?>
+      <?php if($postscript_three): ?>
+        <div id="postscript-three" class="postscript <?php print $postscript_three_classes; ?>">
+          <?php print $postscript_three; ?>
+        </div><!-- /#postscript-three -->
+      <?php endif; ?>
+      <?php if($postscript_four): ?>
+        <div id="postscript-four" class="postscript <?php print $postscript_four_classes; ?>">
+          <?php print $postscript_four; ?>
+        </div><!-- /#postscript-four -->
+      <?php endif; ?>
+    </div><!-- /#postscript-wrapper -->
+    
+    <div id="footer-wrapper" class="container-<?php print $footer_container_width; ?> clearfix">
+      <?php if($footer_first): ?>
+        <div id="footer-first" class="grid-<?php print $footer_first_classes; ?>">
+          <?php print $footer_first; ?>
+        </div><!-- /#footer-first -->
+      <?php endif; ?>
+      <?php if($footer_last): ?>
+        <div id="footer-last" class="grid-<?php print $footer_last_classes; ?>">
+          <?php print $footer_last; ?>
+          <?php if ($footer_message): ?>
+            <div id="footer-message">
+              <?php print $footer_message; ?>
+            </div><!-- /#footer-message -->
+          <?php endif; ?>
+        </div><!-- /#footer-last -->
+      <?php endif; ?>
+    </div><!-- /#footer-wrapper -->
 
-  </div>
+  </div><!-- /#page -->
   <?php print $closure; ?>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/starterkit/template.php b/starterkit/template.php
index 4644ae7a5cb53f1a1e7302bda8eb8e809d65b9cb..fde1079db980fad467625b58ed94335eb8976f8e 100644
--- a/starterkit/template.php
+++ b/starterkit/template.php
@@ -19,7 +19,7 @@ if (theme_get_setting('polished_fixed')) {
 /**
  * Implementation of HOOK_theme().
  */
-function polished_theme(&$existing, $type, $theme, $path) {
+function omega_starterkit_theme(&$existing, $type, $theme, $path) {
   $hooks = omega_theme($existing, $type, $theme, $path);
   // Add your theme hooks like this:
   /*
@@ -98,3 +98,24 @@ function polished_preprocess_block(&$vars, $hook) {
   $vars['sample_variable'] = t('Lorem ipsum.');
 }
 // */
+
+
+/**
+ * Create a string of attributes form a provided array.
+ * 
+ * @param $attributes
+ * @return string
+ */
+function omega_starterkit_render_attributes($attributes) {
+  if($attributes) {
+    $items = array();
+    foreach($attributes as $attribute => $data) {
+      if(is_array($data)) {
+        $data = implode(' ', $data);
+      }
+      $items[] = $attribute . '="' . $data . '"';
+    }
+    $output = ' ' . implode(' ', $items);
+  }
+  return $output;
+}
\ No newline at end of file
diff --git a/starterkit/theme-settings.php b/starterkit/theme-settings.php
index 294d0f7f8a2b18418e055c4fa8872664a9589dda..3665c3f2aaf433af6f187e3ebb572f927c44bcfc 100644
--- a/starterkit/theme-settings.php
+++ b/starterkit/theme-settings.php
@@ -3,6 +3,7 @@
 
 // Include the definition of zen_settings() and zen_theme_get_default_settings().
 include_once './' . drupal_get_path('theme', 'omega') . '/theme-settings.php';
+
 /**
  * Implementation of THEMEHOOK_settings() function.
  *
@@ -11,14 +12,16 @@ include_once './' . drupal_get_path('theme', 'omega') . '/theme-settings.php';
  * @return
  *   A form array.
  */
-function polished_settings($saved_settings) {
+function omega_starterkit_settings($saved_settings) {
   // Get the default values from the .info file.
-  $defaults = omega_theme_get_default_settings('polished');
+  //krumo($saved_settings);
+  $subtheme_defaults = omega_theme_get_default_settings('omega_starterkit');
+  //krumo($defaults);
   // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
+  //$settings = array_merge($defaults, $saved_settings);
   $form = array();
   // Add the base theme's settings.
-  $form += omega_settings($saved_settings, $defaults);
+  $form += omega_settings($saved_settings, $subtheme_defaults);
   // Return the form
   return $form;
 }
diff --git a/template.php b/template.php
index 732c81f50ceab2826f4e095ca196097e761cab66..33c71974f2ee30f182d87ea188eca22f21ac4ad2 100644
--- a/template.php
+++ b/template.php
@@ -224,7 +224,7 @@ function omega_breadcrumb($breadcrumb) {
  * @return string
  */
 function omega_render_attributes($attributes) {
-  if($attributes) {
+  if ($attributes) {
     $items = array();
     foreach($attributes as $attribute => $data) {
       if(is_array($data)) {
diff --git a/theme-functions.inc b/theme-functions.inc
index 6a613c19b4fdd34bb9ce01d8d831b3eb6988f6e2..4072d796c6f9804ca0045a9c85f2a8617a2da0aa 100644
--- a/theme-functions.inc
+++ b/theme-functions.inc
@@ -1,18 +1,43 @@
 <?php
+// $Id$
 /**
- * Provides a wrapper for theme_get_setting()
- * that will return either current or a default value
- * provided by omega_vars('variable_name', 'default_value')
+ * Return the theme settings' default values from the .info and save them into the database.
  *
- * @param setting name $setting
- * @param default value $d
- * @return value
+ * @param $theme
+ *   The name of theme.
  */
-function ovars($s, $d){
-  if ($s) {
-    return $s;
-  }
-  else {
-    return $d;
+function omega_theme_get_default_settings($theme) {
+  $themes = list_themes();
+  //krumo($themes[$theme]->info);
+  // Get the default values from the .info file.
+  $defaults = !empty($themes[$theme]->info['settings']) ? $themes[$theme]->info['settings'] : array();
+
+  if (!empty($defaults)) {
+    // Get the theme settings saved in the database.
+    $settings = theme_get_settings($theme);
+    // Don't save the toggle_node_info_ variables.
+    if (module_exists('node')) {
+      foreach (node_get_types() as $type => $name) {
+        unset($settings['toggle_node_info_' . $type]);
+      }
+    }
+    // Save default theme settings.
+    variable_set(
+      str_replace('/', '_', 'theme_' . $theme . '_settings'),
+      array_merge($defaults, $settings)
+    );
+    // If the active theme has been loaded, force refresh of Drupal internals.
+    if (!empty($GLOBALS['theme_key'])) {
+      theme_get_setting('', TRUE);
+    }
   }
+  // Return the default settings.
+  return $defaults;
+}
+
+function omega_theme_generate_region_settings() {
+  
 }
+function omega_theme_generate_region_options(){
+  
+}
\ No newline at end of file
diff --git a/theme-settings.php b/theme-settings.php
index 8267a2268fbe77e034e684a21f9f379d9736c6be..b3ba36325e340c7c486716b167869ad958a50540 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -1,34 +1,44 @@
 <?php
 // $Id$
+
 // require_once for the functions that need to be available when we are outside
 // of the omega theme in the administrative interface
 //include_once './' . drupal_get_path('theme', 'omega') . '/template.theme-registry.inc';
 include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
+
 /**
-* Implementation of THEMEHOOK_settings() function.
-*
-* @param $saved_settings
-*   array An array of saved settings for this theme.
-* @return
-*   array A form array.
-*/
+ * Implementation of THEMEHOOK_settings() function.
+ *
+ * @param $saved_settings
+ *   array An array of saved settings for this theme.
+ * @return
+ *   array A form array.
+ */
 function omega_settings($saved_settings, $subtheme_defaults = array()) {
-	// Add the form's CSS
+  // Add the form's CSS
   //drupal_add_css(drupal_get_path('theme', 'omega') . '/theme-settings.css', 'theme');
-
   // Add javascript to show/hide optional settings
   drupal_add_js(drupal_get_path('theme', 'omega'). '/js/omega_admin.js', 'theme');
 
   // Get the default values from the .info file.
-  $defaults = omega_theme_get_default_settings('omega');
-  // Allow a subtheme to override the default values.
-  $defaults = array_merge($defaults, $subtheme_defaults);
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
-		
-	for($i=1;$i<=16;$i++){
-		$grids[$i]= $i;
-	}
+  if (count($subtheme_defaults) > 0) {
+    // Allow a subtheme to override the default values.
+    $settings = array_merge($subtheme_defaults, $saved_settings);
+  }
+  else {
+    // Merge the saved variables and their default values.
+    $defaults = omega_theme_get_default_settings('omega');
+    $settings = array_merge($defaults, $saved_settings);
+  }
+
+  for ($i = 1; $i <= 24; $i++){
+    $grids[$i] = $i;
+  }
+  $containers = array(
+    '12' => '12 column grid',
+    '16' => '16 column grid',
+    '24' => '24 column grid'
+  );
   $form['omega_container'] = array(
     '#type' => 'fieldset',
     '#title' => t('Omega 960 settings'),
@@ -36,202 +46,186 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
-	  // General Settings
-	  $form['omega_container']['omega_general'] = array(
-	    '#type' => 'fieldset',
-	    '#title' => t('General Omega 960 Settings'),
-	    '#description' => t('Configure generic options on rendering content in this theme.'),
-	    '#collapsible' => TRUE,
-	    '#collapsed' => TRUE,
-	  );
-		// Page titles
-		  $form['omega_container']['omega_general']['page_format_titles'] = array(
-		    '#type' => 'fieldset',
-		    '#title' => t('Page titles'),
-		    '#description'   => t('This is the title that displays in the title bar of your web browser. Your site title, slogan, and mission can all be set on your Site Information page. [NOTE: For more advanced page title functionality, consider using the "Page Title" module.  However, the Page titles theme settings do not work in combination with the "Page Title" module and will be disabled if you have it enabled.]'),
-		    '#collapsible' => TRUE,
-		    '#collapsed' => TRUE,
-		  );
-		  if (module_exists('page_title') == FALSE) {
-		    // front page title
-		    $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles'] = array(
-		      '#type' => 'fieldset',
-		      '#title' => t('Front page title'),
-		      '#description'   => t('Your front page in particular should have important keywords for your site in the page title'),
-		      '#collapsible' => TRUE,
-		      '#collapsed' => TRUE,
-		    );
-		    $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['front_page_title_display'] = array(
-		      '#type' => 'select',
-		      '#title' => t('Set text of front page title'),
-		      '#collapsible' => TRUE,
-		      '#collapsed' => FALSE,
-		      '#default_value' => $saved_settings['front_page_title_display'],
-		      '#options' => array(
-		                      'title_slogan' => t('Site title | Site slogan'),
-		                      'slogan_title' => t('Site slogan | Site title'),
-		                      'title_mission' => t('Site title | Site mission'),
-		                      'custom' => t('Custom (below)'),
-		                    ),
-		    );
-		    $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['page_title_display_custom'] = array(
-		      '#type' => 'textfield',
-		      '#title' => t('Custom'),
-		      '#size' => 60,
-		      '#default_value' => $saved_settings['page_title_display_custom'],
-		      '#description'   => t('Enter a custom page title for your front page'),
-		    );
-		    // other pages title
-		    $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles'] = array(
-		      '#type' => 'fieldset',
-		      '#title' => t('Other page titles'),
-		      '#collapsible' => TRUE,
-		      '#collapsed' => TRUE,
-		    );
-		    $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display'] = array(
-		      '#type' => 'select',
-		      '#title' => t('Set text of other page titles'),
-		      '#collapsible' => TRUE,
-		      '#collapsed' => FALSE,
-		      '#default_value' => $saved_settings['other_page_title_display'],
-		      '#options' => array(
-		                      'ptitle_slogan' => t('Page title | Site slogan'),
-		                      'ptitle_stitle' => t('Page title | Site title'),
-		                      'ptitle_smission' => t('Page title | Site mission'),
-		                      'ptitle_custom' => t('Page title | Custom (below)'),
-		                      'custom' => t('Custom (below)'),
-		                    ),
-		    );
-		    $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display_custom'] = array(
-		      '#type' => 'textfield',
-		      '#title' => t('Custom'),
-		      '#size' => 60,
-		      '#default_value' => $saved_settings['other_page_title_display_custom'],
-		      '#description'   => t('Enter a custom page title for all other pages'),
-		    );
-		    // SEO configurable separator
-		    $form['omega_container']['omega_general']['page_format_titles']['configurable_separator'] = array(
-		      '#type' => 'textfield',
-		      '#title' => t('Title separator'),
-		      '#description' => t('Customize the separator character used in the page title'),
-		      '#size' => 60,
-		      '#default_value' => $saved_settings['configurable_separator'],
-		    );
-		  } else {
-		      $form['omega_container']['omega_general']['page_format_titles']['#description'] = 'NOTICE: You currently have the "Page Title" module installed and enabled, so the Page titles theme settings have been disabled to prevent conflicts.  If you wish to re-enable the Page titles theme settings, you must first disable the "Page Title" module.';
-		      $form['omega_container']['omega_general']['page_format_titles']['configurable_separator']['#disabled'] = 'disabled';
-		  }
-	  // Breadcrumb
-	  $form['omega_container']['omega_general']['breadcrumb'] = array(
-	    '#type'          => 'fieldset',
-	    '#title'         => t('Breadcrumb settings'),
-	    '#attributes'    => array('id' => 'omega-breadcrumb'),
-	    '#collapsible' => TRUE,
+    // General Settings
+    $form['omega_container']['omega_general'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('General Omega 960 Settings'),
+      '#description' => t('Configure generic options on rendering content in this theme.'),
+      '#collapsible' => TRUE,
       '#collapsed' => TRUE,
     );
-	  $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb'] = array(
-	    '#type'          => 'select',
-	    '#title'         => t('Display breadcrumb'),
-	    '#default_value' => $saved_settings['omega_breadcrumb'],
-	    '#options'       => array(
-	                          'yes'   => t('Yes'),
-	                          'admin' => t('Only in admin section'),
-	                          'no'    => t('No'),
-	                        ),
-	  );
-	  $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_separator'] = array(
-	    '#type'          => 'textfield',
-	    '#title'         => t('Breadcrumb separator'),
-	    '#description'   => t('Text only. Don’t forget to include spaces.'),
-	    '#default_value' => $saved_settings['omega_breadcrumb_separator'],
-	    '#size'          => 5,
-	    '#maxlength'     => 10,
-	  );
-	  $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_home'] = array(
-	    '#type'          => 'checkbox',
-	    '#title'         => t('Show home page link in breadcrumb'),
-	    '#default_value' => $saved_settings['omega_breadcrumb_home'],
-	  );
-	  $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_trailing'] = array(
-	    '#type'          => 'checkbox',
-	    '#title'         => t('Append a separator to the end of the breadcrumb'),
-	    '#default_value' => $saved_settings['omega_breadcrumb_trailing'],
-	    '#description'   => t('Useful when the breadcrumb is placed just before the title.'),
-	  );
-	  $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_title'] = array(
-	    '#type'          => 'checkbox',
-	    '#title'         => t('Append the content title to the end of the breadcrumb'),
-	    '#default_value' => $saved_settings['omega_breadcrumb_title'],
-	    '#description'   => t('Useful when the breadcrumb is not placed just before the title.'),
-	  );
-		  
-	  
-	  
-	   $form['omega_container']['omega_general']['jquery'] = array(
+
+    // Page titles
+      $form['omega_container']['omega_general']['page_format_titles'] = array(
         '#type' => 'fieldset',
-        '#title' => t('jQuery Configuration'),
+        '#title' => t('Page titles'),
+        '#description'   => t('This is the title that displays in the title bar of your web browser. Your site title, slogan, and mission can all be set on your Site Information page. [NOTE: For more advanced page title functionality, consider using the "Page Title" module.  However, the Page titles theme settings do not work in combination with the "Page Title" module and will be disabled if you have it enabled.]'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-	      '#description' => t('<div class="warning">This section is currently disabled as the advanced jQuery features are not currently implemented, and are slated for a 2.x feature release. For now, the jQuery UI setting below is mostly a placeholder.</div>'),
       );
-	    $form['omega_container']['omega_general']['jquery']['omega_jqueryui'] = array(
-          '#type'          => 'radios',
-	        '#description'   => t('The Omega theme provides jQueryUI functionality. You will need to turn this off if you are using the jQuery UI module.'),
-          '#title'         => t('Include jQuery UI?'),
-          '#default_value' => $saved_settings['omega_jqueryui'],
-          '#options'       => array(
-	                             t('Do NOT include jQueryUI'),
-	                             t('DO include jQueryUI'),
-                              ),
-          '#disabled'      => TRUE,                              
-        );
-		  // Mission Statement
-		  $form['omega_container']['omega_general']['mission_statement'] = array(
-		    '#type' => 'fieldset',
-		    '#title' => t('Mission statement'),
-		    '#collapsible' => TRUE,
-		    '#collapsed' => TRUE,
-		  );
-			  $form['omega_container']['omega_general']['mission_statement']['mission_statement_pages'] = array(
-			    '#type'          => 'radios',
-			    '#title'         => t('Where should your mission statement be displayed?'),
-			    '#default_value' => $saved_settings['mission_statement_pages'],
-			    '#options'       => array(
-			                          'home' => t('Display mission statement only on front page'),
-			                          'all' => t('Display mission statement on all pages'),
-			                        ),
-			  );
-		  
+      if (module_exists('page_title') == FALSE) {
+        // front page title
+        $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles'] = array(
+          '#type' => 'fieldset',
+          '#title' => t('Front page title'),
+          '#description'   => t('Your front page in particular should have important keywords for your site in the page title'),
+          '#collapsible' => TRUE,
+          '#collapsed' => TRUE,
+        );
+        $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['front_page_title_display'] = array(
+          '#type' => 'select',
+          '#title' => t('Set text of front page title'),
+          '#collapsible' => TRUE,
+          '#collapsed' => FALSE,
+          '#default_value' => $saved_settings['front_page_title_display'],
+          '#options' => array(
+                          'title_slogan' => t('Site title | Site slogan'),
+                          'slogan_title' => t('Site slogan | Site title'),
+                          'title_mission' => t('Site title | Site mission'),
+                          'custom' => t('Custom (below)'),
+                        ),
+        );
+        $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['page_title_display_custom'] = array(
+          '#type' => 'textfield',
+          '#title' => t('Custom'),
+          '#size' => 60,
+          '#default_value' => $saved_settings['page_title_display_custom'],
+          '#description'   => t('Enter a custom page title for your front page'),
+        );
 
-	  // Region Settings
-	  $form['omega_container']['omega_regions'] = array(
-	    '#type' => 'fieldset',
-	    '#title' => t('960gs Region Settings'),
-	    '#description' => t('Configure how your regions are rendered. This area is currently a quick implementation of an interface to allow end users to quickly build out and adjust the default page layout. This feature will be improved over time, and include much more flexibility.'),
-	    '#collapsible' => TRUE,
-	    '#collapsed' => FALSE,
-	  );
-	  // Header Blocks
-		  $form['omega_container']['omega_regions']['headers'] = array(
+        // other pages title
+        $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles'] = array(
+          '#type' => 'fieldset',
+          '#title' => t('Other page titles'),
+          '#collapsible' => TRUE,
+          '#collapsed' => TRUE,
+        );
+        $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display'] = array(
+          '#type' => 'select',
+          '#title' => t('Set text of other page titles'),
+          '#collapsible' => TRUE,
+          '#collapsed' => FALSE,
+          '#default_value' => $saved_settings['other_page_title_display'],
+          '#options' => array(
+                          'ptitle_slogan' => t('Page title | Site slogan'),
+                          'ptitle_stitle' => t('Page title | Site title'),
+                          'ptitle_smission' => t('Page title | Site mission'),
+                          'ptitle_custom' => t('Page title | Custom (below)'),
+                          'custom' => t('Custom (below)'),
+                        ),
+        );
+        $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display_custom'] = array(
+          '#type' => 'textfield',
+          '#title' => t('Custom'),
+          '#size' => 60,
+          '#default_value' => $saved_settings['other_page_title_display_custom'],
+          '#description'   => t('Enter a custom page title for all other pages'),
+        );
+        // SEO configurable separator
+        $form['omega_container']['omega_general']['page_format_titles']['configurable_separator'] = array(
+          '#type' => 'textfield',
+          '#title' => t('Title separator'),
+          '#description' => t('Customize the separator character used in the page title'),
+          '#size' => 60,
+          '#default_value' => $saved_settings['configurable_separator'],
+        );
+      }
+      else {
+        $form['omega_container']['omega_general']['page_format_titles']['#description'] = 'NOTICE: You currently have the "Page Title" module installed and enabled, so the Page titles theme settings have been disabled to prevent conflicts.  If you wish to re-enable the Page titles theme settings, you must first disable the "Page Title" module.';
+        $form['omega_container']['omega_general']['page_format_titles']['configurable_separator']['#disabled'] = 'disabled';
+      }
+
+      // Breadcrumb
+      $form['omega_container']['omega_general']['breadcrumb'] = array(
+        '#type'          => 'fieldset',
+        '#title'         => t('Breadcrumb settings'),
+        '#attributes'    => array('id' => 'omega-breadcrumb'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+      );
+      $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb'] = array(
+        '#type'          => 'select',
+        '#title'         => t('Display breadcrumb'),
+        '#default_value' => $saved_settings['omega_breadcrumb'],
+        '#options'       => array(
+                              'yes'   => t('Yes'),
+                              'admin' => t('Only in admin section'),
+                              'no'    => t('No'),
+                            ),
+      );
+      $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_separator'] = array(
+        '#type'          => 'textfield',
+        '#title'         => t('Breadcrumb separator'),
+        '#description'   => t('Text only. Don’t forget to include spaces.'),
+        '#default_value' => $saved_settings['omega_breadcrumb_separator'],
+        '#size'          => 5,
+        '#maxlength'     => 10,
+      );
+      $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_home'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Show home page link in breadcrumb'),
+        '#default_value' => $saved_settings['omega_breadcrumb_home'],
+      );
+      $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_trailing'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Append a separator to the end of the breadcrumb'),
+        '#default_value' => $saved_settings['omega_breadcrumb_trailing'],
+        '#description'   => t('Useful when the breadcrumb is placed just before the title.'),
+      );
+      $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_title'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Append the content title to the end of the breadcrumb'),
+        '#default_value' => $saved_settings['omega_breadcrumb_title'],
+        '#description'   => t('Useful when the breadcrumb is not placed just before the title.'),
+      );
+
+      // Mission Statement
+      $form['omega_container']['omega_general']['mission_statement'] = array(
         '#type' => 'fieldset',
-        '#title' => t('Header Configuration'),
-        '#description' => t('Header region zones, including Primary & Secondary menus, Header first and Header Last.'),
+        '#title' => t('Mission statement'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
       );
+        $form['omega_container']['omega_general']['mission_statement']['mission_statement_pages'] = array(
+          '#type'          => 'radios',
+          '#title'         => t('Where should your mission statement be displayed?'),
+          '#default_value' => $saved_settings['mission_statement_pages'],
+          '#options'       => array(
+                                'home' => t('Display mission statement only on front page'),
+                                'all' => t('Display mission statement on all pages'),
+                              ),
+        );
+
+    // Region Settings
+    $form['omega_container']['omega_regions'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('960gs Region Settings'),
+      '#description' => t('Configure how your regions are rendered. This area is currently a quick implementation of an interface to allow end users to quickly build out and adjust the default page layout. This feature will be improved over time, and include much more flexibility.'),
+      '#collapsible' => TRUE,
+      '#collapsed' => FALSE,
+    );
       $form['omega_container']['omega_regions']['omega_default_container_width'] = array(
         '#type' => 'select',
         '#title' => t('Default container width'),
         '#default_value' => $saved_settings['omega_default_container_width'],
-        '#options' => $grids,
+        '#options' => $containers,
         '#weight' => -50,
         '#description' => t('This width is used for regions like $help, $messages and other non-important regions in page.tpl.php'),
       );
+
+      // Header Blocks
+      $form['omega_container']['omega_regions']['headers'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Header Configuration'),
+        '#description' => t('Header region zones, including Primary & Secondary menus, Header first and Header Last.'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+      );
         $form['omega_container']['omega_regions']['headers']['omega_branding_wrapper_width'] = array(
           '#type' => 'select',
           '#title' => t('Wrapper Area width for Header/Navigation Elements'),
           '#default_value' => $saved_settings['omega_branding_wrapper_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t('Total of the two numbers for header first and header last. This will also be the default value for navigation in that zone.'),
         );
         $form['omega_container']['omega_regions']['headers']['omega_header_menu_width'] = array(
@@ -252,7 +246,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Wrapper Area width for Header/Navigation Elements'),
           '#default_value' => $saved_settings['omega_header_wrapper_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t('Total of the two numbers for header first and header last. This will also be the default value for navigation in that zone.'),
         );
         $form['omega_container']['omega_regions']['headers']['omega_header_first_width'] = array(
@@ -264,7 +258,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
         );
         $form['omega_container']['omega_regions']['headers']['omega_header_last_width'] = array(
           '#type' => 'select',
-          '#title' => t('Contextual Width for Header First'),
+          '#title' => t('Contextual Width for Header Last'),
           '#default_value' => $saved_settings['omega_header_last_width'],
           '#options' => $grids,
           '#description' => t('This number, paired with the Header First determine the share of your grid for each element.'),
@@ -273,7 +267,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Wrapper Area width for Breadcrumb/Slogan/Search'),
           '#default_value' => $saved_settings['omega_internal_nav_wrapper_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t(''),
         );
         $form['omega_container']['omega_regions']['headers']['omega_breadcrumb_slogan_width'] = array(
@@ -290,8 +284,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#options' => $grids,
           '#description' => t(''),
         );
-        
-        
+
       // Preface Blocks
       $form['omega_container']['omega_regions']['preface'] = array(
         '#type' => 'fieldset',
@@ -304,7 +297,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Preface Wrapper Container Grids'),
           '#default_value' => $saved_settings['omega_preface_wrapper_grids'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t('Grid elements to be used for the preface region.'),
         );
         $form['omega_container']['omega_regions']['preface']['omega_preface_first_width'] = array(
@@ -328,6 +321,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#options' => $grids,
           '#description' => t('This number, combined with the Preface First and Preface Middle determine the share of your grid for each element.'),
         );
+
       // Main Body Regions
       $form['omega_container']['omega_regions']['main'] = array(
         '#type' => 'fieldset',
@@ -351,7 +345,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Container width for content zone'),
           '#default_value' => $saved_settings['omega_content_container_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t(''),
         );
         $form['omega_container']['omega_regions']['main']['omega_sidebar_first_width'] = array(
@@ -377,20 +371,21 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
         );
         $options = array(t('Combine Sidebars on all except the listed pages.'), t('Combine Sidebars on only the listed pages.'));
         $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>'));
-		    $form['omega_container']['omega_regions']['main']['sidebar_combine'] = array(
-		      '#type' => 'radios',
-		      '#title' => t('Combine Sidebars'),
-		      '#description' => t('This is useful for administrative pages, and in certain contexts. You may choose to in certain areas, combine the <strong>$sidebar_first</strong> and <strong>$sidebar_last</strong> to create one sidebar from the content of both.'),
-		      '#options' => $options,
-		      '#default_value' => $saved_settings['sidebar_combine'],
-		    );
-		    $form['omega_container']['omega_regions']['main']['sidebar_contain_pages'] = array(
-		      '#type' => 'textarea',
-		      '#title' => t('Pages'),
-		      '#default_value' => $saved_settings['sidebar_contain_pages'],
-		      '#description' => $description,
-		    );
-    // Preface Blocks
+        $form['omega_container']['omega_regions']['main']['sidebar_combine'] = array(
+          '#type' => 'radios',
+          '#title' => t('Combine Sidebars'),
+          '#description' => t('This is useful for administrative pages, and in certain contexts. You may choose to in certain areas, combine the <strong>$sidebar_first</strong> and <strong>$sidebar_last</strong> to create one sidebar from the content of both.'),
+          '#options' => $options,
+          '#default_value' => $saved_settings['sidebar_combine'],
+        );
+        $form['omega_container']['omega_regions']['main']['sidebar_contain_pages'] = array(
+          '#type' => 'textarea',
+          '#title' => t('Pages'),
+          '#default_value' => $saved_settings['sidebar_contain_pages'],
+          '#description' => $description,
+        );
+
+      // Postscript Blocks
       $form['omega_container']['omega_regions']['postscript'] = array(
         '#type' => 'fieldset',
         '#title' => t('Postscript Configuration'),
@@ -402,7 +397,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Container width for postscript regions'),
           '#default_value' => $saved_settings['omega_postscript_container_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t(''),
         );
         $form['omega_container']['omega_regions']['postscript']['omega_postscript_one_width'] = array(
@@ -433,7 +428,8 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#options' => $grids,
           '#description' => t('This number, combined with the other Postscript content zones determines the share of your grid for each element.'),
         );
-    // Preface Blocks
+
+      // Footer Blocks
       $form['omega_container']['omega_regions']['footer'] = array(
         '#type' => 'fieldset',
         '#title' => t('Footer Configuration'),
@@ -445,7 +441,7 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
           '#type' => 'select',
           '#title' => t('Container width for footer regions'),
           '#default_value' => $saved_settings['omega_footer_container_width'],
-          '#options' => $grids,
+          '#options' => $containers,
           '#description' => t(''),
         );
         $form['omega_container']['omega_regions']['footer']['omega_footer_first_width'] = array(
@@ -464,4 +460,4 @@ function omega_settings($saved_settings, $subtheme_defaults = array()) {
         );
   // Return theme settings form
   return $form;
-}  
\ No newline at end of file
+}
\ No newline at end of file