diff --git a/lib/docs/filters/openjdk/clean_html_new.rb b/lib/docs/filters/openjdk/clean_html_new.rb
index 9a8aec93..0e16f18d 100644
--- a/lib/docs/filters/openjdk/clean_html_new.rb
+++ b/lib/docs/filters/openjdk/clean_html_new.rb
@@ -24,6 +24,24 @@ module Docs
           end
         end
 
+        # add syntax highlight to code blocks
+        css('pre > code').each do |node|
+          node.parent['class'] = 'lang-java'
+          node.parent['data-language'] = 'java'
+        end
+
+        # add syntax highlight to each method
+        css('.member-signature').each do |node|
+          node.name = 'pre'
+          node['class'] = 'lang-java'
+          node['data-language'] = 'java'
+
+          node.css('span').each do |subnode|
+            subnode.name = 'code'
+          end
+
+        end
+
         doc
       end
     end
diff --git a/lib/docs/scrapers/openjdk.rb b/lib/docs/scrapers/openjdk.rb
index 93bd3380..3a18c588 100644
--- a/lib/docs/scrapers/openjdk.rb
+++ b/lib/docs/scrapers/openjdk.rb
@@ -34,15 +34,6 @@ module Docs
 
     NEWFILTERS = ['openjdk/entries_new', 'openjdk/clean_html_new']
 
-    version '16' do
-      self.release = '16'
-      self.root_path = 'index.html'
-
-      html_filters.push NEWFILTERS
-
-      options[:container] = 'main'
-    end
-
     version '15' do
       self.release = '15.0.1'
       self.root_path = 'index.html'