diff --git a/.htaccess b/.htaccess
index daab6ba..110ffe7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,8 @@
 AddType application/x-web-app-manifest+json .webapp
+ExpiresActive On
+ExpiresByType application/javascript "access plus 1 week"
+ExpiresByType text/css "access plus 1 week"
+ExpiresByType image/png "access plus 1 week"
+ExpiresByType image/jpeg "access plus 1 week"
+ExpiresByType image/svg+xml "access plus 1 week"
+FileETag None
diff --git a/Gruntfile.js b/Gruntfile.js
index 0824a61..4671cda 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
         cssmin: {
             combine: {
                 files: {
-                    'dist/main.css': ['css/style.css']
+                    'dist/main.css': ['css/*.css']
                 }
             }
         },
diff --git a/css/fonts.css b/css/fonts.css
new file mode 100644
index 0000000..eff928c
--- /dev/null
+++ b/css/fonts.css
@@ -0,0 +1,12 @@
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/OpenSans-Light.ttf);
+}
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.ttf);
+}
diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000..0d38189
Binary files /dev/null and b/fonts/OpenSans-Light.ttf differ
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..db43334
Binary files /dev/null and b/fonts/OpenSans-Regular.ttf differ
diff --git a/head.php b/head.php
index 75eb688..dc8f998 100644
--- a/head.php
+++ b/head.php
@@ -5,8 +5,6 @@
 <meta name=viewport content="width=device-width, initial-scale=1">
 <meta name="description" content="Easily download videos from Youtube, Dailymotion, Vimeo and other websites." />
 <link rel="stylesheet" href="dist/main.css" />
-<link rel="stylesheet"
-href="https://fonts.googleapis.com/css?family=Open+Sans:400,300" />
 <link rel="author" href="https://plus.google.com/110403274854419000481?rel=author" />
 <link rel="author" href="https://plus.google.com/103696815796116179392?rel=author" />
 <link href="https://plus.google.com/108799967445657477255" rel="publisher" />