diff --git a/converters/transformers.py b/converters/transformers.py
index c6c76ce..8b95b8d 100755
--- a/converters/transformers.py
+++ b/converters/transformers.py
@@ -254,8 +254,6 @@ class CSSHtmlHeaderTransformer(ActivatableTransformer):
             os.path.join(css, 'notebook.css'),
             os.path.join(css, 'renderedhtml.css'),
             os.path.join(css, 'style.min.css'),
-            # our overrides:
-            os.path.join(here, '..', 'css', 'static_html.css'),
         ]:
             try:
                 with io.open(sheet, encoding='utf-8') as f:
diff --git a/nbconvert.py b/nbconvert.py
index 6d81f54..a74c5bb 100755
--- a/nbconvert.py
+++ b/nbconvert.py
@@ -29,7 +29,10 @@ from converters.bloggerhtml import ConverterBloggerHTML
 from converters.rst import ConverterRST
 from converters.latex import ConverterLaTeX
 from converters.python import ConverterPy
+<<<<<<< HEAD
 from converters.reveal import ConverterReveal
+=======
+>>>>>>> damianavila/reveal_css_fix
 from converters.base import Converter
 
 
diff --git a/reveal b/reveal
index 24c493f..519ee26 160000
--- a/reveal
+++ b/reveal
@@ -1 +1 @@
-Subproject commit 24c493fb83bcc51e5db59e5abca246493eac8700
+Subproject commit 519ee26809bfd6bd824155e999d2c9eaae6786bb
diff --git a/templates/fullhtml.tpl b/templates/fullhtml.tpl
index aa3f16d..46114c4 100644
--- a/templates/fullhtml.tpl
+++ b/templates/fullhtml.tpl
@@ -10,6 +10,18 @@
 {{css}}
 </style>
 {% endfor %}
+
+<style type="text/css">
+/* Overrides of notebook CSS for static HTML export */
+body {
+  overflow: visible;
+  padding: 8px;
+}
+.input_area {
+  padding: 0.4em;
+}
+</style>
+
 <script src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS_HTML" type="text/javascript">
 
 </script>
diff --git a/templates/reveal.tpl b/templates/reveal.tpl
index 413e07e..57b885c 100644
--- a/templates/reveal.tpl
+++ b/templates/reveal.tpl
@@ -35,35 +35,41 @@ document.write( '<link rel="stylesheet" href="reveal/css/print/' + ( window.loca
 
 <style type="text/css">
 /* Overrides of notebook CSS for static HTML export */
-
 .reveal {
   font-size: 20px;
 }
 .reveal pre {
-    width: 100%;
-    padding: 0.2em;
-    margin: 0px auto;
-    font-family: monospace, sans-serif;
-    font-size: 60%;
-    box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
+width: 100%;
+padding: 0.3em;
+margin: 0px auto;
+font-family: monospace, sans-serif;
+font-size: 80%;
+box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
 }
 .reveal section img {
-    border: 0px solid black;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+border: 0px solid black;
+box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+}
+.reveal .slides {
+text-align: left;
 }
 div.input_area {
-    padding: 0.2em;
+padding: 0.06em;
 }
 div.code_cell {
-    background-color: transparent;
+background-color: transparent;
 }
 div.prompt {
-    width: 11ex;
-    padding: 0.0em;
-    margin: 0px;
-    font-family: monospace;
-    font-size: 60%;
-    text-align: center;
+width: 11ex;
+padding: 0.4em;
+margin: 0px;
+font-family: monospace, sans-serif;
+font-size: 80%;
+text-align: right;
+}
+div.output_area pre {
+font-family: monospace, sans-serif;
+font-size: 80%;
 }
 div.output_prompt {
     /* 5px right shift to account for margin in parent container */
@@ -99,7 +105,7 @@ MathJax.Hub.Config({
         inlineMath: [ ['$','$'], ["\\(","\\)"] ],
         displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
     },
-    displayAlign: 'center', // Change this to 'center' to center equations.
+    displayAlign: 'left', // Change this to 'center' to center equations.
     "HTML-CSS": {
         styles: {'.MathJax_Display': {"margin": 0}}
     }
@@ -145,4 +151,4 @@ MathJax.Hub.Rerender(event.currentSlide);
 
 {% block footer %}
 </html>
-{% endblock footer %}
\ No newline at end of file
+{% endblock footer %}
diff --git a/tests/ipynbref/reveal.orig_slides.html b/tests/ipynbref/reveal.orig_slides.html
index 0b78413..8262e65 100644
--- a/tests/ipynbref/reveal.orig_slides.html
+++ b/tests/ipynbref/reveal.orig_slides.html
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> damianavila/reveal_css_fix
 <!DOCTYPE html>
 <html>
 <head>
@@ -105,6 +109,7 @@ b,strong { font-weight: bold; }
 </style>
 <style type="text/css">
 <<<<<<< HEAD
+<<<<<<< HEAD
 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;}
@@ -1126,6 +1131,8 @@ div.output_prompt {
 </style>
 <meta charset="UTF-8">
 =======
+=======
+>>>>>>> damianavila/reveal_css_fix
 
 /* Flexible box model classes */
 /* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
@@ -1697,7 +1704,10 @@ body {
 }
 
 </style>
+<<<<<<< HEAD
 >>>>>>> A new implementation of reveal converter with jinja templates.
+=======
+>>>>>>> damianavila/reveal_css_fix
 <style type="text/css">
 .highlight .hll { background-color: #ffffcc }
 .highlight  { background: #f8f8f8; }
@@ -1763,6 +1773,10 @@ body {
 .highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
 </style>
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> damianavila/reveal_css_fix
 <style type="text/css">
 /* Overrides of notebook CSS for static HTML export */
 
@@ -4987,6 +5001,7 @@ X07vG9Z4QUTEBQ4dOkRpaSklJSVnnQPx/xV9BfkfDyZLAAAAAElFTkSuQmCC
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
 <<<<<<< HEAD
+<<<<<<< HEAD
 tex2jax: {
 inlineMath: [ ['$','$'], ["\\(","\\)"] ],
 displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
@@ -4996,6 +5011,8 @@ displayAlign: 'left', // Change this to 'center' to center equations.
 styles: {'.MathJax_Display': {"margin": 0}}
 }
 =======
+=======
+>>>>>>> damianavila/reveal_css_fix
     tex2jax: {
         inlineMath: [ ['$','$'], ["\\(","\\)"] ],
         displayMath: [ ['$$','$$'], ["\\[","\\]"] ]
@@ -5004,7 +5021,10 @@ styles: {'.MathJax_Display': {"margin": 0}}
     "HTML-CSS": {
         styles: {'.MathJax_Display': {"margin": 0}}
     }
+<<<<<<< HEAD
 >>>>>>> Fixed mathjax inline and some not implemented notice.
+=======
+>>>>>>> damianavila/reveal_css_fix
 });
 </script>
 <!-- End of mathjax configuration -->
@@ -5041,6 +5061,10 @@ Reveal.addEventListener( 'slidechanged', function( event ) {
 MathJax.Hub.Rerender(event.currentSlide);
 });
 </script>
+<<<<<<< HEAD
+=======
+
+>>>>>>> damianavila/reveal_css_fix
 </body>
 
 </html>