diff --git a/README.txt b/README.txt
index 1608da8..803d645 100644
--- a/README.txt
+++ b/README.txt
@@ -1,85 +1,33 @@
 
-Thanks for downloading the Airy Blue theme, originally designed for Open Source Catholic (www.opensourcecatholic.com) by Jeff Geerling of Midwestern Mac, LLC (www.midwesternmac.com).
+Thanks for downloading the Airy Blue theme, originally designed for Open Source
+Catholic (www.opensourcecatholic.com) by Jeff Geerling of Midwestern Mac, LLC
+(www.midwesternmac.com).
 
 
 ##############
 To Install
 ##############
 
-Download the theme from drupal.org, unzip the tarball, place it in sites/all/themes or sites/example.com/themes, and go to the admin/build/themes page on your Drupal site to enable the theme.
+Download the theme from drupal.org, unzip the tarball, place it in
+sites/all/themes or sites/example.com/themes, and go to the admin/build/themes
+page on your Drupal site to enable the theme.
 
 
 ##############
-Dependencies
+Drupal 7 Port
 ##############
-This theme REQUIRES the Zen core theme (2.x-dev as of this release) to be installed; without it, the theme will not work. You can download zen from http://drupal.org/project/zen (install it using the same process above).
 
-Note: Zen 2.x-dev is currently still undergoing some structural changes, so this theme might be broken when you upgrade Zen to the latest -dev version. Always test before putting it on a production server! (There are no performance problems, however - you can use this theme without worrying).
-
-
-##############
-Maintenance Page
-##############
-In order to use this theme's maintenance page for your website (so it will not show the default 'minnelli' theme if your site is in maintenance mode or has a problem), you will need to add the line below to your settings.php file, before the closing ?> tag. For more information, see:
-http://drupal.org/node/195435
-
-$conf['maintenance_theme'] = 'airyblue';
-
-
-##############
-Graphic Header
-##############
-By default, the Title of the site is simply a text header at the top center of the display. If you'd like to make a graphic title (while preserving the text title—especially good for SEO), then you can do so following the steps below (which were used to create the header on www.opensourcecatholic.com):
-
-1. Open the pages.css file in the airyblue folder.
-
-2. Add the following lines in near the #site-name CSS definition (or replace that definition):
-
-  h1#site-name,
-  div#site-name
-  {
-    background: url(images/example-title.png) no-repeat top left;
-    width: XXXpx;
-    margin: 0 auto;
-    padding-top: 0;
-    height: 100px;
-  }
-
-  h1#site-name a,
-  div#site-name a
-  {
-    display: block;
-    text-indent: -9999px;
-    height: 80px;
-    width: XXXpx;
-    padding-top: 20px;
-  }
-
-3. Place an example-title.png (which you'd like to use as your page title) file in the images folder.
-
-4. Change the width values (so they match) to the width of your image.
-
-5. Adjust the height/padding values according to the height of your title image.
-
-Basically, what this code does is move the textual title off the screen (9999px to the left, to be exact), then places an image behind the place that text occupied.
-
-Note: The Photoshop (PSD) file that was used to make this header is included in the 'sources' folder of the airyblue theme.
-
-Note 2: If you'd like to change the positioning of the logo, you can do so by editing the 'top' and 'left' values for the #logo CSS selector in the pages.css file.
+The Drupal 7 version of this theme is undergoing a complete rewrite. Please be
+patient as we work out kinks in the theme's design.
 
 
 ##############
 Rounded Corners in Internet Explorer
 ##############
-If you would like to give IE users and users of other older browsers the ability to see the rounded corners enjoyed by CSS3-compatible browsers, please see the Drupal issue #549590 and use the attached file: http://drupal.org/node/549590
-
-Another solution is to implement a Javascript technique for making rounded corners in IE 6, 7, 8, etc. Just search Google for 'IE Rounded Corners,' and you'll be set!
-
-
-##############
-CSS Problems in Internet Explorer
-##############
-
-If you are experiencing layout problems in Internet Explorer 6/7/8, it might be caused by the number of CSS files referenced by this theme, along with all the modules enabled on the site. Internet Explorer may limit the number of CSS files you can reference.
+If you would like to give IE users and users of other older browsers the ability
+to see the rounded corners enjoyed by CSS3-compatible browsers, please see the
+Drupal issue #549590 and use the attached file: http://drupal.org/node/549590
 
-To fix this problem, turn on CSS file aggregation in admin/settings/performance. This greatly reduces the number of CSS files loaded by the browser.
\ No newline at end of file
+Another solution is to implement a Javascript technique for making rounded
+corners in IE 6, 7, 8, etc. Just search Google for 'IE Rounded Corners,' and
+you'll be set!
\ No newline at end of file
diff --git a/airyblue.info b/airyblue.info
index d906ce8..76a57a9 100644
--- a/airyblue.info
+++ b/airyblue.info
@@ -1,95 +1,33 @@
-
-
-  ; The name and description of the theme used on the admin/build/themes page.
-name        = Airy Blue
+name = Airy Blue
 description = A lightweight, clean and beautiful blog-style theme originally designed for www.opensourcecatholic.com by Jeff Geerling.
-
-  ; The screenshot used on the admin/build/themes page.
 screenshot = screenshot.png
+core = 7.x
 
-  ; "core" specifies the version of Drupal that this theme is compatible with.
-  ; "base theme" specifies that this is a theme that uses the "zen" theme as its
-  ; base theme. Its unlikely you will ever need to change these, but they are
-  ; required fields for a Zen sub-theme. The "engine" field is not used in a
-  ; sub-theme since the engine is inherited from its base theme.
-core       = 6.x
-base theme = zen
-
-  ; This section adds CSS files to your theme. The media type is specified in
-  ; the brackets. Typical CSS media types include "all", "screen", "print", and
-  ; "handheld". See http://www.w3.org/TR/CSS21/media.html#media-types for a full
-  ; list of stylesheet media types in CSS 2.1. The iPhone's preferred media type
-  ; is based on the CSS3 Media queries. http://www.w3.org/TR/css3-mediaqueries/
-  ;
-  ; You can also override any of Zen's stylesheets or any module's stylesheets,
-  ; an /extremely/ useful feature. See the excellent Drupal 6 Theme Guide at
-  ; http://drupal.org/node/171209 for more details.
-stylesheets[all][]   = css/html-elements.css
-stylesheets[all][]   = css/wireframes.css
-stylesheets[all][]   = css/layout.css
-stylesheets[all][]   = css/backgrounds.css
-stylesheets[all][]   = css/tabs.css
-stylesheets[all][]   = css/messages.css
-stylesheets[all][]   = css/pages.css
-stylesheets[all][]   = css/block-editing.css
-stylesheets[all][]   = css/blocks.css
-stylesheets[all][]   = css/navigation.css
-stylesheets[all][]   = css/views-styles.css
-stylesheets[all][]   = css/nodes.css
-stylesheets[all][]   = css/comments.css
-stylesheets[all][]   = css/forms.css
-stylesheets[all][]   = css/fields.css
-stylesheets[print][] = css/print.css
-; stylesheets[handheld][] = css/mobile.css
-; stylesheets[only screen and (max-device-width: 480px)][] = css/iphone.css
+; Stylesheets
+stylesheets[all][] = css/style.css
+stylesheets[all][] = css/tabs.css
 
-  ; Set the conditional stylesheets that are processed by IE.
-conditional-stylesheets[if IE][all][]       = css/ie.css
-conditional-stylesheets[if lte IE 6][all][] = css/ie6.css
-
-  ; Optionally add some jquery scripts to your theme.
+; Scripts
 ; scripts[] = script.js
 
-  ; The regions defined in Zen's default page.tpl.php file.  The name in
-  ; brackets is the name of the variable in the page.tpl.php file, (e.g.
-  ; "[content_top]" in the .info file means there should be a $content_top
-  ; variable in the page.tpl.php file.) The text after the equals sign is a
-  ; descriptive text used on the admin/build/blocks page.
-  ;
-  ; To add a new region, copy Zen's page.tpl.php to your sub-theme's directory,
-  ; add a line line to this file, and then add the new variable to your
-  ; page.tpl.php template.
-regions[sidebar_first]  = first sidebar
-regions[sidebar_second] = second sidebar
-regions[navbar]         = navigation bar
-regions[content_top]    = content top
-regions[content_bottom] = content bottom
-regions[footer]         = footer
-regions[closure_region] = closure
-
-  ; Various page elements output by the theme can be toggled on and off. The
-  ; "features" control which of these check boxes display on the
-  ; admin/build/themes config page. This is useful for suppressing check boxes
-  ; for elements not used by your sub-theme. To suppress a check box, omit the
-  ; entry for it below. See the Drupal 6 Theme Guide for more info:
-  ; http://drupal.org/node/171205#features
+; Theme Regions
+regions[help]           = Help
+regions[sidebar_first]  = First sidebar
+regions[sidebar_second] = Second sidebar
+regions[navbar]         = Navigation bar
+regions[highlighted]    = Highlighted
+regions[header]         = Header
+regions[content_top]    = Content top
+regions[content]        = Content
+regions[content_bottom] = Content bottom
+regions[footer]         = Footer
+
+; Features
 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[zen_block_editing]        = 1
-settings[zen_breadcrumb]           = yes
-settings[zen_breadcrumb_separator] = ' › '
-settings[zen_breadcrumb_home]      = 1
-settings[zen_breadcrumb_trailing]  = 1
-settings[zen_breadcrumb_title]     = 0
-settings[zen_rebuild_registry]     = 1
-settings[zen_wireframes]           = 0
+features[] = main_menu
+features[] = secondary_menu
diff --git a/css/backgrounds.css b/css/backgrounds.css
deleted file mode 100644
index 8967ae3..0000000
--- a/css/backgrounds.css
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/**
- * @file
- * Background Styling
- *
- * The default layout method of Zen doesn't give themers equal-height columns.
- * However, equal-height columns are difficult to achieve and totally
- * unnecessary. Instead, use the Faux Columns method described in the following
- * ALA article:
- *   http://www.alistapart.com/articles/fauxcolumns/
- */
-
-
-body
-{
-}
-
-#body-wrapper
-{
-	background: url(../images/page-bg.png) repeat-x top left;
-}
-
-#page
-{
-}
-
-#page-inner
-{
-}
-
-#header
-{
-	background: url(../images/header.png) no-repeat top left;
-}
-
-#header-inner
-{
-}
-
-#main
-{
-}
-
-#main-inner
-{
-}
-
-#footer
-{
-}
-
-#footer-inner
-{
-}
diff --git a/css/block-editing.css b/css/block-editing.css
deleted file mode 100644
index f2b3a25..0000000
--- a/css/block-editing.css
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/**
- * @file
- * Zen's rollover edit links for blocks.
- */
-
-
-div.block.with-block-editing {
-  position: relative;
-}
-
-div.block.with-block-editing div.edit {
-  display: none;
-  position: absolute;
-  right: 0; /* LTR */
-  top: 0;
-  z-index: 40;
-  border: 1px solid #eee;
-  padding: 0 2px;
-  font-size: 9px;
-  background-color: #fff;
-}
-
-div.block.with-block-editing:hover div.edit {
-  display: block;
-}
diff --git a/css/blocks.css b/css/blocks.css
deleted file mode 100644
index d3172f6..0000000
--- a/css/blocks.css
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/**
- * @file
- * Block Styling
- */
-
-.block-wrapper /* To add a pixel of white inside the border */
-{
-  border: 1px solid #999;
-  border-radius: 10px;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  margin-bottom: 1em;
-}
-
-.block-wrapper .block /* Block div */
-{
-  padding: 10px;
-  background: transparent url(../images/block-bg.png) top left repeat-x;
-  border: 1px solid #FFF;
-  border-radius: 10px;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-.block-region
-{
-  margin: 0;
-  padding: 0;
-}
-
-.block.region-odd /* Zebra striping for each block in the region */
-{
-}
-
-.block.region-even /* Zebra striping for each block in the region */
-{
-}
-
-.block.odd /* Zebra striping independent of each region */
-{
-}
-
-.block.even /* Zebra striping independent of each region */
-{
-}
-
-.region-count-1 /* Incremental count for each block in the region */
-{
-}
-
-.count-1 /* Incremental count independent of each region */
-{
-}
-
-.block-inner /* Additional wrapper for block */
-{
-}
-
-.block h2.title /* Block title */
-{
-  text-align: center;
-  font-size: 1.6em;
-  padding-bottom: 8px;
-  border-bottom: 1px solid #BBB;
-}
-
-.block .content /* Block's content wrapper */
-{
-	font-size: .8em;
-	line-height: 1.3em;
-}
-
-.block .content li /* Lists inside of blocks */
-{
-	margin: 6px 0;
-}
-
-#block-aggregator-category-1 /* Block for the latest news items in the first category */
-{
-}
-
-#block-aggregator-feed-1 /* Block for the latest news items in the first feed */
-{
-}
-
-#block-block-1 /* First administrator-defined block */
-{
-}
-
-#block-blog-0 /* "Recent blog posts" block */
-{
-}
-
-#block-book-0 /* "Book navigation" block for the current book's table of contents */
-{
-}
-
-#block-comment-0 .content /* "Recent comments" block */
-{
-  font-size: .7em;
-  color: #999;
-  line-height: 1.3em;
-}
-
-#block-comment-0 .content a
-{
-  font-size: 1.2em;
-  line-height: 1.3em;
-}
-
-#block-forum-0 /* "Active forum topics" block */
-{
-}
-
-#block-forum-1 /* "New forum topics" block */
-{
-}
-
-#block-menu-primary-links /* "Primary links" block */
-{
-}
-
-#block-menu-secondary-links /* "Secondary links" block */
-{
-}
-
-#block-node-0 /* "Syndicate" block for primary RSS feed */
-{
-}
-
-#block-poll-0 /* "Most recent poll" block */
-{
-}
-
-#block-profile-0 /* "Author information" block for the profile of the page's author */
-{
-}
-
-#block-search-0 /* "Search form" block */
-{
-}
-
-#block-search-0 #search-block-form {
-	margin-top: 1em;
-	text-align: center;
-}
-
-#block-statistics-0 /* "Popular content" block */
-{
-}
-
-#block-user-0 /* "User login form" block */
-{
-}
-
-#block-user-0 .content {
-  margin-top: 1em;
-}
-
-#block-user-1 /* "Navigation" block for Drupal navigation menu */
-{
-}
-
-#block-user-2 /* "Who's new" block for a list of the newest users */
-{
-}
-
-#block-user-3 /* "Who's online" block for a list of the online users */
-{
-}
-/
-{
-}
-
-#block-user-2 /* "Who's new" block for a list of the newest users */
-{
-}
-
-#block-user-3 /* "Who's online" block for a list of the online users */
-{
-}
diff --git a/css/comments.css b/css/comments.css
deleted file mode 100644
index 5671812..0000000
--- a/css/comments.css
+++ /dev/null
@@ -1,204 +0,0 @@
-
-/**
- * @file
- * Comment Styling
- */
-
-
-#comments /* Wrapper for the list of comments and its title */
-{
-  margin: 1em 0;
-}
-
-#comments-title /* Heading for the list of comments */
-{
-}
-
-.comment /* Wrapper for a single comment */
-{
-  background: #EEE;
-  padding: 10px;
-  border: 1px solid #DDD;
-  border-radius: 10px;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-	margin: .5em 0;
-  position: relative;
-}
-
-.comment-inner /* Additional wrapper for a single comment */
-{
-}
-
-.comment-preview /* Preview of the comment before submitting new or updated comment */
-{
-}
-
-.comment.new /* A new comment since the user last viewed the page. */
-{
-}
-
-.comment.odd /* An odd-numbered comment in the list of comments */
-{
-}
-
-.comment.even /* An even-numbered comment in the list of comments */
-{
-}
-
-.comment.first /* The first comment in the list of comments */
-{
-}
-
-.comment.last /* The last comment in the list of comments */
-{
-}
-
-.comment-unpublished /* Unpublished comments */
-{
-  /* background-color: #fff4f4; */ /* Drupal core uses a #fff4f4 background */
-}
-
-.comment-unpublished div.unpublished /* The word "Unpublished" displayed underneath the content. See also the div.unpublished declaration in the nodes.css. */
-{
-}
-
-.comment-published /* Published comments */
-{
-}
-
-.comment-by-anon /* A comment created by an anonymous user */
-{
-}
-
-.comment-by-author /* A comment created by the node's author */
-{
-  background: #EEEEFF;
-  border: 2px solid #DDDDFF;
-}
-
-.comment-mine /* A comment created by the current user */
-{
-}
-
-.comment h3.title,
-.comment h3.title a /* Comment title */
-{
-	text-decoration: none;
-}
-
-.new /* "New" marker for comments that are new for the current user */
-{
-  color: #c00;
-}
-
-.comment .picture /* The picture of the comment author */
-{
-  float: right;
-  margin: 10px;
-}
-
-.comment p
-{
-  margin: 0 0 1em 0;
-}
-
-.comment .submitted /* The "posted by" information */
-{
-  color: #999;
-  font-size: .9em;
-}
-
-.comment .submitted a
-{
-  color: #777;
-}
-
-.comment .submitted a:hover
-{
-  color: #999;
-}
-
-.comment .content /* Comment's content wrapper */
-{
-}
-
-.comment .user-signature /* The user's signature */
-{
-  font-size: .9em;
-  font-style: italic;
-  color: #BBB;
-  border-top: 1px solid #BBB;
-  margin-top: 10px;
-  margin-right: 100px;
-  padding: 2px 5px;
-}
-
-.comment .user-signature a /* Links inside user signatures */
-{
-	color: #BBB;
-}
-
-.comment ul.links /* Comment links. See also the ul.links declaration in the pages.css. */
-{
-  float: right;
-  clear: right;
-  margin: 0;
-}
-
-.indented /* Nested comments are indented */
-{
-  /* margin-left: 25px; */ /* Drupal core uses a 25px left margin */
-}
-
-.preview .comment /* Preview of the comment before submitting new or updated comment */
-{
-  /* background-color: #ffffea; */ /* Drupal core uses a #ffffea background */
-}
-
-/* Comment Reply Styling */
-#comments .box
-{
-  margin: 25px 20px;
-}
-
-#comments .box .content
-{
-  padding: 15px;
-  background: #EEE;
-  border-top: 1px dashed #BBB;
-  border-bottom: 1px dashed #BBB;
-}
-
-#comment-form {
-	padding: 1em;
-	margin: 1em;
-	background: #FFF;
-	position: relative;
-}
-
-#edit-name-wrapper {
-	margin-top: 0;
-}
-
-#edit-homepage-wrapper {
-	width: 8em;
-	top: 0em;
-	left: 20em;
-	position: absolute;
-}
-
-#edit-homepage-wrapper,
-#edit-homepage {
-	color: #777;
-}
-
-#comment-form .form-actions {
-	margin-bottom: 0;
-}
-
-#comment-form input.form-text,
-#comment-form textarea,
-#comment-form input {
-	margin: 0;
-}
\ No newline at end of file
diff --git a/css/editor.css b/css/editor.css
deleted file mode 100644
index caecd1a..0000000
--- a/css/editor.css
+++ /dev/null
@@ -1,285 +0,0 @@
-
-/**
- * @file
- * WYSIWYG Editor Element Styling
- *
- * Use this stylesheet for WYSIWYG custom css - it will make things look nice.
- */
-
-
-/*
- * Fonts
- *
- * Our font size and line height declarations are based on the following ALA
- * article:
- *   http://www.alistapart.com/articles/howtosizetextincss
- *
- * All modern browsrs use a 16px default font size. Specifying the font-size
- * and line-height in ems (relative to the 16px default font) allows the user
- * to resize the font in the browser and produces the most consistent results
- * across different browsers.
- */
-body
-{
-  /* Use a 14px base font size with a 18px line height */
-  font-size: .923em; /* 16px x .875 = 14px */
-  line-height: 1.428em; /* 14px x 1.428 = 20px */
-}
-
-body, caption, th, td, input, textarea, select, option, legend, fieldset
-{
-  /* The following font family declarations are based on the Microsoft core
-   * web fonts which are common fonts available on most computer systems. The
-   * Bitstream Vera fonts are commonly available on Linux systems where the MS
-   * fonts are less common.
-   *
-   * A user's web browser will look at the comma-separated list and will
-   * attempt to use each font in turn until it finds one that is available
-   * on the user's computer. The final "generic" font (sans-serif or serif)
-   * hints at what type of font to use if the web browser doesn't find any
-   * of the fonts in the list.
-
-  font-family: "Times New Roman", Times, Georgia, "Bitstream Vera Serif", serif;
-  font-family: Times, "Times New Roman", Georgia, "Bitstream Vera Serif", serif;
-  font-family: Georgia, "Times New Roman", "Bitstream Vera Serif", serif;
-
-  font-family: Verdana, Tahoma, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-  font-family: Tahoma, Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-  font-family: Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
-  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
-   */
-  font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-}
-
-pre, code
-{
-  font-size: 1.1em; /* Monospace fonts can be hard to read */
-  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-
-/*
- * Headings
- */
-h1, h2, h3, h4, h5, h6
-{
-	font-family: "Warnock Pro", Georgia, Times, serif;
-  font-weight: normal;
-}
-h1
-{
-  font-size: 2.5em;
-  line-height: 1.3em;
-  margin-top: 0;
-  margin-bottom: 0.2em; /* 0.5em is equavalent to 1em in the page's base font.
-                           Remember, a margin specified in ems is relative to
-                           the element's font-size, not to the pages' base
-                           font size. So, for example, if we want a 1em margin
-                           (relative to the base font), we have to divide that
-                           length by the element's font-size:
-                           1em / 2em = 0.5em */
-}
-
-h2
-{
-  font-size: 2em;
-  line-height: 1.3em;
-  margin-top: 0.667em; /* Equivalent to 1em in the page's base font: 1 / 1.5 = 0.667em */
-  margin-bottom: 0.667em;
-}
-
-h3
-{
-  border-bottom: 1px solid #999;
-  font-size: 1.3em;
-  line-height: 1.3em;
-  margin-top: 1.4em;
-  margin-bottom: 0.1em;
-}
-
-h4, h5, h6
-{
-  font-size: 1.1em;
-  line-height: 1.3em;
-  margin-top: 0.909em; /* Equivalent to 1em in the page's base font: 1 / 1.1 = 0.909 */
-  margin-bottom: 0.909em;
-}
-
-/*
- * Block-level elements
- */
-p, ul, ol, dl, pre, table, fieldset
-{
-  margin: 1em 0;
-}
-
-blockquote
-{
-  margin: 1em 2em;
-}
-
-/*
- * Lists
- *
- * We need to standardize the list item indentation.
- */
-ul, ol
-{
-  margin-left: 0;
-  padding-left: 2em; /* LTR */
-}
-
-ul ul, ul ol,
-ol ol, ol ul
-{
-  margin: 0;
-}
-
-li
-{
-  margin: 5px 0;
-  padding: 0;
-}
-
-.item-list ul li /* Drupal override */
-{
-  margin: 0;
-  padding: 0;
-  list-style: inherit;
-}
-
-ul.menu li, /* Drupal override */
-li.expanded,
-li.collapsed,
-li.leaf
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul          { list-style-type: disc; }
-ul ul       { list-style-type: circle; }
-ul ul ul    { list-style-type: square; }
-ul ul ul ul { list-style-type: circle; }
-ol          { list-style-type: decimal; }
-ol ol       { list-style-type: lower-alpha; }
-ol ol ol    { list-style-type: decimal; }
-
-dt
-{
-  margin: 0;
-  padding: 0;
-}
-
-dd
-{
-  margin: 0 0 0 2em;
-  padding: 0;
-}
-
-td
-{
-  padding: 3px;
-}
-
-/*
- * Links
- *
- * The order of link states are based on Eric Meyer's article:
- * http://meyerweb.com/eric/thoughts/2007/06/11/who-ordered-the-link-states
- */
-a:link
-{
-  color: #0000EE;
-}
-
-a:visited
-{
-  color: #0000AA;
-}
-
-a:hover,
-a:focus
-{
-  color: #0077FF;
-}
-
-a:active
-{
-}
-
-/*
- * Tables
- *
- * Drupal provides table styling which is only useful for its admin section
- * forms, so we override this default CSS. (We set it back in forms.css.)
- */
-table
-{
-  border-collapse: collapse;
-  /* width: 100%; */ /* Prevent cramped-looking tables */
-}
-
-th,
-thead th,
-tbody th
-{
-  text-align: left; /* LTR */
-  padding: 0;
-  border-bottom: none;
-}
-
-tbody
-{
-  border-top: none;
-}
-
-/*
- * Abbreviations
- */
-abbr
-{
-  border-bottom: 1px dotted #666;
-  cursor: help;
-  white-space: nowrap;
-}
-
-abbr.created /* Date-based "abbreviations" show computer-friendly timestamps which are not human-friendly. */
-{
-  border: none;
-  cursor: auto;
-  white-space: normal;
-}
-
-/*
- * Images
- */
-img
-{
-  border: 0;
-}
-
-/*
- * Horizontal rules
- */
-hr
-{
-  height: 1px;
-  border: 0;
-  background-color: #666;
-}
-
-/*
- * Forms
- */
-form
-{
-  margin: 0;
-  padding: 0;
-}
-
-fieldset
-{
-  margin: 1em 0;
-  padding: 0.5em;
-  border: 1px solid #999;
-}
diff --git a/css/fields.css b/css/fields.css
deleted file mode 100644
index 46d58f1..0000000
--- a/css/fields.css
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/**
- * @file
- * Field Styling
- */
-
-
-/*
- * Field types
- */
-
-.field /* Wrapper for any CCK field. */
-{
-}
-
-.field-type-datetime /* Always use "datetime" when creating new CCK date fields. "date" and "datestamp" are legacy types. */
-{
-}
-
-.field-type-filefield /* Field from filefield module */
-{
-}
-
-.field-type-image /* Field from imagefield module */
-{
-}
-
-.field-type-nodereference
-{
-}
-
-.field-type-number-decimal
-{
-}
-
-.field-type-number-float
-{
-}
-
-.field-type-number-integer
-{
-}
-
-.field-type-text
-{
-}
-
-.field-type-userreference
-{
-}
-
-
-/*
- * Named fields
- */
-
-.field-field-FIELDNAME /* Underscores in field name are replaced with dashes. */
-{
-}
diff --git a/css/forms.css b/css/forms.css
deleted file mode 100644
index 5cd5674..0000000
--- a/css/forms.css
+++ /dev/null
@@ -1,188 +0,0 @@
-
-/**
- * @file
- * Form Styling
- */
-
-
-.form-item, /* Wrapper for a form element (or group of form elements) and its label */
-.form-checkboxes,
-.form-radios
-{
-  margin: 1em 0;
-}
-
-.form-item input.error, /* Highlight the form elements that caused a form submission error */
-.form-item textarea.error,
-.form-item select.error
-{
-  border: 2px solid #c00;
-}
-
-.form-item label /* The label for a form element */
-{
-  display: block;
-  font-weight: bold;
-}
-
-.form-item label.option /* The label for a radio button or checkbox */
-{
-  display: inline;
-  font-weight: normal;
-}
-
-.form-required /* The part of the label that indicates a required field */
-{
-  color: #c00;
-}
-
-.form-item .description /* The descriptive help text (separate from the label) */
-{
-  font-size: 0.85em;
-}
-
-.form-checkboxes .form-item, /* Pack groups of checkboxes and radio buttons closer together */
-.form-radios .form-item
-{
-  margin: 0.4em 0;
-}
-
-.form-submit /* The submit button */
-{
-}
-
-.container-inline div, .container-inline label /* Inline labels and form divs */
-{
-  display: inline;
-}
-
-.tips /* Tips for Drupal's input formats */
-{
-}
-
-#autocomplete { /* Popup lists for autocompletion of tags, etc. */
-  background-color: #fff;
-}
-
-#autocomplete ul {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-#autocomplete li {
-  margin: 0;
-  padding: 2px 4px;
-}
-
-/*
- * Search (search-theme-form.tpl.php)
- */
-#search-box /* Wrapper for the search form */
-{
-}
-
-#edit-search-theme-form-1-wrapper label /* Label that says "Search this site:" */
-{
-  display: none;
-}
-
-
-/*
- * Search (search-block-form.tpl.php)
- */
-#search-block-form /* Wrapper for the search form */
-{
-}
-
-#edit-search-block-form-1-wrapper label /* Label that says "Search this site:" */
-{
-  display: none;
-}
-
-
-/*
- * Drupal's default login form block
- */
-#user-login-form
-{
-  text-align: center; /* LTR */
-}
-
-#user-login-form .item-list ul
-{
-  list-style-type: none;
-  margin-left: -10px;
-}
-
-#user-login-form .item-list li
-{
-  margin: 0;
-  line-height: 1.3em;
-}
-
-#user-login-form .form-submit
-{
-  font-size: .9em;
-}
-
-
-/*
- * OpenID
- *
- * The default styling for the OpenID login link seems to assume Garland's
- * styling of list items.
- */
-
-#user-login-form ul /* OpenID creates a new ul above the login form's links. */
-{
-  margin-bottom: 0; /* Position OpenID's ul next to the rest of the links. */
-}
-
-#user-login-form li.openid-link /* The "Log in using OpenID" link. */
-{
-  margin-top: 1em;
-  margin-bottom: 8px;
-}
-
-#user-login-form li.user-link /* The "Cancel OpenID login" link. */
-{
-  margin-top: 1em;
-}
-
-#user-login ul
-{
-  margin: 1em 0;
-}
-
-#user-login li.openid-link, /* The OpenID links on the /user form. */
-#user-login li.user-link
-{
-  margin-left: -2em; /* LTR */ /* Un-do all of the padding on the ul list. */
-}
-
-
-/*
- * Drupal admin tables
- *
- * We overrode these styles in html-elements.css, but restore them for the admin
- * section of the site.
- */
-
-form tbody
-{
-  border-top: 1px solid #ccc;
-}
-
-form th,
-form thead th
-{
-  text-align: left; /* LTR */
-  padding-right: 1em; /* LTR */
-  border-bottom: 3px solid #ccc;
-}
-
-form tbody th
-{
-  border-bottom: 1px solid #ccc;
-}
diff --git a/css/html-elements.css b/css/html-elements.css
deleted file mode 100644
index 580f640..0000000
--- a/css/html-elements.css
+++ /dev/null
@@ -1,337 +0,0 @@
-
-/**
- * @file
- * HTML Element Styling
- *
- * This is the "reset" style sheet. It standardizes the properties of the HTML
- * elements across browsers.
- */
-
-
-/*
- * Fonts
- *
- * Our font size and line height declarations are based on the following ALA
- * article:
- *   http://www.alistapart.com/articles/howtosizetextincss
- *
- * All modern browsrs use a 16px default font size. Specifying the font-size
- * and line-height in ems (relative to the 16px default font) allows the user
- * to resize the font in the browser and produces the most consistent results
- * across different browsers.
- */
-body
-{
-  font-size: 100%; /* Fixes exaggerated text resizing in IE6 and IE7 */
-}
-
-#page
-{
-  /* Use a 14px base font size with a 18px line height */
-  font-size: .923em; /* 16px x .875 = 14px */
-  line-height: 1.428em; /* 14px x 1.428 = 20px */
-}
-
-body, caption, th, td, input, textarea, select, option, legend, fieldset
-{
-  /* The following font family declarations are based on the Microsoft core
-   * web fonts which are common fonts available on most computer systems. The
-   * Bitstream Vera fonts are commonly available on Linux systems where the MS
-   * fonts are less common.
-   *
-   * A user's web browser will look at the comma-separated list and will
-   * attempt to use each font in turn until it finds one that is available
-   * on the user's computer. The final "generic" font (sans-serif or serif)
-   * hints at what type of font to use if the web browser doesn't find any
-   * of the fonts in the list.
-
-  font-family: "Times New Roman", Times, Georgia, "Bitstream Vera Serif", serif;
-  font-family: Times, "Times New Roman", Georgia, "Bitstream Vera Serif", serif;
-  font-family: Georgia, "Times New Roman", "Bitstream Vera Serif", serif;
-
-  font-family: Verdana, Tahoma, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-  font-family: Tahoma, Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-  font-family: Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
-  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
-   */
-  font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-}
-
-pre, code
-{
-  background-color: #EEE;
-  font-size: .9em;
-  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-
-pre /* Some nice styles for pre */
-{
-  border: 1px solid #BBB;
-  margin: 10px;
-  padding: 20px;
-  font-size: .95em;
-}
-
-/*
- * Headings
- */
-h1, h2, h3, h4, h5, h6
-{
-  font-family: "Warnock Pro", Georgia, Times, serif;
-  font-weight: normal;
-  text-shadow: 1px 1px 1px #999;
-}
-h1
-{
-  font-size: 2.5em;
-  line-height: 1.3em;
-  margin-top: 0;
-  margin-bottom: 0.2em; /* 0.5em is equavalent to 1em in the page's base font.
-                           Remember, a margin specified in ems is relative to
-                           the element's font-size, not to the pages' base
-                           font size. So, for example, if we want a 1em margin
-                           (relative to the base font), we have to divide that
-                           length by the element's font-size:
-                           1em / 2em = 0.5em */
-}
-
-h2
-{
-  font-size: 2em;
-  line-height: 1.3em;
-  margin-top: 0.667em; /* Equivalent to 1em in the page's base font: 1 / 1.5 = 0.667em */
-  margin-bottom: 0.667em;
-}
-
-h3
-{
-  border-bottom: 1px solid #999;
-  font-size: 1.3em;
-  line-height: 1.3em;
-  margin-top: 1.4em;
-  margin-bottom: 0.1em;
-}
-
-h4, h5, h6
-{
-  font-size: 1.1em;
-  line-height: 1.3em;
-  margin-top: 0.909em; /* Equivalent to 1em in the page's base font: 1 / 1.1 = 0.909 */
-  margin-bottom: 0.909em;
-}
-
-/*
- * Block-level elements
- */
-p, ul, ol, dl, pre, table, fieldset
-{
-  margin: 1em 0;
-}
-
-#content-inner table /* Nice default styling for tables */
-{
-  width: 100%;
-  overflow: scroll;
-}
-
-#content-area .body-field-wrapper table { /* Fix for WYSIWYG Editors */
-  overflow: visible;
-  width: auto;
-}
-
-#content-area .edit-comment-wrapper table { /* Fix for WYSIWYG Editors */
-  overflow: visible;
-  width: auto;
-}
-
-blockquote
-{
-margin: 1em 3em;
-padding: .15em 1em;
-border-left: 3px solid #7777FF;
-background-color: #EEEEFF;
-}
-
-/*
- * Lists
- *
- * We need to standardize the list item indentation.
- */
-ul, ol
-{
-  margin-left: 0;
-  padding-left: 2em; /* LTR */
-}
-
-.block ul, /* Drupal overrides */
-.item-list ul
-{
-  margin: 1em 0;
-  padding: 0 0 0 2em; /* LTR */
-}
-
-ul ul, ul ol,
-ol ol, ol ul,
-.block ul ul, .block ul ol,
-.block ol ol, .block ol ul,
-.item-list ul ul, .item-list ul ol,
-.item-list ol ol, .item-list ol ul
-{
-  margin: 0;
-}
-
-li
-{
-  margin: .8em 0;
-  padding: 0;
-}
-
-.item-list ul li /* Drupal override */
-{
-  margin: 0;
-  padding: 0;
-  list-style: inherit;
-}
-
-ul.menu li, /* Drupal override */
-li.expanded,
-li.collapsed,
-li.leaf
-{
-  margin: 0;
-  padding: 0;
-}
-
-ul          { list-style-type: disc; }
-ul ul       { list-style-type: circle; }
-ul ul ul    { list-style-type: square; }
-ul ul ul ul { list-style-type: circle; }
-ol          { list-style-type: decimal; }
-ol ol       { list-style-type: lower-alpha; }
-ol ol ol    { list-style-type: decimal; }
-
-dt
-{
-  margin: 0;
-  padding: 0;
-}
-
-dd
-{
-  margin: 0 0 0 2em;
-  padding: 0;
-}
-
-td
-{
-  padding: 3px;
-}
-
-/*
- * Links
- *
- * The order of link states are based on Eric Meyer's article:
- * http://meyerweb.com/eric/thoughts/2007/06/11/who-ordered-the-link-states
- */
-a:link
-{
-  color: #0000EE;
-}
-
-a:visited
-{
-  color: #0000AA;
-}
-
-a:hover,
-a:focus
-{
-  color: #0077FF;
-}
-
-a:active
-{
-}
-
-/*
- * Tables
- *
- * Drupal provides table styling which is only useful for its admin section
- * forms, so we override this default CSS. (We set it back in forms.css.)
- */
-table
-{
-  border-collapse: collapse;
-  width: 100%;
-}
-
-th,
-thead th,
-tbody th
-{
-  text-align: left; /* LTR */
-  padding: 3px;
-  border-bottom: none;
-}
-
-tbody
-{
-  border-top: none;
-}
-
-/*
- * Abbreviations
- */
-abbr
-{
-  border-bottom: 1px dotted #666;
-  cursor: help;
-  white-space: nowrap;
-}
-
-abbr.created /* Date-based "abbreviations" show computer-friendly timestamps which are not human-friendly. */
-{
-  border: none;
-  cursor: auto;
-  white-space: normal;
-}
-
-/*
- * Images
- */
-img
-{
-  border: 0;
-}
-
-/*
- * Horizontal rules
- */
-hr
-{
-  border: 0;
-  height: 1px;
-  background-color: #999;
-}
-
-/*
- * Forms
- */
-form
-{
-  margin: 0;
-  padding: 0;
-}
-
-fieldset
-{
-  margin: 1em 0;
-  padding: 0.5em;
-  border: 1px solid #999;
-}
-
-input,
-textarea
-{
-  font-size: .923em;
-}
\ No newline at end of file
diff --git a/css/ie.css b/css/ie.css
deleted file mode 100644
index 6dfec50..0000000
--- a/css/ie.css
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/**
- * @file
- * CSS targeted specifically for Internet Explorer for Windows.
- *
- * Any CSS in this file will apply to all versions of IE. You can target
- * specific versions of IE by using conditional comments. See your sub-theme's
- * .info file for an easy way to use them.
- *
- * While building your theme, you should be aware that IE limits Drupal to 31
- * stylesheets total. The work-around for the bug is to enable CSS aggregation
- * under: admin / settings / performance.
- */
-
-
-/*
- * Tabs
- */
-
-ul.primary li a,
-ul.primary li a .tab,
-ul.secondary li a,
-ul.secondary li a .tab {
-  cursor: pointer;
-}
-
-/*
- * Drupal nodes
- */
-
-.node-unpublished .node-inner>* {
-  position: relative; /* Otherwise these elements will appear below the "Unpublished" text. */
-}
-
-/*
- * Drupal admin tables
- */
-tr.even th,
-tr.even td,
-tr.odd th,
-tr.odd td {
-  border-bottom: 1px solid #ccc; /* IE doesn't display borders on table rows */
-}
-
-/*
- * Markup free clearing
- */
-* html .clearfix {
-  zoom: 1;
-}
-
-/*
- * An extremely ridiculous bug fix for the #content float [see node 561206 on drupal.org]
- */
-#main-inner
-{
-	overflow: auto;
-}
\ No newline at end of file
diff --git a/css/ie6.css b/css/ie6.css
deleted file mode 100644
index 82a3a2a..0000000
--- a/css/ie6.css
+++ /dev/null
@@ -1,102 +0,0 @@
-
-/**
- * @file
- * CSS targeted specifically for Internet Explorer 5 and 6 for Windows.
- *
- * Any CSS in this file will override the rules specified in the ie.css file.
- */
-
-
-/*
- * Layout CSS
- */
-
-body {
-  text-align: center; /* 1st part of IE5/IE6quirks centering hack */
-}
-
-#page {
-  text-align: left; /* LTR */ /* 2nd part of IE5/IE6quirks centering hack */
-}
-
-#main {
-  zoom: 1; /* Otherwise with a liquid layout, sidebars disappear when resizing the windows in IE6 */
-}
-
-#content,
-#navbar,
-#sidebar-first,
-#sidebar-second /* Floating divs */ {
-  display: inline; /* display inline or double your floated margin! [1] */
-  overflow: hidden; /* in ie6, overflow auto is broken [2] and so is overflow visible [3] */
-  overflow-y: visible;
-}
-
-/*
- * Tabs - IE 5 and 6 don't support PNGs with alpha transparency.
- */
-
-ul.primary li a,
-ul.primary li a .tab,
-ul.secondary li a,
-ul.secondary li a .tab {
-  display: inline-block; /* Otherwise the blocks mistakenly get 100% width in IE6 */
-}
-
-ul.primary li a {
-  background: url(../images/tab-left-ie6.png) no-repeat left -38px;
-}
-
-ul.primary li a .tab {
-  background: url(../images/tab-right-ie6.png) no-repeat right -38px;
-}
-
-ul.primary li a:hover {
-  background: url(../images/tab-left-ie6.png) no-repeat left -76px;
-}
-
-ul.primary li a:hover .tab {
-  background: url(../images/tab-right-ie6.png) no-repeat right -76px;
-}
-
-ul.primary li.active a,
-ul.primary li.active a:hover {
-  background: url(../images/tab-left-ie6.png) no-repeat left 0;
-}
-
-ul.primary li.active a .tab,
-ul.primary li.active a:hover .tab {
-  background: url(../images/tab-right-ie6.png) no-repeat right 0;
-}
-
-/*
- * Messages - IE 5 and 6 don't support PNGs with alpha transparency.
- */
-
-div.messages,
-div.status,
-div.warning,
-div.error /* Important messages (status, warning, and error) for the user */ {
-  background-image: url(../images/messages-status-ie6.png);
-}
-
-div.warning /* Medium priority messages */ {
-  background-image: url(../images/messages-warning-ie6.png);
-}
-
-div.error /* High priority messages. See also the .error declaration below. */ {
-  background-image: url(../images/messages-error-ie6.png);
-}
-
-
-/*
- * REFERENCES
- *
-
-1. http://www.positioniseverything.net/explorer/doubled-margin.html
-2. http://browservulsel.blogspot.com/2005/04/ie-overflow-auto-scrollbar-overlap.html
-3. http://www.howtocreate.co.uk/wrongWithIE/?chapter=overflow%3Avisible%3B
-4. http://www.ryanbrill.com/archives/multiple-classes-in-ie
-
- *
- */
diff --git a/css/layout.css b/css/layout.css
deleted file mode 100644
index 6030d22..0000000
--- a/css/layout.css
+++ /dev/null
@@ -1,341 +0,0 @@
-
-/**
- * @file
- * Layout Styling (DIV Positioning)
- *
- * Define CSS classes to create a table-free, 3-column, 2-column, or single
- * column layout depending on whether blocks are enabled in the left or right
- * columns.
- *
- * This layout is based on the Zen Columns layout method.
- *   http://drupal.org/node/201428
- *
- * Only CSS that affects the layout (positioning) of major elements should be
- * listed here.  Such as:
- *   display, position, float, clear, width, height, min-width, min-height
- *   margin, border, padding, overflow
- */
-
-*
-{
-	margin: 0;
-	padding: 0;
-}
-
-/*
- * Body
- */
-body
-{
-	text-align: center;
-}
-
-#body-wrapper
-{
-}
-
-#page,
-#closure-blocks
-{
-  /*
-   * If you want to make the page a fixed width and centered in the viewport,
-   * this is the standards-compliant way to do that. See also the ie6.css file
-   * for the necessary IE5/IE6quirks hack to center a div.
-   */
-  margin: 0 auto;
-	padding: 0;
-	text-align: left;
-	width: 960px;
-}
-
-#page-inner
-{
-  margin: 0 10px;
-  position: relative;
-}
-
-#navigation-top,
-#navigation
-{
-  position: absolute; /* Take the named anchors out of the doc flow    */
-  left: -10000px;     /* and prevent any anchor styles from appearing. */
-}
-
-#skip-to-nav
-{
-  float: right; /* LTR */
-  margin: 0 !important;
-  font-size: 0.8em;
-}
-
-#skip-to-nav a, #skip-to-nav a:hover, #skip-to-nav a:visited
-{
-  position: absolute;
-  left: 0;
-  top: -500px;
-  width: 1px;
-  height: 1px;
-  overflow: hidden;
-}
-
-#skip-to-nav a:active, #skip-to-nav a:focus
-{
-  position: static;
-  width: auto;
-  height: auto;
-}
-
-/*
- * Header
- */
-#header
-{
-  height:171px;
-  width: 960px;
-  margin: 0;
-  position: relative;
-}
-
-#header-inner
-{
-  height: 114px;
-  margin: 0 auto;
-  text-align: center;
-  color: white;
-  width: 100%;
-}
-
-#logo-title
-{
-}
-
-#logo
-{
-  float: left; /* LTR */
-}
-
-#site-name
-{
-}
-
-#site-slogan
-{
-}
-
-#search-box
-{
-}
-
-#header-blocks
-{
-  clear: both; /* Clear the logo */
-}
-
-/*
- * Main (container for everything else)
- */
-#main
-{
-  position: relative;
-}
-
-#main-inner
-{
-	position: relative;
-}
-
-/*
- * Content
- */
-#content
-{
-  margin-top: 10px;
-	overflow: scroll; /* Allow main area to display content wider than main area */
-}
-#content,
-.no-sidebars #content
-{
-  float: left; /* LTR */
-  width: 940px;
-  margin-left: 0; /* LTR */
-  margin-right: -940px; /* LTR */ /* Negative value of #content's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
-}
-
-.sidebar-first #content
-{
-  display: inline; /* Bug fix for IE - content overlaps left sidebar without this */
-  width: 700px;
-  margin-right: -700px; /* LTR */ /* Negative value of #content's width + left margin. */
-}
-
-.sidebar-second #content
-{
-  width: 720px;
-  margin-left: 0; /* LTR */
-  margin-right: -720px; /* LTR */ /* Negative value of #content's width + left margin. */
-}
-
-.two-sidebars #content
-{
-  display: inline; /* Bug fix for IE - content overlaps left sidebar without this */
-  width: 500px;
-  margin-right: -500px; /* LTR */ /* Negative value of #content's width + left margin. */
-}
-
-#content-inner
-{
-  margin: 0;
-  padding: 0;
-}
-
-/*
- * Navbar
- */
-#navbar
-{
-	float: left;
-  width: 760px;
-  height: 65px;
-  position: absolute;
-  top: 122px;
-  left: 5px;
-  margin-left: 0; /* LTR */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
-}
-
-/* --- Removed because of weirdness
-.with-navbar #content,
-.with-navbar #sidebar-first,
-.with-navbar #sidebar-second
-{
-  margin-top: 3.6em;
-}
-*/
-
-#navbar-inner
-{
-}
-
-#primary
-{
-}
-
-#secondary
-{
-}
-
-#navbar ul /* Primary and secondary links */
-{
-  margin: 0;
-  padding: 0;
-  text-align: left; /* LTR */
-}
-
-#navbar li /* A simple method to get navbar links to appear in one line. */
-{
-  float: left; /* LTR */
-  padding: 0 10px 0 0; /* LTR */
-}
-
-/*
- * First sidebar
- */
-#sidebar-first
-{
-  float: left; /* LTR */
-  width: 220px;
-  margin-top: 10px;
-  margin-left: 0; /* LTR */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-first-inner. */
-}
-
-#sidebar-first-inner
-{
-  margin: 0 18px 0 0; /* LTR */
-  padding: 0;
-}
-
-/*
- * Second sidebar
- */
-#sidebar-second
-{
-  float: right;
-  width: 220px;
-  margin-left: 0px; /* LTR */ /* Width of content + sidebar-first. */
-  margin-right: 0px; /* LTR */ /* Negative value of #sidebar-second's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-second-inner. */
-}
-
-#sidebar-second-inner
-{
-  margin: 10px 0 0 20px; /* LTR */
-  padding: 0;
-}
-
-/*
- * Footer
- */
-#footer
-{
-	clear: both;
-}
-
-#footer-inner
-{
-}
-
-/*
- * Closure
- */
-#closure-blocks /* See also the #page declaration above that this div shares. */
-{
-}
-
-/*
- * Markup free clearing (See: http://www.positioniseverything.net/easyclearing.html )
- */
-.clearfix:after
-{
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-
-/*
- * Prevent overflowing content
- */
-#header,
-#content,
-#navbar,
-#sidebar-first,
-#sidebar-second,
-#footer,
-#closure-blocks
-{
-  overflow: visible;
-  word-wrap: break-word; /* A very nice CSS3 property */
-}
-
-#navbar
-{
-  overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
-}
-
-/*
- * If a div.clear-block doesn't have any content after it and its bottom edge
- * touches the bottom of the viewport, Firefox and Safari will mistakenly
- * place several pixels worth of space between the bottom of the div and the
- * bottom of the viewport. Uncomment this CSS property to fix this.
- * Note: with some over-large content, this property might cause scrollbars
- * to appear on the #page div.
- */
-/*
-#page
-{
-  overflow-y: hidden;
-}
-*/
diff --git a/css/messages.css b/css/messages.css
deleted file mode 100644
index dc432f6..0000000
--- a/css/messages.css
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/**
- * @file
- * Message Styling
- *
- * Sensible styling for Drupal's error/warning/status messages.
- */
-
-
-div.messages,
-div.status,
-div.warning,
-div.error /* Important messages (status, warning, and error) for the user */ {
-  min-height: 21px;
-  margin: 0 1em 5px 1em;
-  border: 2px solid #ff7;
-  padding: 5px 5px 5px 35px; /* LTR */
-  color: #000;
-  background-color: #ffc;
-  background-image: url(../images/messages-status.png);
-  background-repeat: no-repeat;
-  background-position: 5px 5px; /* LTR */
-}
-
-div.status /* Normal priority messages */ {
-}
-
-div.warning /* Medium priority messages */ {
-  border-color: #fc0;
-  background-image: url(../images/messages-warning.png);
-}
-
-div.warning,
-tr.warning {
-  color: #000; /* Drupal core uses #220 */
-  background-color: #ffc;
-}
-
-div.error /* High priority messages. See also the .error declaration in pages.css. */ {
-  /* border: 1px solid #d77; */ /* Drupal core uses: 1px solid #d77 */
-  border-color: #c00;
-  background-image: url(../images/messages-error.png);
-}
-
-div.error,
-tr.error {
-  color: #900; /* Drupal core uses #200 */
-  background-color: #fee;
-}
-
-div.messages ul {
-  margin-top: 0;
-  margin-bottom: 0;
-}
diff --git a/css/navigation.css b/css/navigation.css
deleted file mode 100644
index 5683cef..0000000
--- a/css/navigation.css
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/**
- * @file
- * Navigation Styling
- */
-
-
-/*
- * The active item in a Drupal menu
- */
-li a.active
-{
-  color: #000;
-  text-decoration: none;
-}
-
-/*
- * Navigation bar
- */
-#navbar
-{
-}
-
-#navbar-inner
-{
-}
-
-/*
- * Primary and Secondary links
- */
-#primary
-{
-}
-
-#secondary
-{
-}
-
-/*
- * Menu blocks
- */
-.block-menu
-{
-}
-
-/*
- * "Menu block" blocks. See http://drupal.org/project/menu_block
- */
-.block-menu_block
-{
-}
diff --git a/css/nodes.css b/css/nodes.css
deleted file mode 100644
index 4a9feda..0000000
--- a/css/nodes.css
+++ /dev/null
@@ -1,143 +0,0 @@
-
-/**
- * @file
- * Node Styling
- *
- * Style anything that isn't in the $content variable.
- */
-
-.node-teaser /* Node teaser wrapper - for list views */
-{
-  margin: 0 0 20px;
-  border-top: 1px solid #DDD;
-  background: transparent url(../images/node-list-bg.png) 0px 1px repeat-x;
-  padding: 15px;
-}
-
-.node-inner /* Additional wrapper for node */
-{
-}
-
-.sticky /* A sticky node (displayed before others in a list) */
-{
-}
-
-.node-unpublished, /* Unpublished nodes */
-.comment-unpublished /* Unpublished comments */
-{
-  background-color: #fff4f4 !important;
-}
-
-.node-unpublished div.unpublished, /* The word "Unpublished" displayed underneath the content. */
-.comment-unpublished div.unpublished
-{
-  height: 0;
-  overflow: visible;
-  color: #d8d8d8;
-  font-size: 75px;
-  line-height: 1;
-  font-family: Impact, "Arial Narrow", Helvetica, sans-serif;
-  font-weight: bold;
-  text-transform: uppercase;
-  text-align: center;
-  word-wrap: break-word; /* A very nice CSS3 property */
-}
-
-.node-mine /* A node created by the current user */
-{
-}
-
-.node-teaser /* A node displayed as teaser */
-{
-}
-
-/* All nodes are given a node-type-FOO class that describes the type of
- * content that it is. If you create a new content type called
- * "my-custom-type", it will receive a "node-type-my-custom-type" class.
- */
-.node-type-page /* Page content node */
-{
-}
-
-.node-type-story /* Story content node */
-{
-}
-
-.node h2.title /* Node title */
-{
-  font-size: 1.75em;
-}
-
-.node h2.title a
-{
-  text-decoration: none;
-}
-
-.marker /* "New" or "Updated" marker for content that is new or updated for the current user */
-{
-  color: #c00;
-}
-
-.node .picture /* The picture of the node author */
-{
-}
-
-.node.node-unpublished .picture,
-.comment.comment-unpublished .picture
-{
-  position: relative; /* Otherwise floated pictures will appear below the "Unpublished" text. */
-}
-
-.node .meta /* Wrapper for submitted and terms data */
-{
-  color: #999;
-  font-size: .9em;
-  text-align: right;
-}
-
-.node .meta a
-{
-  color: #777;
-}
-
-.node .meta a:hover
-{
-  color: #999;
-}
-
-.node .submitted /* The "posted by" information */
-{
-  float: left;
-  margin-right: 10px;
-  margin-bottom: 10px;
-}
-
-.node .terms /* Node terms (taxonomy) */
-{
-}
-
-.node .content /* Node's content wrapper */
-{
-  clear: both;
-}
-
-.node .forum-post-wrapper .content /* Remove clearing for forum postings */
-{
-	clear: none;
-}
-
-.node .node-end-links /* Node Links wrapper */
-{
-  border-top: 1px solid #999;
-  padding-top: 5px;
-  text-align: right;
-}
-
-.node ul.links /* Node links. See also the ul.links declaration in the pages.css. */
-{
-}
-
-.preview .node /* Preview of the content before submitting new or updated content */
-{
-  /* background-color: #ffffea; */ /* Drupal core uses a #ffffea background */
-}
diff --git a/css/pages.css b/css/pages.css
deleted file mode 100644
index c0d6bbc..0000000
--- a/css/pages.css
+++ /dev/null
@@ -1,442 +0,0 @@
-
-/**
- * @file
- * Page Styling
- *
- * Style the markup found in page.tpl.php. Also includes some styling of
- * miscellaneous Drupal elements that appear in the $content variable, such as
- * ul.links, .pager, .more-link, etc.
- */
-
-
-/*
- * Body
- */
-body
-{
-}
-
-#page
-{
-}
-
-#page-inner
-{
-}
-
-/*
- * Header
- */
-#header
-{
-}
-
-#header-inner
-{
-}
-
-#logo-title /* Wrapper for logo, website name, and slogan */
-{
-  position: relative;
-}
-
-#logo /* Wrapper for logo - adjust positioning by changing 'top' and 'left' values */
-{
-  position: absolute;
-  top: 14px;
-  left: 10px;
-}
-
-#logo-image /* The actual logo image */
-{
-}
-
-h1#site-name, div#site-name /* The name of the website */
-{
-  color: #FFF;
-	font-family: "Warnock Pro", Georgia, Times, serif;
-  margin: 0;
-  padding-top: 25px;
-  font-size: 3.5em;
-  font-weight: normal;
-  line-height: 1.3em;
-  text-shadow: #666 3px 3px 3px; /* CSS3 - Works only in webkit browsers */
-}
-
-#site-name a:link,
-#site-name a:visited,
-#site-name a:hover
-{
-  color: #FFF;
-  text-decoration: none;
-}
-
-#site-slogan /* The slogan (or tagline) of a website */
-{
-}
-
-#search-box
-{
-  position: absolute;
-  top: 123px;
-  right: 10px;
-  width: 250px;
-  text-align: right;
-}
-
-#header-blocks /* Wrapper for any blocks placed in the header region */
-{
-}
-
-/*
- * Main (container for everything else)
- */
-#main
-{
-}
-
-#main-inner
-{
-}
-
-/*
- * Content
- */
-#content
-{
-}
-
-#content-inner
-{
-}
-
-#mission /* The mission statement of the site (displayed on homepage) */
-{
-  border: 2px solid #DDDDFF;
-  background: #EEEEFF;
-  margin-bottom: 20px;
-  padding: 10px 12px;
-  border-radius: 10px; /* Doesn't work in silly IE yet */
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-}
-
-#mission p
-{
-  margin: 0 0 1em 0;
-}
-
-#mission p.last
-{
-  margin-bottom: 0;
-}
-
-#content-top /* Wrapper for any blocks placed in the "content top" region */
-{
-}
-
-#content-header /* Wrapper for breadcrumb, title, messages, tabs, and help */
-{
-}
-
-.breadcrumb /* The path to the current page in the form of a list of links */
-{
-  padding-bottom: 0; /* Undo system.css */
-}
-
-h1.title /* Page title */
-{
-}
-
-h2.title, /* Block title or the title of a piece of content when it is given in a list of content */
-h3.title /* Comment title */
-{
-  margin: 0;
-}
-
-tr.even /* Some tables have rows marked even or odd. */
-{
-  background-color: #fff;
-}
-
-tr.odd
-{
-  /* background-color: #eee; */ /* Drupal core uses a #eee background */
-}
-
-.system-status-report tr.ok /* Leave these rows on the status report alone */
-{
-  background: #dfd;
-  color: #020;
-}
-
-.system-status-report tr.warning /* Leave these rows on the status report alone */
-{
-	background: #ffd;
-  color: #220;
-}
-
-.system-status-report tr.error /* Leave these rows on the status report alone */
-{
-  background: #fcc;
-  color: #200;
-}
-
-div.messages /* Important messages (status, warning, and error) for the user. See also the declarations in messages.css. */
-{
-}
-
-div.status /* Normal priority messages */
-{
-}
-
-div.warning, tr.warning /* Medium priority messages */
-{
-  /* border: 1px solid #f0c020; */ /* Drupal core uses: 1px solid #f0c020 */
-}
-
-div.error, tr.error /* High priority messages. See also the .error declaration below. */
-{
-}
-
-.error /* Errors that are separate from div.messages status messages. */
-{
-  /* color: #e55; */ /* Drupal core uses a #e55 background */
-}
-
-.warning /* Warnings that are separate from div.messages status messages. */
-{
-  /* color: #e09010; */ /* Drupal core uses a #e09010 background */
-}
-
-div.tabs /* See also the tabs.css file. */
-{
-	width: 100%;
-}
-
-.help /* Help text on a page */
-{
-  margin: 1em 0;
-}
-
-.more-help-link /* Link to more help */
-{
-  font-size: 0.85em;
-  text-align: right;
-}
-
-#content-area /* Wrapper for the actual page content */
-{
-  margin-bottom: 1em;
-	clear: both;
-}
-
-#primary ul.links li /* Primary link list */
-{
-  margin: 0 2px 0 0;
-}
-
-#primary ul.links li a
-{
-  display: block;
-  padding: 3px 7px;
-  text-decoration: none;
-  color: #555;
-  font-weight: bold;
-  font-size: 15px;
-}
-
-#primary ul.links li a:hover
-{
-  background: #FFF url(../images/navbar-button-bg.png) top left repeat-x;
-  border-radius: 5px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  color: #333;
-}
-
-#primary ul.links li a.active
-{
-  background: #FFF url(../images/navbar-button-bg.png) top left repeat-x;
-  border-radius: 5px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  color: #333;
-}
-
-ul.links /* List of links */
-{
-  margin: 1em 0;
-  padding: 0;
-}
-
-ul.links.inline
-{
-  margin: 0;
-  display: inline;
-}
-
-ul.links li
-{
-  display: inline;
-  list-style-type: none;
-  padding: 0 0.25em;
-}
-
-.pager { /* A list of page numbers when more than 1 page of content is available */
-	clear:both;
-  margin: 1em 0;
-  text-align: center;
-}
-
-.pager div {
-	padding:0em;
-	display:inline;
-}
-
-.pager strong,
-.pager a {
-	padding: 4px 7px;
-	background: #eeeeff;
-	border: 1px solid #565698;
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	text-decoration: none;
-}
-.pager a:hover {
-	text-decoration: none;
-	background: #fff;
-}
-
-.pager strong {
-	background: #0174bb;
-	color: #fff;
-}
-
-.item-list .pager li {
-	padding: .25em;
-}
-
-.feed-icons /* The links to the RSS or Atom feeds for the current list of content */
-{
-  margin: 1em 0;
-}
-
-.feed-icon /* RSS/Atom links for Views-created blocks and such */
-{
-	text-align: right; /* LTR */
-	margin-right: 1px;
-}
-
-.more-link /* Aggregator, blog, and forum more link */
-{
-  text-align: right; /* LTR */
-}
-
-#content-bottom /* Wrapper for any blocks placed in the "content bottom" region */
-{
-}
-
-/*
- * First sidebar (on left in LTR languages, on right in RTL)
- *
- * Remember to NOT add padding or margin to your #sidebar-first
- * (see the layout.css file.)
- */
-#sidebar-first
-{
-}
-
-#sidebar-first-inner
-{
-}
-
-/*
- * Second sidebar (on right in LTR languages, on left in RTL)
- *
- * Remember to NOT add padding or margin to your #sidebar-second
- * (see the layout.css file.)
- */
-#sidebar-second
-{
-}
-
-#sidebar-second-inner
-{
-}
-
-/*
- * Footer
- */
-#footer
-{
-	margin-top: 20px;
-}
-
-#footer-inner
-{
-}
-
-#footer-message /* Wrapper for the footer message from Drupal's "Site information"
-                   and for any blocks placed in the footer region */
-{
-}
-
-/*
- * Closure
- */
-#closure-blocks /* Wrapper for any blocks placed in the closure region */
-{
-}
-
-/*
- * Drupal boxes
- *
- * Wrapper for Comment form, Comment viewing options, Menu admin, and
- * Search results.
- */
-.box /* Wrapper for box */
-{
-}
-
-.box-inner /* Additional wrapper for box */
-{
-}
-
-.box h2.title /* Box title */
-{
-}
-
-.box .content /* Box's content wrapper */
-{
-}
-
-/*
- * Search Results
- */
- /* Search Page */
-.search-results .search-info
-{
-  color: green;
-}
-
-.search-results dd
-{
-  margin: 0 0 1.5em 0;
-}
-
-.search-results dt.title
-{
-  font-size: 1.3em;
-}
-
-.search-results p.search-snippet
-{
-  margin: 0px 0px;
-}
-
-.search-results .search-snippet strong
-{
-  background-color: #FFFFDD;
-}
\ No newline at end of file
diff --git a/css/print.css b/css/print.css
deleted file mode 100644
index 63ca414..0000000
--- a/css/print.css
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/**
- * @file
- * Print styling
- *
- * We provide some sane print styling for Drupal using Zen's layout method.
- */
-
-
-/* underline all links */
-a:link, a:visited
-{
-  text-decoration: underline !important;
-}
-
-/* Don't underline header */
-#site-name a:link,
-#site-name a:visited
-{
-  text-decoration: none !important;
-}
-
-/* CSS2 selector to add visible href after links */
-#content a:link:after,
-#content a:visited:after
-{
-  content: " (" attr(href) ") ";
-  font-size: 0.8em;
-  font-weight: normal;
-}
-
-/* Un-float the content */
-#content,
-#content-inner
-{
-  float: none;
-  width: 100%;
-  margin: 0 !important;
-  padding: 0 !important;
-}
-
-/* Turn off any background colors or images */
-body,
-#page, #page-inner,
-#main, #main-inner,
-#content, #content-inner
-{
-  color: #000;
-  background-color: transparent !important;
-  background-image: none !important;
-}
-
-/* Hide sidebars and nav elements */
-#skip-to-nav, #navbar, #sidebar-first, #sidebar-second, #footer,
-.breadcrumb, div.tabs, .links, .taxonomy,
-.book-navigation, .forum-topic-navigation, .pager, .feed-icons
-{
-  visibility: hidden;
-  display: none;
-}
-
-/* If you un-comment the "page { overflow-y: hidden; }" ruleset, Firefox clips
-   the content after the first page. */
-#page
-{
-  overflow-y: visible;
-}
diff --git a/css/style.css b/css/style.css
new file mode 100644
index 0000000..1b31a1e
--- /dev/null
+++ b/css/style.css
@@ -0,0 +1,573 @@
+
+/**
+ * @file
+ * Styles for Airy Blue theme.
+ */
+
+/* General Styles / Typography ---------------------------------------------- */
+body {
+  font-family: Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
+  font-size: 100%;
+}
+
+#page {
+  font-size: .923em;
+  line-height: 1.428em;
+}
+
+pre, code {
+  background-color: #eee;
+  font-size: .9em;
+  font-family: "Bitstream Vera Sans Mono", "Courier New", monospace;
+}
+
+pre {
+  border: 1px solid #bbb;
+  margin: 10px;
+  padding: 20px;
+  font-size: .95em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Warnock Pro", Georgia, Times, serif;
+  font-weight: normal;
+  text-shadow: 1px 1px 1px #999;
+}
+
+h1 {
+  font-size: 2.5em;
+  line-height: 1.3em;
+  margin-top: 0;
+  margin-bottom: 0.2em;
+}
+
+h2 {
+  font-size: 2em;
+  line-height: 1.3em;
+  margin-top: 0.667em;
+  margin-bottom: 0.667em;
+}
+
+h3 {
+  border-bottom: 1px solid #999;
+  font-size: 1.3em;
+  line-height: 1.3em;
+  margin-top: 1.4em;
+  margin-bottom: 0.1em;
+}
+
+h4, h5, h6 {
+  font-size: 1.1em;
+  line-height: 1.3em;
+  margin-top: 0.909em;
+  margin-bottom: 0.909em;
+}
+
+p, ul, ol, dl, pre, table, fieldset {
+  margin: 1em 0;
+}
+
+blockquote {
+  margin: 1em 3em;
+  padding: .15em 1em;
+  border-left: 3px solid #7777FF;
+  background-color: #EEEEFF;
+}
+
+ul, ol {
+  margin-left: 0;
+  padding-left: 2em; /* LTR */
+}
+
+.block ul,
+.item-list ul {
+  margin: 1em 0;
+  padding: 0 0 0 2em; /* LTR */
+}
+
+ul ul, ul ol,
+ol ol, ol ul,
+.block ul ul, .block ul ol,
+.block ol ol, .block ol ul,
+.item-list ul ul, .item-list ul ol,
+.item-list ol ol, .item-list ol ul {
+  margin: 0;
+}
+
+li {
+  margin: .8em 0;
+  padding: 0;
+}
+
+.item-list ul li {
+  margin: 0;
+  padding: 0;
+  list-style: inherit;
+}
+
+ul.menu li,
+li.expanded,
+li.collapsed,
+li.leaf {
+  margin: 0;
+  padding: 0;
+}
+
+ul          { list-style-type: disc; }
+ul ul       { list-style-type: circle; }
+ul ul ul    { list-style-type: square; }
+ul ul ul ul { list-style-type: circle; }
+ol          { list-style-type: decimal; }
+ol ol       { list-style-type: lower-alpha; }
+ol ol ol    { list-style-type: decimal; }
+
+dt {
+  margin: 0;
+  padding: 0;
+}
+
+dd {
+  margin: 0 0 0 2em;
+  padding: 0;
+}
+
+img {
+  border: 0;
+}
+
+hr {
+  border: 0;
+  height: 1px;
+  background-color: #999;
+}
+
+/* Links */
+a:link {
+  color: #0000EE;
+}
+
+a:visited {
+  color: #0000AA;
+}
+
+a:hover,
+a:focus {
+  color: #0077FF;
+}
+
+a:active {
+}
+
+/* Tables */
+table {
+  width: 100%;
+  overflow: scroll;
+}
+
+table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+th,
+thead th,
+tbody th {
+  text-align: left; /* LTR */
+  padding: 3px;
+  border-bottom: none;
+}
+
+tbody {
+  border-top: none;
+}
+
+td {
+  padding: 3px;
+}
+
+/* Forms */
+form {
+  margin: 0;
+  padding: 0;
+}
+
+fieldset {
+  margin: 1em 0;
+  padding: 0.5em;
+  border: 1px solid #999;
+}
+
+input,
+textarea {
+  font-size: .923em;
+}
+
+input.form-autocomplete,
+input.form-text,
+input.form-file,
+textarea.form-textarea,
+select.form-select {
+  padding: 2px;
+  border: 1px solid #ccc;
+  border-top-color: #999;
+  border-radius: 3px;
+  background: #fff;
+}
+
+.form-submit {
+  font-size: 1.35em;
+  margin-right: .5em;
+}
+
+/* Layout & Backgrounds ----------------------------------------------------- */
+* {
+  margin: 0;
+  padding: 0;
+}
+
+#page-wrapper {
+  background: transparent url(../images/page-bg.png) top left repeat-x;
+}
+
+#page {
+  margin: 0 auto;
+  padding: 0;
+  position: relative;
+  width: 960px;
+}
+
+#header, /* Add l/r padding */
+#navigation,
+#main-wrapper,
+#footer {
+  margin: 0 10px;
+  position: relative;
+}
+
+#header {
+  background: url(../images/header.png) no-repeat top left;
+  height: 171px;
+  position: relative;
+}
+
+#header .section {
+  color: #fff;
+  height: 114px;
+  margin: 0 auto;
+  text-align: center;
+  width: 100%;
+}
+
+#logo {
+  float: left; /* LTR */
+  left: 10px;
+  position: absolute;
+  top: 14px;
+}
+
+#site-name {
+  color: #fff;
+  font-family: "Warnock Pro", Georgia, Times, serif;
+  margin: 0;
+  padding-top: 25px;
+  font-size: 3.5em;
+  font-weight: normal;
+  line-height: 1.3em;
+  text-shadow: #666 3px 3px 3px;
+}
+
+#site-name a:link,
+#site-name a:visited,
+#site-name a:hover {
+  color: #FFF;
+  text-decoration: none;
+}
+
+#navigation {
+  position: absolute;
+  left: 5px;
+  top: 122px;
+  width: 100%;
+}
+
+/* Messages */
+div.messages {
+  margin: 0 0 1em;
+}
+
+/* Content */
+#content {
+  margin-top: 10px;
+	overflow: visible; /* Allow main area to display content wider than main area */
+}
+
+#content,
+.no-sidebars #content {
+  float: left; /* LTR */
+  width: 940px;
+  margin-left: 0; /* LTR */
+  margin-right: -940px; /* LTR */ /* Negative value of #content's width + left margin. */
+  padding: 0; /* DO NOT CHANGE */
+}
+
+.sidebar-first #content {
+  display: inline; /* Bug fix for IE - content overlaps left sidebar without this */
+  width: 700px;
+  margin-right: -700px; /* LTR */ /* Negative value of #content's width + left margin. */
+}
+
+.sidebar-second #content {
+  width: 720px;
+  margin-left: 0; /* LTR */
+  margin-right: -720px; /* LTR */ /* Negative value of #content's width + left margin. */
+}
+
+.two-sidebars #content {
+  display: inline; /* Bug fix for IE - content overlaps left sidebar without this */
+  width: 500px;
+  margin-right: -500px; /* LTR */ /* Negative value of #content's width + left margin. */
+}
+
+/* First sidebar */
+#sidebar-first {
+  float: left; /* LTR */
+  width: 220px;
+  margin-top: 10px;
+  margin-left: 0; /* LTR */
+  padding: 0; /* DO NOT CHANGE */
+}
+
+#sidebar-first .section {
+  margin: 0 18px 0 0; /* LTR */
+  padding: 0;
+}
+
+/* Second sidebar */
+#sidebar-second {
+  float: right;
+  width: 220px;
+  margin-left: 0px; /* LTR */ /* Width of content + sidebar-first. */
+  margin-right: 0px; /* LTR */ /* Negative value of #sidebar-second's width + left margin. */
+  padding: 0; /* DO NOT CHANGE */
+}
+
+#sidebar-second .section {
+  margin: 10px 0 0 20px; /* LTR */
+  padding: 0;
+}
+
+/* Navigation --------------------------------------------------------------- */
+#navigation .section h2 { /* Should really be 'element-invisible'... */
+  display: none;
+}
+
+#main-menu li {
+  margin: 0 2px 0 0;
+}
+
+#main-menu li a {
+  display: inline-block;
+  padding: 3px 7px;
+  text-decoration: none;
+  color: #555;
+  font-weight: bold;
+  font-size: 15px;
+}
+
+#main-menu li a:hover {
+  background: #FFF url(../images/navbar-button-bg.png) top left repeat-x;
+  border-radius: 5px;
+  color: #333;
+}
+
+#main-menu li a.active {
+  background: #FFF url(../images/navbar-button-bg.png) top left repeat-x;
+  border-radius: 5px;
+  color: #333;
+}
+
+/* Secondary menu */
+#secondary-menu {
+  display: block;
+  margin-top: 1em;
+}
+
+/* General link list styling */
+ul.links {
+  margin: 1em 0;
+  padding: 0;
+}
+
+ul.links.inline {
+  margin: 0;
+  display: inline;
+}
+
+ul.links li {
+  display: inline;
+  list-style-type: none;
+  padding: 0 0.25em;
+}
+
+/* Nodes -------------------------------------------------------------------- */
+.node-teaser {
+  margin: 0 0 20px;
+  border-top: 1px solid #ddd;
+  background: transparent url(../images/node-list-bg.png) 0px 1px repeat-x;
+  padding: 15px;
+}
+
+.node h2 {
+  margin: -.25em 0 0;
+}
+
+.node h2 a {
+  font-size: .85em;
+  text-decoration: none;
+}
+
+.node .submitted {
+  color: #999;
+  font-size: .9em;
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.node .submitted a {
+  color: #777;
+}
+
+.node ul.links {
+  border-top: 1px solid #999;
+  display: block;
+  padding-top: 5px;
+  text-align: right;
+  width: 100%;
+}
+
+/* Comments ----------------------------------------------------------------- */
+#comments {
+}
+
+/* Individual comment display */
+.comment {
+  background: #eee;
+  padding: 1em;
+  border: 1px solid #ddd;
+  border-radius: 10px;
+  margin: .5em 0;
+  position: relative;
+}
+
+.comment h3,
+.comment h3 a {
+  text-decoration: none;
+  margin: 0;
+}
+
+.comment ul.links {
+  border: none;
+  float: right;
+  clear: right;
+  margin: 0 0 -5px;
+  padding: 0;
+  width: inherit;
+}
+
+.comment .submitted {
+  color: #999;
+  font-size: .9em;
+  margin: 0 0 -5px;
+}
+
+.comment .submitted a {
+  color: #777;
+}
+
+.comment p {
+  margin: 0 0 1em 0;
+}
+
+/* Comment form */
+h2.comment-form {
+  margin-top: 1.5em;
+}
+
+#comment-form {
+  border: 1px solid #bbb;
+  border-radius: 10px;
+  padding: 1em;
+}
+
+#comment-form .form-item {
+  margin-top: 0;
+}
+
+/* Blocks ------------------------------------------------------------------- */
+.sidebar .block-wrapper {
+  border: 1px solid #999;
+  border-radius: 10px;
+  margin-bottom: 1em;
+}
+
+.sidebar .block-wrapper .block {
+  background: transparent url(../images/block-bg.png) top left repeat-x;
+  border: 1px solid #fff;
+  border-radius: 10px;
+  padding: 10px;
+}
+
+.sidebar .block h2 {
+  border-bottom: 1px solid #bbb;
+  font-size: 1.6em;
+  margin-top: 0;
+  padding-bottom: 8px;
+  text-align: center;
+}
+
+/* Search block */
+#block-search-form .content {
+  text-align: center;
+}
+
+#block-search-form input.form-text {
+  width: 100px;
+}
+
+/* System ------------------------------------------------------------------- */
+/* Filter tips for text format selection */
+.filter-wrapper {
+  border-color: #ccc;
+  color: #999;
+  padding: .5em 0;
+}
+
+.filter-help a {
+  color: #777;
+  font-size: .85em;
+}
+
+.filter-guidelines {
+  padding: 0 .5em;
+}
+
+.filter-guidelines .tips {
+  margin-bottom: 0;
+}
+
+.filter-guidelines .tips li {
+  margin: 0 0 .2em;
+}
+
+/* Module-specific ---------------------------------------------------------- */
+/* WYSIWYG Fixes */
+.wysiwyg-toggle-wrapper {
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding-left: .35em;
+}
+
+/* Admin menu */
+#admin-menu-wrapper {
+  font-size: .85em;
+}
diff --git a/css/tabs.css b/css/tabs.css
index efa7624..fce18a5 100644
--- a/css/tabs.css
+++ b/css/tabs.css
@@ -12,6 +12,7 @@
 
 div.tabs {
   margin: 0 0 5px 0;
+  width: 100%;
 }
 
 ul.primary {
diff --git a/css/views-styles.css b/css/views-styles.css
deleted file mode 100644
index 6276562..0000000
--- a/css/views-styles.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-/**
- * @file
- * Views Styling
- */
-
-
diff --git a/css/wireframes.css b/css/wireframes.css
deleted file mode 100644
index 2c48b51..0000000
--- a/css/wireframes.css
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/**
- * @file
- * Wireframes Styling
- *
- * Add wireframes to the basic layout elements.
- */
-
-
-.with-wireframes #header-inner,
-.with-wireframes #content-inner,
-.with-wireframes #content-inner>*,
-.with-wireframes .region-navbar,
-.with-wireframes #sidebar-first-inner,
-.with-wireframes #sidebar-second-inner,
-.with-wireframes .region-footer {
-  margin: 1px;
-  padding: 2px;
-  border: 1px solid #ccc;
-}
-
-.with-wireframes #closure-blocks {
-  margin-top: 1px;
-  padding: 2px;
-  border: 1px solid #ccc;
-}
diff --git a/images/messages-error-ie6.png b/images/messages-error-ie6.png
deleted file mode 100644
index 054b9f2..0000000
Binary files a/images/messages-error-ie6.png and /dev/null differ
diff --git a/images/messages-error.png b/images/messages-error.png
deleted file mode 100644
index 012813b..0000000
Binary files a/images/messages-error.png and /dev/null differ
diff --git a/images/messages-status-ie6.png b/images/messages-status-ie6.png
deleted file mode 100644
index f9eb63f..0000000
Binary files a/images/messages-status-ie6.png and /dev/null differ
diff --git a/images/messages-status.png b/images/messages-status.png
deleted file mode 100644
index 9f07a42..0000000
Binary files a/images/messages-status.png and /dev/null differ
diff --git a/images/messages-warning-ie6.png b/images/messages-warning-ie6.png
deleted file mode 100644
index 551a9db..0000000
Binary files a/images/messages-warning-ie6.png and /dev/null differ
diff --git a/images/messages-warning.png b/images/messages-warning.png
deleted file mode 100644
index e727711..0000000
Binary files a/images/messages-warning.png and /dev/null differ
diff --git a/images/vote-on-post.png b/images/vote-on-post.png
deleted file mode 100644
index fd7d889..0000000
Binary files a/images/vote-on-post.png and /dev/null differ
diff --git a/screenshot.png b/screenshot.png
index b8542b7..7828853 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/template.php b/template.php
index c1f7f60..8ddd631 100644
--- a/template.php
+++ b/template.php
@@ -3,194 +3,41 @@
 /**
  * @file
  * Contains theme override functions and preprocess functions for the theme.
- *
- * ABOUT THE TEMPLATE.PHP FILE
- *
- *   The template.php file is one of the most useful files when creating or
- *   modifying Drupal themes. You can add new regions for block content, modify
- *   or override Drupal's theme functions, intercept or make additional
- *   variables available to your theme, and create custom PHP logic. For more
- *   information, please visit the Theme Developer's Guide on Drupal.org:
- *   http://drupal.org/theme-guide
- *
- * OVERRIDING THEME FUNCTIONS
- *
- *   The Drupal theme system uses special theme functions to generate HTML
- *   output automatically. Often we wish to customize this HTML output. To do
- *   this, we have to override the theme function. You have to first find the
- *   theme function that generates the output, and then "catch" it and modify it
- *   here. The easiest way to do it is to copy the original function in its
- *   entirety and paste it here, changing the prefix from theme_ to airyblue_.
- *   For example:
- *
- *     original: theme_breadcrumb()
- *     theme override: airyblue_breadcrumb()
- *
- *   where airyblue is the name of your sub-theme. For example, the
- *   zen_classic theme would define a zen_classic_breadcrumb() function.
- *
- *   If you would like to override any of the theme functions used in Zen core,
- *   you should first look at how Zen core implements those functions:
- *     theme_breadcrumbs()      in zen/template.php
- *     theme_menu_item_link()   in zen/template.php
- *     theme_menu_local_tasks() in zen/template.php
- *
- *   For more information, please visit the Theme Developer's Guide on
- *   Drupal.org: http://drupal.org/node/173880
- *
- * CREATE OR MODIFY VARIABLES FOR YOUR THEME
- *
- *   Each tpl.php template file has several variables which hold various pieces
- *   of content. You can modify those variables (or add new ones) before they
- *   are used in the template files by using preprocess functions.
- *
- *   This makes THEME_preprocess_HOOK() functions the most powerful functions
- *   available to themers.
- *
- *   It works by having one preprocess function for each template file or its
- *   derivatives (called template suggestions). For example:
- *     THEME_preprocess_page    alters the variables for page.tpl.php
- *     THEME_preprocess_node    alters the variables for node.tpl.php or
- *                              for node-forum.tpl.php
- *     THEME_preprocess_comment alters the variables for comment.tpl.php
- *     THEME_preprocess_block   alters the variables for block.tpl.php
- *
- *   For more information on preprocess functions and template suggestions,
- *   please visit the Theme Developer's Guide on Drupal.org:
- *   http://drupal.org/node/223440
- *   and http://drupal.org/node/190815#template-suggestions
- */
-
-
-/*
- * 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('airyblue_fixed')) {
-  drupal_add_css(path_to_theme() . '/layout-fixed.css', 'theme', 'all');
-}
-// */
-
-
-/**
- * Implementation of HOOK_theme().
- */
-function airyblue_theme(&$existing, $type, $theme, $path) {
-  $hooks = zen_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 airyblue_preprocess(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
 
 /**
- * Override or insert variables into the page templates.
+ * Implements theme_preprocess_menu_local_task().
  *
- * @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 airyblue_preprocess_page(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Remove "Search this site: " from Search form
+ * @see zen_preprocess_menu_local_task()
  */
-function phptemplate_preprocess_search_theme_form(&$variables) {
-  unset($variables['form']['search_theme_form']['#title']);
-  unset($variables['form']['search_theme_form']['#printed']);
-  $variables['search']['search_theme_form'] = drupal_render($variables['form']['search_theme_form']);
-  $variables['search_form'] = implode($variables['search']);
-}
+function airyblue_preprocess_menu_local_task(&$variables) {
+  $link =& $variables['element']['#link'];
 
-/**
- * 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 airyblue_preprocess_node(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-
-  // Optionally, run node-type-specific preprocess functions, like
-  // airyblue_preprocess_node_page() or airyblue_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
-  if (function_exists($function)) {
-    $function($vars, $hook);
+  // If the link does not contain HTML already, check_plain() it now.
+  // After we set 'html'=TRUE the link will not be sanitized by l().
+  if (empty($link['localized_options']['html'])) {
+    $link['title'] = check_plain($link['title']);
   }
+  $link['localized_options']['html'] = TRUE;
+  $link['title'] = '<span class="tab">' . $link['title'] . '</span>';
 }
-// */
 
 /**
- * Override or insert variables into the comment templates.
+ * Implements theme_menu_local_tasks().
  *
- * @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.)
+ * @see zen_menu_local_tasks()
  */
-// function airyblue_preprocess_comment(&$vars, $hook) {
-//   if ($vars['status'] = '1') {
-//     $vars['classes_array'][] = 'comment-unpublished';
-//   }
-// }
+function airyblue_menu_local_tasks(&$variables) {
+  $output = '';
 
-/**
- * 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 airyblue_preprocess_block(&$vars, $hook) {
-  $vars['sample_variable'] = t('Lorem ipsum.');
-}
-// */
-
-/**
- * Implementation of hook_button()
- *
- * Based on: http://teddy.fr/blog/beautify-your-drupal-forms
- */
-function airyblue_button($element) {
-  // Make sure not to overwrite classes.
-  if (isset($element['#attributes']['class'])) {
-    $element['#attributes']['class'] = 'form-'. $element['#button_type'] .' '. $element['#attributes']['class'];
+  if ($primary = drupal_render($variables['primary'])) {
+    $output .= '<h2 class="element-invisible">' . t('Primary tabs') . '</h2>';
+    $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
   }
-  else {
-    $element['#attributes']['class'] = 'form-'. $element['#button_type'];
+  if ($secondary = drupal_render($variables['secondary'])) {
+    $output .= '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2>';
+    $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
   }
 
-  // We here wrap the output with a couple span tags
-  return '<span class="button"><span><input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ')  .'id="'. $element['#id'].'" value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." /></span></span>\n";
-}
\ No newline at end of file
+  return $output;
+}
diff --git a/templates/block.tpl.php b/templates/block.tpl.php
index 3acc377..82a30ad 100644
--- a/templates/block.tpl.php
+++ b/templates/block.tpl.php
@@ -1,21 +1,32 @@
 <?php
 
 /**
- * @file block.tpl.php
- *
- * Theme implementation to display a block.
+ * @file
+ * Default theme implementation to display a block.
  *
  * Available variables:
  * - $block->subject: Block title.
- * - $block->content: Block content.
+ * - $content: Block content.
  * - $block->module: Module that generated the block.
- * - $block->delta: This is a numeric id connected to each module.
+ * - $block->delta: An ID for the block, unique within each module.
  * - $block->region: The block region embedding the current block.
- * - $classes: A set of CSS classes for the DIV wrapping the block.
- *   Possible values are: block-MODULE, region-odd, region-even, odd, even,
- *   region-count-X, and count-X.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - block: The current template type, i.e., "theming hook".
+ *   - block-[module]: The module generating the block. For example, the user module
+ *     is responsible for handling the default user navigation block. In that case
+ *     the class would be "block-user".
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
  *
  * Helper variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
  * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
  * - $zebra: Same output as $block_zebra but independent of any block region.
  * - $block_id: Counter dependent on each block region.
@@ -23,23 +34,24 @@
  * - $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.
+ * - $block_html_id: A valid HTML ID and guaranteed unique.
  *
  * @see template_preprocess()
  * @see template_preprocess_block()
+ * @see template_process()
  */
 ?>
 <div class="block-wrapper">
-  <div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?>"><div class="block-inner">
+  <div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
 
-    <?php if ($block->subject): ?>
-      <h2 class="title"><?php print $block->subject; ?></h2>
-    <?php endif; ?>
+    <?php print render($title_prefix); ?>
+  <?php if ($block->subject): ?>
+    <h2<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
+  <?php endif;?>
+    <?php print render($title_suffix); ?>
 
-    <div class="content">
-      <?php print $block->content; ?>
+    <div class="content"<?php print $content_attributes; ?>>
+      <?php print $content ?>
     </div>
-
-    <?php print $edit_links; ?>
-
-  </div></div> <!-- /block-inner, /block -->
-</div> <!-- /block-wrapper -->
\ No newline at end of file
+  </div>
+</div>
diff --git a/templates/comment.tpl.php b/templates/comment.tpl.php
index 788017b..c597c14 100644
--- a/templates/comment.tpl.php
+++ b/templates/comment.tpl.php
@@ -1,69 +1,90 @@
 <?php
 
 /**
- * @file comment.tpl.php
+ * @file
  * Default theme implementation for comments.
  *
  * Available variables:
  * - $author: Comment author. Can be link or plain text.
- * - $classes: A set of CSS classes for the DIV wrapping the comment.
- *   Possible values are: comment, comment-new, comment-preview,
- *   comment-unpublished, comment-published, odd, even, first, last,
- *   comment-by-anon, comment-by-author, or comment-mine.
- * - $content: Body of the post.
- * - $date: Date and time of posting.
- * - $links: Various operational links.
+ * - $content: An array of comment items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $created: Formatted date and time for when the comment was created.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->created variable.
+ * - $changed: Formatted date and time for when the comment was last changed.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->changed variable.
  * - $new: New comment marker.
+ * - $permalink: Comment permalink.
+ * - $submitted: Submission information created from $author and $created during
+ *   template_preprocess_comment().
  * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
  *   comment-unpublished, comment-published or comment-preview.
- * - $submitted: By line with date and time.
  * - $title: Linked title.
- * - $unpublished: Is the comment unpublished?
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - comment: The current template type, i.e., "theming hook".
+ *   - comment-by-anonymous: Comment by an unregistered user.
+ *   - comment-by-node-author: Comment by the author of the parent node.
+ *   - comment-preview: When previewing a new or edited comment.
+ *   The following applies only to viewers who are registered users:
+ *   - comment-unpublished: An unpublished comment visible only to administrators.
+ *   - comment-by-viewer: Comment by the user currently viewing the page.
+ *   - comment-new: New comment since last the visit.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
  *
- * These two variables are provided for context.
+ * These two variables are provided for context:
  * - $comment: Full comment object.
  * - $node: Node object the comments are attached to.
  *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess()
  * @see template_preprocess_comment()
+ * @see template_process()
  * @see theme_comment()
  */
 ?>
-<div class="<?php print $classes; if ($unpublished) { print ' comment-unpublished'; } ?>"><div class="comment-inner clearfix">
-
-  <?php if ($title): ?>
-    <h3 class="title">
-      <?php print $title; ?>
-      <?php if ($comment->new): ?>
-        <span class="new"><?php print $new; ?></span>
-      <?php endif; ?>
-    </h3>
-  <?php elseif ($comment->new): ?>
-    <div class="new"><?php print $new; ?></div>
-  <?php endif; ?>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+  <?php print $picture ?>
 
-  <?php if ($unpublished): ?>
-    <div class="unpublished"><?php print t('Unpublished'); ?></div>
+  <?php if ($new): ?>
+    <span class="new"><?php print $new ?></span>
   <?php endif; ?>
 
-  <?php if ($picture) print $picture; ?>
+  <?php print render($title_prefix); ?>
+  <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
+  <?php print render($title_suffix); ?>
 
-  <div class="content">
-    <?php print $content; ?>
+  <div class="content"<?php print $content_attributes; ?>>
+    <?php
+      // We hide the comments and links now so that we can render them later.
+      hide($content['links']);
+      print render($content);
+    ?>
     <?php if ($signature): ?>
     <div class="user-signature clearfix">
-      <?php print $signature; ?>
+      <?php print $signature ?>
     </div>
     <?php endif; ?>
   </div>
 
-  <?php if ($links): ?>
-    <?php print $links; ?>
-  <?php endif; ?>
-  
+  <?php print render($content['links']) ?>
+
   <div class="submitted">
+    <?php print $permalink; ?>
     <?php print $submitted; ?>
   </div>
-
-</div></div> <!-- /comment-inner, /comment -->
+</div>
diff --git a/templates/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php
deleted file mode 100644
index 39d6969..0000000
--- a/templates/maintenance-page.tpl.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-?>
-<?php
-// Enter the message you would like displayed here:
-$head_title = 'Site-offline | Drupal';
-
-// If you would like your own logo to be displayed, uncomment and set it here:
-// $logo = 'sites/all/files/customLogo.png';
-
-// If your  theme is set to display the site name, uncomment this line and replace the value:
-// $site_name = 'Your Site Name';
-
-// If your  theme is set to *not* display the site name, uncomment this line:
-// unset($site_name);
-
-// If your theme is set to display the site slogan, uncomment this line and replace the value:
-// $site_slogan = 'My Site Slogan';
-
-// If your theme is set to *not* display the site slogan, uncomment this line:
-// unset($site_slogan);
-?>
-<!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; ?>">
-  <div id="body-wrapper">
-    <div id="page"><div id="page-inner">
-
-      <div id="header"><div id="header-inner" class="clearfix">
-
-        <?php if ($logo || $site_name || $site_slogan): ?>
-          <div id="logo-title">
-
-            <?php if ($logo): ?>
-              <div id="logo"><a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo-image" /></a></div>
-            <?php endif; ?>
-
-            <?php if ($site_name): ?>
-              <?php if ($title): ?>
-                <div id="site-name">
-                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
-                  <?php print $site_name; ?>
-                  </a>
-                </div>
-              <?php else: /* Use h1 when the content title is empty */ ?>
-                <h1 id="site-name">
-                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
-                  <?php print $site_name; ?>
-                  </a>
-                </h1>
-              <?php endif; ?>
-            <?php endif; ?>
-
-          </div> <!-- /#logo-title -->
-        <?php endif; ?>
-
-
-      </div></div> <!-- /#header-inner, /#header -->
-
-      <div id="main"><div id="main-inner" class="clearfix<?php if ($primary_links || $secondary_links || $navbar) { print ' with-navbar'; } ?>">
-
-        <div id="content"><div id="content-inner">
-
-          <?php if ($title || $messages): ?>
-            <div id="content-header">
-              <?php if ($title): ?>
-                <h1 class="title"><?php print $title; ?></h1>
-              <?php endif; ?>
-              <?php print $messages; ?>
-            </div> <!-- /#content-header -->
-          <?php endif; ?>
-
-          <div id="content-area">
-            <div id="maintenance-page">Oops, we broke it.</div>
-            <?php print $content; ?>
-          </div>
-
-        </div></div> <!-- /#content-inner, /#content -->
-
-      </div></div> <!-- /#main-inner, /#main -->
-
-      <?php if ($footer || $footer_message): ?>
-        <div id="footer"><div id="footer-inner" class="region region-footer">
-
-          <?php if ($footer_message): ?>
-            <div id="footer-message"><?php print $footer_message; ?></div>
-          <?php endif; ?>
-
-          <?php print $footer; ?>
-
-        </div></div> <!-- /#footer-inner, /#footer -->
-      <?php endif; ?>
-
-    </div></div> <!-- /#page-inner, /#page -->
-  </div> <!-- /#body-wrapper -->
-
-  <?php if ($closure_region): ?>
-    <div id="closure-blocks" class="region region-closure"><?php print $closure_region; ?></div>
-  <?php endif; ?>
-
-  <?php print $closure; ?>
-
-</body>
-</html>
diff --git a/templates/node.tpl.php b/templates/node.tpl.php
deleted file mode 100644
index 81f72de..0000000
--- a/templates/node.tpl.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * @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 id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?>"><div class="node-inner">
-
-  <?php print $picture; ?>
-
-  <?php if (!$page): ?>
-    <h2 class="title">
-      <a href="<?php print $node_url; ?>" title="<?php print $title ?>"><?php print $title; ?></a>
-    </h2>
-  <?php endif; ?>
-
-  <?php if ($unpublished): ?>
-    <div class="unpublished"><?php print t('Unpublished'); ?></div>
-  <?php endif; ?>
-
-  <?php if ($submitted || $terms): ?>
-    <div class="meta">
-      <?php if ($submitted): ?>
-        <div class="submitted">
-          <?php print $submitted; ?>
-        </div>
-      <?php endif; ?>
-
-      <?php if ($terms): ?>
-        <div class="terms terms-inline"><?php print t(' in ') . $terms; ?></div>
-      <?php endif; ?>
-    </div>
-  <?php endif; ?>
-
-  <div class="content">
-    <?php print $content; ?>
-  </div>
-
-  <div class="node-end-links">
-    <?php print $links; ?>
-  </div>
-
-</div></div> <!-- /node-inner, /node -->
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 97d40b0..72d5187 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -2,245 +2,147 @@
 
 /**
  * @file
- * Theme implementation to display a single Drupal page.
+ * Default theme implementation to display a single Drupal page.
  *
  * Available variables:
  *
  * General utility variables:
  * - $base_path: The base URL path of the Drupal installation. At the very
  *   least, this will always default to /.
- * - $css: An array of CSS files for the current page.
  * - $directory: The directory the template is located in, e.g. modules/system
- *   or themes/garland.
- * - $classes_array: Array of the body classes. It is flattened into a string
- *   within the variable $classes.
- * - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement.
+ *   or themes/bartik.
+ * - $is_front: TRUE if the current page is the front page.
  * - $logged_in: TRUE if the user is registered and signed in.
  * - $is_admin: TRUE if the user has permission to access administration pages.
  *
- * Page metadata:
- * - $language: (object) The language the site is being displayed in.
- *   $language->language contains its textual representation.
- *   $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $head_title: A modified version of the page title, for use in the TITLE tag.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- *   so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- *   for the page.
- * - $classes: String of classes that can be used to style contextually through
- *   CSS. It should be placed within the <body> tag. When selecting through CSS
- *   it's recommended that you use the body tag, e.g., "body.front". It can be
- *   manipulated through the variable $classes_array from preprocess functions.
- *   The default values can be one or more of the following:
- *   - front: Page is the home page.
- *   - not-front: Page is not the home page.
- *   - logged-in: The current viewer is logged in.
- *   - not-logged-in: The current viewer is not logged in.
- *   - node-type-[node type]: When viewing a single node, the type of that node.
- *     For example, if the node is a "Blog entry" it would result in "node-type-blog".
- *     Note that the machine name will often be in a short form of the human readable label.
- *   The following only apply with the default 'sidebar_first' and 'sidebar_second' block regions:
- *     - two-sidebars: When both sidebars have content.
- *     - no-sidebars: When no sidebar content exists.
- *     - one-sidebar and sidebar-first or sidebar-second: A combination of the
- *       two classes when only one of the two sidebars have content.
- *
  * Site identity:
  * - $front_page: The URL of the front page. Use this instead of $base_path,
- *   when linking to the front page. This includes the language domain or prefix.
+ *   when linking to the front page. This includes the language domain or
+ *   prefix.
  * - $logo: The path to the logo image, as defined in theme configuration.
  * - $site_name: The name of the site, empty when display has been disabled
  *   in theme settings.
  * - $site_slogan: The slogan of the site, empty when display has been disabled
  *   in theme settings.
- * - $mission: The text of the site mission, empty when display has been disabled
- *   in theme settings.
  *
  * Navigation:
- * - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing the Primary menu links for the
+ * - $main_menu (array): An array containing the Main menu links for the
  *   site, if they have been configured.
- * - $secondary_links (array): An array containing the Secondary menu links for
+ * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
  * - $breadcrumb: The breadcrumb trail for the current page.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
  * - $title: The page title, for use in the actual HTML content.
- * - $messages: HTML for status and error messages. Should be displayed prominently.
- * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
- *   and edit tabs when displaying a node).
- * - $help: Dynamic help text, mostly for admin pages.
- * - $content: The main content of the current Drupal page.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ * - $messages: HTML for status and error messages. Should be displayed
+ *   prominently.
+ * - $tabs (array): Tabs linking to any sub-pages beneath the current page
+ *   (e.g., the view and edit tabs when displaying a node).
+ * - $action_links (array): Actions local to the page, such as 'Add menu' on the
+ *   menu administration interface.
  * - $feed_icons: A string of all feed icons for the current page.
- * - $sidebar_first: The HTML for the first sidebar.
- * - $sidebar_second: The HTML for the second sidebar.
+ * - $node: The node object, if there is an automatically-loaded node
+ *   associated with the page, and the node ID is the second argument
+ *   in the page's path (e.g. node/12345 and node/12345/revisions, but not
+ *   comment/reply/12345).
  *
- * Footer/closing data:
- * - $footer_message: The footer message as defined in the admin settings.
- * - $footer : The footer region.
- * - $closure: Final closing markup from any modules that have altered the page.
- *   This variable should always be output last, after all other dynamic content.
+ * Regions:
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['highlighted']: Items for the highlighted content region.
+ * - $page['content']: The main content of the current page.
+ * - $page['sidebar_first']: Items for the first sidebar.
+ * - $page['sidebar_second']: Items for the second sidebar.
+ * - $page['header']: Items for the header region.
+ * - $page['footer']: Items for the footer region.
  *
  * @see template_preprocess()
  * @see template_preprocess_page()
+ * @see template_process()
  */
 ?>
-<!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 $classes; ?>">
-  <div id="body-wrapper">
-    <div id="page"><div id="page-inner">
-
-      <?php if ($primary_links || $secondary_links || $navbar): ?>
-        <div id="skip-to-nav"><a href="#navigation"><?php print t('Skip to Navigation'); ?></a></div>
-      <?php endif; ?>
-
-      <div id="header"><div id="header-inner" class="clearfix">
-
-        <?php if ($logo || $site_name || $site_slogan): ?>
-          <div id="logo-title">
 
-            <?php if ($logo): ?>
-              <div id="logo"><a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" id="logo-image" /></a></div>
-            <?php endif; ?>
+  <div id="page-wrapper"><div id="page">
 
-            <?php if ($site_name): ?>
-              <?php if ($title): ?>
-                <div id="site-name">
-                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
-                  <?php print $site_name; ?>
-                  </a>
-                </div>
-              <?php else: /* Use h1 when the content title is empty */ ?>
-                <h1 id="site-name">
-                  <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home">
-                  <?php print $site_name; ?>
-                  </a>
-                </h1>
-              <?php endif; ?>
-            <?php endif; ?>
+    <div id="header"><div class="section clearfix">
 
-            <?php if ($site_slogan): ?>
-              <div id="site-slogan"><?php print $site_slogan; ?></div>
-            <?php endif; ?>
-
-          </div> <!-- /#logo-title -->
-        <?php endif; ?>
-
-        <?php if ($primary_links || $secondary_links || $navbar): ?>
-          <div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
-
-            <a name="navigation" id="navigation"></a>
-
-            <?php if ($primary_links): ?>
-              <div id="primary">
-                <?php print theme('links', $primary_links); ?>
-              </div> <!-- /#primary -->
-            <?php endif; ?>
+      <?php if ($logo): ?>
+        <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+          <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+        </a>
+      <?php endif; ?>
 
-            <?php if ($secondary_links): ?>
-              <div id="secondary">
-                <?php print theme('links', $secondary_links); ?>
-              </div> <!-- /#secondary -->
+      <?php if ($site_name || $site_slogan): ?>
+        <div id="name-and-slogan">
+          <?php if ($site_name): ?>
+            <?php if ($title): ?>
+              <div id="site-name">
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </div>
+            <?php else: /* Use h1 when the content title is empty */ ?>
+              <h1 id="site-name">
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </h1>
             <?php endif; ?>
-
-            <?php print $navbar; ?>
-
-          </div></div> <!-- /#navbar-inner, /#navbar -->
-        <?php endif; ?>
-
-        <?php if ($search_box): ?>
-          <div id="search-box"><?php print $search_box; ?></div>
-        <?php endif; ?>
-
-      </div></div> <!-- /#header-inner, /#header -->
-
-      <div id="main"><div id="main-inner" class="clear-box<?php if ($primary_links || $secondary_links || $navbar) { print ' with-navbar'; } ?>">
-
-        <?php if ($sidebar_first): ?>
-          <div id="sidebar-first"><div id="sidebar-first-inner" class="region region-sidebar-first">
-            <?php print $sidebar_first; ?>
-          </div></div> <!-- /#sidebar-first-inner, /#sidebar-first -->
-        <?php endif; ?>
-        
-        <div id="content"><div id="content-inner">
-
-          <?php if ($mission): ?>
-            <div id="mission"><?php print $mission; ?></div>
           <?php endif; ?>
 
-          <?php if ($content_top): ?>
-            <div id="content-top" class="region region-content_top">
-              <?php print $content_top; ?>
-            </div> <!-- /#content-top -->
+          <?php if ($site_slogan): ?>
+            <div id="site-slogan"><?php print $site_slogan; ?></div>
           <?php endif; ?>
+        </div> <!-- /#name-and-slogan -->
+      <?php endif; ?>
 
-          <?php if ($breadcrumb || $title || $tabs || $help || $messages): ?>
-            <div id="content-header">
-              <?php print $breadcrumb; ?>
-              <?php if ($title): ?>
-                <h1 class="title"><?php print $title; ?></h1>
-              <?php endif; ?>
-              <?php print $messages; ?>
-              <?php if ($tabs): ?>
-                <div class="tabs"><?php print $tabs; ?></div>
-              <?php endif; ?>
-              <?php print $help; ?>
-            </div> <!-- /#content-header -->
-          <?php endif; ?>
+      <?php print render($page['header']); ?>
 
-          <div id="content-area">
-            <?php print $content; ?>
-          </div>
+    </div></div> <!-- /.section, /#header -->
 
-          <?php if ($feed_icons): ?>
-            <div class="feed-icons"><?php print $feed_icons; ?></div>
-          <?php endif; ?>
+    <?php if ($main_menu || $secondary_menu): ?>
+      <div id="navigation"><div class="section">
+        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'inline', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
+      </div></div> <!-- /.section, /#navigation -->
+    <?php endif; ?>
 
-          <?php if ($content_bottom): ?>
-            <div id="content-bottom" class="region region-content_bottom">
-              <?php print $content_bottom; ?>
-            </div> <!-- /#content-bottom -->
-          <?php endif; ?>
+    <div id="main-wrapper"><div id="main" class="clearfix">
 
-        </div></div> <!-- /#content-inner, /#content -->
+      <?php if ($page['sidebar_first']): ?>
+        <div id="sidebar-first" class="column sidebar"><div class="section">
+          <?php print render($page['sidebar_first']); ?>
+        </div></div> <!-- /.section, /#sidebar-first -->
+      <?php endif; ?>
 
-        <?php if ($sidebar_second): ?>
-          <div id="sidebar-second"><div id="sidebar-second-inner" class="region region-sidebar-second">
-            <?php print $sidebar_second; ?>
-          </div></div> <!-- /#sidebar-second-inner, /#sidebar-second -->
+      <div id="content" class="column"><div class="section">
+        <?php print $messages; ?>
+        <?php if ($breadcrumb): ?>
+          <div id="breadcrumb"><?php print $breadcrumb; ?></div>
         <?php endif; ?>
-
-      </div></div> <!-- /#main-inner, /#main -->
-
-      <?php if ($footer || $footer_message): ?>
-        <div id="footer"><div id="footer-inner" class="region region-footer">
-
-          <?php if ($footer_message): ?>
-            <div id="footer-message"><?php print $footer_message; ?></div>
-          <?php endif; ?>
-
-          <?php print $footer; ?>
-
-        </div></div> <!-- /#footer-inner, /#footer -->
+        <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?>
+        <a id="main-content"></a>
+        <?php print render($title_prefix); ?>
+        <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
+        <?php print render($title_suffix); ?>
+        <?php if (!empty($tabs['#primary'])): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
+        <?php print render($page['help']); ?>
+        <?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+        <?php print render($page['content']); ?>
+        <?php print $feed_icons; ?>
+      </div></div> <!-- /.section, /#content -->
+
+      <?php if ($page['sidebar_second']): ?>
+        <div id="sidebar-second" class="column sidebar"><div class="section">
+          <?php print render($page['sidebar_second']); ?>
+        </div></div> <!-- /.section, /#sidebar-second -->
       <?php endif; ?>
 
-    </div></div> <!-- /#page-inner, /#page -->
-  </div> <!-- /#body-wrapper -->
-
-  <?php if ($closure_region): ?>
-    <div id="closure-blocks" class="region region-closure"><?php print $closure_region; ?></div>
-  <?php endif; ?>
+    </div></div> <!-- /#main, /#main-wrapper -->
 
-  <?php print $closure; ?>
+    <div id="footer"><div class="section">
+      <?php print render($page['footer']); ?>
+    </div></div> <!-- /.section, /#footer -->
 
-</body>
-</html>
+  </div></div> <!-- /#page, /#page-wrapper -->
diff --git a/templates/search-theme-form.tpl.php b/templates/search-theme-form.tpl.php
deleted file mode 100644
index ab1e97e..0000000
--- a/templates/search-theme-form.tpl.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file search-theme-form.tpl.php
- * Default theme implementation for displaying a search form directly into the
- * theme layout. Not to be confused with the search block or the search page.
- *
- * Available variables:
- * - $search_form: The complete search form ready for print.
- * - $search: Array of keyed search elements. Can be used to print each form
- *   element separately.
- *
- * Default keys within $search:
- * - $search['search_theme_form']: Text input area wrapped in a div.
- * - $search['submit']: Form submit button.
- * - $search['hidden']: Hidden form elements. Used to validate forms when submitted.
- *
- * Since $search is keyed, a direct print of the form element is possible.
- * Modules can add to the search form so it is recommended to check for their
- * existance before printing. The default keys will always exist.
- *
- *   <?php if (isset($search['extra_field'])): ?>
- *     <div class="extra-field">
- *       <?php print $search['extra_field']; ?>
- *     </div>
- *   <?php endif; ?>
- *
- * To check for all available data within $search, use the code below.
- *
- *   <?php print '<pre>'. check_plain(print_r($search, 1)) .'</pre>'; ?>
- *
- * @see template_preprocess_search_theme_form()
- */
-?>
-<div id="search" class="container-inline">
-  <?php print $search_form; ?>
-</div>
diff --git a/theme-settings.php b/theme-settings.php
deleted file mode 100644
index 21cced0..0000000
--- a/theme-settings.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-// Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php';
-
-
-/**
- * Implementation of THEMEHOOK_settings() function.
- *
- * @param $saved_settings
- *   An array of saved settings for this theme.
- * @return
- *   A form array.
- */
-function airyblue_settings($saved_settings) {
-
-  // Get the default values from the .info file.
-  $defaults = zen_theme_get_default_settings('airyblue');
-
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
-
-  /*
-   * Create the form using Forms API: http://api.drupal.org/api/6
-   */
-  $form = array();
-  /* -- Delete this line if you want to use this setting
-  $form['airyblue_example'] = array(
-    '#type'          => 'checkbox',
-    '#title'         => t('Use this sample setting'),
-    '#default_value' => $settings['airyblue_example'],
-    '#description'   => t("This option doesn't do anything; it's just an example."),
-  );
-  // */
-
-  // Add the base theme's settings.
-  $form += zen_settings($saved_settings, $defaults);
-
-  // Remove some of the base theme's settings.
-  unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
-
-  // Return the form
-  return $form;
-}
