7 files changed, 21 insertions, 21 deletions
diff --git a/_includes/common/bootstrap_css.html b/_includes/common/bootstrap_css.html
index f47b856..72c078b 100644
--- a/_includes/common/bootstrap_css.html
+++ b/_includes/common/bootstrap_css.html
@@ -1,5 +1,5 @@
-{% if site.minified_externals %}
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/css/bootstrap.min.css">
+{% if site.settings.3rdparty.minified %}
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.min.css">
 {% else %}
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/css/bootstrap.css">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/css/bootstrap.css">
 {% endif %}
diff --git a/_includes/common/bootstrap_js.html b/_includes/common/bootstrap_js.html
index e724257..3f80e7d 100644
--- a/_includes/common/bootstrap_js.html
+++ b/_includes/common/bootstrap_js.html
@@ -1,5 +1,5 @@
-{% if site.minified_externals %}
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/js/bootstrap.min.js"></script>
+{% if site.settings.3rdparty.minified %}
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.min.js"></script>
 {% else %}
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.bootstrap_version }}/js/bootstrap.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/{{ site.settings.3rdparty.versions.bootstrap }}/js/bootstrap.js"></script>
 {% endif %}
diff --git a/_includes/common/header.html b/_includes/common/header.html
index 7f5390e..4020667 100644
--- a/_includes/common/header.html
+++ b/_includes/common/header.html
@@ -5,10 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {% if site.project.name %}
-      <title>{{ page.title }} - {{ site.project.name }} - {{ site.personal_info.name }}</title>
+    {% if site.settings.project.name %}
+      <title>{{ page.title }} - {{ site.settings.project.name }} - {{ site.settings.author.name }}</title>
     {% else %}
-      <title>{{ page.title }} - {{ site.personal_info.name }}</title>
+      <title>{{ page.title }} - {{ site.settings.author.name }}</title>
     {% endif %}
 
     {% include common/bootstrap_css.html %}
@@ -20,7 +20,7 @@
   </head>
   <body>
     <div class="top-level-footer-wrapper">
-      {% if site.hide_navbar or page.hide_navbar %}
+      {% if site.settings.navbar.hide or page.navbar.hide %}
       {% else %}
         <div class="footer-wrapper-collapse">
           {% include common/navbar.html %}
diff --git a/_includes/common/ie_compat.html b/_includes/common/ie_compat.html
index 3cef67d..494d971 100644
--- a/_includes/common/ie_compat.html
+++ b/_includes/common/ie_compat.html
@@ -1,11 +1,11 @@
-{% if site.minified_externals %}
+{% if site.settings.3rdparty.minified %}
   <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/{{ site.html5shiv_version }}/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/{{ site.respond_version }}/respond.min.js"></script>
+    <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.min.js"></script>
   <![endif]-->
 {% else %}
   <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/{{ site.html5shiv_version }}/html5shiv.js"></script>
-    <script src="https://oss.maxcdn.com/respond/{{ site.respond_version }}/respond.js"></script>
+    <script src="https://oss.maxcdn.com/html5shiv/{{ site.settings.3rdparty.versions.html5shiv }}/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/respond/{{ site.settings.3rdparty.versions.respond }}/respond.js"></script>
   <![endif]-->
 {% endif %}
diff --git a/_includes/common/jquery.html b/_includes/common/jquery.html
index aa6d2fd..7e59177 100644
--- a/_includes/common/jquery.html
+++ b/_includes/common/jquery.html
@@ -1,5 +1,5 @@
-{% if site.minified_externals %}
-  <script src="https://code.jquery.com/jquery-{{ site.jquery_version }}.min.js"></script>
+{% if site.settings.3rdparty.minified %}
+  <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.min.js"></script>
 {% else %}
-  <script src="https://code.jquery.com/jquery-{{ site.jquery_version }}.js"></script>
+  <script src="https://code.jquery.com/jquery-{{ site.settings.3rdparty.versions.jquery }}.js"></script>
 {% endif %}
diff --git a/_includes/common/navbar.html b/_includes/common/navbar.html
index 8ec0812..1da4b5a 100644
--- a/_includes/common/navbar.html
+++ b/_includes/common/navbar.html
@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">{{ site.personal_info.name }}</a>
+      <a class="navbar-brand" href="/">{{ site.settings.author.name }}</a>
     </div>
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
diff --git a/_includes/common/sidebar.html b/_includes/common/sidebar.html
index 923eb04..1a161ba 100644
--- a/_includes/common/sidebar.html
+++ b/_includes/common/sidebar.html
@@ -1,10 +1,10 @@
 <div class="row">
   <div class="col-xs-12 col-sm-6 col-md-12">
     <h2 class="h4">About</h2>
-    <p>{{ site.project.description }}. Feel free to contribute or contact me.</p>
+    <p>{{ site.settings.project.description }}. Feel free to contribute or contact me.</p>
     <div class="list-group wide-enough">
       <a class="list-group-item" href="{{ site.github.repository_url }}"><span class="glyphicon glyphicon-home"></span>&nbsp;GitHub repository</a>
-      <a class="list-group-item" href="mailto:{{ site.personal_info.email }}"><span class="glyphicon glyphicon-envelope"></span>&nbsp;{{ site.personal_info.email }}</a>
+      <a class="list-group-item" href="mailto:{{ site.settings.author.email }}"><span class="glyphicon glyphicon-envelope"></span>&nbsp;{{ site.settings.author.email }}</a>
     </div>
   </div>
   <div class="col-xs-12 col-sm-6 col-md-12">