diff --git a/strapdown/strapdown.css b/strapdown.css
similarity index 90%
rename from strapdown/strapdown.css
rename to strapdown.css
index 8f5a943a246a19ace4ad7266f97b3bf19718bb12..7840e6e331893f0228043d5dbbdc2d3dc1a47da3 100644
--- a/strapdown/strapdown.css
+++ b/strapdown.css
@@ -1,10 +1,3 @@
-
-/*******************************************************************
-
-This chunk is to fix Bootstrap so that the Markdown output looks good
-
-*******************************************************************/
-
 body {
   padding-top: 60px;
   padding-bottom: 40px;
diff --git a/strapdown/strapdown.js b/strapdown.js
similarity index 99%
rename from strapdown/strapdown.js
rename to strapdown.js
index ecef869e916836bfaf055b5501fe78ce47d2a538..f75b82c601a4011d431ea74ab28c536c65f40f82 100644
--- a/strapdown/strapdown.js
+++ b/strapdown.js
@@ -374,16 +374,19 @@ var PR=win['PR']={'createSimpleLexer':createSimpleLexer,'registerLangHandler':re
   var linkEl = document.createElement('link');
   linkEl.href = originBase + '/themes/'+theme+'.min.css';
   linkEl.rel = 'stylesheet';
+  linkEl.type = 'text/css';
   document.head.appendChild(linkEl);
 
   var linkEl = document.createElement('link');
   linkEl.href = originBase + '/strapdown.css';
   linkEl.rel = 'stylesheet';
+  linkEl.type = 'text/css';
   document.head.appendChild(linkEl);
 
   var linkEl = document.createElement('link');
   linkEl.href = originBase + '/themes/bootstrap-responsive.min.css';
   linkEl.rel = 'stylesheet';
+  linkEl.type = 'text/css';
   document.head.appendChild(linkEl);
 
   //////////////////////////////////////////////////////////////////////
diff --git a/strapdown/themes/LICENSE b/themes/LICENSE
similarity index 100%
rename from strapdown/themes/LICENSE
rename to themes/LICENSE
diff --git a/themes/Muli/Muli-Black.ttf b/themes/Muli/Muli-Black.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..76825b81701f0c162c335fd11dc1b807559bc267
Binary files /dev/null and b/themes/Muli/Muli-Black.ttf differ
diff --git a/themes/Muli/Muli-BlackItalic.ttf b/themes/Muli/Muli-BlackItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..70762c09d9caeb922bbdbeaf9844c9a5f59e9666
Binary files /dev/null and b/themes/Muli/Muli-BlackItalic.ttf differ
diff --git a/themes/Muli/Muli-Bold.ttf b/themes/Muli/Muli-Bold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..732c3ec02e9d75470a748e42d7b32d7490029e5a
Binary files /dev/null and b/themes/Muli/Muli-Bold.ttf differ
diff --git a/themes/Muli/Muli-BoldItalic.ttf b/themes/Muli/Muli-BoldItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..1dac1c9cb6eb1bb2c52434be99fe0aa4e1067662
Binary files /dev/null and b/themes/Muli/Muli-BoldItalic.ttf differ
diff --git a/themes/Muli/Muli-ExtraBold.ttf b/themes/Muli/Muli-ExtraBold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a8ef44cec3a6f8b9b1c83a230df2d1fed9d2a3a5
Binary files /dev/null and b/themes/Muli/Muli-ExtraBold.ttf differ
diff --git a/themes/Muli/Muli-ExtraBoldItalic.ttf b/themes/Muli/Muli-ExtraBoldItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..b99e68d4604b8fc305dc48424f737661f3bdce53
Binary files /dev/null and b/themes/Muli/Muli-ExtraBoldItalic.ttf differ
diff --git a/themes/Muli/Muli-ExtraLight.ttf b/themes/Muli/Muli-ExtraLight.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..ffe7b29deba65d44b9126ffe33300b6038de765e
Binary files /dev/null and b/themes/Muli/Muli-ExtraLight.ttf differ
diff --git a/themes/Muli/Muli-ExtraLightItalic.ttf b/themes/Muli/Muli-ExtraLightItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..eb8b36a0a347bee20a9a3a050f03ab5443c1701c
Binary files /dev/null and b/themes/Muli/Muli-ExtraLightItalic.ttf differ
diff --git a/themes/Muli/Muli-Italic.ttf b/themes/Muli/Muli-Italic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..e1599293f25f1474c94159465c7114031229610f
Binary files /dev/null and b/themes/Muli/Muli-Italic.ttf differ
diff --git a/themes/Muli/Muli-Light.ttf b/themes/Muli/Muli-Light.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..4e66b6979f9d657eb79351ccdf1eab0bf9e17ac0
Binary files /dev/null and b/themes/Muli/Muli-Light.ttf differ
diff --git a/themes/Muli/Muli-LightItalic.ttf b/themes/Muli/Muli-LightItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..85ac2513289fbe0fa1a5eb3bf72fa30fe995c639
Binary files /dev/null and b/themes/Muli/Muli-LightItalic.ttf differ
diff --git a/themes/Muli/Muli-Regular.ttf b/themes/Muli/Muli-Regular.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..1dfd643187ae2435efc15374d230a32d7f2f7d26
Binary files /dev/null and b/themes/Muli/Muli-Regular.ttf differ
diff --git a/themes/Muli/Muli-SemiBold.ttf b/themes/Muli/Muli-SemiBold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..096a15e424aa909aab43fb8ede78767d7b143b11
Binary files /dev/null and b/themes/Muli/Muli-SemiBold.ttf differ
diff --git a/themes/Muli/Muli-SemiBoldItalic.ttf b/themes/Muli/Muli-SemiBoldItalic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..6d7bcc856934b6bf14ae17b6cb70b1fc3995e266
Binary files /dev/null and b/themes/Muli/Muli-SemiBoldItalic.ttf differ
diff --git a/themes/Muli/OFL.txt b/themes/Muli/OFL.txt
new file mode 100755
index 0000000000000000000000000000000000000000..1016891d2d644e98c5994c719e317efe04bd259d
--- /dev/null
+++ b/themes/Muli/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2016 The Muli Project Authors (contact@sansoxygen.com)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/strapdown/themes/README.md b/themes/README.md
similarity index 100%
rename from strapdown/themes/README.md
rename to themes/README.md
diff --git a/strapdown/themes/amelia.min.css b/themes/amelia.min.css
similarity index 100%
rename from strapdown/themes/amelia.min.css
rename to themes/amelia.min.css
diff --git a/strapdown/themes/bootstrap-responsive.min.css b/themes/bootstrap-responsive.min.css
similarity index 100%
rename from strapdown/themes/bootstrap-responsive.min.css
rename to themes/bootstrap-responsive.min.css
diff --git a/strapdown/themes/bootstrap.min.css b/themes/bootstrap.min.css
similarity index 100%
rename from strapdown/themes/bootstrap.min.css
rename to themes/bootstrap.min.css
diff --git a/strapdown/themes/cerulean.min.css b/themes/cerulean.min.css
similarity index 100%
rename from strapdown/themes/cerulean.min.css
rename to themes/cerulean.min.css
diff --git a/strapdown/themes/cyborg.min.css b/themes/cyborg.min.css
similarity index 100%
rename from strapdown/themes/cyborg.min.css
rename to themes/cyborg.min.css
diff --git a/strapdown/themes/journal.css b/themes/journal.css
similarity index 100%
rename from strapdown/themes/journal.css
rename to themes/journal.css
diff --git a/strapdown/themes/journal.min.css b/themes/journal.min.css
similarity index 100%
rename from strapdown/themes/journal.min.css
rename to themes/journal.min.css
diff --git a/strapdown/themes/readable.min.css b/themes/readable.min.css
similarity index 100%
rename from strapdown/themes/readable.min.css
rename to themes/readable.min.css
diff --git a/strapdown/themes/simplex.min.css b/themes/simplex.min.css
similarity index 100%
rename from strapdown/themes/simplex.min.css
rename to themes/simplex.min.css
diff --git a/strapdown/themes/slate.min.css b/themes/slate.min.css
similarity index 100%
rename from strapdown/themes/slate.min.css
rename to themes/slate.min.css
diff --git a/strapdown/themes/spacelab.min.css b/themes/spacelab.min.css
similarity index 99%
rename from strapdown/themes/spacelab.min.css
rename to themes/spacelab.min.css
index f6b6d938ebaaf85b3104ca457b5fbecf9ed8417f..d1c65c1cd367e56278b273b4263a7176db5cde9b 100644
--- a/strapdown/themes/spacelab.min.css
+++ b/themes/spacelab.min.css
@@ -1,4 +1,4 @@
-@import url('http://fonts.googleapis.com/css?family=Muli');
+@import url('https://fonts.googleapis.com/css?family=Muli');
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]){display:none;}
diff --git a/strapdown/themes/spruce.min.css b/themes/spruce.min.css
similarity index 100%
rename from strapdown/themes/spruce.min.css
rename to themes/spruce.min.css
diff --git a/strapdown/themes/superhero.min.css b/themes/superhero.min.css
similarity index 100%
rename from strapdown/themes/superhero.min.css
rename to themes/superhero.min.css
diff --git a/strapdown/themes/united.min.css b/themes/united.min.css
similarity index 100%
rename from strapdown/themes/united.min.css
rename to themes/united.min.css