diff --git a/lib/docs/filters/marionette/clean_html.rb b/lib/docs/filters/marionette/clean_html.rb
index 28cd2310..3a23b73f 100644
--- a/lib/docs/filters/marionette/clean_html.rb
+++ b/lib/docs/filters/marionette/clean_html.rb
@@ -15,7 +15,7 @@ module Docs
         css('#source + h2', '#improve', '#source', '.glyphicon', 'p > br').remove
 
         css('pre > code').each do |node|
-          node.parent['data-language'] = node['class'][/lang-(\w+)/, 1]
+          node.parent['data-language'] = node['class'][/lang-(\w+)/, 1] if node['class']
           node.before(node.children).remove
         end
 
diff --git a/lib/docs/filters/marionette/entries.rb b/lib/docs/filters/marionette/entries.rb
index 37ee3600..ef20811c 100644
--- a/lib/docs/filters/marionette/entries.rb
+++ b/lib/docs/filters/marionette/entries.rb
@@ -9,7 +9,10 @@ module Docs
       end
 
       def get_type
-        name
+        type = name.dup
+        type = 'CollectionView' if type.include?('CollectionView')
+        type = 'Miscellaneous' if %w(Features Installing\ Marionette Upgrade\ Guide Common\ Concepts).include?(type)
+        type
       end
 
       def additional_entries
diff --git a/lib/docs/scrapers/marionette.rb b/lib/docs/scrapers/marionette.rb
index a98949de..74d8ca33 100644
--- a/lib/docs/scrapers/marionette.rb
+++ b/lib/docs/scrapers/marionette.rb
@@ -3,8 +3,6 @@ module Docs
     self.name = 'Marionette.js'
     self.slug = 'marionette'
     self.type = 'marionette'
-    self.release = '2.4.7'
-    self.base_url = "http://marionettejs.com/docs/v#{release}/"
     self.root_path = 'index'
     self.links = {
       home: 'http://marionettejs.com/',
@@ -19,5 +17,15 @@ module Docs
       &copy; 2016 Muted Solutions, LLC<br>
       Licensed under the MIT License.
     HTML
+
+    version '3' do
+      self.release = '3.0.0'
+      self.base_url = "http://marionettejs.com/docs/v#{release}/"
+    end
+
+    version '2' do
+      self.release = '2.4.7'
+      self.base_url = "http://marionettejs.com/docs/v#{release}/"
+    end
   end
 end