diff --git a/README.md b/README.md
index 6c9f36b303..37a0225aff 100644
--- a/README.md
+++ b/README.md
@@ -267,12 +267,24 @@ All feature pages are stored in the `page` folder, they will appear in the navig
 
 Portfolio is a feature bootstrapped page that will take all the markdown/html files in the `_portfolio` folder to create a 3x3 image portfolio matrix.
 
+The portfolio page can be enable/disable through the `_config.yml` via:
+```yml
+# Scripts / Feature
+  portfolio: true
+```
 ### Search
 
 The search feature is based on [Simple-Jekyll-search](https://github.com/christian-fei/Simple-Jekyll-Search) there is a `search.json` file that will create a list of all of the site posts, pages and portfolios. 
 
 Then there's a `search.js` displaying the formated results entered in the `search.html` page. 
 
+
+The search page can be enable/disable through the `_config.yml` via:
+```yml
+# Scripts / Feature
+  search: true
+```
+
 ### Tags
 
 Post tags should be placed between `[]` in your post metadata. Seperate each tag with a comma.
@@ -288,6 +300,12 @@ tags: [sample, markdown, html]
 ```
 
 All the tags will be listed in `tags.html` with a link toward the pages or posts.
+The tags page can be enable/disable through the `_config.yml` via:
+
+```yml
+# Scripts / Feature
+  tags: true
+```
 
 
 ## License
diff --git a/_config.yml b/_config.yml
index 00a159f8bf..2a8e228846 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,10 +43,14 @@ theme_settings:
   wordpress:
   youtube:
 
-  # Scripts
+  # Scripts / Features 
   google_analytics: # Tracking ID, e.g. "UA-000000-01"
   disqus_shortname:
   katex: true # Enable if using math markup
+  portfolio: true
+  search: true
+  tags: true
+  
   
   # Localization strings
   str_follow_on: "Follow on"
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 670a818cbc..67d58387fd 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -27,7 +27,29 @@ <h1 class="site-title">
             </a>
         </li>
         {% endif %}
-        {% endfor %}
+        {% endfor %} 
+        {% if site.theme_settings.portfolio %}
+        <li>
+            <a class="clear" href="{{ site.url }}{{ site.baseurl }}/portfolio">
+                Portfolio
+            </a>
+        </li>
+        {% endif %}
+        {% if site.theme_settings.portfolio %}
+        <li>
+            <a class="clear" href="{{ site.url }}{{ site.baseurl }}/search">
+                Search
+            </a>
+        </li>
+        {% endif %}
+        {% if site.theme_settings.portfolio %}
+        <li>
+            <a class="clear" href="{{ site.url }}{{ site.baseurl }}/tags">
+                Tags
+            </a>
+        </li>
+        {% endif %}
+        
     </ul>
         
 	</nav>
diff --git a/pages/portfolio.html b/pages/portfolio.html
index 3dd73e8e79..1cb775bd53 100644
--- a/pages/portfolio.html
+++ b/pages/portfolio.html
@@ -4,6 +4,7 @@
 permalink: /portfolio/
 subtitle: "Projects I am working on" 
 feature-img: "assets/img/pexels/computer.jpeg"
+hide: true
 ---
 
 <!-- Portfolio Grid Section -->
@@ -11,7 +12,7 @@
     <div class="row">
         {% for item in site.portfolio %}
         <div class="col-sm-4 col-xs-4 portfolio-item">
-            <a href="{{ site.baseurl }}//{{ item.url }}" class="portfolio-link" data-keyboard="true">
+            <a href="{{ site.baseurl }}{{ item.url }}" class="portfolio-link" data-keyboard="true">
                 <div class="caption" title="{{ item.title }}">
                     <div class="caption-content">
                         <i class="fa fa-search-plus fa-3x"></i>
diff --git a/pages/search.html b/pages/search.html
index 1fb468b49e..1b222d704a 100644
--- a/pages/search.html
+++ b/pages/search.html
@@ -4,6 +4,7 @@
 permalink: /search/
 subtitle: "What are you looking for?"
 feature-img: "assets/img/pexels/search-map.jpeg"
+hide: true
 ---
 
 <!-- Html Elements for Search -->
diff --git a/pages/search.json b/pages/search.json
index e24228ae44..a10def100b 100644
--- a/pages/search.json
+++ b/pages/search.json
@@ -1,6 +1,7 @@
 ---
 ---
 [
+  {% if site.theme_settings.search %}
   {% for post in site.posts %}
     {
       "title"    : "{{ post.title | escape }}",
@@ -23,4 +24,5 @@
      {% endif %}
    } {% unless forloop.last %},{% endunless %}
   {% endfor %}
+  {% endif %}
 ]
diff --git a/pages/tags.html b/pages/tags.html
index 034fe5ef24..daaa4d2a4a 100644
--- a/pages/tags.html
+++ b/pages/tags.html
@@ -2,6 +2,7 @@
 layout: page
 title: Tags
 permalink: /tags/
+hide: true
 ---
 
 <div class="home">
diff --git a/type-on-strap.gemspec b/type-on-strap.gemspec
index 6eeb95f93b..772429b59f 100644
--- a/type-on-strap.gemspec
+++ b/type-on-strap.gemspec
@@ -2,16 +2,17 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "type-on-strap"
-  spec.version       = "0.0.2"
+  spec.version       = "0.1.0"
   spec.authors       = ["Sylhare","Rohan Chandra"]
   spec.email         = ["sylhare@outlook.com", "hellorohan@outlook.com"]
 
-  spec.summary       = %q{A custom type-theme template (a free and open-source Jekyll theme. Great for blogs and easy to customize.)}
+  spec.summary       = %q{A custom Type Theme template (a free and open-source Jekyll theme. Great for blogs and easy to customize.)}
   spec.homepage      = "https://github.com/sylhare/Type-on-Strap"
   spec.license       = "MIT"
 
-  spec.files         = Dir.glob("**/{*,.*}").select do |f|
-    f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README.md)((\.(txt|md|markdown)|$)))}i)
+  spec.files         = Dir.glob("**/pages/*.{html,json}") +
+                       Dir.glob("**/{*,.*}").select do |f|
+    f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README)((\.(txt|md|markdown)|$)))}i)
   end
 
   spec.add_runtime_dependency "jekyll", "~> 3.3"