diff --git a/p/.htaccess b/p/.htaccess
index fefe8b226..2b1e27a88 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -10,13 +10,13 @@ AddDefaultCharset	UTF-8
 	AddType application/font-woff .woff
 
 	AddCharset	UTF-8	.css
+	AddCharset	UTF-8	.html
 	AddCharset	UTF-8	.js
-	AddCharset	UTF-8	.map
 	AddCharset	UTF-8	.svg
 </IfModule>
 
 <IfModule mod_deflate.c>
-	AddOutputFilterByType DEFLATE application/javascript application/json image/svg+xml text/css text/javascript
+	AddOutputFilterByType DEFLATE application/javascript application/json application/xhtml+xml image/svg+xml text/css text/html text/javascript
 </IfModule>
 
 <IfModule mod_expires.c>
@@ -24,11 +24,13 @@ AddDefaultCharset	UTF-8
 	ExpiresByType	application/font-woff	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
 	ExpiresByType	application/json	"access plus 1 month"
+	ExpiresByType	application/xhtml+xml	"access plus 1 month"
 	ExpiresByType	image/gif	"access plus 1 month"
 	ExpiresByType	image/png	"access plus 1 month"
 	ExpiresByType	image/svg+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
 	ExpiresByType	text/css	"access plus 1 month"
+	ExpiresByType	text/html	"access plus 1 month"
 	ExpiresByType	text/javascript	"access plus 1 month"
 	<FilesMatch "\.php$">
 		ExpiresActive	Off
@@ -36,13 +38,7 @@ AddDefaultCharset	UTF-8
 </IfModule>
 
 <IfModule mod_headers.c>
-	<FilesMatch "\.(css|js|ico|gif|png|woff)$">
+	<FilesMatch "\.(css|html|js|ico|gif|png|woff)$">
 		Header	merge Cache-Control "public"
 	</FilesMatch>
 </IfModule>
-
-<Files "favicon.ico">
-	Order	Deny,Allow
-	Allow	from all
-	Satisfy	Any
-</Files>