diff --git a/data/homepagefeatures.toml b/data/homepagefeatures.toml
index 5237489d7..071035f2a 100644
--- a/data/homepagefeatures.toml
+++ b/data/homepagefeatures.toml
@@ -10,7 +10,7 @@
[[feature]]
name = "Robust Content Management"
- description = "You need more than front matter to make static scalable. Hugo offers support for taxonomies, unlimited content types, DRY templating, URL management, menus, archetypes, summaries, and so much more...all *without* the need for plugins."
+ description = "You need more than front matter to make static scalable. Hugo offers support for taxonomies, unlimited content types, DRY templating, URL management, menus, archetypes, summaries, and so much more without the need for plugins."
order = 3
[[feature]]
diff --git a/layouts/index.html b/layouts/index.html
index ad0f325b8..0b4b81f6f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -3,7 +3,31 @@
{{- partial "site-search.html" . -}}
{{ end }}
{{ define "main" }}
- {{ partial "homepage/homepage-content.html" . }}
+
+
+ {{ partial "homepage/homepage-hero.html" . }}
+
+
+
+ {{ partial "homepage/homepage-focus.html" . }}
+
+
+
+
+ {{ partial "homepage/homepage-features" . }}
+
+
+
+
+
+
+
+ {{ partial "homepage/homepage-open-source.html" . }}
+
+
+
{{ end }}
{{ define "addscripts" }}
diff --git a/layouts/partials/homepage/homepage-content.html b/layouts/partials/homepage/homepage-content.html
deleted file mode 100644
index ca2a5ad81..000000000
--- a/layouts/partials/homepage/homepage-content.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- {{ partial "svg-icons/hugo-logo-wide.svg" . }}
-
-
The world's fastest static website engine.
-
Written in Golang.
-
-
-
-
-
-
- {{partial "svg-icons/gopher-small-homepage.svg" .}}
- {{partial "svg-icons/md.svg" .}}
-
-
- $ brew update
-
$ brew install hugo
-
-
-
-
Focus on your content and design.
-
-
Forget databases, security updates, and cofee breaks spent waiting for your site to rebuild.
-
Golang's speed combined with markdown's elegant simplicity mean Hugo is the first static site generator fast enough to keep up with your creativity.
-
-
-
-
-
-
What Makes Hugo Special?
- {{ partial "homepage/homepage-features" . }}
-
-
-
-
-
-
-
diff --git a/layouts/partials/homepage/homepage-features.html b/layouts/partials/homepage/homepage-features.html
index e0867e56b..c687f8a8a 100644
--- a/layouts/partials/homepage/homepage-features.html
+++ b/layouts/partials/homepage/homepage-features.html
@@ -1,3 +1,4 @@
+
{{.name}}
diff --git a/layouts/partials/homepage/homepage-focus.html b/layouts/partials/homepage/homepage-focus.html
new file mode 100644
index 000000000..d3da69094
--- /dev/null
+++ b/layouts/partials/homepage/homepage-focus.html
@@ -0,0 +1,16 @@
+
+
+ {{partial "svg-icons/gopher-small-homepage.svg" .}}
+ {{partial "svg-icons/md.svg" .}}
+
+
+ $ brew update
+
$ brew install hugo
+
+
+
+
Focus on your content and design.
+
+
Forget databases, security updates, and cofee breaks spent waiting for your site to rebuild.
+
Golang's speed combined with markdown's elegant simplicity mean Hugo is the first static site generator fast enough to keep up with your creativity.
+
\ No newline at end of file
diff --git a/layouts/partials/homepage/homepage-hero.html b/layouts/partials/homepage/homepage-hero.html
new file mode 100644
index 000000000..47dc85a09
--- /dev/null
+++ b/layouts/partials/homepage/homepage-hero.html
@@ -0,0 +1,8 @@
+
+ {{ partial "svg-icons/hugo-logo-wide.svg" . }}
+
+
The world's fastest static website engine.
+
Written in Golang.
+
\ No newline at end of file
diff --git a/layouts/partials/homepage/homepage-open-source.html b/layouts/partials/homepage/homepage-open-source.html
new file mode 100644
index 000000000..e452ecb2a
--- /dev/null
+++ b/layouts/partials/homepage/homepage-open-source.html
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/layouts/partials/homepage/homepage-tweets.html b/layouts/partials/homepage/homepage-tweets.html
index 4194184b9..ea7e1351b 100644
--- a/layouts/partials/homepage/homepage-tweets.html
+++ b/layouts/partials/homepage/homepage-tweets.html
@@ -1,3 +1,4 @@
+
See what others are saying about Hugo...
{{ range first 6 (sort $.Site.Data.homepagetweets.tweet "date" "desc" ) }}