diff --git a/assets/stylesheets/components/_content.scss b/assets/stylesheets/components/_content.scss
index fd90fc4b..647c2914 100644
--- a/assets/stylesheets/components/_content.scss
+++ b/assets/stylesheets/components/_content.scss
@@ -163,6 +163,13 @@
   }
 }
 
+._heading-links {
+  float: right;
+  font-weight: normal;
+
+  > a + a { margin-left: .25rem; }
+}
+
 //
 // Table of contents
 //
diff --git a/assets/stylesheets/global/_classes.scss b/assets/stylesheets/global/_classes.scss
index 3ad027dc..c7ec0771 100644
--- a/assets/stylesheets/global/_classes.scss
+++ b/assets/stylesheets/global/_classes.scss
@@ -90,6 +90,7 @@
   margin: 2em 0 1em;
   padding-left: .5em;
   padding-right: .5em;
+  overflow: hidden;
   font-size: inherit;
   color: $boxHeaderColor;
   border: 1px solid $boxBorder;
diff --git a/lib/docs/filters/lodash/clean_html.rb b/lib/docs/filters/lodash/clean_html.rb
index 07822d6f..85fffbf5 100644
--- a/lib/docs/filters/lodash/clean_html.rb
+++ b/lib/docs/filters/lodash/clean_html.rb
@@ -2,21 +2,26 @@ module Docs
   class Lodash
     class CleanHtmlFilter < Filter
       def call
-        @doc = at_css('h1+div+div')
+        @doc = at_css('.doc-container')
 
-        css('h3 + p', 'hr').remove
-
-        css('h2 a:contains("#")', 'h3 a:contains("#")').remove
+        css('> div', '> div > div', '.highlight').each do |node|
+          node.before(node.children).remove
+        end
 
         # Remove <code> inside headings
         css('h2', 'h3').each do |node|
           node.content = node.content
         end
 
+        css('h3 + p > a:first-child').each do |node|
+          node.parent.previous_element << %(<div class="_heading-links">#{node.parent.inner_html}</div>)
+          node.parent.remove
+        end
+
         # Remove code highlighting
         css('pre').each do |node|
-          node.inner_html = node.inner_html.gsub('<br>', "\n").gsub('&nbsp;', ' ')
-          node.content = node.content
+          node.inner_html = node.inner_html.gsub('</div>', "</div>\n").gsub('&nbsp;', ' ')
+          node.content = node.content.strip
           node['data-language'] = 'javascript'
         end
 
diff --git a/lib/docs/filters/lodash/entries.rb b/lib/docs/filters/lodash/entries.rb
index 7c0fca7f..957fd512 100644
--- a/lib/docs/filters/lodash/entries.rb
+++ b/lib/docs/filters/lodash/entries.rb
@@ -9,7 +9,7 @@ module Docs
 
           heading.parent.css('a').each do |link|
             name = link.content
-            name = name.remove(/\u{279C}.*/)
+            name.remove! %r{\s.*}
             entries << [name, link['href'].remove('#'), type]
           end
         end
diff --git a/lib/docs/scrapers/lodash.rb b/lib/docs/scrapers/lodash.rb
index c690deb6..d781f7e0 100644
--- a/lib/docs/scrapers/lodash.rb
+++ b/lib/docs/scrapers/lodash.rb
@@ -19,13 +19,18 @@ module Docs
     HTML
 
     version '4' do
-      self.release = '4.15.0'
-      self.base_url = 'https://lodash.com/docs'
+      self.release = '4.16.2'
+      self.base_url = "https://lodash.com/docs/#{release}"
     end
 
     version '3' do
-      self.release = '3.10.0'
-      self.base_url = 'https://lodash.com/docs' # OUT-OF-DATE
+      self.release = '3.10.1'
+      self.base_url = "https://lodash.com/docs/#{release}"
+    end
+
+    version '2' do
+      self.release = '2.4.2'
+      self.base_url = "https://lodash.com/docs/#{release}"
     end
   end
 end