From: Gabriel Dunne <gdunne@quilime.com>
Date: Mon, 13 Feb 2012 03:20:45 +0000 (-0800)
Subject: updated style and added new entries
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=8d8466a38552c5b729d2431017ce84cdd9ea03f3;p=plog.git

updated style and added new entries
---

diff --git a/content/code/archlinux_install b/content/code/archlinux_install
index b834918..fad1226 100644
--- a/content/code/archlinux_install
+++ b/content/code/archlinux_install
@@ -36,8 +36,6 @@ Once downloaded, I followed my [notes](http://quilime.com/code/bootable_iso/) on
 
 The [installation](https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide) article on the archwiki is an excellent resource.
 
-You'll be prompted to chose your editor. If you don't know vi, then stick with nano. You can skip this, because you'll be asked again when it's needed.
-
 
 
 ## Disk Partitions
@@ -65,7 +63,7 @@ Some of these, namely **boot**, **swap**, and **home**, are *optional*.
 
 ## Select Packages
 
-At minimum, you'll need the core packages that are already selected. I also included certain key packages such as OpenSSH. Basically, include any packages you need for internet connectivity, as everything else will be updated from the net. I use GRUB as the bootloader.
+At minimum, you'll need the core packages that are already selected. I also included certain key packages such as OpenSSH. Basically, include any packages you need for internet connectivity, as everything else will be updated from the net.
 
 
 
diff --git a/content/code/bootable_iso b/content/code/bootable_iso
index 643aba5..640561d 100644
--- a/content/code/bootable_iso
+++ b/content/code/bootable_iso
@@ -2,16 +2,16 @@ title = create bootable iso from unix/osx terminal
 date = july 7 2011
 --
 
-1. <code class="prettyprint">$  diskutil list</code><br />
+1. <code class="prettyprint">diskutil list</code><br />
 Determines the device node assigned to your flash media (e.g. /dev/disk2)
 
-2. <code class="prettyprint">$  diskutil unmountDisk /dev/disk#</code><br />
+2. <code class="prettyprint">diskutil unmountDisk /dev/disk#</code><br />
 Replace # with the disk number from the last command; in the previous example, # is 2)
 
-3. <code class="prettyprint">$  sudo dd if=/path/to/example.iso of=/dev/diskN bs=1m</code><br />
+3. <code class="prettyprint">sudo dd if=/path/to/example.iso of=/dev/diskN bs=1m</code><br />
 Replace <code>/path/to/example.iso</code> with the path to the iso; for example: <code>./windows7.iso</code>. After typing in your sudo password, the process will start invisibly.
 
-4. <code class="prettyprint">$  diskutil eject /dev/disk#</code><br />
+4. <code class="prettyprint">diskutil eject /dev/disk#</code><br />
 Remove your flash media device when the command completes. Done!
 
 Referenced from <a href="https://help.ubuntu.com/community/BurningIsoHowto">BurningIsoHowto</a>
diff --git a/content/code/clmpr b/content/code/clmpr
new file mode 100644
index 0000000..76fbb1b
--- /dev/null
+++ b/content/code/clmpr
@@ -0,0 +1,4 @@
+title = clmpr
+tags = software web bookmarks
+--
+<a href="https://github.com/quilime/clmpr">clmpr</a> - minimal bookmarking site<br />
diff --git a/content/code/config b/content/code/config
index 5a219d6..8b13789 100644
--- a/content/code/config
+++ b/content/code/config
@@ -1 +1 @@
-template = linked-archive
+
diff --git a/content/code/osx_command_line_audio b/content/code/osx_command_line_audio
index e2db2b1..c74f46b 100644
--- a/content/code/osx_command_line_audio
+++ b/content/code/osx_command_line_audio
@@ -9,14 +9,11 @@ Install sox by either downloading the OSX binary from <a href="http://sox.source
 or    
 install <a href="http://mxcl.github.com/homebrew/">homebrew</a>, and then install sox with <code class="prettyprint">brew install sox</code>    
 
-<br />
-
-Examples:
+##Examples
 
 cat audio from /dev/urandom/ :
 <pre class="prettyprint">cat /dev/urandom | sox -traw -r44100 -b16 -u - -tcoreaudio</pre>
 
-<br />
 
 audio from an executable
 <pre class="prettyprint">
@@ -33,10 +30,8 @@ gcc test.c -o test
 </pre>
 
 
-<br />
-
 
-links: 
+##resources
 
 - <a href="http://countercomplex.blogspot.com/2011/10/algorithmic-symphonies-from-one-line-of.html">http://countercomplex.blogspot.com/2011/10/algorithmic-symphonies-from-one-line-of.html</a>
 - <a href="http://www.bemmu.com/music/index.html">http://www.bemmu.com/music/index.html</a>
@@ -45,4 +40,4 @@ links:
 <!--
 - <a href="http://wurstcaptures.untergrund.net/music/?oneliner=-(M%3D127)%3E(s%3D(((y%3D%5B3%2C3%2C4.7%2C2%5D%5Bp%3Dt%3E%3E14%263%5D%2F5*t)*.96%2663)%2B(y%2663))*1.2%2B(t%3E%3E16%3F(((5*t%25(m%3D2048))*(a%3D1-t%25m%2Fm)%26128)*(0x53232323%3E%3E(z%3Dt%3E%3E11%26(k%3D31))%261)*a%2B((d%3D(14*t*t%5Et)%25m*a)%26M)*(0xa444c444%3E%3Ez%261)*a*1.5%2B((a*d*(t%3E%3E9%261)%26M)%2F7.5))%2B((((h%3D%22IQNNNN!!%5D%5D!Q!IW%5DWQNN%3F%3F!!W%5DWQNNN%3F%22.charCodeAt(t%3E%3E10%2615%7Cp%2F3%3C%3C4)%2F33*t-t)%26k)%2B(h*1.99%26k)%2B(h*.49%26k)%2B(h*.97%26k)-64))*a*(2-a)*2%3A0))%3F-M%3As%3EM%3FM%3As&oneliner2=&t0=0&tmod=0&duration=30&separation=100&rate=8000">one-liner</a> from <a href="http://www.iquilezles.org">inigo quilez</a>
 
--->
\ No newline at end of file
+-->
diff --git a/content/code/plog b/content/code/plog
new file mode 100644
index 0000000..c6bd8c3
--- /dev/null
+++ b/content/code/plog
@@ -0,0 +1,4 @@
+title = plog
+tags = software web cms blog engine
+--
+<a href="http://git.quilime.com/?p=plog.git">plog</a> - project+log CMS<br />
diff --git a/content/code/scripts/imageslice b/content/code/scripts/imageslice
index ccf4286..acd928b 100644
--- a/content/code/scripts/imageslice
+++ b/content/code/scripts/imageslice
@@ -41,9 +41,9 @@ fi
 
 ##To Use
 navigate to slice.sh in your terminal and do 
-<pre class="prettyprint">$  chmod 775 slice.sh
-$  ./slice.sh Sunset.jpg 800 600 16 16</pre>
+<pre class="prettyprint">chmod +x slice.sh
+./slice.sh Sunset.jpg 800 600 16 16</pre>
 replace **Sunset.jpg** with your image name.  
 params: **Image Height, Image Width, Vertical Divisions, Horizontal Divisions**  
 
-  <br />
\ No newline at end of file
+  <br />
diff --git a/content/code/ssh_keys b/content/code/ssh_keys
index 4dae5b1..a17c9eb 100644
--- a/content/code/ssh_keys
+++ b/content/code/ssh_keys
@@ -2,11 +2,11 @@ title = create ssh keys
 date = april 16 2011
 --
 <pre class="prettyprint">
-local~ $    ssh-keygen -t rsa
+ssh-keygen -t rsa
 // linux
-local~ $    ssh-copy-id [user@]host
+ssh-copy-id [user@]host
 // osx
-local~ $    cat ~/.ssh/id_rsa.pub | ssh user@machine "mkdir ~/.ssh; cat >> ~/.ssh/authorized_keys"
-local~ $    eval `ssh-agent`
-local~ $    ssh-add
-</pre>
\ No newline at end of file
+cat ~/.ssh/id_rsa.pub | ssh user@machine "mkdir ~/.ssh; cat >> ~/.ssh/authorized_keys"
+eval `ssh-agent`
+ssh-add
+</pre>
diff --git a/content/journal/2011-04-29 b/content/journal/2011-04-29
new file mode 100644
index 0000000..e676eec
--- /dev/null
+++ b/content/journal/2011-04-29
@@ -0,0 +1,7 @@
+title = Live Visuals
+date = 2011-04-30
+--
+<iframe src="http://player.vimeo.com/video/23305801?title=0&amp;byline=0&amp;color=ffffff" width="500" height="375" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe><p>Sepalcure, Shigeto, Simple & Santa, GAFFTA, San Francisco<br />
+April 29 2011<br />
+<br />
+live visual software performed w/Santa</p>
diff --git a/content/projects/aero b/content/projects/aero
index ff7c060..29483d3 100644
--- a/content/projects/aero
+++ b/content/projects/aero
@@ -1,12 +1,10 @@
 title = aero
 date = 2007
 thumb = http://portfolio.quilime.com/2008/aero/thumb.png
+template = project
 --
-
 <img src="http://portfolio.quilime.com/2008/aero//aero.jpg" />
 
-<p>
-aero
-<br/>
+aero  
 <em>ceramic. 6" x 3" x 3"</em>
-</p>
+
diff --git a/content/projects/boat b/content/projects/boat
index 3f5776c..36318ef 100644
--- a/content/projects/boat
+++ b/content/projects/boat
@@ -1,5 +1,6 @@
 title = boat
 date = 2007
+template = project
 --
 
 
diff --git a/content/projects/bodyneg b/content/projects/bodyneg
index 276b85e..be647d1 100644
--- a/content/projects/bodyneg
+++ b/content/projects/bodyneg
@@ -1,12 +1,9 @@
 title = bodyneg
 date = 2008
 thumb = http://portfolio.quilime.com/2008/bodyneg/thumb.png
+template = project
 --
 
 <img src="http://portfolio.quilime.com/2008/bodyneg/BODYNEG.jpg">
 
-<p>
-bodyneg
-<br/>
-<em>ink press, 5 wall-mounted panels. 8' x 4' x 2'</em>
-</p>
+ink press, 5 wall-mounted panels. 8' x 4' x 2'
diff --git a/content/projects/dots b/content/projects/dots
index 57ebc55..6f8d2fc 100644
--- a/content/projects/dots
+++ b/content/projects/dots
@@ -1,5 +1,6 @@
 title = dots
 date = 2007
+template = project
 --
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0033.png">
diff --git a/content/projects/icarus b/content/projects/icarus
index 384fc8b..0ec0843 100644
--- a/content/projects/icarus
+++ b/content/projects/icarus
@@ -1,6 +1,7 @@
 title = icarus
 date = 2007
 thumb = http://portfolio.quilime.com/2008/icarus/thumb.png
+template = project
 --
 <img src="http://portfolio.quilime.com/2008/icarus/icarus.jpg" />
 
diff --git a/content/projects/rattle b/content/projects/rattle
index c31c4ec..46d9f9c 100644
--- a/content/projects/rattle
+++ b/content/projects/rattle
@@ -22,5 +22,5 @@ date = 2008
 <p>
 rattle
 <br/>
-<em>synthesiser (interactive)<em>
+<em>synthesiser (interactive)</em>
 </p>
diff --git a/content/projects/rattles b/content/projects/rattles
index d0a793f..8636883 100644
--- a/content/projects/rattles
+++ b/content/projects/rattles
@@ -1,15 +1,18 @@
 title = Rattles
 date = 2006
 thumb = http://portfolio.quilime.com/2008/rattle/thumb.png
+template = project
 --
 
+Particles are jostled and shaken as in a rattle. The sonic possibilities of their collisions and movement are given freedom and sonic depth via software.
+Rattles and shakers can be embedded into one another, allowing for more sensitivity, sonic subtlety, and layers when making music. Interaction with the digital rattle is as intuitive as its physical counterpart.
+
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0077.png">
 
 
-Particles are jostled and shaken as in a rattle. The sonic possibilities of their collisions and movement are given freedom and sonic depth via software.
-Rattles and shakers can be embedded into one another, allowing for more sensitivity, sonic subtlety, and layers when making music. Interaction with the digital rattle is as simple and dynamic as its physical counterpart.
 
-<!--
+
+
 The interaction with "Rattles" is identicle to the traditional percussive instrument.
 The visual shape, texture, or size of each interior rattler represents a unique audio 
 tone, either percussive or melodic. The resulting soundscape of the rattle instrument is 
@@ -17,9 +20,9 @@ therefore unique and rich with sonic subtlety and variation, transforming the tr
 "rattle" into an instrument with a necesarry visual component. 
 Rattles can be embedded into one another, allowing for more 
 sensitivity, sonic subtlety, and layers.
--->
 
-*medium: software*
+
+written in c++
 
 <img style="width:100%;" src="http://portfolio.quilime.com/new/content/03_Rattles/images/rattleFlowers.0118.png">
 
diff --git a/content/projects/sempernull b/content/projects/sempernull
index a304ce5..dbd2894 100644
--- a/content/projects/sempernull
+++ b/content/projects/sempernull
@@ -1,6 +1,7 @@
 title = sempernull
 date = 2007
 thumb = http://portfolio.quilime.com/2008/sempernull/thumb.png
+tag = video installation
 --
 
 
@@ -22,5 +23,5 @@ thumb = http://portfolio.quilime.com/2008/sempernull/thumb.png
 <p>
 sempernull
 <br/>
-<em>video installation<em>
+
 </p>
diff --git a/content/projects/stars b/content/projects/stars
index 8bad75f..7ae96ec 100644
--- a/content/projects/stars
+++ b/content/projects/stars
@@ -1,5 +1,6 @@
 title = Stars
 data = 2007
+template = project
 --
 
 
diff --git a/content/projects/tessellated b/content/projects/tessellated
index 70c36d8..a6acfdc 100644
--- a/content/projects/tessellated
+++ b/content/projects/tessellated
@@ -1,12 +1,7 @@
-title = tessellated
+title = Booth Design
 date = 2006
 thumb = http://portfolio.quilime.com/2008/tessellated/thumb.png
-
+tags = identity design, installation design
+template = project
 --
 <img src="http://portfolio.quilime.com/2008/tessellated/tessellated_booth_comp.jpg" />
-
-<p>
-tessellated group
-<br/>
-<em>identity design, installation design</em>
-</p>
diff --git a/content/projects/web b/content/projects/web
deleted file mode 100644
index 777f549..0000000
--- a/content/projects/web
+++ /dev/null
@@ -1,34 +0,0 @@
-title = Web
-date = 2007
---
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/01_Dots/images/out.0033.png">
-
-
-A network of dots and lines interacts with itself in a single mesh. Depth determines audio volume. Intersections, connections and line-length determine tones. Similar tones and chord groups are designated with additional web lines and connections. You are able to interact with each web line as the strings of an instrument, each tone resonating through its connections.
-
-*medium: software*
-
-<!--more-->
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.0645.png">
-
-<br />
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.1336.png">
-
-<br />
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/web.2533.png">
-
-<br />
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0105.png">
-
-<br />
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0327.png">
-
-<br />
-
-<img style="width:100%;" src="http://portfolio.quilime.com/new/content/06_Web/images/zforest.0619.png">
diff --git a/css/style.css b/css/style.css
index 415effb..d6ee141 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,35 +1,31 @@
-body {
-    background:#f4f4f4;
-}
 body, table {
     font-size: 12px;
-    font-family: sans-serif;
+    font-family: monaco, sans-serif;
     line-height:1.5em;
 }
 
 body { 
+    background:#212121;
     padding:0;
     margin:0;
-    color: #555;
+    color: #ddd;
 }
 
 a { 
-    font-weight:bold;
-    color:#000;
-/*    color: #22f;*/
+    color:rgb(42, 88, 235);
+    text-decoration:underline;
 }
 a img { 
     border:0; 
 }
 a.visited {
-    
 }
 a.mute { 
     font-weight:normal;
     color:rgb(129, 144, 144);
 }
 a:hover, a.mute:hover { 
-    color:rgb(209, 28, 36);
+    color:f0a;;
 }
 
 h1 {
@@ -38,10 +34,13 @@ h1 {
     margin-bottom:30px;
 }
 h1, h2, h3, h4, h5, h6 { 
-    
+    font-weight:normal;
+    color:#fff;
+    font-size:12px;
 }
 h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { 
-text-decoration:none;
+    text-decoration:none;
+    color:#fff;
 }
 
 ul, li { 
@@ -62,17 +61,23 @@ blockquote {
     padding:0;
 }
 pre, code {
-    color:#f08;
-    font-weight:bold;
+    color:#df0;
     line-height:1.3em;
-    font-size:12px;
+    font-family: Consolas,"Andale Mono",Monaco,Courier,"Courier New",Verdana,sans-serif;
+    padding:1px 5px 2px;
+    background:#121212;
+    border-radius:4px;
+}
+pre {
+    padding:10px 30px;
 }
 
 #content {
-  padding-left: 150px;
-  padding-top:30px;
-  padding-right:10px;
-  padding-bottom: 200px;
+  padding-left: 160px;
+  padding-bottom: 20px;
+}
+#content.single {
+    padding-top:0;
 }
 
 #nextprev {
@@ -82,9 +87,11 @@ pre, code {
 
 
 #nav {
-  position:absolute;
-  top: 30px;
-  left: 20px;
+  position:fixed;
+    top:0;
+    left:0;
+  padding:20px;
+background:rgba(33,33,33,0.9);
 }
 #nav a {
 }
@@ -97,23 +104,33 @@ pre, code {
 
 
 
-
-
-
 .entry {
-  width:auto;
   padding-bottom:20px;
-  border-radius:3px;
   margin-bottom:70px;
-  background:#fff;
-  padding:20px;
+}
+.single .entry {
+}
+
+.singlebg {
+
+}
+.entry h1 {
+    margin-bottom:40px;
+}
+#content h1, .entry h1 a {
+   display:block;
+    background:#f09;
+    padding-left:1em;
+}
+.entry h1 a:hover {
+
+     background:rgba(255,0,153,.7);
 }
 .entry h2 {
-    margin-bottom:20px;
+    margin-top:40px;
 }
 .entry .metadata { 
     margin-top:30px;
-    font-style:italic; color:#777; font-size:12px;
 }
 .entry .metadata .tags li { 
     display:inline-block; 
@@ -124,6 +141,9 @@ pre, code {
 }
 
 
+.archive li {
+    border-bottom:1px dotted #363636;
+}
 
 .project {
     display:inline-block;
diff --git a/lib/data.php b/lib/data.php
index 4ec23d3..5cf44bb 100644
--- a/lib/data.php
+++ b/lib/data.php
@@ -25,6 +25,9 @@ function get_entries( $path = "", $args = array())
 	$entries = array();
 	foreach ($dir_iterator as $file => $info) {
 
+		# don't list hidden files
+		if (substr($info->getFilename(), 0, 1) == '.') continue;
+
 		// $finfo = finfo_open(FILEINFO_MIME_TYPE);
 		// $ftype = finfo_file($finfo, join(array($info->getPath(), $info->getFilename()), DIRECTORY_SEPARATOR));
 		// finfo_close($finfo);		
diff --git a/lib/model.php b/lib/model.php
index 6cc7c86..e148db2 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -42,7 +42,7 @@ class Model
 		} 
 
 
-		# if entry (file in CONTENT dir)
+		# if single entry (file in CONTENT dir)
 		else if ($this->is_single())
 		{
 			$this->entry = get_entry( $this->content_request );
diff --git a/lib/output.php b/lib/output.php
index efac82e..442d1f9 100644
--- a/lib/output.php
+++ b/lib/output.php
@@ -115,6 +115,7 @@ function get_rss_feed( $url )
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
     $data = curl_exec($ch);
     curl_close($ch);
+
     return new SimpleXMLElement($data);
 }
 
diff --git a/pages/about b/pages/about
index 903998b..7673dff 100644
--- a/pages/about
+++ b/pages/about
@@ -3,15 +3,24 @@ title = about
 #about
 
 quilime is a codification of projects, process and resources by **gabriel dunne** ([www](http://gabrieldunne.com), [email](&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x67;&#x64;&#x75;&#x6e;&#110;&#x65;&#x40;&#x71;&#117;&#105;&#x6c;&#x69;&#x6d;&#101;&#x2e;&#x63;&#111;&#x6d;))
-<br />elsewhere:
-[github](http://github.com/quilime/),
-[vimeo](http://vimeo.com/quilime/),
-[clmpr](http://clmpr.com/quilime/),
-[flickr](http://flickr.com/photos/quilime/),
-[delicious](http://delicious.com/quilime/),
-[ffffound](http://ffffound.com/home/quilime/found/),
-[@quilime](http://twitter.com/quilime/)
+
+quilime is powered by <a href="http://git.quilime.com/?p=plog;a=summary">plog</a>, a static-file **p**roject+**log**ging engine.
+
+other projects   
+[clmpr](http://clmpr.com/quilime/)  
+[aggregate](http://media.quilime.com/aggregate/)  	
+[git.quilime.com](http://git.quilime.com)  
+
+
+elsewhere on the internets     
+[flickr](http://flickr.com/photos/quilime/)  
+[vimeo](http://vimeo.com/quilime/)    
+[github](http://github.com/quilime/)  
+[@quilime](http://twitter.com/quilime/)  
+
 
 <!-- add <a href="http://quilime.com/.rss" class="rss">.rss</a> to the end of any url for an xml feed -->
 
-quilime is powered by <a href="http://git.quilime.com/?p=plog.git;a=summary">plog</a> (project+log) engine.
+
+
+
diff --git a/templates/default.html.tpl b/templates/default.html.tpl
index 9ae7ca8..b68684f 100644
--- a/templates/default.html.tpl
+++ b/templates/default.html.tpl
@@ -11,6 +11,7 @@
     
 <div id="content">
 
+    <div class="entries">
 	<? foreach($entries as $entry): ?>
 	<?  
         if (isset($entry['content_short'])) 
@@ -19,6 +20,7 @@
         $this->include_template('entry.html.tpl', array('entry' => $entry)); 
     ?>
 	<? endforeach; ?>	
+    </div>
 	
 </div>
 
diff --git a/templates/entry.html.tpl b/templates/entry.html.tpl
index 2314da2..9591536 100644
--- a/templates/entry.html.tpl
+++ b/templates/entry.html.tpl
@@ -1,7 +1,7 @@
 <div class="entry">
 
 	<h1>
-		<a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>"><?=$entry['title']?></a>
+		<a title="posted on <?=$entry['date']?>" href="/<?=$entry['url']?>"><?=$entry['title']?></a>
 	</h1>
 
 	<div class="content">	
@@ -9,10 +9,9 @@
 	</div>
 
 	<div class="metadata">
-		<abbr title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></abbr> 
-		in <a href="/<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a><? if ($entry['tags']) echo ' filed as ' . implode(', ', $entry['tags']); ?>
+		<a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>">#</a>
+		<span title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></span> 
+		in <a href="/<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a><? if ($entry['tags']) echo ' as ' . implode(', ', $entry['tags']); ?>
 	</div>
 
-
-
 </div>
diff --git a/templates/index.html.tpl b/templates/index.html.tpl
index c960310..fed7e26 100644
--- a/templates/index.html.tpl
+++ b/templates/index.html.tpl
@@ -11,8 +11,24 @@
 <div id="content">
 
 	<table>
+
+
 	<tr>
-	<td style="padding-right:100px;" valign="top">
+
+	<td  style="padding-right:100px;"  valign="top">
+		<h3><a href="/journal/">journal</a></h3>
+		<ul class="archive">
+		<? $c=15; foreach(get_entries('journal/') as $entry): if ($c--==0) break; ?>
+		<li>
+		<a href="<?=$entry['url']?>" title="<?=date("m d Y", $entry['timestamp'])?>"><?=$entry['title']?></a> &nbsp;&nbsp;&nbsp; <span style="float:right"><?=date('Y m d', $entry['timestamp']);?></span>
+		</li>
+		<? endforeach; ?>	
+		</ul>	
+		<p><a class="more" href="/journal/">more &rarr;</a></p>
+	</td>
+	
+		
+	<td valign="top">
 		<h3><a class="more" href="/code/">code</a></h3>
 		<ul class="archive">
 		<? $c=15; foreach(get_entries('code/') as $entry): if ($c--==0) break; ?>
@@ -24,25 +40,12 @@
 		<p><a class="more" href="/code/">more &rarr;</a></p>
 	</td>
 
-	<td  valign="top">
-		<h3><a href="/journal/">log</a></h3>
-		<ul class="archive">
-		<? $c=15; foreach(get_entries('journal/') as $entry): if ($c--==0) break; ?>
-		<li>
-		<a href="<?=$entry['url']?>" title="<?=date("m d Y", $entry['timestamp'])?>"><?=date('Y m d', $entry['timestamp']);?> &mdash; <?=$entry['title']?></a>
-		</li>
-		<? endforeach; ?>	
-		</ul>	
-		<p><a class="more" href="/log/">more &rarr;</a></p>
-	</td>
+
 
 	</tr>
 	</table>	
 
-	<br />
-	<br />
-	<br />
-	<br />			
+	<br /><br />
 
 	<div>
 	<h3><a href="/projects/">projects</a></h3>
@@ -61,24 +64,17 @@
 	<? endforeach; ?>	
 	</ul>	
 
-		&bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a> - data visualization<br />		
+
+<!-- 		&bull; <a href="http://content.stamen.com/som_transbay_tower">Bay Area Transit</a> - data visualization<br />		
 		&bull; <a href="http://portfolio.quilime.com/content/daschtein/index.html">Dachstein</a> - installation<br />
 		&bull; <a href="http://portfolio.quilime.com/content/cm/index.html">Celestial Mechanics</a> - dome-based animation<br />
-		&bull; <a href="http://portfolio.quilime.com/content/valentine/index.html">Valentine</a><br />	
-
-	<br />
-	<br />
-	<br />
+		&bull; <a href="http://portfolio.quilime.com/content/valentine/index.html">Valentine</a><br />	 -->
 
-	<h3><a href="/software/">software</a></h3>
-		
-		&bull; <a href="http://git.quilime.com/?p=plog.git">plog</a> - project+log CMS<br />
-		&bull; <a href="https://github.com/quilime/clmpr">clmpr</a> - minimal bookmarking site<br />
+</div>
 
+<br /><br/>
 
-	</div>
 
-</div>
 
 
     <? $this->include_template('nav.html.tpl') ?>
diff --git a/templates/linked-archive.html.tpl b/templates/linked-archive.html.tpl
index 3423992..788e5ea 100644
--- a/templates/linked-archive.html.tpl
+++ b/templates/linked-archive.html.tpl
@@ -14,7 +14,7 @@
     <ul class="archive">
     <? foreach($entries as $entry): ?>
     <li>
-        &bull; <a class="more" href="#<?= $entry['url']; ?>"><?= $entry['title']; ?></a>
+        <a class="more" href="#<?= $entry['url']; ?>"><?= $entry['title']; ?></a>
     </li>
     <? endforeach; ?>   
     </ul>
diff --git a/templates/nav.html.tpl b/templates/nav.html.tpl
index 622fb62..226ec1b 100644
--- a/templates/nav.html.tpl
+++ b/templates/nav.html.tpl
@@ -41,13 +41,13 @@
 ======= -->
 <ul id="nav">	  
 
-    <li><a href="/">quilime</a></li>
+    <li><a href="/">home</a></li>
 	<li><a href="/about/">about</a></li>
 
 	<br />
 	<br />
 
-	<small>category</small>
+	content
 	<? $dirs = get_dirs("", array('recursive' => 0)); ?>
 	<? foreach($dirs as $dir) : ?>
 	<li><a href="/<?=$dir['url']?>"><?=$dir['name']?></a></li>
@@ -56,11 +56,17 @@
 	<br />
 	<br />
 
-	<small>pages</small>
-    <li><a href="/projects">projects</a></li>
+	static
 	<li><a href="/photo">photo</a></li>
 	<li><a href="/agg">aggregate</a></li>
 	<li><a href="/links">links</a></li>	
 
+	<br />
+	<br />
+
+	<li id="nextprev">
+		<? $this->include_template('nextprev.html.tpl'); ?>
+	</li>
+
 </ul>
 
diff --git a/templates/project.html.tpl b/templates/project.html.tpl
new file mode 100644
index 0000000..c76e637
--- /dev/null
+++ b/templates/project.html.tpl
@@ -0,0 +1,13 @@
+<div class="entry">
+
+	<div class="content">	
+		<?=$entry['content']?>
+	</div>
+
+	<div class="metadata">
+		<a title="posted on <?=$entry['date']?>" href="<?=$entry['url']?>"><?=$entry['title']?></a><br />
+		<abbr title="<?=get_relative_time($entry['timestamp']);?>"><?=date("F d, Y", $entry['timestamp'])?></abbr> 
+		in <a href="/<?=$entry['cat']['url'];?>"><?=$entry['cat']['name'];?></a><? if ($entry['tags']) echo ' filed as ' . implode(', ', $entry['tags']); ?>		
+	</div>
+
+</div>
diff --git a/templates/projects.html.tpl b/templates/projects.html.tpl
index 14021ca..dcd2097 100644
--- a/templates/projects.html.tpl
+++ b/templates/projects.html.tpl
@@ -11,11 +11,13 @@
     
 <div id="content">
 
+    <h1>projects</h1>
+
     <? foreach($entries as $entry): ?>
     <?  if (isset($entry['content_short'])) ?>
             
             <div class="project">
-            <a href="<?= $entry['url']?>">
+            <a href="/<?= $entry['url']?>">
             <div class="thumb">
             <? if (isset($entry['config']['thumb'])): ?>
             <img src="<?= $entry['config']['thumb']?>">
diff --git a/templates/single.html.tpl b/templates/single.html.tpl
index f8f5c36..d03a616 100644
--- a/templates/single.html.tpl
+++ b/templates/single.html.tpl
@@ -3,49 +3,24 @@
     
     <? $this->include_template('head-inc.html.tpl') ?>
     
-<!-- <<<<<<< HEAD
-    <title><?=SITE_TITLE?><?=TITLE_DELIMITER?> <?=$data['title'];?></title>
-======= -->
     <title><?=$entry['title'];?></title>
-<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
     
 </head>
 <body>
     
-	<div id="content">
-		<? $this->include_template('entry.html.tpl'); ?>
-	</div>
+	<div id="content" class="single">
+		<? 
+	        if (isset($entry['config']['template'])) {
+	        	$this->include_template($entry['config']['template'] . '.' . $this->response_format . '.tpl'); 
+	        }
+	        else {
+				$this->include_template('entry.html.tpl'); 
+			}
 
-	<div id="nextprev">
-		<? $this->include_template('nextprev.html.tpl'); ?>
+		?>
 	</div>
 
-<!-- <<<<<<< HEAD -->
-<!-- 
-
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-    var disqus_shortname = 'quilime'; // required: replace example with your forum shortname
-
-    // The following are highly recommended additional parameters. Remove the slashes in front to use.
-    // var disqus_identifier = 'unique_dynamic_id_1234';
-    // var disqus_url = 'http://example.com/permalink-to-page.html';
-
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
- -->
-
-<!-- ======= -->
 	<? $this->include_template('nav.html.tpl') ?>	
-<!-- >>>>>>> 2ae0cd949c331f83dcb05116cffdca21b2ecb871 -->
 	<? $this->include_template('footer.html.tpl') ?>
 
 </body>