diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 3ff41842..458719e4 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -62,8 +62,8 @@ canonifyURLs = true
 
   # options for highlight.js (version, additional languages, and theme)
   disable_highlight = false # set to true to disable Highlight
-  highlightjsVersion = "9.11.0"
-  highlightjsCDN = "//cdn.bootcss.com"
+  highlightjsVersion = "9.12.0"
+  highlightjsCDN = "//cdnjs.cloudflare.com/ajax/libs"
   highlightjsLang = ["r", "yaml", "css"]
   highlightjsTheme = "github"
   MathJaxCDN = "//cdn.bootcss.com"
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index dcc917f8..57e9cbce 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -8,18 +8,19 @@
       {{ $.Scratch.Set "jsFiles" false }}
     {{ end }}
 
-    {{ if (not .Params.disable_highlight) }}
-      {{ $highVer := .Site.Params.highlightjsVersion }}
-      {{ $highCDN := (.Site.Params.highlightjsCDN | default "//cdn.bootcss.com") }}
-      {{ if (not (eq $highVer "")) }}
-        <script src="{{ $highCDN }}/highlight.js/{{ $highVer }}/highlight.min.js"></script>
+    {{ if (and (not .Site.Params.disable_highlight) (not .Params.disable_highlight)) }}
+        {{ $highVersion := .Site.Params.highlightjsVersion | default "9.12.0" }}
+        {{ $highCDN := .Site.Params.highlightjsCDN | default "//cdnjs.cloudflare.com/ajax/libs" }}
+        <script src="{{ $highCDN }}/highlight.js/{{ $highVersion }}/highlight.min.js"></script>
+
         {{ $.Scratch.Set "highLangs" .Site.Params.highlightjsLang }}
         {{ range .Params.highlightjsLang }}{{ $.Scratch.Add "highLangs" . }}{{ end }}
         {{ range ($.Scratch.Get "highLangs") }}
-        <script src="{{ $highCDN }}/highlight.js/{{ $highVer }}/languages/{{ . }}.min.js"></script>{{ end }}
-        <script>hljs.configure({languages: []}); hljs.initHighlightingOnLoad();</script>
-      {{ end }}
+          <script src="{{ $highCDN }}/highlight.js/{{ $highVersion }}/languages/{{ . }}.min.js"></script>
+        {{ end }}
+        <script>hljs.initHighlightingOnLoad();</script>
     {{ end }}
+
     <!-- If the value "default" is passed into the param then we will first
      load the standard js files associated with the theme -->
     {{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b954fe92..767d0168 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -51,7 +51,6 @@
         <!-- If the value "default" is passed into the param then we will first
              load the standard css files associated with the theme -->
         {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }}
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css">
             <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700">
             <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.25/jquery.fancybox.min.css">
@@ -68,12 +67,12 @@
             {{ end }}
         {{ end }}
 
-{{ if (not .Params.disable_highlight) }}
-  {{ $highTheme := .Site.Params.highlightjsTheme }}
-    {{ with .Site.Params.highlightjsVersion }}
-    <link href='{{ $.Site.Params.highlightjsCDN | default "//cdn.bootcss.com" }}/highlight.js/{{ . }}/styles/{{ $highTheme }}.min.css' rel='stylesheet' type='text/css' />
-  {{ end }}
-{{ end }}
+        {{ if (and (not .Site.Params.disable_highlight) (not .Params.disable_highlight)) }}
+            {{ $highTheme := .Site.Params.highlightjsTheme | default "github" }}
+            {{ $highVersion := .Site.Params.highlightjsVersion | default "9.12.0" }}
+            {{ $highCDN := .Site.Params.highlightjsCDN | default "//cdnjs.cloudflare.com/ajax/libs" }}
+            <link href='{{ $highCDN }}/highlight.js/{{ $highVersion }}/styles/{{ $highTheme }}.min.css' rel='stylesheet' type='text/css' />
+        {{ end }}
 
       {{ template "_internal/google_analytics.html" . }}
     </head>