diff --git a/README.md b/README.md
index 29b3bfc..401469f 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,18 @@ A [Hugo](http://gohugo.io) theme with clear typograhy for easy, disturbance-free
 
 # Setup 
 
-From the root of your Hugo site, clone the theme into a folder named `cocoa` by running:
+From the root of your Hugo site, clone the theme into `themes/cocoa` by running:
 
 ````
 $ mkdir themes
 $ cd themes
-$ git clone https://github.com/nishanths/cocoa-hugo-theme cocoa
+$ git clone https://github.com/nishanths/cocoa-hugo-theme.git cocoa
 ````
 
 Then, generate static files by running:
 
 ````
-hugo -t cocoa
+$ hugo -t cocoa
 ````
 
 # Theme
@@ -52,10 +52,37 @@ $ hugo new fixed/about.md
 
 ## Fonts and Colors
 
-The primary font face is Proxima Nova. You will need to place your own copy of the font under ``. The monospace font face is Ubuntu Mono from Google Fonts. 
+The primary font face is Proxima Nova in 400 and 700 weights. If you own the font, create a font face declarations like in the example below, and place it in `static/css/webfonts.css`:
+
+````css
+@font-face {
+	font-family: 'ProximaNova';
+	font-weight: normal;
+	font-style: normal;
+	src: url('webfonts/2F00B2_0_0.eot');
+	src: url('webfonts/2F00B2_0_0.eot?#iefix') format('embedded-opentype'),
+	     url('webfonts/2F00B2_0_0.woff2') format('woff2'),
+	     url('webfonts/2F00B2_0_0.woff') format('woff'),
+	     url('webfonts/2F00B2_0_0.ttf') format('truetype');
+}
+  
+@font-face {
+	font-family: 'ProximaNova';
+	font-weight: bold;
+	font-style: normal;
+	src: url('webfonts/2F00B2_1_0.eot');
+	src: url('webfonts/2F00B2_1_0.eot?#iefix') format('embedded-opentype'),
+		  url('webfonts/2F00B2_1_0.woff2') format('woff2'),
+		  url('webfonts/2F00B2_1_0.woff') format('woff'),
+		  url('webfonts/2F00B2_1_0.ttf') format('truetype');
+}
+ 
+````
+
+If you do not provide Proxima Nova files, the fallback font face—Source Sans Pro—will be automatically used from Google Fonts. The primary monospace font face is Ubuntu Mono from Google Fonts.
 
 
-The main colors are 
+The main colors are:
 
 * `#333333`
 * `#b7b7b7`
diff --git a/layouts/partials/head_includes.html b/layouts/partials/head_includes.html
index e5bc1b0..318127f 100644
--- a/layouts/partials/head_includes.html
+++ b/layouts/partials/head_includes.html
@@ -2,6 +2,7 @@
 <link rel="stylesheet" href="/css/reset.css">
 <link rel="stylesheet" href="/css/pygments.css">
 <link rel="stylesheet" href="/css/main.css">
+<link rel="stylesheet" href="/css/webfonts.css">
 
 <!-- Icon -->
 <link rel="shortcut icon"
diff --git a/main.less b/main.less
index 8a32f2f..383de71 100644
--- a/main.less
+++ b/main.less
@@ -11,8 +11,8 @@
 @vspacing: @base-font-size*2;
 
 @monospace-font-stack: ~"'Ubuntu Mono', 'Menlo', monospace";
-@body-font-stack: ~"'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif";
-@heading-font-stack: ~"'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif";
+@body-font-stack: ~"'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif";
+@heading-font-stack: ~"'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif";
 @special-font-stack-1: ~"'Raleway', 'Helvetica Neue', 'Arial', sans-serif";
 
 @black: #333;
diff --git a/static/css/main.css b/static/css/main.css
index 196bc6b..6188a7d 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -47,7 +47,7 @@ body {
   width: 100%;
   min-height: 100%;
   font-weight: 400;
-  font-family: 'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
+  font-family: 'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
   color: #333333;
   line-height: 1.6;
   text-rendering: optimizeLegibility !important;
@@ -165,7 +165,7 @@ body {
 }
 .section.header .name {
   font-size: 18px;
-  font-family: 'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
+  font-family: 'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
   letter-spacing: -0.005rem;
   text-transform: uppercase;
   font-weight: 700;
@@ -302,7 +302,7 @@ body {
 }
 .section.main .content .page-heading {
   font-size: 18px;
-  font-family: 'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
+  font-family: 'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
   letter-spacing: -0.005rem;
   text-transform: uppercase;
   font-weight: 700;
@@ -462,7 +462,7 @@ a {
 .section.main .content .markdown h5,
 .section.main .content .markdown h6 {
   font-size: 18px;
-  font-family: 'Proxima Nova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
+  font-family: 'ProximaNova', 'Source Sans Pro', 'Helvetica Neue', 'Arial' sans-serif;
   letter-spacing: -0.005rem;
   text-transform: uppercase;
   font-weight: 700;