diff --git a/_config.yml b/_config.yml
index 5a8b7b3bea3a34c52ca18dbd6eeae91af1b10ea6..5a8c05a02a18a39e42853ac40941ef8e869f295c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,8 +20,8 @@ subtitle: "A free HTML5 agency template"
 # and never end with a slash. Set it to a blank value if hosting at the
 # root of your server.
 # baseurl: "/" # the subpath of your site
-# url: "http://luminousrubyist.github.io" # the base hostname & protocol for your site
-# baseurl: "/"
+url: "http://luminousrubyist.github.io" # the base hostname & protocol for your site
+baseurl: "/airspace-jekyll"
 cover: "/assets/cover.png"
 logo: "/assets/logo.png"
 
diff --git a/_includes/footer.html b/_includes/footer.html
index 8b1033e066f2c0e6d00dbdb5289285b5f49ea0cb..fd1b8d131120e2416997d7821b26158f0efd25f1 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -6,9 +6,9 @@
         <div class="footer-manu">
           <ul>
             <li><a href="#">About Us</a></li>
-            <li><a href="/contact">Contact us</a></li>
+            <li><a href="{{ site.baseurl }}/contact">Contact us</a></li>
             <li><a href="#">How it works</a></li>
-            <li><a href="/blog">Blog</a></li>
+            <li><a href="{{ site.baseurl }}/blog">Blog</a></li>
             <li><a href="#">Terms</a></li>
           </ul>
         </div>
diff --git a/_includes/head.html b/_includes/head.html
index 3a9509095caa0aac94e86b0a8dcbbbe43e05c314..7b4293f80135e9f812e29692c0d01a6065811d8b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,29 +6,29 @@
 <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
 <!-- CSS -->
-<link rel="stylesheet" href="/css/owl.carousel.css" />
-<link rel="stylesheet" href="/css/bootstrap.min.css" />
-<link rel="stylesheet" href="/css/font-awesome.min.css" />
-<link rel="stylesheet" href="/css/airspace.css" />
-<link rel="stylesheet" href="/css/style.css" />
-<link rel="stylesheet" href="/css/ionicons.min.css" />
-<link rel="stylesheet" href="/css/animate.css" />
-<link rel="stylesheet" href="/css/responsive.css" />
-<link rel="stylesheet" href="/css/syntax.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/owl.carousel.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/bootstrap.min.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/font-awesome.min.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/airspace.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/style.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/ionicons.min.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/animate.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/responsive.css" />
+<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css" />
 
 <!-- Js -->
 <script src="/js/vendor/modernizr-2.6.2.min.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>')</script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/owl.carousel.min.js"></script>
-<script src="/js/plugins.js"></script>
-<script src="/js/min/waypoints.min.js"></script>
-<script src="/js/jquery.counterup.js"></script>
+<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
+<script src="{{ site.baseurl }}/js/owl.carousel.min.js"></script>
+<script src="{{ site.baseurl }}/js/plugins.js"></script>
+<script src="{{ site.baseurl }}/js/min/waypoints.min.js"></script>
+<script src="{{ site.baseurl }}/js/jquery.counterup.js"></script>
 
 <!-- Google Map -->
 <script src="https://maps.googleapis.com/maps/api/js"></script>
-<script src="/js/google-map-init.js"></script>
+<script src="{{ site.baseurl }}/js/google-map-init.js"></script>
 
 
-<script src="/js/main.js"></script>
+<script src="{{ site.baseurl }}/js/main.js"></script>
diff --git a/_includes/header.html b/_includes/header.html
index 30e0f91975e520c517057c616c1c22c7b6937122..df83905dbab1e2de52db9f17e87ac90968fdfeac 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -15,17 +15,17 @@
             <span class="icon-bar"></span>
             </button>
             <a class="navbar-brand" href="index.html">
-              <img src="/img/logo.png" alt="Logo">
+              <img src="{{ site.baseurl }}/img/logo.png" alt="Logo">
             </a>
           </div>
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
               <ul class="nav navbar-nav navbar-right">
-                <li><a href="/">Home</a></li>
-                <li><a href="/work">Work</a></li>
-                <li><a href="/blog">Blog</a></li>
+                <li><a href="{{ site.baseurl }}/">Home</a></li>
+                <li><a href="{{ site.baseurl }}/work">Work</a></li>
+                <li><a href="{{ site.baseurl }}/blog">Blog</a></li>
                 <li><a href="#">Service</a></li>
-                <li><a href="/contact">Contact</a></li>
+                <li><a href="{{ site.baseurl }}/contact">Contact</a></li>
               </ul>
             </div><!-- /.navbar-collapse -->
           </div><!-- /.container-fluid -->
diff --git a/work.html b/work.html
index de7b6e0adf0c1709af1f5a9e4ed1335ee8f70668..f147a171a0bcdb6d9cfb218b1850324379c1a7fd 100755
--- a/work.html
+++ b/work.html
@@ -37,7 +37,7 @@ permalink: /work/
                 <ul id="portfolio-contant-active">
                     <li class="mix Branding">
                       <a href="#">
-                        <img src="/img/portfolio/work1.jpg" alt="">
+                        <img src="{{ site.baseurl }}/img/portfolio/work1.jpg" alt="">
                         <div class="overly">
                           <div class="position-center">
                             <h2>Tesla Motors</h2>
@@ -49,7 +49,7 @@ permalink: /work/
                   </li>
                   <li class="mix Websites">
                     <a href="#">
-                      <img src="/img/portfolio/work2.jpg" alt="">
+                      <img src="{{ site.baseurl }}/img/portfolio/work2.jpg" alt="">
                       <div class="overly">
                         <div class="position-center">
                           <h2>Tesla Motors</h2>
@@ -61,7 +61,7 @@ permalink: /work/
                   </li>
                   <li class="mix Graphic">
                     <a href="#">
-                      <img src="/img/portfolio/work3.jpg" alt="">
+                      <img src="{{ site.baseurl }}/img/portfolio/work3.jpg" alt="">
                       <div class="overly">
                         <div class="position-center">
                           <h2>Tesla Motors</h2>
@@ -74,7 +74,7 @@ permalink: /work/
                   </li>
                   <li class="mix design">
                     <a href="#">
-                      <img src="/img/portfolio/work4.jpg" alt="">
+                      <img src="{{ site.baseurl }}/img/portfolio/work4.jpg" alt="">
                       <div class="overly">
                         <div class="position-center">
                           <h2>Tesla Motors</h2>
@@ -86,7 +86,7 @@ permalink: /work/
                   </li>
                   <li class="mix Video">
                     <a href="#">
-                      <img src="/img/portfolio/work5.jpg" alt="">
+                      <img src="{{ site.baseurl }}/img/portfolio/work5.jpg" alt="">
                       <div class="overly">
                         <div class="position-center">
                           <h2>Tesla Motors</h2>
@@ -98,7 +98,7 @@ permalink: /work/
                   </li>
                   <li class="mix Graphic">
                     <a href="#">
-                      <img src="/img/portfolio/work6.jpg" alt="">
+                      <img src="{{ site.baseurl }}/img/portfolio/work6.jpg" alt="">
                       <div class="overly">
                         <div class="position-center">
                           <h2>Tesla Motors</h2>
@@ -124,40 +124,40 @@ permalink: /work/
         <div class="block">
           <div id="clients-logo" class="owl-carousel">
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo1.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo1.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo2.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo2.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo3.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo3.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo4.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo4.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo5.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo5.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo3.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo3.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo2.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo2.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo5.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo5.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo1.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo1.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo4.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo4.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo5.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo5.png" alt="Features">
             </div>
             <div class="clients-logo-img">
-              <img src="/img/clients/clients-logo3.png" alt="Features">
+              <img src="{{ site.baseurl }}/img/clients/clients-logo3.png" alt="Features">
             </div>
           </div>
         </div>