diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index d902ab42..c51da49c 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -210,7 +210,7 @@ credits = [
     'https://raw.githubusercontent.com/docker/docker/master/LICENSE'
   ], [
     'Dojo',
-    '2005-2015 The Dojo Foundation',
+    '2005-2017 JS Foundation',
     'BSD + AFL',
     'http://dojotoolkit.org/license.html'
   ], [
diff --git a/assets/javascripts/views/pages/javascript.coffee b/assets/javascripts/views/pages/javascript.coffee
deleted file mode 100644
index c5e572fc..00000000
--- a/assets/javascripts/views/pages/javascript.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-#= require views/pages/base
-
-class app.views.JavascriptWithMarkupCheckPage extends app.views.BasePage
-  prepare: ->
-    for el in @findAllByTag('pre')
-      language = if el.textContent.match(/^\s*</)
-        'markup'
-      else
-        'javascript'
-      @highlightCode el, language
-    return
-
-app.views.DojoPage =
-app.views.JavascriptWithMarkupCheckPage
diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee
index 1d325020..851dce00 100644
--- a/assets/javascripts/views/pages/simple.coffee
+++ b/assets/javascripts/views/pages/simple.coffee
@@ -21,6 +21,7 @@ app.views.CordovaPage =
 app.views.CrystalPage =
 app.views.D3Page =
 app.views.DockerPage =
+app.views.DojoPage =
 app.views.DrupalPage =
 app.views.ElectronPage =
 app.views.ElixirPage =
diff --git a/assets/stylesheets/pages/_dojo.scss b/assets/stylesheets/pages/_dojo.scss
index 94f850d1..bb24b223 100644
--- a/assets/stylesheets/pages/_dojo.scss
+++ b/assets/stylesheets/pages/_dojo.scss
@@ -1,6 +1,5 @@
 ._dojo {
   @extend %simple;
 
-  .functionIcon, .parameters { @extend %code; }
   .jsdoc-inheritance { color: $textColorLight; }
 }
diff --git a/lib/docs/filters/dojo/clean_html.rb b/lib/docs/filters/dojo/clean_html.rb
index a97f7cd9..a146f1c0 100644
--- a/lib/docs/filters/dojo/clean_html.rb
+++ b/lib/docs/filters/dojo/clean_html.rb
@@ -39,6 +39,21 @@ module Docs
           node.replace(node.content)
         end
 
+        css('.functionIcon', '.parameters').each do |node|
+          node.name = 'code'
+          node.content = node.content.strip
+        end
+
+        css('pre').each do |node|
+          node['data-language'] = node.content =~ /\A\s*</ ? 'markup' : 'javascript'
+        end
+
+        css('.jsdoc-function-information', '.jsdoc-examples', '.jsdoc-example', 'span').each do |node|
+          node.before(node.children).remove
+        end
+
+        css('table', 'a', 'h2', 'h3', 'td', 'strong').remove_attr('class')
+
         doc
       end
     end
diff --git a/lib/docs/scrapers/dojo.rb b/lib/docs/scrapers/dojo.rb
index c13bd704..937ed21a 100644
--- a/lib/docs/scrapers/dojo.rb
+++ b/lib/docs/scrapers/dojo.rb
@@ -25,7 +25,7 @@ module Docs
     options[:skip_patterns] = [/dijit/, /dojox/]
 
     options[:attribution] = <<-HTML
-      &copy; 2005&ndash;2015 The Dojo Foundation<br>
+      &copy; 2005&ndash;2017 JS Foundation<br>
       Licensed under the AFL 2.1 and BSD 3-Clause licenses.
     HTML