diff --git a/wp-content/themes/studio13/404.php b/wp-content/themes/studio13/404.php
index 28641a2..024cd5d 100755
--- a/wp-content/themes/studio13/404.php
+++ b/wp-content/themes/studio13/404.php
@@ -1,7 +1,7 @@
 <?php get_header(); ?>
 <div id="content">
-    <div id="inner-content">
-        <div id="main" class="first" role="main">
+    <div id="inner-content" class="row">
+        <div id="main" class="small-12 columns" role="main">
             <article id="post-not-found" class="hentry">
                 <header class="article-header">
                     <h1>Trist 404-side</h1>
@@ -10,7 +10,7 @@
                     <p>ånei og ånei</p>
                 </section> <!-- end article section -->
                 <section class="search">
-                        <p>La brukeren få søke litt istedet <?php get_search_form(); ?></p>
+                        <p>Du kan søke litt istedet <?php get_search_form(); ?></p>
                 </section> <!-- end search section -->
                 <footer class="article-footer">
                         <p></p>
diff --git a/wp-content/themes/studio13/content-full.php b/wp-content/themes/studio13/content-full.php
new file mode 100644
index 0000000..b339299
--- /dev/null
+++ b/wp-content/themes/studio13/content-full.php
@@ -0,0 +1,16 @@
+<article id="post-<?php the_ID(); ?>" role="article" class="sticky">
+    <header class="article-header row">
+        <div class="small-12 columns">
+            <?php the_post_thumbnail(); ?>
+            <h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
+            <!--<p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>-->
+        </div>
+    </header> <!-- end article header -->
+    <section class="entry-content">
+        <?php the_content(); ?>
+    </section> <!-- end article section -->
+    <footer class="article-footer">
+        <a href="" class="btn-tiny primary"><i class="icon-facebook"></i></a>
+        <a href="" class="btn-tiny secondary"><i class="icon-twitter"></i></a>
+    </footer> <!-- end article footer -->
+</article> <!-- end article -->
diff --git a/wp-content/themes/studio13/content-notfound.php b/wp-content/themes/studio13/content-notfound.php
new file mode 100644
index 0000000..ba57c4d
--- /dev/null
+++ b/wp-content/themes/studio13/content-notfound.php
@@ -0,0 +1,12 @@
+
+<article id="post-not-found" class="hentry ">
+    <header class="article-header">
+        <h1>Ai ai ai</h1>
+    </header>
+    <section class="entry-content">
+        <p>index.php: .post-not-found .entry-content</p>
+    </section>
+    <footer class="article-footer">
+        <p>index.php: .post-not-found .article-footer</p>
+    </footer>
+</article>
diff --git a/wp-content/themes/studio13/content-sticky.php b/wp-content/themes/studio13/content-sticky.php
new file mode 100644
index 0000000..4da610d
--- /dev/null
+++ b/wp-content/themes/studio13/content-sticky.php
@@ -0,0 +1,17 @@
+<!-- Sticky post with large picture -->
+<article id="post-<?php the_ID(); ?>" role="article" class="sticky">
+    <header class="article-header row">
+        <div class="small-12 columns">
+            <?php the_post_thumbnail(); ?>
+            <h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
+            <!--<p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>-->
+        </div>
+    </header> <!-- end article header -->
+    <section class="entry-content">
+        <?php the_excerpt(); ?>
+    </section> <!-- end article section -->
+    <footer class="article-footer">
+        <a href="" class="btn-tiny primary"><i class="icon-facebook"></i></a>
+        <a href="" class="btn-tiny secondary"><i class="icon-twitter"></i></a>
+    </footer> <!-- end article footer -->
+</article> <!-- end article -->
diff --git a/wp-content/themes/studio13/content.php b/wp-content/themes/studio13/content.php
new file mode 100644
index 0000000..4e3a8eb
--- /dev/null
+++ b/wp-content/themes/studio13/content.php
@@ -0,0 +1,20 @@
+<article id="post-<?php the_ID(); ?>" role="article">
+    <div class="row">
+        <div class="small-6 columns">
+            <?php the_post_thumbnail(); ?>
+        </div>
+        <div class="small-6 columns">
+            <header class="article-header">
+                    <h4><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h4>
+                    <!--<p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>-->
+            </header> <!-- end article header -->
+            <section class="entry-content">
+                <?php the_excerpt(); ?>
+            </section> <!-- end article section -->
+            <footer class="article-footer">
+                <a href="" class="btn-tiny primary"><i class="icon-facebook"></i></a>
+                <a href="" class="btn-tiny secondary"><i class="icon-twitter"></i></a>
+            </footer> <!-- end article footer -->
+        </div>
+    </div>
+</article> <!-- end article -->
diff --git a/wp-content/themes/studio13/css/app.css b/wp-content/themes/studio13/css/app.css
index 0ce9a4d..6b4187f 100644
--- a/wp-content/themes/studio13/css/app.css
+++ b/wp-content/themes/studio13/css/app.css
@@ -300,9 +300,9 @@ blockquote, blockquote p { line-height: 1.6; color: #ff99be; }
 button, .button { border-style: solid; border-width: 1px; cursor: pointer; font-family: inherit; font-weight: bold; line-height: 1; margin: 0 0 1.25em; position: relative; text-decoration: none; text-align: center; display: inline-block; padding-top: 0.75em; padding-right: 1.5em; padding-bottom: 0.8125em; padding-left: 1.5em; font-size: 1em; background-color: #007aff; border-color: #0062cc; color: white; }
 button:hover, button:focus, .button:hover, .button:focus { background-color: #0062cc; }
 button:hover, button:focus, .button:hover, .button:focus { color: white; }
-button.secondary, .button.secondary { background-color: #ff005c; border-color: #cc004a; color: white; }
-button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus { background-color: #cc004a; }
-button.secondary:hover, button.secondary:focus, .button.secondary:hover, .button.secondary:focus { color: white; }
+button.secondary, body button.button, .button.secondary, body .button { background-color: #ff005c; border-color: #cc004a; color: white; }
+button.secondary:hover, body button.button:hover, button.secondary:focus, body button.button:focus, .button.secondary:hover, body .button:hover, .button.secondary:focus, body .button:focus { background-color: #cc004a; }
+button.secondary:hover, body button.button:hover, button.secondary:focus, body button.button:focus, .button.secondary:hover, body .button:hover, .button.secondary:focus, body .button:focus { color: white; }
 button.success, .button.success { background-color: #5da423; border-color: #457a1a; color: white; }
 button.success:hover, button.success:focus, .button.success:hover, .button.success:focus { background-color: #457a1a; }
 button.success:hover, button.success:focus, .button.success:hover, .button.success:focus { color: white; }
@@ -319,10 +319,10 @@ button.disabled, button[disabled], .button.disabled, .button[disabled] { backgro
 button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus { background-color: #0062cc; }
 button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus { color: white; }
 button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus { background-color: #007aff; }
-button.disabled.secondary, button[disabled].secondary, .button.disabled.secondary, .button[disabled].secondary { background-color: #ff005c; border-color: #cc004a; color: white; cursor: default; opacity: 0.6; -webkit-box-shadow: none; box-shadow: none; }
-button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus { background-color: #cc004a; }
-button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus { color: white; }
-button.disabled.secondary:hover, button.disabled.secondary:focus, button[disabled].secondary:hover, button[disabled].secondary:focus, .button.disabled.secondary:hover, .button.disabled.secondary:focus, .button[disabled].secondary:hover, .button[disabled].secondary:focus { background-color: #ff005c; }
+button.disabled.secondary, body button.disabled.button, button[disabled].secondary, body button[disabled].button, .button.disabled.secondary, body .button.disabled, .button[disabled].secondary, body .button[disabled] { background-color: #ff005c; border-color: #cc004a; color: white; cursor: default; opacity: 0.6; -webkit-box-shadow: none; box-shadow: none; }
+button.disabled.secondary:hover, body button.disabled.button:hover, button.disabled.secondary:focus, body button.disabled.button:focus, button[disabled].secondary:hover, body button[disabled].button:hover, button[disabled].secondary:focus, body button[disabled].button:focus, .button.disabled.secondary:hover, body .button.disabled:hover, .button.disabled.secondary:focus, body .button.disabled:focus, .button[disabled].secondary:hover, body .button[disabled]:hover, .button[disabled].secondary:focus, body .button[disabled]:focus { background-color: #cc004a; }
+button.disabled.secondary:hover, body button.disabled.button:hover, button.disabled.secondary:focus, body button.disabled.button:focus, button[disabled].secondary:hover, body button[disabled].button:hover, button[disabled].secondary:focus, body button[disabled].button:focus, .button.disabled.secondary:hover, body .button.disabled:hover, .button.disabled.secondary:focus, body .button.disabled:focus, .button[disabled].secondary:hover, body .button[disabled]:hover, .button[disabled].secondary:focus, body .button[disabled]:focus { color: white; }
+button.disabled.secondary:hover, body button.disabled.button:hover, button.disabled.secondary:focus, body button.disabled.button:focus, button[disabled].secondary:hover, body button[disabled].button:hover, button[disabled].secondary:focus, body button[disabled].button:focus, .button.disabled.secondary:hover, body .button.disabled:hover, .button.disabled.secondary:focus, body .button.disabled:focus, .button[disabled].secondary:hover, body .button[disabled]:hover, .button[disabled].secondary:focus, body .button[disabled]:focus { background-color: #ff005c; }
 button.disabled.success, button[disabled].success, .button.disabled.success, .button[disabled].success { background-color: #5da423; border-color: #457a1a; color: white; cursor: default; opacity: 0.6; -webkit-box-shadow: none; box-shadow: none; }
 button.disabled.success:hover, button.disabled.success:focus, button[disabled].success:hover, button[disabled].success:focus, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success:hover, .button[disabled].success:focus { background-color: #457a1a; }
 button.disabled.success:hover, button.disabled.success:focus, button[disabled].success:hover, button[disabled].success:focus, .button.disabled.success:hover, .button.disabled.success:focus, .button[disabled].success:hover, .button[disabled].success:focus { color: white; }
@@ -493,7 +493,7 @@ fieldset legend { font-weight: bold; background: white; padding: 0 0.1875em; mar
 .label.round { -webkit-border-radius: 1000px; border-radius: 1000px; }
 .label.alert { background-color: #c60f13; color: #fff; }
 .label.success { background-color: #5da423; color: #fff; }
-.label.secondary { background-color: #ff005c; color: #fff; }
+.label.secondary, body .label.button { background-color: #ff005c; color: #fff; }
 
 /* Pagination */
 .pagination { display: block; height: 1.5em; margin-left: -0.3125em; }
@@ -516,15 +516,27 @@ table tr th, table tr td { padding: 0.5625em 0.625em; font-size: 0.875em; color:
 table tr.even, table tr.alt, table tr:nth-of-type(even) { background: #f9f9f9; }
 table thead tr th, table tfoot tr th, table tbody tr td, table tr td, table tfoot tr td { display: table-cell; line-height: 1.125em; }
 
+/* General styles */
+body h1, body h2, body h3, body h4 { text-transform: uppercase; }
+body h1 { margin-bottom: 0.3em; }
 body a { -webkit-transition: background-color 0.15s ease, color 0.15s ease; -moz-transition: background-color 0.15s ease, color 0.15s ease; -o-transition: background-color 0.15s ease, color 0.15s ease; transition: background-color 0.15s ease, color 0.15s ease; }
 body a:hover { color: #ff005c; }
 
+/* buttons */
+body .button { border: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; text-transform: uppercase; }
+body .btn-tiny { text-align: center; font-size: 1.3em; display: inline-block; color: white; width: 32px; height: 32px; line-height: 32px; }
+body .btn-tiny .icon-twitter { font-size: 0.7em; }
+body .primary { background-color: #007aff; }
+body .primary:hover { color: white; background-color: #ff005c; }
+body .secondary, body .button { background-color: #ff005c; }
+body .secondary:hover, body .button:hover { color: white; background-color: #007aff; }
+
 header.header { margin-top: 2em; margin-bottom: 2em; }
-header.header .date { color: #007aff; font-size: 3.4em; text-transform: uppercase; font-weight: bold; margin-bottom: 10px; display: inline-block; }
+header.header .date { color: #007aff; font-size: 3.45em; text-transform: uppercase; font-weight: 600; margin-bottom: 10px; display: inline-block; }
 header.header .logo img { position: relative; bottom: -15px; left: 10px; }
 header.header .nav-menu { margin: 0; padding: 0; border: 0; overflow: hidden; *zoom: 1; margin: 0 auto; background-color: #007aff; }
 header.header .nav-menu li { list-style-image: none; list-style-type: none; margin-left: 0; display: -moz-inline-stack; display: inline-block; vertical-align: middle; *vertical-align: auto; zoom: 1; *display: inline; white-space: nowrap; }
-header.header .nav-menu a { font-size: 1.6em; display: inline-block; padding: .45em; color: white; text-transform: uppercase; }
+header.header .nav-menu a { font-size: 1.5em; font-weight: 600; display: inline-block; padding: .7em .8em; color: white; text-transform: uppercase; }
 header.header .nav-menu a:hover { background-color: #ff005c; }
 
 .highlight a { height: 280px; line-height: 1.1; font-size: 2.5em; font-weight: bold; text-transform: uppercase; text-align: center; display: block; color: white; background-color: #ff005c; }
@@ -534,9 +546,32 @@ header.header .nav-menu a:hover { background-color: #ff005c; }
 .highlight a .number { font-size: 3em; }
 
 .separator { height: 2px; background-color: #ff005c; margin: 2em 0; }
+.separator.tiny-margin { margin-top: 0; margin-bottom: 0.4em; }
 
-.article-header h1 a { color: inherit; }
-.article-header h1 a:hover { color: #007aff; }
+article .article-header h1 a { color: inherit; }
+article .article-header h1 a:hover { color: #007aff; }
+article .article-header h4 a { color: #ff005c; }
+article .article-header h4 a:hover { color: #007aff; }
+article .entry-content { font-size: 0.9em; }
+article .article-footer { text-align: right; margin-bottom: 2em; }
+
+.moretag { font-weight: bold; }
+
+.bluebordered { border-left: 2px solid #007aff; }
+
+.row.row.tweets-and-blog { margin-bottom: 2em; }
+
+.social-media { font-size: 2em; color: #ff005c; }
+.social-media img, .social-media i { padding-left: 1em; }
+.social-media i { font-size: 1.5em; color: #007aff; }
+.social-media .uppercase { text-transform: uppercase; }
+
+.sidebar .lineup ul.artists { list-style-type: none; padding-left: 0; text-transform: uppercase; font-size: 1.2em; font-weight: bold; line-height: 1.2; }
+.sidebar .lineup ul.artists a { color: #007aff; }
+.sidebar .lineup ul.artists a:hover { color: white; background-color: #ff005c; }
+.sidebar .lineup ul.artists.headliners { margin-top: 1em; font-size: 2em; }
+.sidebar .lineup ul.artists.headliners li:nth-child(even) a { color: #ff005c; }
+.sidebar .lineup ul.artists.headliners li:nth-child(even) a:hover { color: white; background-color: #007aff; }
 
 .footer { min-width: 100%; text-align: center; height: 400px; background-color: #007aff; }
 .footer #inner-footer img { margin-top: 100px; }
diff --git a/wp-content/themes/studio13/front-page.php b/wp-content/themes/studio13/front-page.php
index d7f6c51..42e87d1 100644
--- a/wp-content/themes/studio13/front-page.php
+++ b/wp-content/themes/studio13/front-page.php
@@ -20,33 +20,56 @@
                 <h3>Nyheter</h3>
             </div>
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-                <article id="post-<?php the_ID(); ?>" role="article">
-                    <header class="article-header">
-                        <h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
-                        <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>
-                    </header> <!-- end article header -->
-                    <section class="entry-content ">
-                        <?php the_post_thumbnail(); ?>
-                        <?php the_content(); ?>
-                    </section> <!-- end article section -->
-                    <footer class="article-footer">
-                        FB-knapp, twitter-knapp
-                    </footer> <!-- end article footer -->
-                </article> <!-- end article -->
-                <?php endwhile; ?>
-            <?php else : ?>
-                <article id="post-not-found" class="hentry ">
-                    <header class="article-header">
-                        <h1>Ai ai ai</h1>
-                    </header>
-                    <section class="entry-content">
-                        <p>index.php: .post-not-found .entry-content</p>
-                    </section>
-                    <footer class="article-footer">
-                        <p>index.php: .post-not-found .article-footer</p>
-                    </footer>
-                </article>
+                <?php if (is_sticky($post->ID)): ?>
+                    <?php get_template_part( 'content', 'sticky' ); ?>
+                <?php else:  ?>
+                <!-- FIXME:  -->
+                    <?php get_template_part( 'content' ); ?>
                 <?php endif; ?>
+            <?php endwhile; ?>
+                <div class="row">
+                    <div class="small-12 columns">
+                        <a href="/nyheter/" class="button small-12">Les flere nyheter her</a>
+                    </div>
+                </div>
+                <div class="row tweets-and-blog">
+                    <div class="small-6 columns">
+                        <a href="#"><img src="<?php echo get_template_directory_uri(); ?>/images/studiotweets.png" alt="Tweets om STUDiO" /></a>
+                        <div class="twitter-feed"></div>
+                    </div>
+                    <div class="bluebordered text-center small-6 columns">
+                        <a href="#"><img src="<?php echo get_template_directory_uri(); ?>/images/follow_bloggers.png" class="highlight higlight-image" alt="Frivillig Studio 2013" /></a>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="small-12 columns">
+                        <div class="instagram-feed">
+                             <ul class="small-block-grid-2">
+                                <li><h1>Instagram</h1><h4>#Studiofestivalen</h4></li>
+                                <li><img src="http://placekitten.com/330/330/"></li>
+                            </ul> 
+                             <ul class="small-block-grid-4">
+                                <li><img src="http://placekitten.com/200/200/"></li>
+                                <li><img src="http://placekitten.com/200/200/"></li>
+                                <li><img src="http://placekitten.com/200/200/"></li>
+                                <li><img src="http://placekitten.com/200/200/"></li>
+                            </ul> 
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row social-media">
+                    <div class="small-12 columns"><div class="separator tiny-margin"></div>
+                    </div>
+                </div>
+                <div class="row social-media">
+                    <div class="small-12 columns">
+                        <p><span class="uppercase">Følg oss på:</span> <img src="<?php echo get_template_directory_uri(); ?>/images/vimeo.png" /> <img src="<?php echo get_template_directory_uri(); ?>/images/flickr.png" /> <i class="icon-twitter"></i> <i class="icon-facebook"></i> </p>
+                    </div>
+                </div>
+            <?php else : ?>
+                    <?php get_template_part( 'content', 'notfound' ); ?>
+            <?php endif; ?>
             </div> <!-- end #main -->
             <?php get_sidebar(); ?>
     </div> <!-- end #inner-content -->
diff --git a/wp-content/themes/studio13/functions.php b/wp-content/themes/studio13/functions.php
index 53320ff..38dd6ad 100644
--- a/wp-content/themes/studio13/functions.php
+++ b/wp-content/themes/studio13/functions.php
@@ -35,4 +35,15 @@ function prefix_remove_menu_item_whitespace( $html_content ) {
 }
 add_filter( 'wp_nav_menu_hoved_items', 'prefix_remove_menu_item_whitespace' );
 
+function custom_excerpt_length( $length ) {
+	return 20;
+}
+add_filter( 'excerpt_length', 'custom_excerpt_length', 999 );
+
+function new_excerpt_more($more) {
+    global $post;
+    return '... <a class="moretag" href="'. get_permalink($post->ID) . '">les mer</a>';
+}
+add_filter('excerpt_more', 'new_excerpt_more');
+
 ?>
diff --git a/wp-content/themes/studio13/header.php b/wp-content/themes/studio13/header.php
index 65e0a0e..9f937d7 100644
--- a/wp-content/themes/studio13/header.php
+++ b/wp-content/themes/studio13/header.php
@@ -25,7 +25,8 @@
         <meta name="msapplication-TileImage" content="<?php echo get_template_directory_uri(); ?>/images/win8-tile-icon.png">
         <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">
         <!-- Stylesheets -->
-        <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,400,700' rel='stylesheet' type='text/css'>
+        <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,400,600,700' rel='stylesheet' type='text/css'>
+        <link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet">
         <link href="<?php echo get_template_directory_uri(); ?>/css/normalize.css" media="screen, projector, print" rel="stylesheet" type="text/css" />
         <link href="<?php echo get_template_directory_uri(); ?>/css/app.css" media="screen, projector, print" rel="stylesheet" type="text/css" />
 
diff --git a/wp-content/themes/studio13/images/brillemote.jpg b/wp-content/themes/studio13/images/brillemote.jpg
new file mode 100644
index 0000000..51bc416
Binary files /dev/null and b/wp-content/themes/studio13/images/brillemote.jpg differ
diff --git a/wp-content/themes/studio13/images/fine_hatter.jpg b/wp-content/themes/studio13/images/fine_hatter.jpg
new file mode 100644
index 0000000..a0b7cc7
Binary files /dev/null and b/wp-content/themes/studio13/images/fine_hatter.jpg differ
diff --git a/wp-content/themes/studio13/images/flickr.png b/wp-content/themes/studio13/images/flickr.png
new file mode 100644
index 0000000..8717ebe
Binary files /dev/null and b/wp-content/themes/studio13/images/flickr.png differ
diff --git a/wp-content/themes/studio13/images/follow_bloggers.png b/wp-content/themes/studio13/images/follow_bloggers.png
new file mode 100644
index 0000000..ddc29ca
Binary files /dev/null and b/wp-content/themes/studio13/images/follow_bloggers.png differ
diff --git a/wp-content/themes/studio13/images/mandig_bart.jpg b/wp-content/themes/studio13/images/mandig_bart.jpg
new file mode 100644
index 0000000..148c827
Binary files /dev/null and b/wp-content/themes/studio13/images/mandig_bart.jpg differ
diff --git a/wp-content/themes/studio13/images/studiotweets.png b/wp-content/themes/studio13/images/studiotweets.png
new file mode 100644
index 0000000..5a51b31
Binary files /dev/null and b/wp-content/themes/studio13/images/studiotweets.png differ
diff --git a/wp-content/themes/studio13/images/vimeo.png b/wp-content/themes/studio13/images/vimeo.png
new file mode 100644
index 0000000..90e85de
Binary files /dev/null and b/wp-content/themes/studio13/images/vimeo.png differ
diff --git a/wp-content/themes/studio13/index.php b/wp-content/themes/studio13/index.php
index 2ddcf06..f89e15a 100755
--- a/wp-content/themes/studio13/index.php
+++ b/wp-content/themes/studio13/index.php
@@ -1,34 +1,12 @@
 <?php get_header(); ?>
 <div id="content">
-    <div id="inner-content">
-        <div id="main" role="main">
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-                <article id="post-<?php the_ID(); ?>" role="article">
-                    <header class="article-header">
-                        <h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
-                        <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>
-                    </header> <!-- end article header -->
-                    <section class="entry-content ">
-                        <?php the_post_thumbnail(); ?>
-                        <?php the_content(); ?>
-                    </section> <!-- end article section -->
-                    <footer class="article-footer">
-                        FB-knapp, twitter-knapp
-                    </footer> <!-- end article footer -->
-                </article> <!-- end article -->
+                    <?php get_template_part( 'content', 'full' ); ?>
                 <?php endwhile; ?>
             <?php else : ?>
-                <article id="post-not-found" class="hentry ">
-                    <header class="article-header">
-                        <h1>Ai ai ai</h1>
-                    </header>
-                    <section class="entry-content">
-                        <p>index.php: .post-not-found .entry-content</p>
-                    </section>
-                    <footer class="article-footer">
-                        <p>index.php: .post-not-found .article-footer</p>
-                    </footer>
-                </article>
+                    <?php get_template_part( 'content', 'notfound' ); ?>
                 <?php endif; ?>
             </div> <!-- end #main -->
             <?php get_sidebar(); ?>
diff --git a/wp-content/themes/studio13/page.php b/wp-content/themes/studio13/page.php
index 15a41e8..db5508a 100644
--- a/wp-content/themes/studio13/page.php
+++ b/wp-content/themes/studio13/page.php
@@ -1,20 +1,9 @@
 <?php get_header(); ?>
 <div id="content">
-    <div id="inner-content">
-        <div id="main" role="main">
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
             <?php while (have_posts()) : the_post(); ?>
-
-            <article id="post-<?php the_ID(); ?>" role="article" itemscope itemtype="http://schema.org/BlogPosting">
-                <header class="article-header">
-                    <h1 class="page-title" itemprop="headline"><?php the_title(); ?></h1>
-                </header> <!-- end article header -->
-                <section class="entry-content" itemprop="articleBody">
-                    innhold:"<?php the_content(); ?>"
-                </section> <!-- end article section -->
-                <footer class="article-footer">
-                    nederst på siden
-                </footer> <!-- end article footer -->
-            </article> <!-- end article -->
+                    <?php get_template_part( 'content', 'full' ); ?>
             <?php endwhile; ?>
         </div> <!-- end #main -->
         <?php get_sidebar(); ?>
diff --git a/wp-content/themes/studio13/sass/app.scss b/wp-content/themes/studio13/sass/app.scss
index 571fee4..f7ffcac 100644
--- a/wp-content/themes/studio13/sass/app.scss
+++ b/wp-content/themes/studio13/sass/app.scss
@@ -40,8 +40,16 @@
 @import "compass/typography/lists/inline-block-list";
 @import "compass/css3/transform";
 @import "compass/css3/transition";
+@import "compass/css3/box-shadow";
 
+/* General styles */
 body {
+    h1,h2,h3,h4 {
+        text-transform: uppercase;
+    }
+    h1 {
+        margin-bottom: 0.3em;
+    }
     a {
         @include transition(
             background-color .15s ease,
@@ -51,15 +59,55 @@ body {
             color: $secondary-color;
         }
     }
+    
 }
+/* buttons */
+body {
+    .button {
+        border: 0;
+        @extend .secondary;
+        @include box-shadow(none);
+        text-transform: uppercase;
+    }
+    .btn-tiny {
+        $size: 32px;
+        text-align: center;
+        font-size: 1.3em;
+        display: inline-block;
+        color: white;
+        width: $size;
+        height: $size;
+        line-height: $size;
+        .icon-twitter {
+            font-size: 0.7em;
+        }
+    }
+    .primary {
+        background-color: $primary-color;
+
+        &:hover {
+            color: white;
+            background-color: $secondary-color;
+        }
+    }
+    .secondary {
+        background-color: $secondary-color;
+
+        &:hover {
+            color: white;
+            background-color: $primary-color;
+        }
+    }
+}
+
 header.header {
     margin-top: 2em;
     margin-bottom: 2em;
     .date {
         color: $primary-color;
-        font-size: 3.4em;
+        font-size: 3.45em;
         text-transform: uppercase;
-        font-weight: bold;
+        font-weight: 600;
         margin-bottom: 10px;
         display: inline-block;
 
@@ -76,9 +124,10 @@ header.header {
         background-color: $primary-color;
 
         a {
-            font-size: 1.6em;
+            font-size: 1.5em;
+            font-weight: 600;
             display: inline-block;
-            padding: .45em;
+            padding: .7em .8em;
             color: white;
             text-transform: uppercase;
 
@@ -122,15 +171,91 @@ header.header {
     height: 2px;
     background-color: $secondary-color;
     margin: 2em 0;
+    &.tiny-margin {
+        margin-top: 0;
+        margin-bottom: 0.4em;
+    }
 }
-.article-header {
-    h1 a {
-        color: inherit;
+article {
+    .article-header {
+        h1 a {
+            color: inherit;
 
-        &:hover {
-            color: $primary-color;
+            &:hover {
+                color: $primary-color;
+            }
+        }
+        h4 a {
+            color: $secondary-color;
+            &:hover { color: $primary-color; }
         }
     }
+    .entry-content {
+        font-size: 0.9em;
+    }
+    
+    .article-footer {
+        text-align: right;
+        margin-bottom: 2em;
+    }
+}
+.moretag {
+    font-weight: bold;
+}
+.bluebordered {
+    border-left: 2px solid $primary-color;
+}
+.row.row.tweets-and-blog {
+    margin-bottom: 2em;
+}
+.social-media {
+    font-size: 2em;
+    color: $secondary-color;
+
+    img, i {
+        padding-left: 1em;
+    }
+    i {
+        font-size: 1.5em;
+        color: $primary-color;
+    }
+    .uppercase {
+        text-transform: uppercase;
+    }
+}
+.sidebar {
+    .lineup {
+        ul.artists {
+            list-style-type: none;
+            padding-left: 0;
+            text-transform: uppercase;
+            font-size: 1.2em;
+            font-weight: bold;
+            line-height: 1.2;
+
+            a {
+                color: $primary-color;
+                &:hover {
+                    color: white;
+                    background-color: $secondary-color;
+                }
+            }
+
+            &.headliners {
+                margin-top: 1em;
+                font-size: 2em;
+
+                li:nth-child(even) a {
+                    color: $secondary-color;
+                    &:hover {
+                        color: white;
+                        background-color: $primary-color;
+                    }
+                }
+            }
+        }
+    }
+
 }
 .footer {
     min-width: 100%;
diff --git a/wp-content/themes/studio13/search.php b/wp-content/themes/studio13/search.php
index 12842cc..6106474 100644
--- a/wp-content/themes/studio13/search.php
+++ b/wp-content/themes/studio13/search.php
@@ -1,36 +1,16 @@
 <?php get_header(); ?>
 <div id="content">
-    <div id="inner-content">
-        <div id="main" role="main">
-            <h1 class="archive-title"><span>Søkeresultat for </span> <?php echo esc_attr(get_search_query()); ?></h1>
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
+            <h1 class="archive-title"><span>Søkeresultat for </span> '<?php echo esc_attr(get_search_query()); ?>'</h1>
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-                <article id="post-<?php the_ID(); ?>" role="article">
-                    <header class="article-header">
-                        <h3 class="search-title"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
-                        <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>
-                    </header> <!-- end article header -->
-                    <section class="entry-content">
-                            <?php the_excerpt('<span class="read-more">Les mer </span>'); ?>
-                    </section> <!-- end article section -->
-                    <footer class="article-footer">
-                    </footer> <!-- end article footer -->
-                </article> <!-- end article -->
+                    <?php get_template_part( 'content' ); ?>
             <?php endwhile; ?>
                     <nav class="wp-prev-next">
                         <?php posts_nav_link(); ?>
                     </nav>
                 <?php else : ?>
-                    <article id="post-not-found" class="hentry">
-                        <header class="article-header">
-                            <h1>Sorry, ingen treff.</h1>
-                        </header>
-                        <section class="entry-content">
-                            <p>Prøv å søke på noe annet <?php get_search_form(); ?></p>
-                        </section>
-                        <footer class="article-footer">
-                            <p></p>
-                        </footer>
-                    </article>
+                    <?php get_template_part( 'content', 'notfound' ); ?>
                 <?php endif; ?>
             </div> <!-- end #main -->
                 <?php get_sidebar(); ?>
diff --git a/wp-content/themes/studio13/sidebar.php b/wp-content/themes/studio13/sidebar.php
index a82a2f5..9eee07a 100644
--- a/wp-content/themes/studio13/sidebar.php
+++ b/wp-content/themes/studio13/sidebar.php
@@ -3,8 +3,53 @@
         <?php dynamic_sidebar( 'sidebar-one' ); ?>
     <?php else : ?>
         <!-- This content shows up if there are no widgets defined in the backend. -->
-        <div class="alert alert-help">
-            <p>Widgets kan havne her</p>
+        <!-- FIXME: template-tag -->
+        <div class="lineup">
+            <a href="/artister/"><img src="<?php echo get_template_directory_uri(); ?>/images/artister.png" alt="Artister" /></a>
+            <ul class="artists headliners">
+                <li><a href="">obama</a></li>
+                <li><a href="">THE ETTES</a></li>
+                <li><a href="">THE KNIFE</a></li>
+                <li><a href="">BOB GELDOF</a></li>
+                <li><a href="">HONNINGBARNA</a></li>
+                <li><a href="">OSCAR WILDE</a></li>
+                <li><a href="">gandhi</a></li>
+                <li><a href="">MEGADEATH</a></li>
+                <li><a href="">DARKTHRONE</a></li>
+                <li><a href="">hussein bolt</a></li>
+                <li><a href="">kent</a></li>
+                <li><a href="">frodo</a></li>
+                <li><a href="">gandalf</a></li>
+                <li><a href="">withnail</a></li>
+                <li><a href="">julenissen</a></li>
+                <li><a href="">lana del rey</a></li>
+                <li><a href="">fyrstekake</a></li>
+            </ul>
+            <ul class="artists">
+                <li><a href="">BØLLEFRØ</a></li>
+                <li><a href="">KANELBOLLE</a></li>
+                <li><a href="">KJØLESKAP</a></li>
+                <li><a href="">KAFFE</a></li>
+                <li><a href="">ALTINN ER DUST</a></li>
+                <li><a href="">SKATTEETATEN</a></li>
+                <li><a href="">KJØTTBOLLER</a></li>
+                <li><a href="">BØLLEBIRGER</a></li>
+                <li><a href="">DE LILLOS</a></li>
+                <li><a href="">HAMBURGER</a></li>
+                <li><a href="">TACO</a></li>
+                <li><a href="">EPLEKAKE</a></li>
+                <li><a href="">BØLLEFRØ</a></li>
+                <li><a href="">KANELBOLLE</a></li>
+                <li><a href="">KJØLESKAP</a></li>
+                <li><a href="">KAFFE</a></li>
+                <li><a href="">ALTINN ER DUST</a></li>
+                <li><a href="">SKATTEETATEN</a></li>
+                <li><a href="">KJØTTBOLLER</a></li>
+                <li><a href="">BØLLEBIRGER</a></li>
+                <li><a href="">DE LILLOS</a></li>
+                <li><a href="">TACO</a></li>
+                <li><a href="">EPLEKAKE</a></li>
+            </ul>
         </div>
     <?php endif; ?>
 </div>