diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 8a43a656..1c4fedea 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -290,7 +290,6 @@ class WikiController < ApplicationController
 
   def s5
     if @web.markup == :markdownMML or @web.markup == :markdown
-#      @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"), {:raw => true}).to_s5)
       @s5_content = sanitize_html(Maruku.new(@page.content.delete("\r\x01-\x08\x0B\x0C\x0E-\x1F"),
            {:math_enabled => true, :math_numbered => ['\\[','\\begin{equation}'], :content_only => true,
             :author => @page.author, :title => @page.plain_name}).to_s5)
diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml
index 40c84a0a..83368801 100644
--- a/app/views/wiki/page.rhtml
+++ b/app/views/wiki/page.rhtml
@@ -44,7 +44,7 @@
     <%= link_to 'PDF', {:web => @web.address, :action => 'pdf', :id => @page.name},
             {:id => 'view_pdf'} %>
    <% end %>
-   <% if #{@params['category']}  == 'S5-slideshow' %>
+   <% if WikiReference.pages_in_category('S5-slideshow').map.include?(@page.name) %>
     |
     <%= link_to 'S5', {:web => @web.address, :action => 's5', :id => @page.name} %>
    <% end %>
diff --git a/public/s5/ui/default/math.css b/public/s5/ui/default/math.css
index d46fb6e9..15927aaf 100644
--- a/public/s5/ui/default/math.css
+++ b/public/s5/ui/default/math.css
@@ -3,3 +3,17 @@ math[display=block] {overflow:auto;}
 math { white-space: nowrap }
 .maruku-eq-number {float:right}
 .blockquotesource {margin-left:1em;}
+table.plaintable {
+    border-collapse:collapse;
+    margin-left:30px;
+    border:0;
+}
+.plaintable td {border:1px solid #000; padding: 3px;}
+.plaintable th {padding: 3px;}
+.plaintable caption {
+    font-weight: bold;
+    font-size:1.1em;
+    text-align:center;
+    margin-left:30px;
+}
+
diff --git a/public/s5/ui/default/pretty.css b/public/s5/ui/default/pretty.css
index 9c74c6b8..93334851 100644
--- a/public/s5/ui/default/pretty.css
+++ b/public/s5/ui/default/pretty.css
@@ -54,7 +54,7 @@ html>body div#controls {position: fixed; padding: 0; top: auto;}
   cursor: pointer;}
 #controls #navList #jumplist {background: #DDD; color: #272;}
 
-#currentSlide {text-align: center; font-size: 0.5em; color: #494;}
+#currentSlide {text-align: center; font-size: 0.5em; color: #4E4;}
 
 #slide0 {padding-top: 3.5em; font-size: 90%;}
 #slide0 h1 {position: static; margin: 1em 0 0; padding: 0;
@@ -75,7 +75,6 @@ html>body .external {border-bottom: none;}
 img.incremental {visibility: hidden;}
 .slide .current {color: #B02;}
 
-
 /* diagnostics
 
 li:after {content: " [" attr(class) "]"; color: #F88;}
diff --git a/public/s5/ui/default/slides.js b/public/s5/ui/default/slides.js
index 7f248e01..8a677d3c 100644
--- a/public/s5/ui/default/slides.js
+++ b/public/s5/ui/default/slides.js
@@ -33,8 +33,8 @@ var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0;
 var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0;
 
 function hasClass(object, className) {
-	if (!object.className) return false;
-	return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1);
+	if (!object.className ||!object.getAttribute('class')) return false;
+	return (object.getAttribute('class').search('(^|\\s)' + className + '(\\s|$)') != -1);
 }
 
 function hasValue(object, value) {