diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
index 637001b8..59bc73fc 100644
--- a/lib/coderay/helpers/file_type.rb
+++ b/lib/coderay/helpers/file_type.rb
@@ -96,6 +96,7 @@ def shebang filename
       'java'     => :java,
       'js'       => :java_script,
       'json'     => :json,
+      'amps'     => :amps,
       'mab'      => :ruby,
       'pas'      => :delphi,
       'patch'    => :diff,
diff --git a/lib/coderay/scanners/liquid.rb b/lib/coderay/scanners/liquid.rb
new file mode 100644
index 00000000..a0255712
--- /dev/null
+++ b/lib/coderay/scanners/liquid.rb
@@ -0,0 +1,55 @@
+module CodeRay
+module Scanners
+
+  load :html
+
+  class Liquid < Scanner
+   
+    register_for :liquid
+    title 'Liquid Template'
+
+    KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
+
+    LIQUID_BLOCK = /
+      ({[{|%])
+      \s
+      (.*?)
+      \s
+      ([%|}]})
+    /
+      
+    START_OF_LIQUID = /{{|{%/ 
+
+    protected
+   
+    def setup
+      @html_scanner = CodeRay.scanner :html, tokens: @tokens, keep_tokens: true, keep_state: true
+      @liquid_attribute_scanner = CodeRay.scanner :html, tokens: @tokens, keep_tokens: true, keep_stat: true
+    end
+ 
+    def scan_tokens(tokens, options)
+      until eos?
+        if (match = scan_until(/(?=#{START_OF_LIQUID})/o) || scan_rest) and not match.empty?
+          @html_scanner.tokenize match, tokens: tokens 
+        elsif match = scan(/#{LIQUID_BLOCK}/o)
+          start_tag = self[1]
+          code = self[2]
+          end_tag = self[3]
+    
+          tokens.begin_group :inline
+          tokens.text_token start_tag, :inline_delimiter
+ 
+          unless code.empty?
+            @liquid_attribute_scanner.tokenize code, tokens: tokens, state: :attribute
+          end
+          
+          tokens.text_token end_tag, :inline_delimiter unless end_tag.empty?
+          tokens.end_group :inline
+        else 
+          raise_inspect 'else-case reached!', tokens
+        end 
+      end
+    end
+  end
+end
+end