diff --git a/templates/frontOffice/default/assets/less/thelia/account.less b/templates/frontOffice/default/assets/less/thelia/account.less
index 7d5b46a1a..1e78cd9b7 100755
--- a/templates/frontOffice/default/assets/less/thelia/account.less
+++ b/templates/frontOffice/default/assets/less/thelia/account.less
@@ -51,7 +51,8 @@
 // Message if no order or no address
 .deliveries-warning,
 .address-warning,
-.orders-warning {
+.orders-warning,
+.folder-warning {
     clear: both;
     .alert; .alert-warning;
     margin-bottom: 0;
diff --git a/templates/frontOffice/default/assets/less/thelia/folder.less b/templates/frontOffice/default/assets/less/thelia/folder.less
new file mode 100644
index 000000000..2a90aa18d
--- /dev/null
+++ b/templates/frontOffice/default/assets/less/thelia/folder.less
@@ -0,0 +1,98 @@
+// Thelia : Folder
+
+// Folder Info
+.folder-chapo {}
+.folder-description {
+    margin-bottom: 20px;
+}
+
+// Content List
+#folder-contents {
+    .contents > ul { .contents-grid; }
+}
+
+.contents-grid,
+.contents-list {
+    // Animation
+    @media (min-width: @screen-tablet) {
+        .content-image {
+            display: block;
+            overflow: hidden;
+            position: relative;
+            > .mask {
+                background-color: @brand-primary;
+                background-color: rgba(red(@brand-primary), green(@brand-primary), blue(@brand-primary), .4);
+                display: block;
+                .opacity(0);
+                overflow: visible;
+                position: absolute;
+                top: 0; left: 0;
+                visibility: hidden;
+                width: 100%; height: 100%;
+                .transition(opacity 300ms ease-in-out 50ms);
+            }
+            &:hover,
+            &:focus {
+                .mask {
+                    visibility: visible;
+                    .opacity(1);
+                }
+            }
+
+        }
+    }
+}
+
+
+// Contents Grid
+.contents-grid {
+    .make-row();
+    .list-unstyled();
+    .item { .make-sm-column(4); .make-md-column(4); .clearfix(); } // default
+    &.content-col-2 > .item { .make-md-column(6); }
+    &.content-col-3 > .item { .make-md-column(4); }
+    &.content-col-4 > .item { .make-md-column(3); }
+    &.content-col-5 > .item { .make-md-column(2.4); }
+    &.content-col-6 > .item { .make-md-column(2); }
+
+    .item {
+        margin-bottom: @line-height-computed;
+
+        .content-image {
+            > img  { .img-responsive(); width: 100%; }
+            > .mask {}
+        }
+
+        .content-info {
+            .name { margin: 4px 0; }
+            .description { .visible-xs; }
+            .short-description { display: block; margin-bottom: 5px; }
+        }
+    }
+}
+
+// Content List
+.contents-list {
+    .list-unstyled();
+    .item {
+        + .item { border-top: 1px solid #ededed; padding-top: 15px; }
+        > article {
+            .make-row();
+            margin-left: 0;
+
+            .content-image {
+                .make-sm-column(3);
+                margin-bottom: 15px; padding: 0;
+                > img { .img-responsive(); width: 100%; }
+                > .mask {}
+            }
+
+            .content-info {
+                .make-sm-column(6);
+                .name { margin-top: 0; }
+                .description {}
+                .short-description {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/templates/frontOffice/default/assets/less/thelia/import.less b/templates/frontOffice/default/assets/less/thelia/import.less
index 4923d1bc5..2279fc332 100755
--- a/templates/frontOffice/default/assets/less/thelia/import.less
+++ b/templates/frontOffice/default/assets/less/thelia/import.less
@@ -28,6 +28,9 @@
 @import "category";
 @import "product";
 
+// Thelia : Contents
+@import "folder";
+
 // Thelia : Pages
 @import "page-home";
 @import "page-error";
diff --git a/templates/frontOffice/default/folder.html b/templates/frontOffice/default/folder.html
new file mode 100644
index 000000000..b95bfc2cd
--- /dev/null
+++ b/templates/frontOffice/default/folder.html
@@ -0,0 +1,99 @@
+{extends file="layout.tpl"}
+
+{* Body Class *}
+{block name="body-class"}page-folder{/block}
+
+{* Page Title *}
+{block name='no-return-functions' append}
+    {loop name="folder.seo.title" type="folder" id="{folder attr="id"}"}
+    {$page_title = {$META_TITLE}}
+    {/loop}
+{/block}
+
+{* Meta *}
+{block name="meta"}
+    {loop name="folder.seo.meta" type="folder" id="{folder attr="id"}"}
+    {if $META_DESCRIPTION}<meta name="description" content="{$META_DESCRIPTION}">{/if}
+    {if $META_KEYWORDS}<meta name="keywords" content="{$META_KEYWORDS}">{/if}
+    {/loop}
+{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = []}
+    {loop name="folder_path" type="folder-path" folder="{folder attr="id"}"}
+    {$breadcrumbs[] = ['title' => {$TITLE}, 'url'=> {$URL}]}
+    {/loop}
+{/block}
+
+{* Content *}
+{block name="main-content"}
+    <div class="main">
+
+        <div class="col-main" role="main" aria-labelledby="main-label">
+
+        {loop name="folder" type="folder" id="{folder attr="id"}"}
+            <h1 id="main-label" class="page-header">{$TITLE}</h1>
+            {if $CHAPO}
+                <div class="folder-chapo">
+                    {$CHAPO}
+                </div>
+            {/if}
+            {if $DESCRIPTION}
+                <div class="folder-description">
+                    {$DESCRIPTION nofilter}
+                </div>
+            {/if}
+
+            <div id="folder-contents">
+                <div class="contents">
+                    {ifloop rel="folder_content"}
+                        <ul>
+                            {loop name="folder_content" type="content" folder="$ID"}
+                                <li class="item">
+                                    <article>
+                                        <a href="{$URL}" tabindex="-1" class="content-image">
+                                            {loop name="content_thumbnail" type="image" width="369" height="247" content=$ID limit="1"}
+                                                <img src="{$IMAGE_URL}" alt="{$TITLE}">
+                                            {/loop}
+                                            {elseloop rel="content_thumbnail"}
+                                                {images file='assets/img/280x196.png'}<img src="{$asset_url}" alt="{$TITLE}">{/images}
+                                            {/elseloop}
+                                            <span class="mask"></span>
+                                        </a>
+
+                                        <div class="content-info">
+                                            <h3 class="name"><a href="{$URL}">{$TITLE}</a></h3>
+
+                                            {if $CHAPO}
+                                            <div class="short-description">
+                                               {$CHAPO}
+                                            </div>
+                                            {/if}
+                                        </div>
+                                    </article><!-- /content -->
+                                </li>
+                            {/loop}
+                        </ul>
+                    {/ifloop}
+                    {elseloop  rel="folder_content"}
+                        <div class="folder-warning">
+                            {intl l="No Content in this folder."}
+                        </div>
+                    {/elseloop}
+                </div>
+            </div><!-- /#category-products -->
+
+
+            {if $POSTSCRIPTUM}
+                <small class="folder-postscriptum">
+                    {$POSTSCRIPTUM}
+                </small>
+            {/if}
+        {/loop}
+
+        </div>
+    </div>
+{/block}
+
+
diff --git a/templates/frontOffice/default/includes/asides/articles.html b/templates/frontOffice/default/includes/asides/articles.html
index 13be98a8e..59225d638 100755
--- a/templates/frontOffice/default/includes/asides/articles.html
+++ b/templates/frontOffice/default/includes/asides/articles.html
@@ -3,13 +3,9 @@
     <div class="block-content">
         <nav class="nav-categories">
             <ul id="category" class="accordion">
-                    {loop name="current_article" type="content" current="yes"}
-                        {assign var="current_id"  value={$ID}}
-                    {/loop}
-                    {loop name="blog.article"  type="content" current_folder="yes" exclude="$current_id"}
-                        <li><a href="{$URL}">{$TITLE}</a></li>
-                    {/loop}
-
+                {loop name="blog.article"  type="content" current_folder="yes" exclude="{content attr="id"}"}
+                    <li><a href="{$URL}">{$TITLE}</a></li>
+                {/loop}
             </ul>
         </nav>
     </div>