diff --git a/site/layouts/index.html b/site/layouts/index.html
index 3f88f86c..7a3efd6c 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -1,8 +1,9 @@
 {{ define "main" }}
+{{ partial "home_hero" . }}
 <div class="container">
     <section class="section">
         <div class="columns is-multiline">
-            {{ range .Site.Data.twitter }}
+            {{ range sort .Site.Data.twitter "order" }}
             <div class="column is-one-third">
                 {{ partial "widget/tweet.html" . }}
             </div>
diff --git a/site/layouts/partials/header_homepage.html b/site/layouts/partials/header_homepage.html
deleted file mode 100644
index a660c25e..00000000
--- a/site/layouts/partials/header_homepage.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<section id="homepage-hero" class="hero is-medium is-primary is-bold">
-    <div class="hero-head">
-        <nav id="hero-navbar" class="navbar is-dark is-size-6 is-fixed-top" role="navigation" aria-label="main navigation">
-            {{ partial "nav_contents" . }}
-        </nav>
-    </div>
-
-    <div class="hero-body">
-        <div class="container">
-            <div class="columns">
-                <!-- Left panel -->
-                <div class="column is-centered-vertically is-5">
-                    <h2 class="title">{{ .Site.Params.Tagline }}</h2>
-                    <div>
-                        <a class="button is-medium is-light" href="{{ .Site.Params.GithubURL }}" target="_blank">
-                            <span class="icon">
-                                <i class="fab fa-github"></i>
-                            </span>
-                            <span>Source Code</span>
-                        </a>
-                    </div>
-                </div>
-
-                <!-- Right panel -->
-                <div class="column is-7">
-                    <figure class="image is-16by9">
-                        <img src="{{ .Site.BaseURL}}/images/jumbotron.png" />
-                    </figure>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/site/layouts/partials/home_hero_contents.html b/site/layouts/partials/home_hero_contents.html
new file mode 100644
index 00000000..9d32d422
--- /dev/null
+++ b/site/layouts/partials/home_hero_contents.html
@@ -0,0 +1,13 @@
+<h2 class="title">{{ .Site.Params.Tagline }}</h2>
+<div class="content">
+    <p>Yes. Experimental.</p>
+    <p>No. It can't run games... yet.</p>
+</div>
+<div>
+    <a class="button is-medium is-light" href="{{ .Site.Params.GithubURL }}" target="_blank">
+        <span class="icon">
+            <i class="fab fa-github"></i>
+        </span>
+        <span>Source Code</span>
+    </a>
+</div>
\ No newline at end of file
diff --git a/site/themes/shared-bulma-theme b/site/themes/shared-bulma-theme
index 673758d4..57954c8c 160000
--- a/site/themes/shared-bulma-theme
+++ b/site/themes/shared-bulma-theme
@@ -1 +1 @@
-Subproject commit 673758d483b4ce07efdff1ddbb3b199065a3f1b0
+Subproject commit 57954c8c06096e5ee0771d63711166e43edcc8ed