diff --git a/bg.png b/bg.png
new file mode 100644
index 0000000..d6050dd
Binary files /dev/null and b/bg.png differ
diff --git a/front-page.php b/front-page.php
new file mode 100644
index 0000000..62c5fa2
--- /dev/null
+++ b/front-page.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * The main template file.
+ *
+ * This is the most generic template file in a WordPress theme
+ * and one of the two required files for a theme (the other being style.css).
+ * It is used to display a page when nothing more specific matches a query.
+ * E.g., it puts together the home page when no home.php file exists.
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); 
+	global $wp_query;
+$wp_query->is_archive = true;
+?>
+
+		<div id="container" >
+			<div id="content" role="main">
+
+			<?php
+			/* Run the loop to output the posts.
+			 * If you want to overload this in a child theme then include a file
+			 * called loop-index.php and that will be used instead.
+			 */
+			 
+			 the_post();
+			 ?>
+			 
+			 <div id="post-<?php the_ID(); ?>" <?php post_class('first'); ?>>
+			 <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark">
+			 
+				 <div class="entry-image">
+					<?php echo get_the_post_thumbnail( $post->ID, array(550,550) ) ?>
+				</div>
+				<h2 class="entry-title"><?php the_title(); ?></h2>
+			
+			</a>
+			<?php //endif; ?>
+
+	
+
+	<?php if ( is_archive() || is_search() ) : // Only display excerpts for archives and search. ?>
+			<div class="entry-summary">
+				<?php the_excerpt(); ?>
+			</div><!-- .entry-summary -->
+	<?php else : ?>
+			<div class="entry-content">
+				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+				<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+			</div><!-- .entry-content -->
+	<?php endif; ?>
+
+			<div class="entry-utility">
+				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+			</div><!-- .entry-utility -->
+		</div><!-- #post-## -->
+
+<div class="therest">
+<?php
+			 get_template_part( 'loop', 'index' );
+			 
+			?></div>
+			</div><!-- #content -->
+			<div id="front-feed">
+				<?php dynamic_sidebar( 'front-page-right' ) ?>
+			</div><!-- #content -->
+		</div><!-- #container -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
diff --git a/functions.php b/functions.php
index 5c56925..168cfde 100644
--- a/functions.php
+++ b/functions.php
@@ -3,14 +3,23 @@
 function studio11_widgets_init() {
 	// Area 1, located at the top of the sidebar.
 	register_sidebar( array(
-		'name' => __( 'Left side widget area', 'Studio11' ),
-		'id' => 'left-primary-widget-area',
-		'description' => __( 'The primary left widget area', 'twentyten' ),
+		'name' => __( 'Left column', 'Studio11' ),
+		'id' => 'left-column',
+		'description' => __( 'The left column in the layout', 'studio11' ),
 		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
 		'after_widget' => '</li>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
 	) );
+	
+	register_sidebar( array(
+		'name' => __( 'Right column', 'studio11'),
+		'id'=>'right-column',
+		'description' => __( 'The right column in the layout', 'studio11' ),
+		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+		'after_widget' => '</li>',
+		'before_title' => '<h3 class="widget-title">',
+		'after_title' => '</h3>',));
 
 }
 /** Register sidebars by running twentyten_widgets_init() on the widgets_init hook. */
@@ -92,3 +101,65 @@ function get_related_events( $post_id)
 	
 	return $related;
 }
+
+function artist_content_events( $content )
+{
+	global $post;
+	if(is_single())
+	{
+	
+		if($post->post_type == 'artist')
+		{
+			$events = get_related_events($post->ID);
+		
+			$content .= '<ul class="artist-list">';
+		
+			foreach($events as $event)
+			{
+				$content .=  '<li>';
+				$content .=  '<a href="' . get_permalink( $event->ID ) . '">';
+				$content .=  get_the_post_thumbnail($event->ID, array(32,32), array('style'=>'float:left;')); 
+				$content .=  '<span class="event_title">' . $event->post_title . '</span>';
+				$content .=  '</a>';
+				$content .=  '</li>';
+			}
+		
+			$content .=  '</ul>';
+		}
+		else if($post->post_type == 'event')
+		{
+			$artists = get_related_artists($post->ID);
+
+			$content .=   '<ul class="artist-list">';
+			foreach($artists as $artist)
+			{
+				$content .= '<li>';
+				$content .= '<a href="' . get_permalink( $artist->ID ) . '">';
+				$content .= get_the_post_thumbnail($artist->ID, array(32,32), array('style'=>'float:left;')); 
+				$content .= '<span class="event_title">' . $artist->post_title . '</span>';
+				$content .= '</a>';
+				$content .= '</li>';
+			}
+			$content .= '</ul>';
+		}
+	}
+	return $content;
+}
+
+if(function_exists('get_related_events'))
+	add_filter( 'the_content', 'artist_content_events' );
+/*
+function thumbnail_in_header($title)
+{
+	global $post;
+
+	if ( is_single() && 
+			current_theme_supports( 'post-thumbnails' ) &&
+							has_post_thumbnail( $post->ID ) &&
+							($image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
+							$image[1] >= 550 ) 
+						$title = '<img src="'. get_the_post_thumbnail( $post->ID ) . '" />' . $title;
+	return $title;
+}
+
+add_filter('the_title', 'thumbnail_in_header');*/
diff --git a/header.php b/header.php
index 626c438..177490b 100644
--- a/header.php
+++ b/header.php
@@ -52,16 +52,8 @@
 ?>
 </head>
 
-<body <?php body_class(); ?> onload="randomBackground()">
-<script type="text/javascript"> 
- 
-function randomBackground() {
-var bgcolorlist=new Array("#2aa445", "#f6a61c", "#646567", "#ce2083")
- 
-document.body.style.background=bgcolorlist[Math.floor(Math.random()*bgcolorlist.length)]
-}
-</script> 
-<div id="header" style="">
+<body <?php body_class(); ?>>
+<div id="header">
 		<div id="masthead">
 			<div id="branding" role="banner">
 				<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
@@ -74,31 +66,16 @@ document.body.style.background=bgcolorlist[Math.floor(Math.random()*bgcolorlist.
 						
 						</a>
 					</span>
-				<!--</<?php echo $heading_tag; ?>>
-				<div id="site-description"><?php bloginfo( 'description' ); ?></div>-->
-
-				<?php
-					// Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
-							has_post_thumbnail( $post->ID ) &&
-							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
-							$image[1] >= HEADER_IMAGE_WIDTH ) :
-						// Houston, we have a new header image!
-						echo get_the_post_thumbnail( $post->ID );
-					/*elseif ( get_header_image() ) : ?>
-						<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
-					<?php*/ endif; ?>
+				</<?php echo $heading_tag; ?>
 			</div><!-- #branding -->
 
 			<div id="access" role="navigation">
 			  <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
-				<?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used.  If none is assigned, the menu with the lowest ID is used.  */ ?>
 				<?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
 			</div><!-- #access -->
 		</div><!-- #masthead -->
-	</div><!-- #header -->
+		</div><!-- #header -->
+</div><!-- skjønner ikke hvorfor denne trengs -->
 <div id="wrapper" class="hfeed">
-	
-
 	<div id="main">
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..023bb26
--- /dev/null
+++ b/index.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * The main template file.
+ *
+ * This is the most generic template file in a WordPress theme
+ * and one of the two required files for a theme (the other being style.css).
+ * It is used to display a page when nothing more specific matches a query.
+ * E.g., it puts together the home page when no home.php file exists.
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); ?>
+		
+		<div id="container">
+			<div id="content" role="main">
+
+			<?php
+			/* Run the loop to output the posts.
+			 * If you want to overload this in a child theme then include a file
+			 * called loop-index.php and that will be used instead.
+			 */
+			 get_template_part( 'loop', 'index' );
+			?>
+			</div><!-- #content -->
+		</div><!-- #container -->
+		
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
diff --git a/sidebar.php b/sidebar.php
index e668739..f58fc2c 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -10,67 +10,15 @@
  
  ?>
 
-		<div id="left-primary" class="widget-area" role="complementary">
+		<div id="left-column">
 			<ul class="xoxo">
-
-<?php
-	/* When we call the dynamic_sidebar() function, it'll spit out
-	 * the widgets for that widget area. If it instead returns false,
-	 * then the sidebar simply doesn't exist, so we'll hard-code in
-	 * some default sidebar stuff just in case.
-	 */
-	if ( ! dynamic_sidebar( 'left-primary-widget-area' ) ) : ?>
-
-	  <?php dynamic_sidebar( 'left-primary-widget-area' ); ?>
-		   <?php endif; // end primary widget area ?>
+		<?php dynamic_sidebar( 'left-column' ) ?>
 			</ul>
-		</div><!-- #primary .widget-area -->
-
-<?php
-?>
-
-		<div id="primary" class="widget-area" role="complementary">
+		</div>
+		
+		<div id="right-column">
 			<ul class="xoxo">
-
-<?php
-	/* When we call the dynamic_sidebar() function, it'll spit out
-	 * the widgets for that widget area. If it instead returns false,
-	 * then the sidebar simply doesn't exist, so we'll hard-code in
-	 * some default sidebar stuff just in case.
-	 */
-	if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
-			<li id="search" class="widget-container widget_search">
-				<?php get_search_form(); ?>
-			</li>
-
-			<li id="archives" class="widget-container">
-				<h3 class="widget-title"><?php _e( 'Archives', 'twentyten' ); ?></h3>
-				<ul>
-					<?php wp_get_archives( 'type=monthly' ); ?>
-				</ul>
-			</li>
-
-			<li id="meta" class="widget-container">
-				<h3 class="widget-title"><?php _e( 'Meta', 'twentyten' ); ?></h3>
-				<ul>
-					<?php wp_register(); ?>
-					<li><?php wp_loginout(); ?></li>
-					<?php wp_meta(); ?>
-				</ul>
-			</li>
-
-		<?php endif; // end primary widget area ?>
+		<?php dynamic_sidebar( 'right-column' ) ?>
 			</ul>
-		</div><!-- #primary .widget-area -->
-
-<?php
-	// A second sidebar for widgets, just because.
-	if ( is_active_sidebar( 'secondary-widget-area' ) ) : ?>
-
-		<div id="secondary" class="widget-area" role="complementary">
-			<ul class="xoxo">
-				<?php dynamic_sidebar( 'secondary-widget-area' ); ?>
-			</ul>
-		</div><!-- #secondary .widget-area -->
-
-<?php endif; ?>
+		</div>
+		<div id="float_stopper"></div>
diff --git a/single.php b/single.php
new file mode 100644
index 0000000..202c7ce
--- /dev/null
+++ b/single.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * The Template for displaying all single posts.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+
+get_header(); ?>
+
+		<div id="container">
+			<div id="content" role="main">
+<?php echo get_the_post_thumbnail( $post->ID, array(550,500) ); ?>
+			<?php
+			/* Run the loop to output the post.
+			 * If you want to overload this in a child theme then include a file
+			 * called loop-single.php and that will be used instead.
+			 */
+			 
+			get_template_part( 'loop', 'single' );
+			?>
+
+			</div><!-- #content -->
+		</div><!-- #container -->
+
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
diff --git a/style.css b/style.css
index 9c7876f..54e48b7 100644
--- a/style.css
+++ b/style.css
@@ -68,12 +68,12 @@ DESCRIPTION: Two-column fixed layout with one sidebar right of content
 
 #container {
 	float: left;
-	margin: 0 -240px 0 0;
-	width: 100%;
-}
-#content {
-	margin: 0 280px 0 20px;
+	/*margin: 0 -240px 0 0;*/
+	/*width: 100%;*/
 }
+/*#content {
+	margin: 0 80px 0 20px;
+}*/
 #primary,
 #secondary {
 	float: right;
@@ -1385,31 +1385,244 @@ code {
 #studiotwitter ul
 {
 	margin:0px !important;
-	list-style:none !important;
 }
 
 .artist-list
 {
 	margin:0px;
 }
-
-.artist-list li a
+.artist-list li 
 {
-	display:block;
+	clear:left;
+	list-style:none !important;
 }
 
 .artist-list li img
 {
-	margin-right:5px;
+	position:absolute;
 }
 
+.artist-list li a:hover
+{
+	background-color:rgba(200,200,200,0.5);
+}
+
+.artist-list li a
+{
+	display:block;
+	min-height:32px;
+	width:100%;
+	margin:1px;
+}
+
+.artist-list .event_title
+{
+	margin-left:37px;
+}
+
+#wrapper
+{
+	padding-top:20px;
+}
 
 body {
-	color: #646567;		
-	webkit-transition-property: color, background; 
+	/*color: #646567;	*/	
+	/*webkit-transition-property: color, background; 
 	-webkit-transition-duration: 1s, 1s; 
-	-webkit-transition-timing-function: linear, ease-in;
+	-webkit-transition-timing-function: linear, ease-in;*/
+	background: url('/oyvinbak/studio11/wp-content/themes/studio11/bg.png');
 	width: auto;
 	height: auto;
 		
 }
+
+#wrapper
+{
+	background-color:transparent;
+	width:900px;
+}
+/*
+.home #content
+{
+	float:left;
+	width:400px;
+	margin:0px;
+}*/
+
+#front-feed
+{
+	float:right;
+	width:200px;
+}
+
+#left-column
+{
+	float:left;
+	width:150px;
+	position:absolute;
+}
+
+#left-column, #right-column
+{
+	margin-top:60px;
+}
+
+#left-column ul, #right-column ul
+{
+	padding:0px;
+	margin:0px;
+}
+
+#left-column > ul > li, #right-column > ul > li
+{
+	background-color:white
+	padding:5px;
+	list-style:none !important;
+	margin:0px;
+	margin-bottom:20px;
+}
+
+#left-column .widget-container, #right-column .widget-container
+{
+	padding:10px;
+}
+
+#left-column li, #right-column li
+{
+	list-style:none !important;
+}
+.widget_artist_widget
+{
+	background-color:rgba(217, 92, 168,0.9);
+}
+
+.home .entry-image
+{
+	max-height:200px;
+	overflow:hidden;
+}
+
+.home .therest .hentry
+{
+	width:270px;
+	float:left;
+	display:block;
+}
+
+.widget_artist_widget a
+{
+	
+	color:rgb(255,165,0) !important;
+	text-decoration:none;
+}
+
+.widget_nav_menu
+{
+	position:fixed;
+	background-color:rgba(251,182,89,0.9);
+}
+
+.widget_nav_menu
+{
+	text-align:center;
+}
+
+.widget_nav_menu a
+{
+	color:gray;
+	font-weight:bolder;
+	font-size:150%;
+	text-decoration:none;
+}
+
+.widget_text
+{
+	background-color:rgba(128,128,128,0.7);
+}
+
+#right-column
+{
+	float:left;
+	width:150px;
+	margin-left:25px;
+}
+
+.widget-container
+{
+	-moz-box-shadow: 0px -3px 6px rgba(0,0,0,0.35);
+	-webkit-box-shadow: 3px -3px 6px rgba(0,0,0,0.35);
+	box-shadow: 0px -3px 6px rgba(0,0,0,0.35);
+}
+
+#container
+{
+	-moz-box-shadow: 0px -3px 6px rgba(0,0,0,0.75);
+	-webkit-box-shadow: 3px -3px 6px rgba(0,0,0,0.75);
+	box-shadow: 0px -3px 6px rgba(0,0,0,0.75);
+}
+#container
+{
+	width: 550px;
+	margin-left:175px !important;
+	background-color:rgba(66,193,122,0.95);
+	padding:15px;
+	overflow:hidden;
+	
+}
+
+#float_stopper
+{
+	clear:left;
+}
+
+#main
+{
+	margin-bottom:20px;
+}
+#access
+{
+	background-color:rgba(251,182,89,0.9);
+}
+.menu-header 
+{
+	display:none;
+}
+
+#access a
+{
+	color:black;
+	font-weight:bold;
+}
+
+@media (max-width: 940px){
+	.menu-header 
+	{
+		display:block !important;
+	}
+	
+	#left-column
+	{
+		position:static;
+		float:none;
+		width:100%;
+	}
+	
+	
+	#right-column
+	{
+		display:none;
+	}
+	
+	#content, #container
+	{
+		margin: auto !important;
+		
+		width:580px !important;
+	}
+	
+	#wrapper, #main
+	{
+		width:580px !important;
+		margin: auto !important;
+	}
+}