diff --git a/prefixfree.js b/prefixfree.js
index 6a71162..a2bd833 100644
--- a/prefixfree.js
+++ b/prefixfree.js
@@ -157,8 +157,8 @@ var self = window.PrefixFree = {
 		}
 		
 		fix('functions', '(\\s|:)', '\\s*\\(', '$1' + prefix + '$2(');
-		fix('keywords', '(\\s|:)', '(\\s|;|\\})', '$1' + prefix + '$2$3');
-		fix('properties', '(\\{|\\s|;)', '\\s*:', '$1' + prefix + '$2:');
+		fix('keywords', '(\\s|:)', '(\\s|;|\\}||$)', '$1' + prefix + '$2$3');
+		fix('properties', '(^|\\{|\\s|;)', '\\s*:', '$1' + prefix + '$2:');
 		
 		// Prefix properties *inside* values (issue #8)
 		if (self.properties.length) {
diff --git a/prefixfree.min.js b/prefixfree.min.js
index 64ee7b9..7462086 100644
--- a/prefixfree.min.js
+++ b/prefixfree.min.js
@@ -3,7 +3,7 @@
 'url("'+f+b+'")':a}),b=b.replace(RegExp("\\b(behavior:\\s*?url\\('?\"?)"+f,"gi"),"$1"));var c=document.createElement("style");c.textContent=b;c.media=a.media;c.disabled=a.disabled;e.insertBefore(c,a);e.removeChild(a)}}};d.send(null);a.setAttribute("data-inprogress","")},styleElement:function(a){var b=a.disabled;a.textContent=h.fix(a.textContent,true,a);a.disabled=b},styleAttribute:function(a){var b=a.getAttribute("style"),b=h.fix(b,false,a);a.setAttribute("style",b)},register:function(a){this.fixers=
 this.fixers||[];this.fixers.push(a)},fix:function(a,b){for(var c=0;c<this.fixers.length;c++)a=this.fixers[c](a,b)||a;return a},camelCase:function(a){return a.replace(/-([a-z])/g,function(a,c){return c.toUpperCase()}).replace("-","")},deCamelCase:function(a){return a.replace(/[A-Z]/g,function(a){return"-"+a.toLowerCase()})}};(function(){function a(a,c){return[].slice.call((c||document).querySelectorAll(a))}setTimeout(function(){a('link[rel~="stylesheet"]').forEach(StyleFix.link)},10);document.addEventListener("DOMContentLoaded",
 function(){a('link[rel~="stylesheet"]:not([data-inprogress])').forEach(StyleFix.link);a("style").forEach(StyleFix.styleElement);a("[style]").forEach(StyleFix.styleAttribute)},false)})()}})();
-(function(h){if(window.StyleFix&&window.getComputedStyle){var a=window.PrefixFree={prefixCSS:function(b,c){function f(c,d,e,f){c=a[c];c.length&&(c=RegExp(d+"("+c.join("|")+")"+e,"gi"),b=b.replace(c,f))}var e=a.prefix;f("functions","(\\s|:)","\\s*\\(","$1"+e+"$2(");f("keywords","(\\s|:)","(\\s|;|\\})","$1"+e+"$2$3");f("properties","(\\{|\\s|;)","\\s*:","$1"+e+"$2:");if(a.properties.length){var d=RegExp("\\b("+a.properties.join("|")+")(?!:)","gi");f("valueProperties","\\b",":(.+?);",function(a){return a.replace(d,
+(function(h){if(window.StyleFix&&window.getComputedStyle){var a=window.PrefixFree={prefixCSS:function(b,c){function f(c,d,e,f){c=a[c];c.length&&(c=RegExp(d+"("+c.join("|")+")"+e,"gi"),b=b.replace(c,f))}var e=a.prefix;f("functions","(\\s|:)","\\s*\\(","$1"+e+"$2(");f("keywords","(\\s|:)","(\\s|;|\\}||$)","$1"+e+"$2$3");f("properties","(^|\\{|\\s|;)","\\s*:","$1"+e+"$2:");if(a.properties.length){var d=RegExp("\\b("+a.properties.join("|")+")(?!:)","gi");f("valueProperties","\\b",":(.+?);",function(a){return a.replace(d,
 e+"$1")})}c&&(f("selectors","","\\b",a.prefixSelector),f("atrules","@","\\b","@"+e+"$1"));return b=b.replace(RegExp("-"+e,"g"),"-")},prefixSelector:function(b){return b.replace(/^:{1,2}/,function(b){return b+a.prefix})},prefixProperty:function(b,c){var f=a.prefix+b;return c?StyleFix.camelCase(f):f}};(function(){var b={},c="",f=0,e=[],d=getComputedStyle(document.documentElement,null),i=document.createElement("div").style,j=function(a){e.indexOf(a)===-1&&e.push(a);if(a.indexOf("-")>-1){var d=a.split("-");
 if(a.charAt(0)==="-"){var a=d[1],g=++b[a]||1;b[a]=g;for(f<g&&(c=a,f=g);d.length>3;)d.pop(),g=d.join("-"),StyleFix.camelCase(g)in i&&(a=e,a.indexOf(g)===-1&&a.push(g))}}};if(d.length>0)for(var g=0;g<d.length;g++)j(d[g]);else for(var h in d)j(StyleFix.deCamelCase(h));a.prefix="-"+c+"-";a.Prefix=StyleFix.camelCase(a.prefix);e.sort();a.properties=[];for(g=0;g<e.length;g++){h=e[g];if(h.charAt(0)!=="-")break;h.indexOf(a.prefix)===0&&(d=h.slice(a.prefix.length),StyleFix.camelCase(d)in i||a.properties.push(d))}a.Prefix==
 "Ms"&&!("transform"in i)&&!("MsTransform"in i)&&"msTransform"in i&&a.properties.push("transform","transform-origin");a.properties.sort()})();(function(){function b(a,b){e[b]="";e[b]=a;return!!e[b]}var c={"linear-gradient":{property:"backgroundImage",params:"red, teal"},calc:{property:"width",params:"1px + 5%"},element:{property:"backgroundImage",params:"#foo"}},f={initial:"color","zoom-in":"cursor","zoom-out":"cursor",box:"display",flexbox:"display","inline-flexbox":"display"};c["repeating-linear-gradient"]=