diff --git a/Rules b/Rules
index a714a35..e2b5ac4 100644
--- a/Rules
+++ b/Rules
@@ -20,7 +20,6 @@ compile '*' do
   elsif item[:extension] == 'md'
     filter :kramdown, {:input => 'GFM'}
     filter :colorize_syntax, :default_colorizer => :pygmentize
-    filter :code_class_simplfier
     filter :relativize_paths, :type => :html
     layout 'default'
   elsif item[:extension] == 'css'
@@ -46,4 +45,4 @@ route '*' do
   end
 end
 
-layout '*', :erb
\ No newline at end of file
+layout '*', :erb
diff --git a/content/stylesheets/colorful.css b/content/stylesheets/colorful.css
index caefe52..22af139 100644
--- a/content/stylesheets/colorful.css
+++ b/content/stylesheets/colorful.css
@@ -1,20 +1,20 @@
 /* pygments-css colorful */
-.codehilite .hll { background-color: #ffffcc }
-.codehilite .c { color: #808080 } /* Comment */
-.codehilite .err { color: #F00000; background-color: #F0A0A0 } /* Error */
-.codehilite .k { color: #008000; font-weight: bold } /* Keyword */
-.codehilite .o { color: #303030 } /* Operator */
-.codehilite .cm { color: #808080 } /* Comment.Multiline */
-.codehilite .cp { color: #507090 } /* Comment.Preproc */
-.codehilite .c1 { color: #808080 } /* Comment.Single */
-.codehilite .cs { color: #cc0000; font-weight: bold } /* Comment.Special */
-.codehilite .gd { color: #A00000 } /* Generic.Deleted */
-.codehilite .ge { font-style: italic } /* Generic.Emph */
-.codehilite .gr { color: #FF0000 } /* Generic.Error */
-.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.codehilite .gi { color: #00A000 } /* Generic.Inserted */
-.codehilite .go { color: #808080 } /* Generic.Output */
-.codehilite .gp {
+code[class^='language-'] .hll { background-color: #ffffcc }
+code[class^='language-'] .c { color: #808080 } /* Comment */
+code[class^='language-'] .err { color: #F00000; background-color: #F0A0A0 } /* Error */
+code[class^='language-'] .k { color: #008000; font-weight: bold } /* Keyword */
+code[class^='language-'] .o { color: #303030 } /* Operator */
+code[class^='language-'] .cm { color: #808080 } /* Comment.Multiline */
+code[class^='language-'] .cp { color: #507090 } /* Comment.Preproc */
+code[class^='language-'] .c1 { color: #808080 } /* Comment.Single */
+code[class^='language-'] .cs { color: #cc0000; font-weight: bold } /* Comment.Special */
+code[class^='language-'] .gd { color: #A00000 } /* Generic.Deleted */
+code[class^='language-'] .ge { font-style: italic } /* Generic.Emph */
+code[class^='language-'] .gr { color: #FF0000 } /* Generic.Error */
+code[class^='language-'] .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+code[class^='language-'] .gi { color: #00A000 } /* Generic.Inserted */
+code[class^='language-'] .go { color: #808080 } /* Generic.Output */
+code[class^='language-'] .gp {
   color: #c65d09;
   font-weight: bold;
   /* NOTE: Hacks to allow copy-paste */
@@ -25,48 +25,48 @@
   -ms-user-select: none;
   user-select: none;
 } /* Generic.Prompt */
-.codehilite .gs { font-weight: bold } /* Generic.Strong */
-.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.codehilite .gt { color: #0040D0 } /* Generic.Traceback */
-.codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
-.codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
-.codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
-.codehilite .kp { color: #003080; font-weight: bold } /* Keyword.Pseudo */
-.codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
-.codehilite .kt { color: #303090; font-weight: bold } /* Keyword.Type */
-.codehilite .m { color: #6000E0; font-weight: bold } /* Literal.Number */
-.codehilite .s { background-color: #fff0f0 } /* Literal.String */
-.codehilite .na { color: #0000C0 } /* Name.Attribute */
-.codehilite .nb { color: #007020 } /* Name.Builtin */
-.codehilite .nc { color: #B00060; font-weight: bold } /* Name.Class */
-.codehilite .no { color: #003060; font-weight: bold } /* Name.Constant */
-.codehilite .nd { color: #505050; font-weight: bold } /* Name.Decorator */
-.codehilite .ni { color: #800000; font-weight: bold } /* Name.Entity */
-.codehilite .ne { color: #F00000; font-weight: bold } /* Name.Exception */
-.codehilite .nf { color: #0060B0; font-weight: bold } /* Name.Function */
-.codehilite .nl { color: #907000; font-weight: bold } /* Name.Label */
-.codehilite .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.codehilite .nt { color: #007000 } /* Name.Tag */
-.codehilite .nv { color: #906030 } /* Name.Variable */
-.codehilite .ow { color: #000000; font-weight: bold } /* Operator.Word */
-.codehilite .w { color: #bbbbbb } /* Text.Whitespace */
-.codehilite .mf { color: #6000E0; font-weight: bold } /* Literal.Number.Float */
-.codehilite .mh { color: #005080; font-weight: bold } /* Literal.Number.Hex */
-.codehilite .mi { color: #0000D0; font-weight: bold } /* Literal.Number.Integer */
-.codehilite .mo { color: #4000E0; font-weight: bold } /* Literal.Number.Oct */
-.codehilite .sb { background-color: #fff0f0 } /* Literal.String.Backtick */
-.codehilite .sc { color: #0040D0 } /* Literal.String.Char */
-.codehilite .sd { color: #D04020 } /* Literal.String.Doc */
-.codehilite .s2 { background-color: #fff0f0 } /* Literal.String.Double */
-.codehilite .se { color: #606060; font-weight: bold; background-color: #fff0f0 } /* Literal.String.Escape */
-.codehilite .sh { background-color: #fff0f0 } /* Literal.String.Heredoc */
-.codehilite .si { background-color: #e0e0e0 } /* Literal.String.Interpol */
-.codehilite .sx { color: #D02000; background-color: #fff0f0 } /* Literal.String.Other */
-.codehilite .sr { color: #000000; background-color: #fff0ff } /* Literal.String.Regex */
-.codehilite .s1 { background-color: #fff0f0 } /* Literal.String.Single */
-.codehilite .ss { color: #A06000 } /* Literal.String.Symbol */
-.codehilite .bp { color: #007020 } /* Name.Builtin.Pseudo */
-.codehilite .vc { color: #306090 } /* Name.Variable.Class */
-.codehilite .vg { color: #d07000; font-weight: bold } /* Name.Variable.Global */
-.codehilite .vi { color: #3030B0 } /* Name.Variable.Instance */
-.codehilite .il { color: #0000D0; font-weight: bold } /* Literal.Number.Integer.Long */
+code[class^='language-'] .gs { font-weight: bold } /* Generic.Strong */
+code[class^='language-'] .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+code[class^='language-'] .gt { color: #0040D0 } /* Generic.Traceback */
+code[class^='language-'] .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+code[class^='language-'] .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+code[class^='language-'] .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+code[class^='language-'] .kp { color: #003080; font-weight: bold } /* Keyword.Pseudo */
+code[class^='language-'] .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+code[class^='language-'] .kt { color: #303090; font-weight: bold } /* Keyword.Type */
+code[class^='language-'] .m { color: #6000E0; font-weight: bold } /* Literal.Number */
+code[class^='language-'] .s { background-color: #fff0f0 } /* Literal.String */
+code[class^='language-'] .na { color: #0000C0 } /* Name.Attribute */
+code[class^='language-'] .nb { color: #007020 } /* Name.Builtin */
+code[class^='language-'] .nc { color: #B00060; font-weight: bold } /* Name.Class */
+code[class^='language-'] .no { color: #003060; font-weight: bold } /* Name.Constant */
+code[class^='language-'] .nd { color: #505050; font-weight: bold } /* Name.Decorator */
+code[class^='language-'] .ni { color: #800000; font-weight: bold } /* Name.Entity */
+code[class^='language-'] .ne { color: #F00000; font-weight: bold } /* Name.Exception */
+code[class^='language-'] .nf { color: #0060B0; font-weight: bold } /* Name.Function */
+code[class^='language-'] .nl { color: #907000; font-weight: bold } /* Name.Label */
+code[class^='language-'] .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+code[class^='language-'] .nt { color: #007000 } /* Name.Tag */
+code[class^='language-'] .nv { color: #906030 } /* Name.Variable */
+code[class^='language-'] .ow { color: #000000; font-weight: bold } /* Operator.Word */
+code[class^='language-'] .w { color: #bbbbbb } /* Text.Whitespace */
+code[class^='language-'] .mf { color: #6000E0; font-weight: bold } /* Literal.Number.Float */
+code[class^='language-'] .mh { color: #005080; font-weight: bold } /* Literal.Number.Hex */
+code[class^='language-'] .mi { color: #0000D0; font-weight: bold } /* Literal.Number.Integer */
+code[class^='language-'] .mo { color: #4000E0; font-weight: bold } /* Literal.Number.Oct */
+code[class^='language-'] .sb { background-color: #fff0f0 } /* Literal.String.Backtick */
+code[class^='language-'] .sc { color: #0040D0 } /* Literal.String.Char */
+code[class^='language-'] .sd { color: #D04020 } /* Literal.String.Doc */
+code[class^='language-'] .s2 { background-color: #fff0f0 } /* Literal.String.Double */
+code[class^='language-'] .se { color: #606060; font-weight: bold; background-color: #fff0f0 } /* Literal.String.Escape */
+code[class^='language-'] .sh { background-color: #fff0f0 } /* Literal.String.Heredoc */
+code[class^='language-'] .si { background-color: #e0e0e0 } /* Literal.String.Interpol */
+code[class^='language-'] .sx { color: #D02000; background-color: #fff0f0 } /* Literal.String.Other */
+code[class^='language-'] .sr { color: #000000; background-color: #fff0ff } /* Literal.String.Regex */
+code[class^='language-'] .s1 { background-color: #fff0f0 } /* Literal.String.Single */
+code[class^='language-'] .ss { color: #A06000 } /* Literal.String.Symbol */
+code[class^='language-'] .bp { color: #007020 } /* Name.Builtin.Pseudo */
+code[class^='language-'] .vc { color: #306090 } /* Name.Variable.Class */
+code[class^='language-'] .vg { color: #d07000; font-weight: bold } /* Name.Variable.Global */
+code[class^='language-'] .vi { color: #3030B0 } /* Name.Variable.Instance */
+code[class^='language-'] .il { color: #0000D0; font-weight: bold } /* Literal.Number.Integer.Long */
diff --git a/content/stylesheets/cotton_candy.css b/content/stylesheets/cotton_candy.css
index 584f123..87c2e37 100644
--- a/content/stylesheets/cotton_candy.css
+++ b/content/stylesheets/cotton_candy.css
@@ -1,8 +1,8 @@
 #main code, code * { color: #675D69; }
-.codehilite .k { color: #143A77; }
-.codehilite .kp { color: #8C5DC7; }
-.codehilite .kd { color: #8C5DC7; }
-.codehilite .mi { color: #8C5DC7; }
-.codehilite .s { color: #0060B0; }
-.codehilite .c { color: #91B9A3; }
-.codehilite .o { color: #009DE7; }
\ No newline at end of file
+code[class^='language-'] .k { color: #143A77; }
+code[class^='language-'] .kp { color: #8C5DC7; }
+code[class^='language-'] .kd { color: #8C5DC7; }
+code[class^='language-'] .mi { color: #8C5DC7; }
+code[class^='language-'] .s { color: #0060B0; }
+code[class^='language-'] .c { color: #91B9A3; }
+code[class^='language-'] .o { color: #009DE7; }
\ No newline at end of file
diff --git a/lib/default.rb b/lib/default.rb
deleted file mode 100644
index e5d1ef6..0000000
--- a/lib/default.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# All files in the 'lib' directory will be loaded
-# before nanoc starts compiling.
-
-class CodeClassSimplfier < Nanoc::Filter
-  identifier :code_class_simplfier
-  type :text
-
-  def run(content, params={})
-    return content.dup.gsub!(/"language-\w+?"/, "codehilite")
-  end
-
-end
\ No newline at end of file