diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index c29745f8..4ebd4bea 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -181,7 +181,7 @@ credits = [
     'https://raw.githubusercontent.com/apache/cordova-docs/master/LICENSE'
   ], [
     'CSS<br>DOM<br>HTML<br>JavaScript<br>SVG<br>XPath',
-    '2005-2016 Mozilla Developer Network and individual contributors',
+    '2005-2017 Mozilla Developer Network and individual contributors',
     'CC BY-SA',
     'https://creativecommons.org/licenses/by-sa/2.5/'
   ], [
diff --git a/lib/docs/filters/css/entries.rb b/lib/docs/filters/css/entries.rb
index 5fd670d7..e46415d1 100644
--- a/lib/docs/filters/css/entries.rb
+++ b/lib/docs/filters/css/entries.rb
@@ -53,6 +53,8 @@ module Docs
           type.remove! %r{\(.*\)}
           type.sub! 'and', '&'
           type.strip!
+          type = 'Scroll Snap' if type.include?('Scroll Snap')
+          type = 'Compositing & Blending' if type.include?('Compositing')
           type = 'Animations & Transitions' if type.in?(%w(Animations Transitions))
           type = 'Image Values' if type == 'Image Values & Replaced Content'
           type = 'Variables' if type == 'Custom Properties for Cascading Variables'
diff --git a/lib/docs/filters/dom/entries.rb b/lib/docs/filters/dom/entries.rb
index 86f9f50b..0a1df952 100644
--- a/lib/docs/filters/dom/entries.rb
+++ b/lib/docs/filters/dom/entries.rb
@@ -6,8 +6,10 @@ module Docs
         'EXT_'                => 'WebGL',
         'OES_'                => 'WebGL',
         'WEBGL_'              => 'WebGL',
+        'Ambient Light'       => 'Ambient Light',
         'Battery Status'      => 'Battery Status',
         'Canvas '             => 'Canvas',
+        'Cooperative Scheduling' => 'Scheduling',
         'CSS Font Loading'    => 'CSS',
         'CSS Object Model'    => 'CSS',
         'Credential'          => 'Credential Management',
@@ -40,6 +42,7 @@ module Docs
         'Web Animations'      => 'Animation',
         'Web App Manifest'    => 'Web App Manifest',
         'Web Audio'           => 'Web Audio',
+        'Web Budget'          => 'Web Budget',
         'Web Messaging'       => 'Web Messaging',
         'Web MIDI'            => 'Web MIDI',
         'Web Speech'          => 'Web Speech',
@@ -50,12 +53,15 @@ module Docs
         'WebVR'               => 'WebVR' }
 
       TYPE_BY_NAME_STARTS_WITH = {
+        'Ambient'             => 'Ambient Light',
         'Audio'               => 'Web Audio',
         'Broadcast'           => 'Broadcast Channel',
+        'Budget'              => 'Web Budget',
         'Canvas'              => 'Canvas',
         'CSS'                 => 'CSS',
         'ChildNode'           => 'Node',
         'console'             => 'Console',
+        'CustomElement'       => 'Custom Elements',
         'DataTransfer'        => 'Drag & Drop',
         'document'            => 'Document',
         'DocumentFragment'    => 'DocumentFragment',
diff --git a/lib/docs/filters/javascript/entries.rb b/lib/docs/filters/javascript/entries.rb
index 872e33a0..39b7a0b8 100644
--- a/lib/docs/filters/javascript/entries.rb
+++ b/lib/docs/filters/javascript/entries.rb
@@ -51,7 +51,7 @@ module Docs
           'Classes'
         elsif slug.start_with? 'Errors'
           'Errors'
-        elsif slug.start_with?('Functions') || slug.include?('GeneratorFunction')
+        elsif slug.start_with?('Functions') || slug.include?('GeneratorFunction') || slug.include?('AsyncFunction')
           'Function'
         elsif slug.start_with? 'Global_Objects'
           object, method = *slug.remove('Global_Objects/').split('/')
@@ -77,7 +77,7 @@ module Docs
 
         %w(arithmetic assignment bitwise comparison logical).each do |s|
           css("a[href^='operators/#{s}_operators#']").each do |node|
-            name = node.content.strip
+            name = CGI::unescapeHTML(node.content.strip)
             name.remove! %r{[a-zA-Z]}
             name.strip!
             entries << [name, node['href'], 'Operators']
diff --git a/lib/docs/scrapers/mdn/css.rb b/lib/docs/scrapers/mdn/css.rb
index 348f0b59..322d8b4e 100644
--- a/lib/docs/scrapers/mdn/css.rb
+++ b/lib/docs/scrapers/mdn/css.rb
@@ -8,7 +8,7 @@ module Docs
 
     options[:root_title] = 'CSS'
 
-    options[:skip] = %w(/CSS3 /Media/Visual /paged_media)
+    options[:skip] = %w(/CSS3 /Media/Visual /paged_media /Media/TV /Media/Tactile)
     options[:skip] += %w(/mq-boolean /single-transition-timing-function) # bug
     options[:skip_patterns] = [/Extensions/, /Tools/, /@media\/-webkit/, /webkit-mask/, /-moz-system-metric/]
 
diff --git a/lib/docs/scrapers/mdn/mdn.rb b/lib/docs/scrapers/mdn/mdn.rb
index a0f2b053..1c01ccd7 100644
--- a/lib/docs/scrapers/mdn/mdn.rb
+++ b/lib/docs/scrapers/mdn/mdn.rb
@@ -12,11 +12,11 @@ module Docs
     options[:trailing_slash] = false
 
     options[:skip_link] = ->(link) {
-      link['title'].try(:include?, 'written'.freeze) && !link['href'].try(:include?, 'transform-function'.freeze)
+      link['title'].try(:include?, 'not yet been written'.freeze) && !link['href'].try(:include?, 'transform-function'.freeze)
     }
 
     options[:attribution] = <<-HTML
-      &copy; 2016 Mozilla Contributors<br>
+      &copy; 2005&ndash;2017 Mozilla Developer Network and individual contributors.<br>
       Licensed under the Creative Commons Attribution-ShareAlike License v2.5 or later.
     HTML