diff --git a/docs/components.html b/docs/components.html
index 9654f334cf..5d05c6192b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -7,6 +7,8 @@
     <title>Ionic - The Most powerful cross-platform mobile app framework.</title>
     <link href="bootstrap3.css" rel="stylesheet">
     <link href="pygments.css" rel="stylesheet">
+    <link href="docs.css" rel="stylesheet">
+
     <link href="/dist/ionic.css" rel="stylesheet">
     <link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
   </head>
@@ -43,7 +45,7 @@
     <div id="content">
       <div class="container">
         <div class="row">
-          <div class="col-xs-6 col-sm-3" id="sidebar" role="navigation">
+          <div class="col-xs-6 col-sm-2" id="sidebar" role="navigation">
             <div class="sidebar-nav">
               <ul class="list-group">
                 <a class="list-group-item" href="#buttons">Buttons</a></li>
@@ -53,7 +55,7 @@
               </ul>
             </div>
           </div>
-          <div class="col-xs-12 col-sm-9">
+          <div class="col-xs-6 col-sm-6">
             <div class="page-header">
               <h1 id="buttons">Buttons</h1>
             </div>
@@ -89,8 +91,41 @@
                 <button type="button" class="button button-danger">Danger</button>
               </div>
             </div>
-            <div class="syntax"><pre><span class="nt">&lt;button</span> <span class="na">class=</span><span class="s">&quot;button button-primary&quot;</span><span class="nt">&gt;</span>Button<span class="nt">&lt;/a&gt;</span>
-</pre></div>
+            <div class="highlight">
+<pre>
+<span class="c">&lt;!-- Standard white/grey button --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-default&quot;</span><span class="nt">&gt;</span>Default<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- A secondary dark grey button --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-secondary&quot;</span><span class="nt">&gt;</span>Secondary<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- A dark button --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-dark&quot;</span><span class="nt">&gt;</span>Dark<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- A blue button that can be used in lots of places --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-primary&quot;</span><span class="nt">&gt;</span>Primary<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- A green button --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-success&quot;</span><span class="nt">&gt;</span>Success<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- A cyan button --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-info&quot;</span><span class="nt">&gt;</span>Info<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- An orange button, often used for warning messages --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-warning&quot;</span><span class="nt">&gt;</span>Warning<span class="nt">&lt;/button&gt;</span>
+
+<span class="c">&lt;!-- Used for serious actions that have serious side effects --&gt;</span>
+<span class="nt">&lt;button</span> <span class="na">type=</span><span class="s">&quot;button&quot;</span> <span class="na">class=</span><span class="s">&quot;button button-danger&quot;</span><span class="nt">&gt;</span>Danger<span class="nt">&lt;/button&gt;</span>
+</pre>
+            </div>
+            <h3 id="buttons-icons">Icon-only Buttons</h3>
+            <p>
+              To show a button without padding, a background, or border, add <code>.button-clear</code>. Perfect for icon-only buttons in small spaces.
+            </p>
+          </div>
+          <div class="col-xs-6 col-sm-4">
+            <div id="phone">
+            </div>
           </div>
         </div>
       </div>
diff --git a/docs/docs.css b/docs/docs.css
new file mode 100644
index 0000000000..d9123362a4
--- /dev/null
+++ b/docs/docs.css
@@ -0,0 +1,5 @@
+#phone {
+  width: 320px;
+  height: 568px;
+  background-color: #eee;
+}
diff --git a/docs/index.html b/docs/index.html
index 6e68526ef3..314ad98e0c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -7,6 +7,7 @@
     <title>Ionic - The Most powerful cross-platform mobile app framework.</title>
     <link href="bootstrap3.css" rel="stylesheet">
     <link href="pygments.css" rel="stylesheet">
+    <link href="docs.css" rel="stylesheet">
   </head>
   <body>
     <!-- Static navbar -->
diff --git a/docs/pygments.css b/docs/pygments.css
index f89aef494c..dc60655fa0 100644
--- a/docs/pygments.css
+++ b/docs/pygments.css
@@ -1,70 +1,61 @@
-.syntax pre { background: #242424; color: #f6f3e8}
-.syntax .hll { background-color: #ffffcc }
-.syntax .c { color: #99968b; font-style: normal} /* Comment */
-.syntax .err { color: #f6f3e8} /* Error */
-.syntax .g { color: #f6f3e8} /* Generic */
-.syntax .k { color: #8ac6f2} /* Keyword */
-.syntax .l { color: #f6f3e8} /* Literal */
-.syntax .n { color: #f6f3e8} /* Name */
-.syntax .o { color: #f6f3e8} /* Operator */
-.syntax .x { color: #f6f3e8} /* Other */
-.syntax .p { color: #f6f3e8} /* Punctuation */
-.syntax .cm { color: #99968b; font-style: normal} /* Comment.Multiline */
-.syntax .cp { color: #e5786d} /* Comment.Preproc */
-.syntax .c1 { color: #99968b; font-style: normal} /* Comment.Single */
-.syntax .cs { color: #99968b; font-style: normal} /* Comment.Special */
-.syntax .gd { color: #f6f3e8} /* Generic.Deleted */
-.syntax .ge { color: #f6f3e8} /* Generic.Emph */
-.syntax .gr { color: #f6f3e8} /* Generic.Error */
-.syntax .gh { color: #f6f3e8; font-weight: bold} /* Generic.Heading */
-.syntax .gi { color: #f6f3e8} /* Generic.Inserted */
-.syntax .go { color: #808080; background-color: #303030 } /* Generic.Output */
-.syntax .gp { color: #f6f3e8} /* Generic.Prompt */
-.syntax .gs { color: #f6f3e8} /* Generic.Strong */
-.syntax .gu { color: #f6f3e8; font-weight: bold} /* Generic.Subheading */
-.syntax .gt { color: #f6f3e8} /* Generic.Traceback */
-.syntax .kc { color: #8ac6f2} /* Keyword.Constant */
-.syntax .kd { color: #8ac6f2} /* Keyword.Declaration */
-.syntax .kn { color: #8ac6f2} /* Keyword.Namespace */
-.syntax .kp { color: #8ac6f2} /* Keyword.Pseudo */
-.syntax .kr { color: #8ac6f2} /* Keyword.Reserved */
-.syntax .kt { color: #cae682} /* Keyword.Type */
-.syntax .ld { color: #f6f3e8} /* Literal.Date */
-.syntax .m { color: #e5786d} /* Literal.Number */
-.syntax .s { color: #95e454; font-style: normal} /* Literal.String */
-.syntax .na { color: #cae682} /* Name.Attribute */
-.syntax .nb { color: #f6f3e8} /* Name.Builtin */
-.syntax .nc { color: #f6f3e8} /* Name.Class */
-.syntax .no { color: #e5786d} /* Name.Constant */
-.syntax .nd { color: #f6f3e8} /* Name.Decorator */
-.syntax .ni { color: #e7f6da} /* Name.Entity */
-.syntax .ne { color: #f6f3e8} /* Name.Exception */
-.syntax .nf { color: #cae682} /* Name.Function */
-.syntax .nl { color: #f6f3e8} /* Name.Label */
-.syntax .nn { color: #f6f3e8} /* Name.Namespace */
-.syntax .nx { color: #f6f3e8} /* Name.Other */
-.syntax .py { color: #f6f3e8} /* Name.Property */
-.syntax .nt { color: #8ac6f2} /* Name.Tag */
-.syntax .nv { color: #cae682} /* Name.Variable */
-.syntax .ow { color: #f6f3e8} /* Operator.Word */
-.syntax .w { color: #f6f3e8} /* Text.Whitespace */
-.syntax .mf { color: #e5786d} /* Literal.Number.Float */
-.syntax .mh { color: #e5786d} /* Literal.Number.Hex */
-.syntax .mi { color: #e5786d} /* Literal.Number.Integer */
-.syntax .mo { color: #e5786d} /* Literal.Number.Oct */
-.syntax .sb { color: #95e454; font-style: normal} /* Literal.String.Backtick */
-.syntax .sc { color: #95e454; font-style: normal} /* Literal.String.Char */
-.syntax .sd { color: #95e454; font-style: normal} /* Literal.String.Doc */
-.syntax .s2 { color: #95e454; font-style: normal} /* Literal.String.Double */
-.syntax .se { color: #95e454; font-style: normal} /* Literal.String.Escape */
-.syntax .sh { color: #95e454; font-style: normal} /* Literal.String.Heredoc */
-.syntax .si { color: #95e454; font-style: normal} /* Literal.String.Interpol */
-.syntax .sx { color: #95e454; font-style: normal} /* Literal.String.Other */
-.syntax .sr { color: #95e454; font-style: normal} /* Literal.String.Regex */
-.syntax .s1 { color: #95e454; font-style: normal} /* Literal.String.Single */
-.syntax .ss { color: #95e454; font-style: normal} /* Literal.String.Symbol */
-.syntax .bp { color: #f6f3e8} /* Name.Builtin.Pseudo */
-.syntax .vc { color: #cae682} /* Name.Variable.Class */
-.syntax .vg { color: #cae682} /* Name.Variable.Global */
-.syntax .vi { color: #cae682} /* Name.Variable.Instance */
-.syntax .il { color: #e5786d} /* Literal.Number.Integer.Long */
+.hll { background-color: #ffffcc }
+.c { color: #999988; font-style: italic } /* Comment */
+.err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.k { color: #000000; font-weight: bold } /* Keyword */
+.o { color: #000000; font-weight: bold } /* Operator */
+.cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
+.c1 { color: #999988; font-style: italic } /* Comment.Single */
+.cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.ge { color: #000000; font-style: italic } /* Generic.Emph */
+.gr { color: #aa0000 } /* Generic.Error */
+.gh { color: #999999 } /* Generic.Heading */
+.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.go { color: #888888 } /* Generic.Output */
+.gp { color: #555555 } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #aaaaaa } /* Generic.Subheading */
+.gt { color: #aa0000 } /* Generic.Traceback */
+.kc { color: #000000; font-weight: bold } /* Keyword.Constant */
+.kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
+.kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.m { color: #009999 } /* Literal.Number */
+.s { color: #d01040 } /* Literal.String */
+.na { color: #008080 } /* Name.Attribute */
+.nb { color: #0086B3 } /* Name.Builtin */
+.nc { color: #445588; font-weight: bold } /* Name.Class */
+.no { color: #008080 } /* Name.Constant */
+.nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
+.ni { color: #800080 } /* Name.Entity */
+.ne { color: #990000; font-weight: bold } /* Name.Exception */
+.nf { color: #990000; font-weight: bold } /* Name.Function */
+.nl { color: #990000; font-weight: bold } /* Name.Label */
+.nn { color: #555555 } /* Name.Namespace */
+.nt { color: #000080 } /* Name.Tag */
+.nv { color: #008080 } /* Name.Variable */
+.ow { color: #000000; font-weight: bold } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mf { color: #009999 } /* Literal.Number.Float */
+.mh { color: #009999 } /* Literal.Number.Hex */
+.mi { color: #009999 } /* Literal.Number.Integer */
+.mo { color: #009999 } /* Literal.Number.Oct */
+.sb { color: #d01040 } /* Literal.String.Backtick */
+.sc { color: #d01040 } /* Literal.String.Char */
+.sd { color: #d01040 } /* Literal.String.Doc */
+.s2 { color: #d01040 } /* Literal.String.Double */
+.se { color: #d01040 } /* Literal.String.Escape */
+.sh { color: #d01040 } /* Literal.String.Heredoc */
+.si { color: #d01040 } /* Literal.String.Interpol */
+.sx { color: #d01040 } /* Literal.String.Other */
+.sr { color: #009926 } /* Literal.String.Regex */
+.s1 { color: #d01040 } /* Literal.String.Single */
+.ss { color: #990073 } /* Literal.String.Symbol */
+.bp { color: #999999 } /* Name.Builtin.Pseudo */
+.vc { color: #008080 } /* Name.Variable.Class */
+.vg { color: #008080 } /* Name.Variable.Global */
+.vi { color: #008080 } /* Name.Variable.Instance */
+.il { color: #009999 } /* Literal.Number.Integer.Long */