diff --git a/blueprints/item.yaml b/blueprints/item.yaml
@@ -0,0 +1,103 @@
+title: Item
+'@extends':
+    type: default
+    context: blueprints://pages
+
+form:
+  fields:
+    tabs:
+
+      fields:
+        blog:
+          type: tab
+          title: Blog Item
+
+          fields:
+
+            header_image:
+              type: section
+              title: Header Image
+              underline: true
+
+            header.header_image:
+              type: toggle
+              toggleable: true
+              label: Display Header Image
+              help: Enabled displaying of a header image
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+
+            header.header_image_file:
+              type: text
+              toggleable: true
+              label: Image File
+              help: image filename that exists in the page folder. If not provided, will use the first image found.
+              placeholder: For example: myimage.jpg
+
+            header.header_image_width:
+              type: text
+              toggleable: true
+              label: Image Width
+              size: small
+              help: Header width in px
+              placeholder: Default is 900
+              validate:
+                type: int
+                min: 0
+                max: 5000
+
+            header.header_image_height:
+              type: text
+              toggleable: true
+              label: Image Height
+              size: small
+              help: Header height in px
+              placeholder: Default is 300
+              validate:
+                type: int
+                min: 0
+                max: 5000
+
+
+            summary:
+              type: section
+              title: Summary
+              underline: true
+
+
+            header.summary.enabled:
+              type: toggle
+              toggleable: true
+              label: Summary
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+
+            header.summary.format:
+              type: select
+              toggleable: true
+              label: Format
+              classes: fancy
+              options:
+                'short': 'Use the first occurence of delimter or size'
+                'long': 'Summary delimiter will be ignored'
+
+            header.summary.size:
+              type: text
+              toggleable: true
+              label: Size
+              classes: large
+              placeholder: 300
+              validate:
+                type: int
+                min: 1
+
+            header.summary.delimiter:
+              type: text
+              toggleable: true
+              label: Summary delimiter
+              classes: large
+              placeholder: ===
diff --git a/blueprints/modular/features.yaml b/blueprints/modular/features.yaml
@@ -1,5 +1,5 @@
 title: Features
-@extends: default
+'@extends': default
 
 form:
   fields:
@@ -11,9 +11,14 @@ form:
               fields:
                 column1:
                   fields:
-                    type:
+                    name:
                       default: modular/features
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+            overrides:
+              fields:
+                header.template:
+                  default: modular/features
+                  '@data-options': '\Grav\Common\Page\Pages::modularTypes'
         features:
           type: tab
           title: Features

diff --git a/blueprints/modular/showcase.yaml b/blueprints/modular/showcase.yaml
@@ -1,20 +1,46 @@
 title: Showcase
-@extends: default
+'@extends': default
 
 form:
   fields:
     tabs:
       fields:
-        content:
-          fields:
-            uploads:
-              label: Page Media (first one will be used as background)
         advanced:
           fields:
             columns:
               fields:
                 column1:
                   fields:
-                    type:
+                    name:
                       default: modular/showcase
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+            overrides:
+              fields:
+                header.template:
+                  default: modular/showcase
+                  '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+        buttons:
+          type: tab
+          title: Buttons
+          fields:
+            header.buttons:
+              name: buttons
+              type: list
+              label: Buttons
+              fields:
+                .text:
+                  type: text
+                  label: Text
+                .url:
+                  type: text
+                  label: URL
+                .primary:
+                  type: toggle
+                  label: Primary
+                  highlight: 1
+                  default: 1
+                  options:
+                      1: 'Yes'
+                      0: 'No'
+                  validate:
+                      type: bool
diff --git a/blueprints/modular/text.yaml b/blueprints/modular/text.yaml
@@ -1,10 +1,24 @@
-title: Showcase
-@extends: default
+title: Text
+'@extends': default
 
 form:
   fields:
     tabs:
       fields:
+        advanced:
+          fields:
+            columns:
+              fields:
+                column1:
+                  fields:
+                    name:
+                      default: modular/text
+                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+            overrides:
+              fields:
+                header.template:
+                  default: modular/text
+                  '@data-options': '\Grav\Common\Page\Pages::modularTypes'
         content:
           fields:
             uploads:
@@ -18,12 +32,3 @@ form:
                 'left': 'Left'
                 'right': 'Right'
               type:
-        advanced:
-          fields:
-            columns:
-              fields:
-                column1:
-                  fields:
-                    type:
-                      default: modular/text
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
diff --git a/composer.json b/composer.json
diff --git a/css-compiled/nucleus.css b/css-compiled/nucleus.css
diff --git a/css-compiled/nucleus.css.map b/css-compiled/nucleus.css.map
diff --git a/css-compiled/particles.css b/css-compiled/particles.css
diff --git a/css-compiled/particles.css.map b/css-compiled/particles.css.map
diff --git a/css-compiled/template.css b/css-compiled/template.css
diff --git a/css-compiled/template.css.map b/css-compiled/template.css.map
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/fonts/fontawesome-webfont.woff2 b/fonts/fontawesome-webfont.woff2
diff --git a/languages.yaml b/languages.yaml
@@ -1,2 +1,295 @@
 en:
-  TRANSLATION_TEST: Antimatter!
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Continue reading...
+      NEXT_POST: Next Post
+      PREV_POST: Previous Post
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Search
+    RELATED_POSTS:
+      HEADLINE: Related Posts
+    RANDOM_ARTICLE:
+      HEADLINE: Random Article
+      FEELING_LUCKY: I'm Feeling Lucky!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Some Text Widget
+    POPULAR_TAGS:
+      HEADLINE: Popular Tags
+    ARCHIVES:
+      HEADLINE: Archives
+    SYNDICATE:
+      HEADLINE: Syndicate
+  FORM_DATA:
+    SUMMARY: "Here is the summary of what you wrote to us:"
+  ERROR: Error
+
+de:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Weiterlesen...
+      NEXT_POST: Nächster Beitrag
+      PREV_POST: Vorheriger Beitrag
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: SimpleSearch
+    RELATED_POSTS:
+      HEADLINE: Ähnliche Beiträge
+    RANDOM_ARTICLE:
+      HEADLINE: Zufälliger Artikel
+      FEELING_LUCKY: Auf gut Glück!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Text Widget Beispiel
+    POPULAR_TAGS:
+      HEADLINE: Häufigste Tags
+    ARCHIVES:
+      HEADLINE: Archiv
+    SYNDICATE:
+      HEADLINE: Abonnements
+  FORM_DATA:
+    SUMMARY: "Folgendes haben Sie uns mitgeteilt:"
+  ERROR: Fehler
+
+es:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Continuar leyendo...
+      NEXT_POST: Siguiente Entrada
+      PREV_POST: Entrada Anterior
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Buscar
+    RELATED_POSTS:
+      HEADLINE: Entradas Relacionadas
+    RANDOM_ARTICLE:
+      HEADLINE: Artículo Aleatorio
+      FEELING_LUCKY: Voy a tener suerte!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Algunos Widget de Texto
+    POPULAR_TAGS:
+      HEADLINE: Etiquetas Populares
+    ARCHIVES:
+      HEADLINE: Archivos
+    SYNDICATE:
+      HEADLINE: Distribuir
+  FORM_DATA:
+    SUMMARY: "Este es un resumen de lo escrito:"
+  ERROR: Error
+
+fr:
+  TRANSLATION_TEST: Antimatter !
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Continuer la lecture...
+      NEXT_POST: Article suivant
+      PREV_POST: Article précédent
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Recherche simple
+    RELATED_POSTS:
+      HEADLINE: Articles en relation
+    RANDOM_ARTICLE:
+      HEADLINE: Article aléatoire
+      FEELING_LUCKY: J’ai de la chance !
+    SOME_TEXT_WIDGET:
+      HEADLINE: Du texte gadget
+    POPULAR_TAGS:
+      HEADLINE: Tags populaires
+    ARCHIVES:
+      HEADLINE: Archives
+    SYNDICATE:
+      HEADLINE: Syndication
+  FORM_DATA:
+    SUMMARY: "Voici le résumé de ce que vous avez écrit pour nous :"
+  ERROR: Erreur
+
+it:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Continua a leggere...
+      NEXT_POST: Prossimo articolo
+      PREV_POST: Articolo precedente
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: SimpleSearch
+    RELATED_POSTS:
+      HEADLINE: Articoli correlati
+    RANDOM_ARTICLE:
+      HEADLINE: Articolo a caso
+      FEELING_LUCKY: Mi sento fortunato!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Widget di testo
+    POPULAR_TAGS:
+      HEADLINE: Tag popolari
+    ARCHIVES:
+      HEADLINE: Archivio
+    SYNDICATE:
+      HEADLINE: Feed
+  FORM_DATA:
+    SUMMARY: "Questo è il riassunto di quanto ci hai scritto:"
+  ERROR: Errore
+
+ro:
+  BLOG:
+   ITEM:
+      CONTINUE_READING: Mai multe...
+      NEXT_POST: Următorul articol
+      PREV_POST: Articolul anterior
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Căutare
+    RELATED_POSTS:
+      HEADLINE: Articole corelate
+    RANDOM_ARTICLE:
+     HEADLINE: Articol aleator
+    FEELING_LUCKY: Mă simt norocos
+    SOME_TEXT_WIDGET:
+      HEADLINE: Text modular
+    POPULAR_TAGS:
+      HEADLINE: Etichete populare
+    ARCHIVES:
+      HEADLINE: Arhive
+    SYNDICATE:
+      HEADLINE: Abonați-vă
+  FORM_DATA:
+    SUMMARY: "Acesta este rezumatul mesajului Dvs:"
+  ERROR: Eroare
+
+ru:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Читать далее...
+      NEXT_POST: Следующая запись
+      PREV_POST: Предыдущая запись
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Поиск
+    RELATED_POSTS:
+      HEADLINE: Также читайте
+    RANDOM_ARTICLE:
+      HEADLINE: Случайная запись
+      FEELING_LUCKY: Мне повезёт!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Текстовой виджет
+    POPULAR_TAGS:
+      HEADLINE: Популярные теги
+    ARCHIVES:
+      HEADLINE: Архив
+    SYNDICATE:
+      HEADLINE: Синдикация
+  FORM_DATA:
+    SUMMARY: "Вы написали нам:"
+  ERROR: Ошибка
+
+uk:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Читати далі...
+      NEXT_POST: Наступний запис
+      PREV_POST: Попередній запис
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Пошук
+    RELATED_POSTS:
+      HEADLINE: Також читайте
+    RANDOM_ARTICLE:
+      HEADLINE: Випадковий запис
+      FEELING_LUCKY: Мені пощастить!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Текстовий віджет
+    POPULAR_TAGS:
+      HEADLINE: Популярні теги
+    ARCHIVES:
+      HEADLINE: Архів
+    SYNDICATE:
+      HEADLINE: Синдикація
+  FORM_DATA:
+    SUMMARY: "Ви написали нам:"
+  ERROR: Помилка
+
+hr:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Nastavi s čitanjem...
+      NEXT_POST: Slijedeća objava
+      PREV_POST: Prethodna objava
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Pretraživanje
+    RELATED_POSTS:
+      HEADLINE: Povezane objave
+    RANDOM_ARTICLE:
+      HEADLINE: Slučajni članak
+      FEELING_LUCKY: Osjećam se sretno!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Neki tekst widget
+    POPULAR_TAGS:
+      HEADLINE: Popularni tagovi
+    ARCHIVES:
+      HEADLINE: Arhiva
+    SYNDICATE:
+      HEADLINE: Kanali
+  FORM_DATA:
+    SUMMARY: "Ovo je sažetak onog što ste nam napisali:"
+  ERROR: Greška
+
+pl:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Czytaj dalej...
+      NEXT_POST: Następny wpis
+      PREV_POST: Poprzedni wpis
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Szukaj
+    RELATED_POSTS:
+      HEADLINE: Powiązane wpisy
+    RANDOM_ARTICLE:
+      HEADLINE: Losowy wpis
+      FEELING_LUCKY: Szczęśliwy traf!
+    SOME_TEXT_WIDGET:
+      HEADLINE: Jakiś tekst - widget
+    POPULAR_TAGS:
+      HEADLINE: Popularne tagi
+    ARCHIVES:
+      HEADLINE: Archiwum
+    SYNDICATE:
+      HEADLINE: Feed
+  FORM_DATA:
+    SUMMARY: "Podsumowanie tego co do nas napisałeś:"
+  ERROR: Błąd
+
+pt-BR:
+  TRANSLATION_TEST: Antimatter!
+  BLOG:
+    ITEM:
+      CONTINUE_READING: Continue lendo...
+      NEXT_POST: Próximo Post
+      PREV_POST: Post anterior
+  SIDEBAR:
+    SIMPLE_SEARCH:
+      HEADLINE: Buscar 
+    RELATED_POSTS:
+      HEADLINE: Posts relacionados
+    RANDOM_ARTICLE:
+      HEADLINE: Artigo aleatório
+      FEELING_LUCKY: Me sinto sortudo.
+    SOME_TEXT_WIDGET:
+      HEADLINE: Algum widget de texto
+    POPULAR_TAGS:
+      HEADLINE: Tags Populares
+    ARCHIVES:
+      HEADLINE: Arquivos
+    SYNDICATE:
+      HEADLINE: Feed
+  FORM_DATA:
+    SUMMARY: "Aqui está o resumo do que você nos escreveu:"
+  ERROR: Erro
diff --git a/scss/configuration/template/_colors.scss b/scss/configuration/template/_colors.scss
@@ -52,11 +52,24 @@ $rule-color: 					#F0F2F4;
 $code-text:						#c7254e;
 $code-bg:						#f9f2f4;
 $pre-text:						#237794;
-$pre-bg:						#f6f6f6;
+$pre-bg:						#f0f0f0;
 
 // Dark Contrast variation
 $dark-navbar-text:				#999;
 $dark-sidebar:					#222;
 $dark-sidebar-text:				#999;
 $dark-main-bg:					#333;
 $dark-body-border:				#666;
+
+// Info - Yellow
+$notes-info-border:     #F0AD4E;
+$notes-info-bg:         #FCF8F2;
+// Warning - Red
+$notes-warning-border:  #D9534F;
+$notes-warning-bg:      #FDF7F7;
+// Note - Blue
+$notes-note-border:     #5BC0DE;
+$notes-note-bg:         #F4F8FA;
+// Success - Green
+$notes-success-border:  #5CB85C;
+$notes-success-bg:      #F1F9F1;
diff --git a/scss/template/_header.scss b/scss/template/_header.scss
@@ -1,4 +1,5 @@
 // Header styling
+$dropdown-color: #f6f6f6;
 
 #header {
 	@extend .default-animation;
@@ -32,6 +33,10 @@
 		#navbar a:before, #navbar a:after {
 			background-color: $core-accent !important;
 		}
+
+		.navigation {
+			margin-top: 0.5rem !important;
+		}
 	}
 
 	// set heights for vertical centering
@@ -56,17 +61,57 @@
 
 	#navbar {
 		font-size: $core-font-size - 0.1rem;
+
+		/* Child Indicator */
+		.has-children {
+
+			& > a {
+				& > span {
+					display: inline-block;
+					padding-right: 8px;
+
+					&:after {
+						font-family: FontAwesome;
+						content: '\f107';
+						position: absolute;
+						display: inline-block;
+						right: 8px;
+						top: 4px;
+					}
+				}
+				&:after, &:before {
+					display: none;
+				}
+			}
+
+			& .has-children > a > span:after {
+				content: '\f105';
+			}
+		}
+
+		.navigation > .has-children:hover > a {
+			background: $dropdown-color;
+			border: 1px solid darken($dropdown-color, 4%);
+			border-bottom-color: $dropdown-color;
+			margin: -1px -1px 0 -1px;
+			z-index: 1000;
+			position: relative;
+			padding-bottom: 1px;
+		}
+
 		ul {
 
 			margin: 0;
 			padding: 0;
 			list-style: none;
 
 			&.navigation {
-				@extend %vertical-align;
 				display: inline-block;
-
 				float: right;
+				@extend .default-animation;
+
+				margin-top: 1.4rem;
+
 				li {
 					float: left;
 					position: relative;
@@ -76,6 +121,9 @@
 						display: inline-block;
 						padding: 0.3rem 0.8rem;
 
+						-webkit-backface-visibility: hidden;
+
+
 						&:before, &:after {
 							content: "";
 							position: absolute;
@@ -87,6 +135,7 @@
 							visibility: hidden;
 							@include transform(scaleX(0));
 							@include transition(all 0.2s ease);
+
 						}
 
 						&:hover:before {
@@ -109,49 +158,55 @@
 						}
 					}
 
-					// Dropdown Menu Styles
+					/*Active dropdown nav item */
 					ul {
+						position: absolute;
+						background-color: $dropdown-color;
+						border: 1px solid darken($dropdown-color, 4%);
+						border-top: 0;
+						min-width: 12rem;
+						text-align: left;
+						z-index: 999;
+						left: -1px;
 						display: none;
-						padding: 0;
-						box-shadow: 0 0.05rem 1rem rgba(0,0,0, 0.15) !important;
 					}
 
-					ul ul {
-						left: 100%;
-						top: 0;
-					}	
-
+					ul li {
+						display: block;
+						float: none;
 
-					&:hover {
-						& > ul {
-							display: block;
-							position: absolute;
-							background: rgba($white, 0.9);
-							width: 10rem;
+						/* Active Dropdown nav item */
+						&.active > a {
+							background-color: darken($dropdown-color, 4%);
+							color: $core-accent;
 						}
 
-						li {
-							float: none;
-							margin: 0;
-							padding: 0;
-
-							a {
-								padding: 0.5rem 0.8rem;
-								display: block;
+						&:hover > a {
+							background-color: $core-accent;
+							color: $white;
+						}
 
-								&:before, &:after {
-									display: none;
-								}
-							}
+						a {
+							display: block;
+							margin: 0 -1px;
 
-							&.active {
-								& > a {
-									background: $core-accent;
-									color: $white;
-								}
+							&:after, &:before {
+								display: none;
 							}
 						}
 					}
+
+					/* Dropdown CSS */
+					ul ul {
+						left: 100%;
+						top: 0px;
+					}
+
+					/* Active on Hover */
+					&:hover > ul {
+						display: block;
+					}
+
 				}
 				@include breakpoint(desktop-only) {
 					display: none;
@@ -207,6 +262,10 @@
         background-color: rgba($header-text,0);
         box-shadow: none;
 
+		.navigation .has-children:hover a {
+			color: $core-accent;
+		}
+
         #logo h3, #logo a {
             color: $header-text;
         }
@@ -217,15 +276,5 @@
         	background-color: rgba($header-text,0.7) !important;
         }
 
-        #navbar ul.navigation  {
-
-            ul li a {
-
-                color: $core-accent;
-                &:hover {
-                    color: darken($core-accent, 20%);
-                }
-            }
-        }
     }
 }
diff --git a/scss/template/_simplesearch.scss b/scss/template/_simplesearch.scss
@@ -32,6 +32,17 @@
         }
     }
 
+    .search-wrapper {
+        .search-submit {
+            height: 52px;
+            padding: 0 10px;
+            img {
+                width: 30px;
+            }
+        }
+    }
+
+
     .search-details {
         float: right;
         margin-top: -2.5rem;

diff --git a/scss/template/_typography.scss b/scss/template/_typography.scss
@@ -124,33 +124,57 @@ blockquote > blockquote > blockquote {
 	> p {
 		// Yellow
 		margin-left: -71px;
-		border-left: 10px solid #F0AD4E;
-		background: #FCF8F2;
-		color: darken(#F0AD4E,15%);
+		border-left: 10px solid $notes-info-border;
+		background: $notes-info-bg;
+		color: darken($notes-info-border,15%);
+		a {
+			color: darken($notes-info-border,25%);
+			&:hover {
+				color: lighten($notes-info-border,5%);
+			}
+		}
 	}
 
 	> blockquote > p {
 		// Red
 		margin-left: -94px;
-		border-left: 10px solid #D9534F;
-		background: #FDF7F7;
-		color: darken(#D9534F,15%);
+		border-left: 10px solid $notes-warning-border;
+		background: $notes-warning-bg;
+		color: darken($notes-warning-border,15%);
+		a {
+			color: darken($notes-warning-border,25%);
+			&:hover {
+				color: lighten($notes-warning-border,5%);
+			}
+		}
 	}
 
 	> blockquote > blockquote > p {
 		// Blue
 		margin-left: -118px;
-		border-left: 10px solid #5BC0DE;
-		background: #F4F8FA;
-		color: darken(#5BC0DE,15%);
+		border-left: 10px solid $notes-note-border;
+		background: $notes-note-bg;
+		color: darken($notes-note-border,15%);
+		a {
+			color: darken($notes-note-border,25%);
+			&:hover {
+				color: lighten($notes-note-border,5%);
+			}
+		}
 	}
 
 	> blockquote > blockquote > blockquote > p {
 		// Green
 		margin-left: -142px;
-		border-left: 10px solid #5CB85C;
-		background: #F1F9F1;
-		color: darken(#5CB85C,15%);
+		border-left: 10px solid $notes-success-border;
+		background: $notes-success-bg;
+		color: darken($notes-success-border,15%);
+		a {
+			color: darken($notes-success-border,25%);
+			&:hover {
+				color: lighten($notes-success-border,5%);
+			}
+		}
 	}
 
 }

diff --git a/templates/blog.html.twig b/templates/blog.html.twig
@@ -10,15 +10,15 @@
 		{% else %}
 		<div class="blog-header">
 		{% endif %}
-			{{ page.content }}
+			{{ page.content|raw }}
 		</div>
 
 			{% if config.plugins.breadcrumbs.enabled %}
 				{% include 'partials/breadcrumbs.html.twig' %}
 			{% endif %}
 
 		<div class="content-wrapper blog-content-list grid pure-g">
-			<div id="listing" class="block pure-u-2-3">
+			<div id="listing" class="block pure-u-2-3 h-feed">
 				{% for child in collection %}
 			        {% include 'partials/blog_item.html.twig' with {'blog':page, 'page':child, 'truncate':true} %}
 			    {% endfor %}

diff --git a/templates/default.html.twig b/templates/default.html.twig
@@ -1,5 +1,5 @@
 {% extends 'partials/base.html.twig' %}
 
 {% block content %}
-	{{ page.content }}
+	{{ page.content|raw }}
 {% endblock %}
diff --git a/templates/error.html.twig b/templates/error.html.twig
@@ -3,9 +3,9 @@
 {% block content %}
 	<div id="error">
 		<div>
-			<h1>Error {{ page.header.http_response_code }}</h1>
+			<h1>{{ 'ERROR'|t }} {{ page.header.http_response_code }}</h1>
 			<p>
-				{{ page.content }}
+				{{ page.content|raw }}
 			</p>
 		</div>
 	</div>

diff --git a/templates/form.html.twig b/templates/form.html.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {{ content }}
+    {{ content|raw }}
     {% include "forms/form.html.twig" %}
 
 {% endblock %}
diff --git a/templates/formdata.html.twig b/templates/formdata.html.twig
diff --git a/templates/forms/data.html.twig b/templates/forms/data.html.twig
diff --git a/templates/forms/data.txt.twig b/templates/forms/data.txt.twig
diff --git a/templates/forms/form.html.twig b/templates/forms/form.html.twig
diff --git a/templates/item.html.twig b/templates/item.html.twig
@@ -6,8 +6,8 @@
 		{% endif %}
 
 		<div class="blog-content-item grid pure-g-r">
-			<div id="item" class="block pure-u-2-3">
-			    {% include 'partials/blog_item.html.twig' with {'blog':page.parent, 'truncate':false,'big_header':true} %}
+			<div id="item" class="block pure-u-2-3 h-entry">
+			    {% include 'partials/blog_item.html.twig' with {'blog':page.parent, 'truncate':false} %}
 			</div>
 			<div id="sidebar" class="block size-1-3 pure-u-1-3">
 				{% include 'partials/sidebar.html.twig' with {'blog':page.parent}%}

diff --git a/templates/modular.html.twig b/templates/modular.html.twig
@@ -30,21 +30,27 @@
     {% if show_onpage_menu %}
         <ul class="navigation">
         {% for module in page.collection() %}
-
             {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
             <li class="{{ current_module }}"><a href="#{{ _self.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
-
         {% endfor %}
-    </ul>
+        {% for mitem in site.menu %}
+            <li>
+                <a {% if mitem.class %}class="{{ mitem.class }}"{% endif %} href="{{ mitem.url }}">
+                    {% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %}
+                    {{ mitem.text }}
+                </a>
+            </li>
+        {% endfor %}
+        </ul>
     {% else %}
         {{  parent() }}
     {% endif %}
 {% endblock %}
 
 {% block content %}
-    {{ page.content }}
+    {{ page.content|raw }}
     {% for module in page.collection() %}
         <div id="{{ _self.pageLinkName(module.menu) }}"></div>
-        {{ module.content }}
+        {{ module.content|raw }}
     {% endfor %}
 {% endblock %}
diff --git a/templates/modular/features.html.twig b/templates/modular/features.html.twig
@@ -1,5 +1,5 @@
 <div class="modular-row features {{ page.header.class}}">
-    {{ content }}
+    {{ content|raw }}
     <div class="feature-items">
     {% for feature in page.header.features %}
            <div class="feature">

diff --git a/templates/modular/showcase.html.twig b/templates/modular/showcase.html.twig
@@ -1,10 +1,10 @@
 {% set showcase_image = page.media.images|first.grayscale().contrast(20).brightness(-125).colorize(-35,81,122) %}
 {% if showcase_image %}
-	<div class="modular-row showcase flush-top" style="background-image: url({{ showcase_image.url }});">
+	<div class="modular-row showcase{% if page == page.parent.collection.first %} flush-top{% endif %}" style="background-image: url({{ showcase_image.url }});">
 {% else %}
 <div class="modular-row showcase">
 {% endif %}
-    {{ content }}
+    {{ content|raw }}
 
     {% for button in page.header.buttons %}
         <a class="button{% if button.primary %} primary{% endif %}" href="{{ button.url }}">{{ button.text }}</a>

diff --git a/templates/modular/text.html.twig b/templates/modular/text.html.twig
@@ -1,7 +1,7 @@
 <div class="modular-row callout">
     {% set image = page.media.images|first %}
     {% if image %}
-        {{ image.cropResize(400,400).html('','','align-'~page.header.image_align) }}
+        {{ image.cropResize(400,400).html('','','align-'~page.header.image_align)|raw }}
     {% endif %}
-{{ content }}
+{{ content|raw }}
 </div>
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,8 +1,7 @@
+{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
 <head>
-{% set theme_config = attribute(config.themes, config.system.pages.theme) %}
-
 {% block head %}
     <meta charset="utf-8" />
     <title>{% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }}</title>
@@ -13,10 +12,10 @@
 
     {% block stylesheets %}
         {% do assets.addCss('theme://css/pure-0.5.0/grids-min.css', 103) %}
-        {% do assets.addCss('theme://css-compiled/nucleus.css',102) %}
-        {% do assets.addCss('theme://css-compiled/template.css',101) %}
-        {% do assets.addCss('theme://css/custom.css',100) %}
-        {% do assets.addCss('theme://css/font-awesome.min.css',100) %}
+        {% do assets.addCss('theme://css-compiled/nucleus.css', 102) %}
+        {% do assets.addCss('theme://css-compiled/template.css', 101) %}
+        {% do assets.addCss('theme://css/custom.css', 100) %}
+        {% do assets.addCss('theme://css/font-awesome.min.css', 100) %}
         {% do assets.addCss('theme://css/slidebars.min.css') %}
 
         {% if browser.getBrowser == 'msie' and browser.getVersion == 10 %}
@@ -27,17 +26,20 @@
             {% do assets.addJs('theme://js/html5shiv-printshiv.min.js') %}
         {% endif %}
     {% endblock %}
-    {{ assets.css() }}
 
     {% block javascripts %}
-        {% do assets.addJs('jquery',101) %}
-        {% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %}
+        {% do assets.addJs('jquery', 101) %}
+        {% do assets.addJs('theme://js/modernizr.custom.71422.js', 100) %}
         {% do assets.addJs('theme://js/antimatter.js') %}
         {% do assets.addJs('theme://js/slidebars.min.js') %}
     {% endblock %}
-    {{ assets.js() }}
 
-{% endblock head%}
+    {% block assets deferred %}
+        {{ assets.css()|raw }}
+        {{ assets.js()|raw }}
+    {% endblock %}
+
+{% endblock head %}
 </head>
 <body id="top" class="{{ page.header.body_classes }}">
     <div id="sb-site">
@@ -48,6 +50,9 @@
             </div>
             <div id="navbar">
                 {% block header_extra %}{% endblock %}
+                {% if config.plugins.langswitcher.enabled %}
+                {% include 'partials/langswitcher.html.twig' %}
+                {% endif %}
                 {% block header_navigation %}
                 {% include 'partials/navigation.html.twig' %}
                 {% endblock %}
@@ -73,22 +78,25 @@
         </footer>
         {% endblock %}
     </div>
-    <div class="sb-slidebar sb-left sb-width-thin">
-        <div id="panel">
-        {% include 'partials/navigation.html.twig' %}
+    {% block sidebar_navigation %}
+        <div class="sb-slidebar sb-left sb-width-thin">
+            <div id="panel">
+            {% include 'partials/navigation.html.twig' %}
+            </div>
         </div>
-    </div>
+    {% endblock %}
     {% block bottom %}
-    <script>
-    $(function () {
-        $(document).ready(function() {
-          $.slidebars({
-            hideControlClasses: true,
-            scrollLock: true
-          });
+         <script>
+        $(function () {
+            $(document).ready(function() {
+              $.slidebars({
+                hideControlClasses: true,
+                scrollLock: true
+              });
+            });
         });
-    });
-    </script>
+        </script>
+        {{ assets.js('bottom')|raw }}
     {% endblock %}
 </body>
 </html>
diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig
@@ -1,67 +1,86 @@
-<div class="list-item">
+<div class="list-item h-entry">
+
+    {% set header_image = page.header.header_image|defined(true) %}
+    {% set header_image_width  = page.header.header_image_width|defined(900) %}
+    {% set header_image_height = page.header.header_image_height|defined(300) %}
+    {% set header_image_file = page.header.header_image_file %}
 
     <div class="list-blog-header">
         <span class="list-blog-date">
-            <span>{{ page.date|date("d") }}</span>
-            <em>{{ page.date|date("M") }}</em>
+            <time class="dt-published" datetime="{{ page.date|date("c") }}">
+                <span>{{ page.date|date("d") }}</span>
+                <em>{{ page.date|date("M") }}</em>
+            </time>
         </span>
         {% if page.header.link %}
-            <h4>
-                {% if page.header.continue_link is not sameas(false) %}
-                <a href="{{ page.url }}"><i class="fa fa-angle-double-right"></i></a>
+            <h4 class="p-name">
+                {% if page.header.continue_link is not same as(false) %}
+                <a href="{{ page.url }}"><i class="fa fa-angle-double-right u-url"></i></a>
                 {% endif %}
-                <a href="{{ page.header.link }}">{{ page.title }}</a>
+                <a href="{{ page.header.link }}" class="u-url">{{ page.title }}</a>
             </h4>
         {% else %}
-            <h4><a href="{{ page.url }}">{{ page.title }}</a></h4>
+            <h4 class="p-name"><a href="{{ page.url }}" class="u-url">{{ page.title }}</a></h4>
         {% endif %}
 
         {% if page.taxonomy.tag %}
         <span class="tags">
             {% for tag in page.taxonomy.tag %}
-            <a href="{{ blog.url }}/tag{{ config.system.param_sep }}{{ tag }}">{{ tag }}</a>
+            <a href="{{ blog.url|rtrim('/') }}/tag{{ config.system.param_sep }}{{ tag }}" class="p-category">{{ tag }}</a>
             {% endfor %}
         </span>
         {% endif %}
-        {% if big_header %}
-            {{ page.media.images|first.cropResize(900,600).html }}
-        {% else %}
-            {{ page.media.images|first.cropZoom(900,300).html }}
+        {% if header_image %}
+            {% if header_image_file %}
+                {% set header_image_media = page.media.images[header_image_file] %}
+            {% else %}
+                {% set header_image_media = page.media.images|first %}
+            {% endif %}
+            {{ header_image_media.cropZoom(header_image_width, header_image_height).html|raw }}
         {% endif %}
 
     </div>
 
     <div class="list-blog-padding">
 
-    {% if page.header.continue_link is sameas(false) %}
-        <p>{{ page.content }}</p>
+    {% if page.header.continue_link is same as(false) %}
+        <div class="e-content">
+            {{ page.content|raw }}
+        </div>
         {% if not truncate %}
         {% set show_prev_next = true %}
         {% endif %}
     {% elseif truncate and page.summary != page.content %}
-        <p>{{ page.summary }}</p>
-        <p><a href="{{ page.url }}">Continue Reading...</a></p>
+        <div class="p-summary e-content">
+            {{ page.summary|raw }}
+            <p><a href="{{ page.url }}">{{ 'BLOG.ITEM.CONTINUE_READING'|t }}</a></p>
+        </div>
     {% elseif truncate %}
-        {% if page.summary != page.content %}
-            <p>{{ page.content|truncate(550) }}</p>
-        {% else %}
-            <p>{{ page.content }}</p>
-        {% endif %}
-        <p><a href="{{ page.url }}">Continue Reading...</a></p>
+        <div class="p-summary e-content">
+            {{ page.content|raw }}
+            <p><a href="{{ page.url }}">{{ 'BLOG.ITEM.CONTINUE_READING'|t }}</a></p>
+        </div>
     {% else %}
-        <p>{{ page.content }}</p>
+        <div class="e-content">
+            {{ page.content|raw }}
+        </div>
+
+        {% if config.plugins.comments.enabled %}
+            {% include 'partials/comments.html.twig' %}
+        {% endif %}
+
         {% set show_prev_next = true %}
     {% endif %}
 
     {% if show_prev_next %}
 
         <p class="prev-next">
             {% if not page.isFirst %}
-                <a class="button" href="{{ page.nextSibling.url }}"><i class="fa fa-chevron-left"></i> Next Post</a>
+                <a class="button" href="{{ page.nextSibling.url }}"><i class="fa fa-chevron-left"></i> {{ 'BLOG.ITEM.NEXT_POST'|t }}</a>
             {% endif %}
 
             {% if not page.isLast %}
-                <a class="button" href="{{ page.prevSibling.url }}">Previous Post <i class="fa fa-chevron-right"></i></a>
+                <a class="button" href="{{ page.prevSibling.url }}">{{ 'BLOG.ITEM.PREV_POST'|t }} <i class="fa fa-chevron-right"></i></a>
             {% endif %}
         </p>
     {% endif %}

diff --git a/templates/partials/metadata.html.twig b/templates/partials/metadata.html.twig
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
@@ -1,23 +1,34 @@
+{% import _self as macros %}
+
 {% macro loop(page) %}
+    {% import _self as macros %}
     {% for p in page.children.visible %}
         {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
-        <li class="{{ current_page }}">
-            <a href="{{ p.url }}">
-                {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
-                {{ p.menu }}
-            </a>
-            {% if p.children.visible.count > 0 %}
+        {% if p.children.visible.count > 0 %}
+            <li class="has-children {{ current_page }}">
+                <a href="{{ p.url }}">
+                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+                    {{ p.menu }}
+                    <span></span>
+                </a>
                 <ul>
-                    {{ _self.loop(p) }}
+                    {{ macros.loop(p) }}
                 </ul>
-            {% endif %}
-        </li>
+            </li>
+        {% else %}
+            <li class="{{ current_page }}">
+                <a href="{{ p.url }}">
+                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
+                    {{ p.menu }}
+                </a>
+            </li>
+        {% endif %}
     {% endfor %}
 {% endmacro %}
 
 <ul class="navigation">
     {% if theme_config.dropdown.enabled %}
-        {{ _self.loop(pages) }}
+        {{ macros.loop(pages) }}
     {% else %}
         {% for page in pages.children.visible %}
             {% set current_page = (page.active or page.activeChild) ? 'active' : '' %}
@@ -37,5 +48,8 @@
             </a>
         </li>
     {% endfor %}
-</ul>           
+    {% if config.plugins.login.enabled and grav.user.username %}
+        <li><i class="fa fa-lock"></i> {% include 'partials/login-status.html.twig' %}</li>
+    {% endif %}
+</ul>
 
diff --git a/templates/partials/sidebar.html.twig b/templates/partials/sidebar.html.twig
@@ -1,44 +1,41 @@
-{% if blog.url == base_url_relative %}
-    {% set feed_url = blog.url~'/'~blog.slug %}
-{% else %}
-    {% set feed_url = blog.url %}
-{% endif  %}
+{% set feed_url = blog.url == '/' or blog.url == base_url_relative ? (base_url_relative~'/'~blog.slug) : blog.url %}
+{% set new_base_url = blog.url == '/' ? '' : blog.url %}
 
 {% if config.plugins.simplesearch.enabled %}
 <div class="sidebar-content">
-    <h4>SimpleSearch</h4>
+    <h4>{{ 'SIDEBAR.SIMPLE_SEARCH.HEADLINE'|t }}</h4>
     {% include 'partials/simplesearch_searchbox.html.twig' %}
 </div>
 {% endif %}
 {% if config.plugins.relatedpages.enabled and related_pages|length > 0 %}
-    <h4>Related Posts</h4>
+    <h4>{{ 'SIDEBAR.RELATED_POSTS.HEADLINE'|t }}</h4>
     {% include 'partials/relatedpages.html.twig' %}
 {% endif %}
 {% if config.plugins.random.enabled %}
 <div class="sidebar-content">
-	<h4>Random Article</h4>
-	<a class="button" href="{{ base_url }}/random"><i class="fa fa-retweet"></i> I'm Feeling Lucky!</a>
+	<h4>{{ 'SIDEBAR.RANDOM_ARTICLE.HEADLINE'|t }}</h4>
+	<a class="button" href="{{ base_url }}/random"><i class="fa fa-retweet"></i> {{ 'SIDEBAR.RANDOM_ARTICLE.FEELING_LUCKY'|t }}</a>
 </div>
 {% endif %}
 <div class="sidebar-content">
-	<h4>Some Text Widget</h4>
+	<h4>{{ 'SIDEBAR.SOME_TEXT_WIDGET.HEADLINE'|t }}</h4>
 	<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.</p>
 </div>
 {% if config.plugins.taxonomylist.enabled %}
 <div class="sidebar-content">
-    <h4>Popular Tags</h4>
-    {% include 'partials/taxonomylist.html.twig' with {'base_url':blog.url, 'taxonomy':'tag'} %}
+    <h4>{{ 'SIDEBAR.POPULAR_TAGS.HEADLINE'|t }}</h4>
+    {% include 'partials/taxonomylist.html.twig' with {'base_url':new_base_url, 'taxonomy':'tag'} %}
 </div>
 {% endif %}
 {% if config.plugins.archives.enabled %}
 <div class="sidebar-content">
-    <h4>Archives</h4>
-	{% include 'partials/archives.html.twig' with {'base_url':blog.url} %}
+    <h4>{{ 'SIDEBAR.ARCHIVES.HEADLINE'|t }}</h4>
+	{% include 'partials/archives.html.twig' with {'base_url':new_base_url} %}
 </div>
 {% endif %}
 {% if config.plugins.feed.enabled %}
 <div class="sidebar-content syndicate">
-    <h4>Syndicate</h4>
+    <h4>{{ 'SIDEBAR.SYNDICATE.HEADLINE'|t }}</h4>
     <a class="button" href="{{ feed_url }}.atom"><i class="fa fa-rss-square"></i> Atom 1.0</a>
     <a class="button" href="{{ feed_url }}.rss"><i class="fa fa-rss-square"></i> RSS</a>
 </div>

diff --git a/templates/snipcart.html.twig b/templates/snipcart.html.twig