diff --git a/404.php b/404.php
new file mode 100644
index 0000000..11d0116
--- /dev/null
+++ b/404.php
@@ -0,0 +1,58 @@
+<?php get_header(); ?>
+
+<div id="content">
+
+	<div id="entry_content">
+
+
+	<?php if (have_posts()) : ?>
+
+		<?php while (have_posts()) : the_post(); ?>
+			
+				
+					
+					<div class="mobile">
+					<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
+					<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('&sect; <span class="commentcount">0</span>', '&sect; <span class="commentcount">1</span>', '&sect; <span class="commentcount">%</span>'); ?></p>
+
+
+					<div class="mobile_entry">
+						<?php the_content('&raquo; Read the rest of this entry &laquo;'); ?>
+					</div>
+						<div class="entry">
+							<?php if (is_single()) { ?>
+								<?php comments_template(); ?>
+							<?php } ?>
+						</div>
+					</div>
+					
+				
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<p class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></p>
+			<p class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></p>
+		</div>
+		
+	
+			
+
+	<?php else : ?>
+
+		
+		<div class="entry">
+		<span class="error"><img src="<?php bloginfo('template_directory'); ?>/images/mal.png" alt="error duck" /></span>
+		<p>Hmmm, seems like what you were looking for isn't here.  You might want to give it another try - the server might have hiccuped - or maybe you even spelled something wrong (though it's more likely <strong>I</strong> did).</p>
+		</div>
+
+
+	<?php endif; ?>
+	
+	
+</div> <!-- close entry_content -->
+
+
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
diff --git a/comments.php b/comments.php
new file mode 100644
index 0000000..ee0ece2
--- /dev/null
+++ b/comments.php
@@ -0,0 +1,91 @@
+<?php
+// Do not delete these lines
+	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+		die ('Please do not load this page directly. Thanks!');
+
+	if ( post_password_required() ) { ?>
+		<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+	<?php
+		return;
+	}
+?>
+
+<!-- You can start editing here. -->
+
+<?php if ( have_comments() ) : ?>
+	
+	
+	<h3 id="comments">&sect; <?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
+
+
+	<ul class="commentlist">
+	<?php wp_list_comments(); ?>
+	</ol>
+
+	<div class="navigation">
+		<div class="alignleft"><?php previous_comments_link() ?></div> 
+		<div class="alignright"><?php next_comments_link() ?></div>
+	</div>
+ 	
+
+	<?php else : // this is displayed if there are no comments so far ?>
+
+	<?php if ('open' == $post->comment_status) : ?>
+		<!-- If comments are open, but there are no comments. -->
+
+	 <?php else : // comments are closed ?>
+		<!-- If comments are closed. -->
+		<p class="nocomments">Comments are closed.</p>
+
+	<?php endif; ?>
+<?php endif; ?>
+
+
+<?php if ('open' == $post->comment_status) : ?>
+
+<div id="respond">
+
+<h3>&sect; <?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
+
+<div class="cancel-comment-reply">
+	<small><?php cancel_comment_reply_link(); ?></small>
+</div>
+
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+<?php else : ?>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+
+<?php if ( $user_ID ) : ?>
+
+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+
+<?php else : ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+<label for="url"><small>Website</small></label></p>
+
+<?php endif; ?>
+
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="60%" rows="10" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<?php comment_id_fields(); ?>
+</p>
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+</div>
+
+<?php endif; // if you delete this the sky will fall on your head ?>
diff --git a/footer.php b/footer.php
new file mode 100644
index 0000000..5313a6a
--- /dev/null
+++ b/footer.php
@@ -0,0 +1,19 @@
+
+<div id="footer">
+
+	<div id="footer_contact">
+		<p><a href="http://andreamignolo.com/oulipo">Oulipo</a> by <a href="http://andreamignolo.com">Mignolo</a></p>
+		<p>Powered by <a href="http://wordpress.org">WordPress</a></p>
+	</div>
+
+	<div id="footer_info">
+		<!-- ><p>You can put extra footer information here, just uncomment this line.</p> -->
+	</div>
+
+</div>
+
+
+</div> <!-- close wrapper -->
+<?php wp_footer(); ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/functions.php b/functions.php
new file mode 100644
index 0000000..1669c6f
--- /dev/null
+++ b/functions.php
@@ -0,0 +1,14 @@
+<?php 
+if ( function_exists('register_sidebar') )
+    register_sidebar();
+
+$GLOBALS['content_width'] = 470;
+
+add_filter( 'comments_template', 'legacy_comments' );
+function legacy_comments( $file ) {
+	if ( !function_exists('wp_list_comments') )
+		$file = TEMPLATEPATH . '/legacy.comments.php';
+	return $file;
+}
+
+?>
\ No newline at end of file
diff --git a/header.php b/header.php
new file mode 100644
index 0000000..d3fc6fd
--- /dev/null
+++ b/header.php
@@ -0,0 +1,66 @@
+<!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="en" lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	
+	<title><?php
+	if (is_home()) {
+		 bloginfo('name');
+	} elseif (is_404()) { ?>
+		404 Not Found 
+	<?php } elseif (is_category()) { ?>
+		<?php bloginfo('name'); ?> - Category: <?php wp_title(''); ?>
+	<?php } elseif (is_search()) { ?>
+		<?php bloginfo('name'); ?> - Search Results 
+	<?php } elseif ( is_day() || is_month() || is_year() ) { ?>
+		<?php bloginfo('name'); ?> - Archives: <?php wp_title(''); ?>
+	<?php } else { ?>
+		<?php bloginfo('name'); ?> - <?php wp_title(''); ?>
+	<?php } ?>
+	</title>
+
+	
+	<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
+	<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> Atom" href="<?php bloginfo('atom_url'); ?>" />
+	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS" href="<?php bloginfo('rss2_url'); ?>" />
+	<link rel="EditURI" type="application/rsd+xml" title="RSD" href="<?php bloginfo('url'); ?>/xmlrpc.php?rsd" />
+	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
+	
+	
+	<!--[if lte IE 7]>
+	<link href="<?php bloginfo('template_directory'); ?>/ie.css" type="text/css" rel="stylesheet" media="screen" />
+	<![endif]-->
+	
+	<!--[if lte IE 6]>
+	<link href="<?php bloginfo('template_directory'); ?>/ie6.css" type="text/css" rel="stylesheet" media="screen" />
+	<![endif]-->
+	
+	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' );?>
+	<?php wp_head(); ?>
+
+</head>
+
+<body>
+<div id="wrapper">
+	<div id="search">
+		<span class="twitter"><!-- If you want to integrate Twitter, use http://rick.jinlabs.com/code/twitter/ and put the code snippet here.  --></span>
+		<?php include (TEMPLATEPATH . '/searchform.php'); ?>
+	</div>
+
+	<div id="main_nav">
+		<h1 class="masthead"><a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a></h1>
+		<p class="description"><?php bloginfo('description'); ?></p>
+
+		<ul>
+			
+			<?php wp_list_pages('title_li=&depth=1'); ?>
+			<li><a href="<?php bloginfo('atom_url'); ?>">Feed</a></li>
+		</ul>
+		
+		
+		
+	</div>
+
+
diff --git a/ie.css b/ie.css
new file mode 100644
index 0000000..aa4712a
--- /dev/null
+++ b/ie.css
@@ -0,0 +1,10 @@
+
+
+.commenttext {
+	margin-top: 1.5em;
+}
+
+
+.monthly {
+	padding-top: 1.5em;
+}
\ No newline at end of file
diff --git a/ie6.css b/ie6.css
new file mode 100644
index 0000000..b72f79b
--- /dev/null
+++ b/ie6.css
@@ -0,0 +1,22 @@
+ul.commentlist {
+	margin-top: -2em;
+}
+
+img.avatar {
+	margin-top: 4em;
+}
+
+.commenttext {
+	margin-top: 1.5em;
+}
+
+#main_nav a:hover, .current_page_item, .current {
+	background: #EEE;
+	width: 100%;
+	border-right: 0;
+}
+
+
+.monthly {
+	padding-top: 1.5em;
+}
\ No newline at end of file
diff --git a/images/headertest.gif b/images/headertest.gif
new file mode 100644
index 0000000..af821a1
Binary files /dev/null and b/images/headertest.gif differ
diff --git a/images/mal.png b/images/mal.png
new file mode 100644
index 0000000..a3e2343
Binary files /dev/null and b/images/mal.png differ
diff --git a/images/spacer.png b/images/spacer.png
new file mode 100644
index 0000000..8f292bf
Binary files /dev/null and b/images/spacer.png differ
diff --git a/images/test.png b/images/test.png
new file mode 100644
index 0000000..925cd2e
Binary files /dev/null and b/images/test.png differ
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..bd4f64c
--- /dev/null
+++ b/index.php
@@ -0,0 +1,52 @@
+<?php get_header(); ?>
+
+<div id="content">
+
+	<div id="entry_content">
+
+
+	<?php if (have_posts()) : ?>
+
+		<?php while (have_posts()) : the_post(); ?>
+				<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?> <div <?php post_class(); ?>> <?php }} ?>
+				<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
+				<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('&sect; <span class="commentcount">0</span>', '&sect; <span class="commentcount">1</span>', '&sect; <span class="commentcount">%</span>'); ?></p>
+				
+				
+				<div class="entry">
+					<?php the_content('&raquo; Read the rest of this entry &laquo;'); ?>
+					<?php wp_link_pages(array('before' => '<p>Page: ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+				
+						
+				</div>
+				<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?></div><!-- close post_class --><?php }} ?>
+				
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<p class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></p>
+			<p class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></p>
+		</div>
+		
+	
+			
+
+	<?php else : ?>
+
+		
+		<div class="entry">
+		<span class="error"><img src="<?php bloginfo('template_directory'); ?>/images/mal.png" alt="error duck" /></span>
+		<p>Hmmm, seems like what you were looking for isn't here.  You might want to give it another try - the server might have hiccuped - or maybe you even spelled something wrong (though it's more likely <strong>I</strong> did).</p>
+		</div>
+
+
+	<?php endif; ?>
+	
+	
+</div> <!-- close entry_content -->
+
+
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/legacy.comments.php b/legacy.comments.php
new file mode 100644
index 0000000..8f67a01
--- /dev/null
+++ b/legacy.comments.php
@@ -0,0 +1,108 @@
+<?php // Do not delete these lines
+	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+		die ('Please do not load this page directly. Thanks!');
+
+	if (!empty($post->post_password)) { // if there's a password
+		if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
+			?>
+
+			<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+
+			<?php
+			return;
+		}
+	}
+
+	/* This variable is for alternating comment background */
+	$oddcomment = 'class="alt" ';
+?>
+
+<!-- You can start editing here. -->
+
+<?php if ($comments) : ?>
+	<h3 id="comments">&sect; <?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
+
+	<ul class="commentlist">
+
+	<?php foreach ($comments as $comment) : ?>
+
+		<li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
+			<?php echo get_avatar( $comment, 32 ); ?>
+			
+			<ul class="commentmeta">
+			<li class="ctitle"><strong>Name:</strong> <?php comment_author_link() ?></li>
+			<li class="ctitle"><strong>Date:</strong> <a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?></a> <?php edit_comment_link('edit','&nbsp;&nbsp;',''); ?></li>
+			
+			<?php if ($comment->comment_approved == '0') : ?>
+			<li class="ctitle moderation"><em>Your comment is awaiting moderation.</em></li>
+			<?php endif; ?>
+			
+			<li class="commenttext">
+			<?php comment_text() ?></li>
+			</ul>
+
+		</li>
+
+	<?php
+		/* Changes every other comment to a different class */
+		$oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : '';
+	?>
+
+	<?php endforeach; /* end for each comment */ ?>
+
+	</ul>
+
+ <?php else : // this is displayed if there are no comments so far ?>
+
+	<?php if ('open' == $post->comment_status) : ?>
+		<!-- If comments are open, but there are no comments. -->
+
+	 <?php else : // comments are closed ?>
+		<!-- If comments are closed. -->
+		<p class="nocomments">Comments are closed.</p>
+
+	<?php endif; ?>
+<?php endif; ?>
+
+
+<?php if ('open' == $post->comment_status) : ?>
+
+<h3 id="respond">&sect; Leave a Reply</h3>
+
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+<?php else : ?>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+
+<?php if ( $user_ID ) : ?>
+
+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a></p>
+
+<?php else : ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
+<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
+
+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+<label for="url"><small>Website</small></label></p>
+
+<?php endif; ?>
+
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+</p>
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+
+<?php endif; // if you delete this the sky will fall on your head ?>
diff --git a/page.php b/page.php
new file mode 100644
index 0000000..f55fcc7
--- /dev/null
+++ b/page.php
@@ -0,0 +1,54 @@
+<?php get_header(); ?>
+
+<div id="content">
+
+	<div id="entry_content">
+
+
+	<?php if (have_posts()) : ?>
+
+		<?php while (have_posts()) : the_post(); ?>
+			
+				<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
+				
+				
+				
+				<div class="entry">
+					<?php the_content('Read the rest of this entry &raquo;'); ?>
+					<?php comments_template(); ?>
+						
+				</div>
+
+				
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
+			<div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
+		</div>
+		
+	
+			
+
+	<?php else : ?>
+
+		
+		<div class="entry">
+			<p></p>
+			<p class="error">???????????????????</p>
+			<p class="error">???????????????????</p>
+			<p class="error">???????????????????</p>
+		<p>Looks like what you were looking for isn't here.  You might want to give it another try, perhaps the server hiccuped, or perhaps you spelled something wrong (or maybe I did).</p>
+		</div>
+
+
+	<?php endif; ?>
+	
+	
+</div> <!-- close entry_content -->
+
+
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/readme.html b/readme.html
new file mode 100644
index 0000000..ae77ed6
--- /dev/null
+++ b/readme.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Hanami Operating Manual</title>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<meta name="description" content="Ocular Professor: Showing Off What You See" />
+	<meta name="keywords" content="Ocular Professor, theme, wordpress, photoblog" />
+<style type="text/css" media="screen">
+#content {width:550px; margin: 30px auto; font-family: Times New Roman, Times, serif; line-height: 18px; font-size: 13px;}
+p.update {color: #999; font-size: 12px;}
+</style>
+</head>
+
+<body>
+	<div id="content">
+	<p class="update">This readme was first written on December 29th, 2008.</p>
+	<h1>Oulipo Operating Manual</h1>
+	
+	
+	
+	<ol>
+		<li><a href="#about">About</a></li>	
+		<li><a href="#installation">Installation</a></li>
+		<li><a href="#formatting">Special Formatting</a></li>
+		<li><a href="#plugins">Suggested Plug-ins</a></li>
+		<li><a href="#questions">Questions, Comments, Feature requests</a></li>
+		<li><a href="#thanks">Special Thanks</a></li>
+	</ol>
+	
+	<ol>
+		<li>
+			<h2 id="about">About</h2>
+			<p>Oulipo is a three column, black and white WordPress theme with a clean, grid-based layout and lovely typography.</p>
+
+			</p>
+			
+			<p>In addition to a clean design, Oulipo also features:
+				<ol>
+					<li>A widget-enabled sidebar</li>
+					<li>Front page styling for sticky posts</li>
+					<li>Threaded comments for WordPress 2.7+</li>
+				</ol>
+			</p>
+			
+			<p><a href="#content">Back to Top</a></p> 
+		</li>
+		
+		<li>
+			<h2 id="installation">Installation</h2>
+			<p>Oulipo is installed in the same way as all other WordPress themes.  Simply place the extracted theme in your themes directory (usually <code>/wp-content/themes</code>).  Log-in to the WordPress administration panel, go to the "Design" section, and activate Oulipo.  If my explanation confused you, or you haven't installed a theme before, more detailed directions can be found in the WordPress Codex <a href="http://codex.wordpress.org/Using_Themes#Adding_New_Themes">here</a>.</p>
+			
+			<p><a href="#content">Back to Top</a></p> 
+		</li>
+		
+		<li>
+			<h2 id="formatting">Special Formatting</h2>
+			<p>In addition to supporting standard formatting options such as blockquotes and captions, Oulipo supports a {fin} tag that can be used to demarcate the end of a post.  To use the {fin} tag, simple insert the following code at the end of your post:
+			<p>	<code>&lt;p class="fin"&gt;&lt;span class="bracket"&gt;{&lt;/span&gt; fin &lt;span class="bracket"&gt;}&lt;/span&gt;&lt;/p&gt;</code></p>
+		
+		<li>
+			<h2 id="plugins">Suggested Plugins</h2>
+			<p>Oulipo was originally designed as a personal theme and used a number of plug-ins to enhance the functionality and design.  Here is a list of plugins that were used with the original design that you might want to use on your site: </p>
+			
+			<ul>
+					<li><a href="http://chip.cuccio.us/projects/contact-form-ii/">Contact Form ][</a></li>
+					<li><a href="http://rick.jinlabs.com/code/delicious">del.icio.us for WordPress</a></li>
+					<li><a href="http://wordpress.org/extend/plugins/simple-tags">Simple Tags</a></li>
+					<li><a href="http://justinblanton.com/projects/smartarchives/">Smart Archives</a></li>
+					<li><a href="http://rick.jinlabs.com/code/twitter">Twitter for WordPress</a></li>
+					<li><a href="http://www.elvery.net/drzax/more-things/wordpress-footnotes-plugin/">WP-Footnotes</a></li>
+			</ul>
+			
+			<p><a href="#content">Back to Top</a></p>
+		</li>
+	
+		<li>
+			<h2 id="questions">Questions, Comments, Feature Requests</h2>
+			<p>I'm always happy to get feedback, so feel free to shoot me a line or ten at <code>themes@andreamignolo.com</code>.  It might take me a while to get back to you depending on my schedule, so please be patient! </p>
+			
+			<p><a href="#content">Back to Top</a></p> 
+		</li>
+		
+		<li>
+			<h2 id="thanks">Special Thanks</h2>
+			<p>Special thanks to <a href="http://scottwallick.com/">Scott Allan Wallick's</a> inspirationally detailed readme files.  They are incredibly awesome.</p>
+			
+			<p><a href="#content">Back to Top</a></p> 
+		</li>
+	
+	
+	
+	</ol>
+	</div>
+	
+</body>
+</html>
+
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000..b15f44d
Binary files /dev/null and b/screenshot.png differ
diff --git a/searchform.php b/searchform.php
new file mode 100644
index 0000000..0934a17
--- /dev/null
+++ b/searchform.php
@@ -0,0 +1,4 @@
+<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
+<div><span class="search">Search:</span><input type="text" value="<?php the_search_query(); ?>" size="15" name="s" id="s" />
+<input type="submit" id="searchsubmit" value="Go" /></div>
+</form>
diff --git a/sidebar.php b/sidebar.php
new file mode 100644
index 0000000..84f817b
--- /dev/null
+++ b/sidebar.php
@@ -0,0 +1,110 @@
+	<div id="supplementary">
+		<div class="meta">
+		
+		<?php if (is_home() || is_page()) {?>
+			<ul>
+				<?php if ( !function_exists('dynamic_sidebar')
+					  || !dynamic_sidebar() ) : ?>
+			
+			<!--<li>
+				<h3>About</h3>
+			 	<p>Uncomment this section if you want to put some information about you or the site here</p>
+			</li>-->
+			
+			<li>
+				<h3>Categories</h3>	
+				<ul id="categories">
+					<?php wp_list_categories('orderby=name&title_li='); ?>
+				</ul>
+			</li>
+			
+			<li>
+				<h3>Archives</h3>
+				<ul id="archives">
+					<?php wp_get_archives('format=html'); ?>
+				</ul>
+			</li>
+			
+				<?php endif; ?>
+			</ul>
+			
+		<?php } elseif (is_single()) { ?>
+			<div class="post_nav">
+				<h3>What's this?</h3>
+				<p>You are currently reading <strong><?php the_title(); ?></strong> at
+				<a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
+			
+				<h3>meta</h3>
+				<ul class="single_post_meta">
+					<li><strong>Author:</strong> <?php the_author(); ?></li>
+					<li><strong>Comments: </strong><?php comments_number('No Comments', '1 Comment', '% Comments' );?></li> 
+					<li><strong>Categories:</strong> <?php the_category(', ') ?></li>
+				</ul>
+				<p class="edit"><?php edit_post_link('Edit', '', ''); ?></p>
+			</div>
+				
+		<?php } elseif (is_category()) { ?>
+				<div class="post_nav">
+				<h3>Where Am I?</h3>
+					<p>You are currently browsing the <strong><?php single_cat_title(''); ?></strong> category at 
+					<a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
+					<div class="spacer"></div>
+				</div>
+				
+		<?php } elseif (is_tag()) { ?>
+				<div class="post_nav">
+				<h3>Where Am I?</h3>
+						<p>You are currently browsing entries tagged with <strong><?php single_tag_title(); ?></strong> at
+						<a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?>.</p>
+						<div class="spacer"></div>
+				</div>	
+				
+		<?php } elseif (is_month()) { ?>
+				<div class="post_nav">
+				<h3>Where am I?</h3>
+				<p>You are currently viewing the archives for <strong><?php the_time('F, Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
+				<div class="spacer"></div>
+				</div>
+				
+		<?php } elseif (is_year ()) { ?>
+				<div class="post_nav">
+				<h3>Where am I?</h3>
+					<p>You are currently viewing the archives for <strong><?php the_time('Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
+					<div class="spacer"></div>
+				</div>
+				
+		<?php } elseif (is_day()) { ?>
+				<div class="post_nav">
+				<h3>Where am I?</h3>
+				<p>You are currently viewing the archives for <strong><?php the_time('l, F jS, Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
+				<div class="spacer"></div>
+				</div>
+				
+		<?php } elseif (is_search()) {?>
+				<div class="post_nav">
+				<h3>Search Results</h3>
+				<p>You are currently viewing the search results for <strong><?php the_search_query(); ?></strong>.</p>
+				<div class="spacer"></div>
+				</div>
+				
+		<?php } elseif (is_page('about')) {?>
+				<div class="post_nav">
+					<h3>Blogroll</h3>
+						<ul>
+							<?php wp_list_bookmarks('categorize=0&title_li=0&title_after=&title_before=');?>
+						</ul>
+				</div>
+			
+		<?php } elseif (is_page('contact')) {?>
+				
+				
+				
+		
+			
+			<?php } ?>
+			
+	
+	</div> <!-- close meta -->
+	</div> <!-- close supplementary -->
+	
+</div> <!-- close content -->
\ No newline at end of file
diff --git a/single.php b/single.php
new file mode 100644
index 0000000..6574b20
--- /dev/null
+++ b/single.php
@@ -0,0 +1,54 @@
+<?php get_header(); ?>
+
+<div id="content">
+
+	<div id="entry_content">
+
+
+	<?php if (have_posts()) : ?>
+
+		<?php while (have_posts()) : the_post(); ?>
+				<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?> <div <?php post_class(); ?>> <?php }} ?>
+				<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
+				<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('&sect; <span class="commentcount">0</span>', '&sect; <span class="commentcount">1</span>', '&sect; <span class="commentcount">%</span>'); ?></p>
+				
+				
+				<div class="entry">
+					<?php the_content('&raquo; Read the rest of this entry &laquo;'); ?>
+					<?php wp_link_pages(array('before' => '<p>Page: ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
+					
+					<p class="tags"><?php the_tags('<strong>Tagged:</strong> ', ', ', ''); ?></p>
+					<?php comments_template(); ?>
+						
+				</div>
+				<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?></div><!-- close post_class --><?php }} ?>
+				
+		<?php endwhile; ?>
+
+		<div class="navigation">
+			<p class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></p>
+			<p class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></p>
+		</div>
+		
+	
+			
+
+	<?php else : ?>
+
+		
+		<div class="entry">
+		<span class="error"><img src="<?php bloginfo('template_directory'); ?>/images/mal.png" alt="error duck" /></span>
+		<p>Hmmm, seems like what you were looking for isn't here.  You might want to give it another try - the server might have hiccuped - or maybe you even spelled something wrong (though it's more likely <strong>I</strong> did).</p>
+		</div>
+
+
+	<?php endif; ?>
+	
+	
+</div> <!-- close entry_content -->
+
+
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>
\ No newline at end of file
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..1d97bd5
--- /dev/null
+++ b/style.css
@@ -0,0 +1,776 @@
+/* 
+Theme Name: Oulipo
+Theme URI: http://andreamignolo.com/oulipo
+Description: A grid-based, black and white WordPress theme
+Version: 1.0.6
+Author: A. Mignolo 
+Author URI: http://andreamignolo.com
+Tags: white, three-columns, fixed-width, threaded-comments, sticky-post
+
+License: GNU General Public License (GPL) version 3
+
+*/
+
+
+/* =Global
+------------------------------------------------------------------*/
+
+html, body, form, fieldset, h1, h2, h3, h4, h5, h6, pre, blockquote, ul, ol, dl, address, .more-link  {
+	margin:0;
+	padding:0;
+	}
+
+a, a:link, a:visited {
+	outline: none;
+	text-decoration: none;
+	}
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: normal;
+}
+
+blockquote:before, blockquote:after {
+	content: "";
+}
+
+blockquote, q {
+	quotes: "" "";
+}
+
+/* =Layout
+------------------------------------------------------------------*/
+
+#wrapper {
+	width: 60em;
+	margin: 0 auto;
+}
+
+#main_nav {
+	width: 10em;
+	margin: 9em 0 0 0;
+	float: left;
+	display: inline;
+	position: fixed;
+}
+
+#content {
+	width: 50em;
+	margin: 2em 0 0 0;
+	float: right;
+	display: inline;
+	min-height: 30em;
+}
+
+#entry_content {
+	width: 30em;
+	margin: 0 2.5em 0 4.5em;
+	float: left;
+	display: inline;
+}
+
+#supplementary {
+	width: 11em;
+	margin: 0 0 0 0;
+	float: right;
+	display: inline;
+}
+
+#footer_contact {
+	width: 15.7em;
+	float: right;
+	display: inline;
+}
+
+#footer_info {
+	margin: 0 0 0 20em;
+    width: 45em;
+	float: left;
+	display: inline;
+}
+
+#main_nav ul {
+	margin: 2.5em 0 0 0;
+}
+
+
+.meta ul {
+	margin: 1em 0 0 0;
+}
+
+.meta li {
+	margin: .3em 0 0 0;
+	line-height: 1.5em;
+	padding: 0 0 .2em 0;
+}
+
+ul#categories li, ul#archives li {
+	border-bottom: 0;
+}
+
+#footer {
+	clear: both;
+	border-top: 1px solid #000;
+}
+
+.date, .description {
+	margin: .1em 0 1.5em 0;
+	padding: 0;
+}
+
+
+.header {
+	margin: 0 0 1.5em 0;
+}
+
+.entry {
+	margin: 0 0 4em 0;
+}
+
+.alignleft {
+	float: left;
+}
+
+.alignright {
+	float: right;
+}
+
+.entry img.alignright {
+	margin: 0 0 1.5em 1em;
+}
+
+.entry img.alignleft {
+	margin: 0 1em 1.5em 0;
+}
+
+.offsite img {
+	margin-top: 1em;
+	border: 0;
+}
+
+#main_nav h1.masthead a {
+	line-height: 1em;
+}
+
+dd.gallery-caption {
+	font-size: 11px;
+	color: #CCC;
+	line-height: 12px;
+	margin-top: .5em;
+}
+
+.entry .gallery {
+	margin-top: 0;
+	padding-top: 0;
+}
+
+/* =Typography
+------------------------------------------------------------------*/
+
+#entry_content .sticky {
+	border: 1px dotted #CCC;
+	padding: 15px;
+	margin-bottom: 20px;
+}
+
+
+/* =Typography
+------------------------------------------------------------------*/
+
+body, .delicious-desc {
+	background: #FFF;
+	font-family: "Lucida Grande", "Lucida Sans Unicode", verdana, sans-serif;
+}
+
+h1, h2, h3, h4, h5, #main_nav ul, .date, .description, .ctitle, .fin,
+ 	.entry > p:first-child:first-line, .error, .navigation, .more-link, .comment-author, .comment-meta {
+	font-family: "Hoefler Text", "Constantia", Georgia, "Times New Roman", Times, serif;
+}
+
+h1, .date, .description {
+	font-variant: small-caps;
+}
+
+h1 {
+	font-size: 1.5em;
+}
+
+h2 {
+	font-size: 1.7em;
+	margin-bottom: 1em;
+}
+
+h3 {
+	font-size: 1.7em;
+	margin: 1em 0 0 0;
+	border-bottom: 1px solid #eee;
+}
+
+#supplementary h3, h2.widgettitle {
+	margin: 2em 0 -.7em 0;
+	font-size: 1.15em;
+	font-variant: small-caps;
+	border-bottom: none;
+}
+
+.widget li {
+	border-bottom: 0;
+}
+
+h4 {
+	font-size: 1.4em;
+	margin: 2em 0 0 0;
+	font-variant: small-caps;
+}
+
+h5 {
+	font-size: 1.3em;
+	margin: .8em 0;
+}
+
+#main_nav ul {
+	text-transform: uppercase;
+	font-size: .75em;
+	list-style-type: none;
+}
+
+.entry {
+	font-size: .75em;
+	line-height: 1.9em;
+}
+
+#entry_content p {
+	margin: .7em 0 2em 0;
+}
+
+.description, .date  {
+	font-size: .8em;
+	color: #aaa;
+}
+
+.commentcount {
+	color: #aaa ;
+}
+
+#entry_content .date {
+	margin: -2em 0 2em 0;
+}
+
+.entry > p:first-child:first-letter {
+	font-size: 2em;
+}
+
+.entry > p:first-child:first-line {
+	font-variant: small-caps;
+	font-size: 1.3em;
+}
+
+.entry ul, .entry ol {
+	margin: 1.5em 0 0 0;
+	padding-left: 2.2em;
+}
+
+#search {
+	margin-top: 1.5em;
+	border-bottom: 1px dotted #999;
+}
+
+.search {
+	text-transform: uppercase;
+	font-size: .7em;
+	padding-right: .5em;
+}
+
+#searchform {
+	margin-top: -1em;
+	text-align: right;
+	padding: 0 0 1em 0;
+	}
+
+input {
+	border: 1px solid #666;
+	}
+
+blockquote {
+	width: 90%;
+	margin: 2em auto;
+	padding: 0 0 0 1em;
+	border-left: 2px solid #000;
+	font-style: italic;
+}
+
+.entry img {
+	margin: 1.5em auto 0 auto;
+	padding: 3px;
+	border: 1px solid #000;
+	display: block;
+}
+
+.entry img.wp-smiley {
+	display: inline;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+#entry_content .caption {
+	margin: -2.4em 2em 1.5em 0;
+	font-size: .85em;
+	color: #666;
+	text-align: center;
+}
+
+#entry_content .caption a, ol.footnotes a {
+	font-size: 1.0em;
+}
+
+#entry_content h3 a {
+	font-weight: normal;
+	font-variant: small-caps;
+	color: #000;
+	font-size: .75em;
+}
+
+#supplementary ul {
+	list-style-type: none;
+}
+
+#supplementary ul li ul li {
+	border-bottom: 1px dotted #EEE;
+}
+
+#supplementary p {
+	line-height: 1.5em;
+}
+
+.meta {
+	margin: 0;
+	font-size: .7em;
+	line-height: 1.9em;
+}
+
+.footnotes {
+	margin: 3em 0 0 0;
+	padding-left: 2.2em;
+	border-top: 1px dotted #999;
+	font-size: .85em;
+	line-height: 1.2em;
+}
+
+li.footnote {
+	margin-top: .5em;
+}
+
+.wp-tag-cloud {
+	padding-left: 0;
+}
+
+.highlight {
+	color: #ff9900;
+}
+
+.error {
+	font-size: 5em;
+	text-align: center;
+}
+
+#footer {
+	font-size: .7em;
+	line-height: 1.7em;
+}
+
+#footer p {
+	margin: 0;
+	padding: 0;
+}
+
+#footer_contact {
+	padding: 1em 0 1em 1em;
+}
+
+#footer_info {
+	height: 3.2em;
+	padding: 1em 1.9em 1em 1em;
+	border-right: 1px dotted #000;
+}
+
+
+#entry_content .fin {
+	text-align: center;
+	font-size: 1.3em;
+	margin: 3em 0 4em 0;
+}
+
+.more-link .bracket {
+	line-height: 5em;
+	font-size: 1.5em;
+}
+
+.post_nav {
+	position: fixed;
+	width: 15.5em;
+}
+
+code {
+	font-size: 1.2em;
+}
+
+.navigation {
+	font-size: .9em;
+	border-top: 1px solid #EEE;
+	font-variant: small-caps;
+}
+
+.spacer {
+	height: 2em;
+	background: url(./images/spacer.png) top center no-repeat;
+	padding-right: 1em;
+}
+
+
+/* =Link Styles
+------------------------------------------------------------------*/
+
+a {
+	color: #666;
+}
+
+#main_nav h1.masthead a {
+	color: #FF9900;
+}
+#main_nav h1.masthead a:hover {
+	border-right: none;
+}
+
+h2 {
+	border-bottom: 1px solid #EEE;
+}
+
+h2 a, #main_nav a {
+	color: #000;
+}
+
+h2 a:hover {
+	color: #CCC;
+	border-bottom: 1px solid #FF9900;
+}
+
+h3 {
+	margin: 2em 0 0 0;
+}
+
+img a, img a:hover {
+	text-decoration: none;
+}
+
+.entry a, .navigation a {
+	font-weight: bold;
+	font-size: 12px;
+	color: #000;
+	border-bottom: 1px solid #EEE;
+}
+
+.entry a:hover, .navigation a:hover {
+	color: #FF9900;
+	border-bottom: 1px dotted #333;
+}
+
+.entry sup {
+	font-size: 11px;
+	color: #aaa;
+}
+
+.entry sup a {
+	border: 0;
+	color: #3399FF;
+	margin: 0;
+	font-weight: normal;
+	font-size: 10px;
+}
+
+#supplementary .post_nav ul.about_nav li a, #supplementary .post_nav ul.single_post_meta a, #supplementary ul.contact_key li a {
+	color: #888888;
+	border-bottom: 0;
+}
+
+#main_nav li {
+	border-bottom: 1px solid #EEE;
+}
+
+#main_nav a {
+	display: block;
+	width: 100%;
+	line-height: 1.6em;	
+	padding-top: .3em;
+}
+
+#main_nav a:hover, .current_page_item, .current {
+	width: 100%;
+	border-right: 3px solid #EEE;
+}
+
+#footer a {
+	border-bottom: 1px solid #eee;
+}
+
+#footer a:hover {
+	color: #3399FF;
+	border-bottom: 1px solid #FF9900;
+}
+
+#supplementary a {
+	color: #888;
+}
+
+#supplementary a:hover {
+	color: #3399FF;
+
+}
+
+#supplementary .offsite a, .offsite a img {
+	border: 0;
+}
+
+.entry h3 a, .entry h3 a:hover {
+	color: #333;
+	text-decoration: none;
+	border: 0;
+}
+
+.entry a.more-link {
+	color: #666;
+	font-variant: small-caps;
+	font-size: 1.2em;
+	border: 0;
+	text-align: center;
+	display: block;
+	margin: 1em auto;
+	text-transform: none;
+	font-weight: normal;
+	clear: both;
+	
+}
+
+
+/* =Plug-in Styles
+------------------------------------------------------------------*/
+
+ul.delicious {
+	list-style-type: none;
+}
+
+ul.delicious li {
+	margin: 1em 0;
+	line-height: 1.5em;
+	padding-bottom: .8em;
+}
+
+.twitter {
+	margin: 0 0 4em 0;
+	font-size: .7em;
+	color: #999;
+}
+
+.smartarchives {
+	margin: 2em 0 3em 0;
+	font-size: .8em;
+}
+
+.smartarchives ul {
+	margin: 0 0 1.5em 0;
+	list-style-type: none;
+}
+	
+.smartarchives h2 {
+	margin: 0 0 0 0;
+}
+
+.smartarchives h2 a {
+	text-decoration: none;
+	color: #000;
+	border: 0;
+}
+
+.smartarchives h2 a:hover {
+	text-decoration: none;
+	border: 0;
+}
+
+.monthly {
+	clear: both;
+	padding-top: 3em;
+}
+
+ul.archive_block {
+	padding-left: 0;
+	width: 100%;
+	overflow: hidden;
+	padding-bottom: 2em;
+}
+
+#content .archive_block li {
+	float: left;
+	display: inline;
+	padding: 5px 7px;
+	background: #000;
+	color: #FFF;
+	font-size: 11px;
+	margin-left: .2em;
+	margin-bottom: .2em;
+}
+
+#content .archive_block li.empty {
+	font-size: 11px;
+	color: #333;
+}
+
+#content .smartarchives .archive_block li a {
+	color: #CCC;
+	border-bottom: 0;
+	font-weight: normal;
+	font-size: 11px;
+	border-bottom: 1px dotted #336699;
+	
+}
+
+.contactform {
+	margin: 2em 0;
+}
+
+.contactform label {
+	font-weight: bold;
+}
+
+.contactleft {
+	margin: 1em 0 0 0;
+}
+
+#contactsubmit {
+	margin: 1em 0 0 0;
+}
+
+
+
+
+/* =Threaded Styles
+------------------------------------------------------------------*/
+
+ul.commentlist cite {
+	font-style: normal;
+	font-weight: bold;
+}
+
+ul.commentlist span.says {
+	display: none;
+}
+
+ul.commentlist .comment-author, ul.commentlist .comment-meta {
+	font-variant: small-caps;
+}
+
+ul.commentlist .comment-meta {
+	margin-top: -.5em;
+}
+
+ul.children {
+	list-style-type: none;
+}
+
+h3#comments {
+	margin-bottom: 1em;
+	clear: both;
+}
+
+ul.commentlist .navigation {
+	border: 0;
+}
+
+ul.commentlist .comment.bypostauthor .vcard img {
+	border: 1px solid #FF9900;
+}
+
+ul.commentlist .comment .comment-author.vcard img{
+	border: 1px solid #000;
+}
+
+.depth-2 {
+	margin-top: 2em;
+}
+
+
+/* =Comment Styles
+------------------------------------------------------------------*/
+ul.commentlist, ul.commentmeta {
+	margin: 0;
+	padding: 0;
+	list-style-type: none;
+}
+
+
+ul.commentmeta {
+	margin-top: 2em;
+}
+
+img.avatar {
+	margin: 0 1em 0 0;
+	float: left;
+	display: inline;
+}
+
+.commenttext {
+	margin-left: 4.4em;
+	border-bottom: 1px dotted #000;
+	padding-bottom: 1.5em;
+}
+
+#comments, #respond {
+	margin: 3em 0 0 0;
+	border: 0;
+}
+
+.moderation {
+	margin-left: 4.4em;
+}
+
+.ctitle {
+	font-variant: small-caps;
+}
+
+/* =Better image scaling in IE
+------------------------------------------------------------------*/
+
+img { -ms-interpolation-mode:bicubic; }
+
+
+/* =Required 
+------------------------------------------------------------------*/
+
+.aligncenter {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.alignleft {
+	float: left;
+}
+
+.alignright {
+	float: right;
+}
+
+#entry_content .entry p.wp-caption-text {
+	color: #CCC;
+	text-align: center;
+	font-size: 11px;
+	margin-top: 0;
+}
+
+/* =Widget
+------------------------------------------------------------------*/
+.textwidget {
+	margin-top: 15px;
+	padding-bottom: 15px;
+	border-bottom: 1px dotted #CCC;
+}
+
+