diff --git a/assets/javascripts/views/pages/phalcon.coffee b/assets/javascripts/views/pages/phalcon.coffee
deleted file mode 100644
index 49d7ca35..00000000
--- a/assets/javascripts/views/pages/phalcon.coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-#= require views/pages/base
-
-class app.views.PhalconPage extends app.views.BasePage
-  prepare: ->
-    @highlightCode @findAll('pre[class*="php"]'), 'php'
-    @highlightCode @findAll('pre.highlight-html'), 'markup'
-    return
diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee
index ca42ef93..076d57e5 100644
--- a/assets/javascripts/views/pages/simple.coffee
+++ b/assets/javascripts/views/pages/simple.coffee
@@ -19,6 +19,7 @@ app.views.MomentPage =
 app.views.MongoosePage =
 app.views.NodePage =
 app.views.PerlPage =
+app.views.PhalconPage =
 app.views.PhaserPage =
 app.views.PostgresPage =
 app.views.RamdaPage =
diff --git a/lib/docs/filters/phalcon/clean_html.rb b/lib/docs/filters/phalcon/clean_html.rb
index 4585c3a8..b98defd9 100644
--- a/lib/docs/filters/phalcon/clean_html.rb
+++ b/lib/docs/filters/phalcon/clean_html.rb
@@ -28,6 +28,8 @@ module Docs
           code.remove! %r{\A\s*<\?php\s*} unless code.include?(' ?>')
           node.content = code
           node.name = 'pre'
+          node['data-language'] = node['class'][/highlight-(\w+)/, 1]
+          node['data-language'] = 'php' if node['data-language'] == 'html+php'
         end
 
         css('.section').each do |node|
diff --git a/lib/docs/filters/phalcon/entries.rb b/lib/docs/filters/phalcon/entries.rb
index 288b63c7..869abc9b 100644
--- a/lib/docs/filters/phalcon/entries.rb
+++ b/lib/docs/filters/phalcon/entries.rb
@@ -10,7 +10,7 @@ module Docs
           'Guides'
         else
           path = name.split('\\')
-          path[1] == 'Mvc' ? path[1..2].join('\\') : path[1]
+          path[0] == 'Mvc' ? path[0..1].join('\\') : path[0]
         end
       end
 
diff --git a/lib/docs/scrapers/phalcon.rb b/lib/docs/scrapers/phalcon.rb
index 1cd70592..6af36bb0 100644
--- a/lib/docs/scrapers/phalcon.rb
+++ b/lib/docs/scrapers/phalcon.rb
@@ -1,7 +1,7 @@
 module Docs
   class Phalcon < UrlScraper
     self.type = 'phalcon'
-    self.release = '2.0.6'
+    self.release = '2.0.10'
     self.base_url = 'https://docs.phalconphp.com/en/latest/'
     self.root_path = 'index.html'
     self.links = {