diff --git a/README.md b/README.md
index 44f3d9b..94634b4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Features
 ---------
 - Admin Panel
 - Markdown editor with live preview and image upload
-- Categorization with tags (multiple tagging support)
+- Categorization with category and tags (multiple tagging support)
 - Static Pages (e.g. Contact Page, About Page)
 - Meta canonical, description, and rich snippets for SEO
 - Pagination
@@ -144,7 +144,7 @@ This will produce a hash which is to be placed in the `password` field in `usern
 
 Both Online or Offline
 ----------------------
-The built-in editor found in the admin panel, also provides you the ability to write to Markdown files offline by uploading them (see naming convention below) into the `content/username/blog` folder (the `username` must match `YourUsername.ini` above). 
+The built-in editor found in the admin panel, also provides you the ability to write to Markdown files offline by uploading them (see naming convention below) into the `content/username/blog/category/type/` folder (the `username` must match `YourUsername.ini` above). 
 
 For static pages you can upload it to the `content/static` folder.
 
@@ -218,6 +218,7 @@ Contributors
 - [BlackCodec](https://github.com/BlackCodec)
 - [mlncn](https://github.com/mlncn)
 - [Tea23](https://github.com/Tea23)
+- [greenphp](https://github.com/greenphp)
 
 Copyright / License
 -------------------
diff --git a/humans.txt b/humans.txt
index 30252b7..5131e78 100644
--- a/humans.txt
+++ b/humans.txt
@@ -28,6 +28,9 @@ Location: Natick, Massachusetts, USA
 Contributor: Tea23
 Github: https://github.com/Tea23
 
+Contributor: greenphp
+Github: https://github.com/greenphp
+
 /* THANKS */
 Name: Martin Angelov (http://tutorialzine.com)
 Name: Xiaoying Riley (http://themes.3rdwavemedia.com)
diff --git a/system/admin/admin.php b/system/admin/admin.php
index b173e5b..02972d6 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -575,7 +575,7 @@ function edit_link($title, $tag, $url, $content, $oldfile, $destination = null,
         $tagmd = "";
     }    
     if ($link !== null) {
-        $post_link = "\n<!--link" . $post_link. " link-->";
+        $post_link = "\n<!--link " . $post_link. " link-->";
     } else {
         $post_link = "";
     }    
@@ -730,7 +730,7 @@ function edit_quote($title, $tag, $url, $content, $oldfile, $destination = null,
         $tagmd = "";
     }    
     if ($quote !== null) {
-        $post_quote = "\n<!--quote" . $post_quote . " quote-->";
+        $post_quote = "\n<!--quote " . $post_quote . " quote-->";
     } else {
         $post_quote = "";
     }    
@@ -886,7 +886,7 @@ function edit_audio($title, $tag, $url, $content, $oldfile, $destination = null,
         $tagmd = "";
     }    
     if ($audio !== null) {
-        $post_audio = "\n<!--audio" . $post_audio . " audio-->";
+        $post_audio = "\n<!--audio " . $post_audio . " audio-->";
     } else {
         $post_audio = "";
     }    
@@ -1069,7 +1069,7 @@ function edit_category($title, $url, $content, $oldfile, $destination = null, $d
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
     if (!empty($post_title) && !empty($post_url) && !empty($post_content)) {
-    
+	
         if (get_magic_quotes_gpc()) {
             $post_content = stripslashes($post_content);
         }
@@ -1080,8 +1080,8 @@ function edit_category($title, $url, $content, $oldfile, $destination = null, $d
             rename($oldfile, $newfile);
             file_put_contents($newfile, print_r($post_content, true));
         }
-        
-        rename_category_folder($post_url, $oldfile);
+		
+		rename_category_folder($post_url, $oldfile);
         
         rebuilt_cache('all');
         if ($destination == 'post') {
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php
index f461f41..3ea3d3e 100644
--- a/themes/clean/main.html.php
+++ b/themes/clean/main.html.php
@@ -16,7 +16,7 @@
             <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+                <span itemprop="articleSection"><?php echo $p->category ?></span> by
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php
index 3af0b45..bfedb75 100644
--- a/themes/clean/post.html.php
+++ b/themes/clean/post.html.php
@@ -9,7 +9,7 @@
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
-            <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+            <span itemprop="articleSection"><?php echo $p->category ?></span> by
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
diff --git a/themes/default/main.html.php b/themes/default/main.html.php
index f461f41..3ea3d3e 100644
--- a/themes/default/main.html.php
+++ b/themes/default/main.html.php
@@ -16,7 +16,7 @@
             <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+                <span itemprop="articleSection"><?php echo $p->category ?></span> by
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
diff --git a/themes/default/post.html.php b/themes/default/post.html.php
index 5e54a71..b6d9b39 100644
--- a/themes/default/post.html.php
+++ b/themes/default/post.html.php
@@ -9,7 +9,7 @@
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
-            <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+            <span itemprop="articleSection"><?php echo $p->category ?></span> by
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php
index b2f371b..5e902ab 100644
--- a/themes/logs/main.html.php
+++ b/themes/logs/main.html.php
@@ -16,7 +16,7 @@
             <h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
             <div class="date">
                 <span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
-                <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+                <span itemprop="articleSection"><?php echo $p->category ?></span> by
                 <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
                 <?php if (disqus_count()) { ?> - 
                     <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php
index 9ca8d47..399d3f3 100644
--- a/themes/logs/post.html.php
+++ b/themes/logs/post.html.php
@@ -9,7 +9,7 @@
         <div class="date">
             <span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
             - Posted in
-            <span itemprop="articleSection"><?php echo $p->tag ?></span> by
+            <span itemprop="articleSection"><?php echo $p->category ?></span> by
             <span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
             <span><a href="<?php echo $p->url ?>" rel="permalink">Permalink</a></span>
         </div>