diff --git a/data/fonts/classic.toml b/data/fonts/classic.toml
index 4b9e568c..3b24d07b 100644
--- a/data/fonts/classic.toml
+++ b/data/fonts/classic.toml
@@ -2,7 +2,7 @@
 name = "Classic"
 
 # Optional Google font URL
-google_fonts = "Playfair Display:400,700|Fauna One"
+google_fonts = "Playfair+Display:400,700|Fauna+One"
 
 # Font families
 heading_font = "Playfair Display"
diff --git a/layouts/partials/css/parse_theme.css b/layouts/partials/css/parse_theme.css
index 8288dfdd..9a57a70e 100644
--- a/layouts/partials/css/parse_theme.css
+++ b/layouts/partials/css/parse_theme.css
@@ -3,7 +3,7 @@
 
 {{/* Attempt to load font style specified by user. */}}
 {{- $font_index := .Site.Params.font | default "default" -}}
-{{ if isset .Site.Data.themes $font_index }}
+{{ if isset .Site.Data.fonts $font_index }}
   {{- $font := index .Site.Data.fonts $font_index -}}
   {{- $scr.Set "google_fonts" $font.google_fonts -}}
   {{- $scr.Set "body_font" $font.body_font -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index ebe66c87..8dad2636 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -40,7 +40,7 @@
   {{- partial "css/parse_theme.css" . -}}
   {{- $scr := .Scratch -}}
   {{ with ($scr.Get "google_fonts") }}
-  <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{- . -}}">
+  <link rel="stylesheet" href="{{ printf "//fonts.googleapis.com/css?family=%s" . }}">
   {{ end }}
   <link rel="stylesheet" href="{{ "styles.css" | relURL }}">
   {{ range .Site.Params.custom_css }}