diff --git a/Gemfile.lock b/Gemfile.lock
index 80184cd..d7af4ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -15,42 +15,43 @@ GEM
     colorator (0.1)
     ethon (0.9.0)
       ffi (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.14)
     gemoji (2.1.0)
-    github-pages (78)
-      github-pages-health-check (= 1.1.0)
-      jekyll (= 3.0.5)
+    github-pages (91)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.2.0)
+      jekyll (= 3.1.6)
       jekyll-coffeescript (= 1.0.1)
       jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 1.11.1)
-      jekyll-mentions (= 1.1.2)
+      jekyll-github-metadata (= 2.0.2)
+      jekyll-mentions (= 1.1.3)
       jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.10.0)
+      jekyll-redirect-from (= 0.11.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 1.4.0)
+      jekyll-seo-tag (= 2.0.0)
       jekyll-sitemap (= 0.10.0)
-      jemoji (= 0.6.2)
-      kramdown (= 1.10.0)
+      jemoji (= 0.7.0)
+      kramdown (= 1.11.1)
       liquid (= 3.0.6)
       listen (= 3.0.6)
       mercenary (~> 0.3)
-      rouge (= 1.10.1)
+      rouge (= 1.11.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.1.0)
+    github-pages-health-check (1.2.0)
       addressable (~> 2.3)
       net-dns (~> 0.8)
       octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (2.4.1)
-      activesupport (>= 2, < 5)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
       nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (3.0.5)
+    jekyll (3.1.6)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -64,51 +65,55 @@ GEM
     jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (1.11.1)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
       octokit (~> 4.0)
-    jekyll-mentions (1.1.2)
+    jekyll-mentions (1.1.3)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.10.0)
+    jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (1.4.0)
-      jekyll (~> 3.0)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
     jekyll-sitemap (0.10.0)
-    jekyll-watch (1.4.0)
+    jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.6.2)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
     json (1.8.3)
-    kramdown (1.10.0)
+    kramdown (1.11.1)
     liquid (3.0.6)
     listen (3.0.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
     mercenary (0.3.6)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    pkg-config (1.1.7)
     public_suffix (1.5.3)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rouge (1.10.1)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
+    terminal-table (1.6.0)
     thread_safe (0.3.5)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
diff --git a/_config.yml b/_config.yml
index 1ca1df1..16c2142 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,3 +1,12 @@
 title: Sophie Stadler
 markdown: kramdown
-url: http://sophiestadler.com
\ No newline at end of file
+url: http://sophiestadler.com
+collections:
+  posts:
+    output: true
+    permalink: /blog/:year/:month/:day/:title/
+    title: Notes
+  soft_computer:
+    output: true
+    permalink: /softcomputer/:path/
+    title: Soft Computer
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index 436d0bc..1e451b5 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,6 +7,7 @@
     <meta charset="utf-8">
     <meta name=viewport content="width=device-width, initial-scale=1">
 
+    <link href="https://npmcdn.com/basscss@8.0.2/css/basscss.min.css" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="{{ base.url }}/static/css/style.css">
     <link href='https://fonts.googleapis.com/css?family=Arimo:400,700' rel='stylesheet' type='text/css'>
     
diff --git a/_layouts/page.html b/_layouts/page.html
index 5dad5dc..9b242af 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,9 +1,11 @@
 {% include header.html %}
 
-<body>
-  <main>
-    <h1><a href="/" class="link-no-underline">{{ site.title }}</a> {% if page.title != site.title %}– {{ page.title }}{% endif %}</h1>
+<body class="m0">
+  <main class="py3 px4 max-width-2">
+    <h1><a href="/" class="text-decoration-none">{{ site.title }}</a> {% if page.title != site.title %}– {{ page.title }}{% endif %}</h1>
     {{ content }}
+
+    {% if page.title != site.title %}<p>&larrlp; <a href="/">Back to the site</a></p>{% endif %}
   </main>
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
   <script type="text/javascript" src="{{ base.url }}/static/js/background.js"></script>
diff --git a/_layouts/post.html b/_layouts/post.html
index f8b9a45..d921e0d 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,9 +1,14 @@
 {% include header.html %}
 
-<body>
-  <main>
-    <h1>{{ page.title }}</h1>
-    {{ content }}
+<body class="m0">
+  <main class="py3 px4 max-width-2">
+    <h1><a href="/" class="text-decoration-none">{{ site.title }}</a> {% if page.title != site.title %}– Notes{% endif %}</h1>
+    <article class="pb3">
+      <h2>{{ page.title }}</h2>
+      <h3 class="o4">{{ page.date | date: '%B %d, %Y' }}</h3>
+      {{ content }}
+    </article>
+
     <p>&larrlp; <a href="/blog">Back to the blog</a></p>
   </main>
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js" ></script>
diff --git a/softcomputer/howmanyhacks/index.html b/_soft_computer/howmanyhacks.html
similarity index 100%
rename from softcomputer/howmanyhacks/index.html
rename to _soft_computer/howmanyhacks.html
diff --git a/softcomputer/index.md b/_soft_computer/index.md
similarity index 100%
rename from softcomputer/index.md
rename to _soft_computer/index.md
diff --git a/softcomputer/music/index.md b/_soft_computer/music.md
similarity index 99%
rename from softcomputer/music/index.md
rename to _soft_computer/music.md
index 5067dea..6018bf2 100644
--- a/softcomputer/music/index.md
+++ b/_soft_computer/music.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: post
 title: Music
 ---
 
diff --git a/blog/index.html b/blog/index.html
index 4f25ef2..5096dff 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -4,11 +4,10 @@
 ---
 
 {% for post in site.posts %}
-  <article>
-    <h2><a href="{{ post.url }}" class="link-no-underline">{{ post.title }}</a></h1>
-    <h3 class="date">{{ post.date | date: '%B %d, %Y' }}</h2>
+  <article class="pb3">
+    <h2><a href="{{ post.url }}" class="text-decoration-none">{{ post.title }}</a></h2>
+    <h3 class="o4">{{ post.date | date: '%B %d, %Y' }}</h3>
 
     {{ post.content }}
   </article>
-{% endfor %}
-<p>&larrlp; <a href="/">Back to the site</a></p>
\ No newline at end of file
+{% endfor %}
\ No newline at end of file
diff --git a/static/css/style.css b/static/css/style.css
index 7fff9a8..2504065 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,57 +1,20 @@
-* {
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
 html,
 body {
   color: rgba(35, 30, 30, 0.9);
-  font-family: 'Arimo', sans-serif;
-  font-size: 16px;
+  font-family: 'Arimo', -apple-system, sans-serif;
   -webkit-font-smoothing: antialiased;
-  font-weight: 400;
   height: 100%;
   line-height: 1.5;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-}
-main,
-article {
-  height: auto;
-  min-height: 100%;
-  padding-bottom: 3rem;
 }
+
 a {
   color: inherit;
 }
+
 a:hover {
   color: rgba(35, 30, 30, 0.6);
 }
 
-.link-no-underline {
-  text-decoration: none;
-}
-.date {
+.o4 {
   opacity: 0.4;
-}
-
-/* Small screens */
-@media screen and (min-width: 300px) {
-  main {
-    margin: 0 auto;
-    padding: 1rem 0;
-    width: 85%;
-  }
-}
-/* Medium screens */
-@media screen and (min-width: 40rem) {
-  main {
-    margin: 0;
-    padding: 3rem 0 3rem 5rem;
-    max-width: 32rem;
-  }
-}
-/* Large screens */
-@media screen and (min-width: 64em) {
 }
\ No newline at end of file