diff --git a/_includes/header.html b/_includes/header.html
index 4ee84dd..4173899 100755
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -10,11 +10,11 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}" />
 		<meta name="keywords" content="MISP, CTI, malware, threat, cyber, intelligence, information exchange, sharing, open source, MISP threat sharing, Malware Information Sharing Platform" />
-          <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/images/ico/favicon-144.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/images/ico/favicon-114.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/images/ico/favicon-72.png">
-                  <link rel="apple-touch-icon-precomposed" href="assets/images/ico/favicon-57.png">
-                                 <link rel="shortcut icon" href="assets/images/ico/favicon.png">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/assets/images/ico/favicon-144.png">
+          <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ site.baseurl }}/assets/images/ico/favicon-114.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ site.baseurl }}/assets/images/ico/favicon-72.png">
+    <link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/assets/images/ico/favicon-57.png">
+                  <link rel="shortcut icon" href="{{ site.baseurl }}/assets/images/ico/favicon.png">
 		<!--[if lte IE 8]><script src="{{ site.baseurl }}/assets/css/ie/html5shiv.js"></script><![endif]-->
 		<script src="{{ site.baseurl }}/assets/js/jquery.min.js"></script>
 		<script src="{{ site.baseurl }}/assets/js/jquery.dropotron.min.js"></script>
diff --git a/assets/sass/style.scss b/assets/sass/style.scss
index 2fd413e..a5ebf74 100755
--- a/assets/sass/style.scss
+++ b/assets/sass/style.scss
@@ -3,7 +3,7 @@
 ---
 
 @charset 'UTF-8';
-@import url('font-awesome.min.css');
+@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css');
 @import url('http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,600,600italic');
 
 @import 'vars';
@@ -19,7 +19,7 @@
 
 	body,
 	#skel-layers-wrapper {
-		background: $color-bg url('images/bg01.png');
+		background: $color-bg url('../css/images/bg01.png');
 	}
 
 	body {
@@ -44,7 +44,7 @@
 		color: $color-accent-bg;
 		text-decoration: none;
 		border-bottom: dotted 1px;
-		
+
 		&:hover {
 			color: $color-accent-bg;
 			border-bottom-color: transparent;
@@ -54,7 +54,7 @@
 	strong, b {
 		font-weight: 600;
 	}
-	
+
 	em, i {
 		font-style: italic;
 	}
@@ -68,12 +68,12 @@
 		font-weight: 600;
 		line-height: 1.75em;
 		margin-bottom: 1em;
-		
+
 		a {
 			color: inherit;
 			text-decoration: none;
 		}
-		
+
 		em {
 			font-style: normal;
 			font-weight: 300;
@@ -95,19 +95,19 @@
 		position: relative;
 		top: 0.5em;
 	}
-	
+
 	sup {
 		font-size: 0.8em;
 		position: relative;
 		top: -0.5em;
 	}
-	
+
 	hr {
 		border-top: solid 1px $color-border;
 		border: 0;
 		margin-bottom: 1.5em;
 	}
-	
+
 	blockquote {
 		border-left: solid 0.5em $color-border;
 		font-style: italic;
@@ -128,15 +128,15 @@
 			margin-top: -0.25em;
 			margin-bottom: 0.25em;
 		}
-		
+
 		&.major {
 			text-align: center;
 			margin: 0 0 2em 0;
-			
+
 			h2 {
 				font-size: 2.25em;
 			}
-			
+
 			p {
 				position: relative;
 				border-top: solid 1px $color-border;
@@ -148,14 +148,14 @@
 			}
 		}
 	}
-	
+
 	footer {
 		margin: 0 0 3em 0;
-		
+
 		> :last-child {
 			margin-bottom: 0;
 		}
-		
+
 		&.major {
 			padding-top: 3em;
 		}
@@ -178,7 +178,7 @@
 		padding: 0.75em;
 		text-decoration: none;
 		width: 100%;
-		
+
 		&:focus {
 			border-color: $color-accent-bg;
 		}
@@ -212,11 +212,11 @@
 		color: $color-fg-light;
 	}
 
-	:-ms-input-placeholder {  
+	:-ms-input-placeholder {
 		color: $color-fg-light;
 	}
 
-	.formerize-placeholder {  
+	.formerize-placeholder {
 		color: $color-fg-light;
 	}
 
@@ -227,12 +227,12 @@
 		display: inline-block;
 		position: relative;
 		border-radius: $size-radius;
-		
+
 		img {
 			display: block;
 			border-radius: $size-radius;
 		}
-		
+
 		&.left {
 			display: block;
 			float: left;
@@ -243,9 +243,9 @@
 			img {
 				display: block;
 				width: 100%;
-			}			
+			}
 		}
-		
+
 		&.fit {
 			display: block;
 
@@ -254,11 +254,11 @@
 				width: 100%;
 			}
 		}
-		
+
 		&.featured {
 			display: block;
 			margin: 0 0 2em 0;
-			
+
 			img {
 				display: block;
 				width: 100%;
@@ -272,16 +272,16 @@
 		@include icon;
 		position: relative;
 		text-decoration: none;
-		
+
 		> .label {
 			display: none;
 		}
-		
+
 		&.major {
 			text-align: center;
 			cursor: default;
 			background-color: $color-accent-bg;
-			@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("images/bg01.png")');
+			@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")');
 			color: $color-accent-fg;
 			border-radius: 100%;
 			display: inline-block;
@@ -290,13 +290,13 @@
 			line-height: 5em;
 			box-shadow: 0 0 0 7px white, 0 0 0 8px $color-border;
 			margin: 0 0 2em 0;
-			
+
 			&:before {
 				font-size: 36px;
 			}
 		}
 	}
-	
+
 /* Lists */
 
 	ol {
@@ -319,13 +319,13 @@
 				padding-left: 0.5em;
 			}
 		}
-		
+
 		&.links {
 			li {
 				line-height: 2.5em;
 			}
 		}
-		
+
 		&.icons {
 			cursor: default;
 
@@ -337,14 +337,14 @@
 				&:first-child {
 					padding-left: 0;
 				}
-				
+
 				a, span {
 					font-size: 2em;
 					border: 0;
 				}
 			}
 		}
-				
+
 		&.actions {
 			cursor: default;
 
@@ -355,17 +355,17 @@
 			li {
 				display: inline-block;
 				padding: 0 0 0 1.5em;
-			
+
 				&:first-child {
 					padding: 0;
 				}
 			}
-			
+
 			&.vertical {
 				li {
 					display: block;
 					padding: 1.5em 0 0 0;
-			
+
 					&:first-child {
 						padding: 0;
 					}
@@ -379,7 +379,7 @@
 				display: inline-block;
 				padding: 0 0 0 1em;
 				margin: 0 0 0 1em;
-			
+
 				&:first-child
 				{
 					border-left: 0;
@@ -394,40 +394,40 @@
 
 	table {
 		width: 100%;
-	
+
 		&.default {
 			width: 100%;
-		
+
 			tbody {
 				tr {
 					border-bottom: solid 1px $color-border;
 				}
 			}
-			
+
 			td {
 				padding: 0.5em 1em 0.5em 1em;
 			}
-			
+
 			th {
 				font-weight: 600;
 				padding: 0.5em 1em 0.5em 1em;
 				text-align: left;
 			}
-		
+
 			thead {
 				background-color: #555555;
-				@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("images/bg01.png")');
+				@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")');
 				color: #fff;
 			}
-			
+
 			tfoot {
 			}
-			
+
 			tbody {
 			}
 		}
 	}
-		
+
 /* Button */
 
 	input[type="submit"],
@@ -437,7 +437,7 @@
 		@include vendor-property('appearance', 'none');
 		@include vendor-property('transition', 'background-color 0.2s ease-in-out, color 0.2s ease-in-out, box-shadow 0.2s ease-in-out');
 		background-color: $color-accent-bg;
-		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("images/bg01.png")');
+		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")');
 		border-radius: $size-radius;
 		border: 0;
 		color: $color-accent-fg;
@@ -464,7 +464,7 @@
 		&.alt {
 			background-color: #555555;
 			color: #fff;
-			
+
 			&:hover {
 				background-color: lighten(#555555, 5);
 			}
@@ -472,7 +472,7 @@
 			&:active {
 				background-color: darken(#555555, 5);
 			}
-		}	
+		}
 
 		&.icon {
 			&:before {
@@ -483,7 +483,7 @@
 		&.fit {
 			width: 100%;
 		}
-		
+
 		&.small {
 			font-size: 0.8em;
 		}
@@ -494,21 +494,21 @@
 	.box {
 		&.highlight {
 			text-align: center;
-		}	
+		}
 
 		&.post {
 			position: relative;
 			margin: 0 0 2em 0;
-			
+
 			&:after {
 				content: '';
 				display: block;
 				clear: both;
 			}
-			
+
 			.inner {
 				margin-left: calc(30% + 2em);
-				
+
 				> :last-child {
 					margin-bottom: 0;
 				}
@@ -520,22 +520,22 @@
 			}
 		}
 	}
-	
+
 /* Header */
 
 	#header {
 		text-align: center;
 		padding: 3em 0 0 0;
 		background-color: #fff;
-		background-image:			url('images/bg02.png'),		url('images/bg02.png'),		url('images/bg01.png');
+		background-image:			url('../css/images/bg02.png'),		url('../css/images/bg02.png'),		url('../css/images/bg01.png');
 		background-position:		top left,					top left,					top left;
 		background-size:			100% 6em,					100% 6em,					auto;
 		background-repeat:			no-repeat,					no-repeat,					repeat;
-		
+
 		h1 {
 			padding: 0 0 0.25em 0;
 			margin: 0;
-			
+
 			a {
 				font-size: 1.5em;
 				letter-spacing: -0.025em;
@@ -543,30 +543,30 @@
 			}
 		}
 	}
-	
+
 	#nav {
 		cursor: default;
 		background-color: #333;
-		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.3)), url("images/bg01.png")');
+		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.3)), url("../css/images/bg01.png")');
 		padding: 0;
-		
+
 		&:after {
 			content: '';
 			display: block;
 			width: 100%;
 			height: 0.75em;
 			background-color: $color-accent-bg;
-			background-image: url("images/bg01.png");
+			background-image: url("../css/images/bg01.png");
 		}
 
 		> ul {
 			margin: 0;
-			
+
 			> li {
 				position: relative;
 				display: inline-block;
 				margin-left: 1em;
-				
+
 				a {
 					color: #c0c0c0;
 					text-decoration: none;
@@ -574,17 +574,17 @@
 					display: block;
 					padding: 1.5em 0.5em 1.35em 0.5em;
 				}
-				
+
 				&:first-child {
 					margin-left: 0;
 				}
-				
+
 				&:hover {
 					a {
 						color: #fff;
 					}
 				}
-				
+
 				&.current {
 					font-weight: 600;
 
@@ -599,49 +599,49 @@
 						left: 50%;
 						margin-left: -0.375em;
 						background-color: $color-accent-bg;
-						background-image: url("images/bg01.png");
+						background-image: url("../css/images/bg01.png");
 					}
-					
+
 					a {
 						color: #fff;
 					}
 				}
-				
+
 				&.active {
 					a {
 						color: #fff;
 					}
 				}
-				
+
 				> ul {
 					display: none;
 				}
 			}
 		}
 	}
-	
+
 /* Dropotron */
 
 	.dropotron {
 		background-color: #333;
-		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0.3), rgba(0,0,0,0)), url("images/bg01.png")');
+		@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0.3), rgba(0,0,0,0)), url("../css/images/bg01.png")');
 		border-radius: $size-radius;
 		color: #fff;
 		min-width: 10em;
 		padding: 1em 0;
 		text-align: center;
 		box-shadow: 0 1em 1em 0 rgba(0,0,0,0.5);
-		
+
 		> li {
 			line-height: 2em;
 			padding: 0 1.1em 0 1em;
-			
+
 			> a {
 				color: #c0c0c0;
 				text-decoration: none;
 				border: 0;
 			}
-			
+
 			&.active,
 			&:hover {
 				> a {
@@ -649,7 +649,7 @@
 				}
 			}
 		}
-		
+
 		&.level-0 {
 			border-radius: 0 0 $size-radius $size-radius;
 			font-size: 0.9em;
@@ -667,7 +667,7 @@
 		height: 28em;
 		text-align: center;
 		position: relative;
-		
+
 		header {
 			position: absolute;
 			bottom: 0;
@@ -677,26 +677,26 @@
 			background: rgba(27,27,27,0.75);
 			color: #fff;
 			padding: 1.0em 0;
-			
+
 			h2 {
 				display: inline-block;
 				margin: 0;
 				font-size: 1.25em;
 				vertical-align: middle;
-				
+
 				em {
 					opacity: 0.75;
 				}
 
 				a {
 					border-bottom-color: transparentize(#fff, 0.5);
-					
+
 					&:hover {
 						border-bottom-color: transparent;
 					}
 				}
 			}
-			
+
 			.button {
 				vertical-align: middle;
 				margin-left: 1em;
@@ -708,35 +708,35 @@
 
 	.wrapper {
 		padding: 5em 0 3em 0;
-		
+
 		&.style1 {
 			background: #fff;
 		}
-		
+
 		&.style2 {
 			background-color:		#fff;
-			background-image:		url('images/bg02.png'),			url('images/bg03.png'),			url('images/bg01.png');
+			background-image:		url('../css/images/bg02.png'),			url('../css/images/bg03.png'),			url('../css/images/bg01.png');
 			background-position:	top left,						bottom left,					top left;
 			background-size:		100% 6em,						100% 6em,						auto;
 			background-repeat:		no-repeat,						no-repeat,						repeat;
 		}
-		
+
 		&.style3 {
 			background-color: $color-accent-bg;
-			@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("images/bg01.png")');
+			@include vendor-value('background-image', 'linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.15)), url("../css/images/bg01.png")');
 			color: $color-accent-fg;
-			
+
 			.button {
 				background: $color-accent-fg;
 				color: $color-fg;
-				
+
 				&:hover {
 					color: $color-accent-bg !important;
 				}
 			}
 		}
 	}
-	
+
 /* CTA */
 
 	#cta {
@@ -749,46 +749,46 @@
 				vertical-align: middle;
 				margin: 0;
 			}
-			
+
 			.button {
 				vertical-align: middle;
 				margin-left: 1em;
 			}
 		}
 	}
-	
+
 /* Footer */
 
 	#footer {
 		padding: 4em 0 8em 0;
-		
+
 		a {
 			color: inherit;
 			border-bottom-color: transparentize($color-fg, 0.75);
-			
+
 			&:hover {
 				color: $color-accent-bg;
 				border-bottom-color: transparent;
 			}
 		}
-		
+
 		.container {
 			margin-bottom: 4em;
 		}
-		
+
 		.icons {
 			text-align: center;
 			margin: 0;
-			
+
 			a {
 				color: $color-fg-light;
-				
+
 				&:hover {
 					color: $color-fg;
 				}
 			}
 		}
-		
+
 		.copyright {
 			color: $color-fg-light;
 			margin-top: 1.5em;