diff --git a/.gitignore b/.gitignore
index 82ec92343..78de23d9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,5 +59,7 @@ dist/converse-mobile.min.js
 
 css/converse.css.map
 css/converse.min.css
+css/theme.min.css
+css/mobile.min.css
 
 .sv?
diff --git a/Makefile b/Makefile
index c224f7bbb..b3d247d00 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ dev: stamp-bower stamp-bundler build
 ## Builds
 
 .PHONY: css
-css: sass/*.scss css/converse.css css/converse.min.css
+css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css
 
 css/converse.css:: stamp-bundler stamp-bower sass
 	$(SASS) -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
@@ -135,6 +135,12 @@ css/converse.css:: stamp-bundler stamp-bower sass
 css/converse.min.css:: stamp-npm
 	$(CLEANCSS) css/converse.css > css/converse.min.css
 
+css/theme.min.css:: stamp-npm
+	$(CLEANCSS) css/theme.css > css/theme.min.css
+
+css/mobile.min.css:: stamp-npm
+	$(CLEANCSS) css/mobile.css > css/mobile.min.css
+
 .PHONY: watch
 watch: stamp-bundler
 	$(SASS) --watch -I ./components/bourbon/app/assets/stylesheets/ sass/converse.scss:css/converse.css
diff --git a/css/mobile.css b/css/mobile.css
new file mode 100644
index 000000000..b4879b218
--- /dev/null
+++ b/css/mobile.css
@@ -0,0 +1,11 @@
+#conversejs {
+    left: 0px;
+    right: 0px;
+}
+.converse-chatroom {
+    font-size: 14px;
+}
+.intro {
+  padding: 0;
+  height: 100vh;
+}
diff --git a/css/theme.css b/css/theme.css
index 3ab0298af..914198dcc 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -109,7 +109,6 @@ a:focus {
     }
 }
 
-
 .features-section,
 .outro,
 .intro {
diff --git a/mobile.html b/mobile.html
new file mode 100644
index 000000000..7352e15bd
--- /dev/null
+++ b/mobile.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Converse.js | Mobile</title>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="description" content="Converse.js | Mobile" />
+    <meta name="author" content="JC Brand" />
+    <meta name="keywords" content="xmpp chat webchat converse.js" />
+    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="css/mobile.css" />
+    <script type="text/javascript" src="analytics.js"></script>
+    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+    <![if gte IE 9]>
+        <script src="dist/converse-mobile.js"></script>
+    <![endif]>
+</head>
+
+<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
+
+    <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
+        <div class="container">
+            <div class="navbar-header page-scroll">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
+                    <i class="fa fa-bars"></i>
+                </button>
+                <a class="navbar-brand" href="#page-top">
+                    <i class="fa fa-play-circle"></i>  <span class="light">Home</span>
+                </a>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
+                <ul class="nav navbar-nav">
+                    <!-- Hidden li included to remove active class from about link when scrolled up past about section -->
+                    <li class="hidden">
+                        <a href="#page-top"></a>
+                    </li>
+                    <li class="page-scroll">
+                        <a href="#about">About</a>
+                    </li>
+                    <li class="page-scroll">
+                        <a href="#features">Features</a>
+                    </li>
+                    <li class="page-scroll">
+                        <a href="#contact">Contact</a>
+                    </li>
+                    <li>
+                        <a href="/docs/html/manual.html">User Manual</a>
+                    </li>
+                    <li>
+                        <a href="/docs/html/index.html">Documentation</a>
+                    </li>
+                    <li>
+                        <a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank">Download</a>
+                    </li>
+                </ul>
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container -->
+    </nav>
+
+    <section class="intro" class="container">
+        <div class="row">
+            <h1 class="brand-heading"><i class="icon-conversejs"></i> Converse.js</h1>
+            <div class="col-md-8 col-md-offset-2">
+                <p class="intro-text">A free and open-source XMPP chat client in your browser</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-8 col-md-offset-2 banner-social-buttons">
+                <ul class="list-inline">
+                    <li><a href="https://twitter.com/jcopkode" class="btn btn-circle btn-lg" title="Twitter" target="_blank"><i class="fa fa-twitter"></i></a>
+                    </li>
+                    <li><a href="https://github.com/jcbrand/converse.js" class="btn btn-circle btn-lg" title="GitHub" target="_blank"><i class="fa fa-github"></i></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </section>
+
+    <section id="about" class="container content-section text-center">
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2">
+                <h2><strong>Converse.js</strong> is written in Javascript and runs in your browser.</h2>
+                <p>
+                    You can connect to any publically accessible <a href="http://xmpp.org" target="_blank">XMPP/Jabber</a> server,
+                    either from a <a href="https://xmpp.net/directory.php">public provider</a>, or one you have set up yourself.
+                </p>
+                <h3>Don't have an XMPP/Jabber account?</h3>
+                <p>No problem! With converse.js you can register an account on any public XMPP server that allows registration.</p>
+            </div>
+        </div>
+    </section>
+
+    <section class="outro content-section text-center" id="contact">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-8 col-lg-offset-2">
+                    <h2>Contact</h2>
+                    <ul class="contact">
+                        <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a> or chat with me via XMPP at <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
+                        <li>For technical support, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a><br/>
+                            or ask in the Converse.js chat room:
+                            <a href="xmpp:discuss@conference.conversejs.org" class="converse-chatroom xmpp JSnocheck" title="Converse.js chat room">discuss@conference.conversejs.org</a></li>
+                        <li>Also check out the <a href="http://librelist.com/browser/conversejs" target="_blank">mailing list archives</a>.</li>
+                        <li>Please file <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">bugs on Github</a>.</li>
+                        <li>I'm available for features and <a href="http://opkode.com/contact" target="_blank">consulting</a>.</li>
+                    </ul>
+                </div>
+                <div class="sponsors">
+                    Converse.js is supported by <a href="https://www.keycdn.com/" target="_blank"><img style="height: 2em" src="/logo/keycdn.svg" alt="KeyCDN"></a>
+                </div>
+            </div>
+        </div>
+    </section>
+</body>
+
+<script>
+    require(['converse'], function (converse) {
+        converse.initialize({
+            bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
+            keepalive: true,
+            message_carbons: true,
+            play_sounds: true,
+            roster_groups: true,
+            show_controlbox_by_default: false
+        });
+    });
+</script>
+</html>
