diff --git a/bower.json b/bower.json
index 88c322a..b45aa79 100644
--- a/bower.json
+++ b/bower.json
@@ -84,7 +84,15 @@
       "main": "./jquery.slimscroll.js"
     },
     "font-awesome": {
-      "main": "css/font-awesome.css"
+      "main": [
+        "css/font-awesome.css",
+        "fonts/FontAwesome.otf",
+        "fonts/fontawesome-webfont.eot",
+        "fonts/fontawesome-webfont.svg",
+        "fonts/fontawesome-webfont.ttf",
+        "fonts/fontawesome-webfont.woff",
+        "fonts/fontawesome-webfont.woff2"
+      ]
     }
   }
 }
diff --git a/gulp/build.js b/gulp/build.js
index 87cc06a..fea762d 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -19,7 +19,7 @@ gulp.task('partials', function () {
       quotes: true
     }))
     .pipe($.angularTemplatecache('templateCacheHtml.js', {
-      module: '123',
+      module: 'BlurAdmin',
       root: 'app'
     }))
     .pipe(gulp.dest(conf.paths.tmp + '/partials/'));
@@ -85,7 +85,7 @@ gulp.task('other', function () {
 
   return gulp.src([
     path.join(conf.paths.src, '/**/*'),
-    path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss}')
+    path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss,md}')
   ])
     .pipe(fileFilter)
     .pipe(gulp.dest(path.join(conf.paths.dist, '/')));
diff --git a/src/app/pages/tables/basic/tables.html b/src/app/pages/tables/basic/tables.html
index 28d167c..c57d68b 100644
--- a/src/app/pages/tables/basic/tables.html
+++ b/src/app/pages/tables/basic/tables.html
@@ -2,38 +2,38 @@
 
   <div class="row">
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Hover Rows" class-container="with-scroll table-panel">
+      <div ba-panel ba-panel-title="Hover Rows" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/hoverRows.html"></div>
-      </blur-panel>
+      </div>
     </div>
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Bordered Table" class-container="with-scroll table-panel">
+      <div ba-panel ba-panel-title="Bordered Table" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/borderedTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Condensed Table" class-container="with-scroll table-panel">
+      <div ba-panel ba-panel-title="Condensed Table" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/condensedTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Striped Rows" class-container="with-scroll table-panel">
+      <div ba-panel ba-panel-title="Striped Rows" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/stripedRows.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
   <div class="row">
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Contextual Table" class-container="with-scroll table-panel">
+      <div ba-panel ba-panel-title="Contextual Table" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/contextualTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
     <div class="col-lg-6 col-md-12">
-      <blur-panel title="Responsive Table" class-container="with-scroll table-panel">
+      <div ba-panel-title="Responsive Table" ba-panel-class="with-scroll table-panel">
         <div include-with-scope="app/pages/tables/widgets/responsiveTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
 
diff --git a/src/app/pages/tables/smart/tables.html b/src/app/pages/tables/smart/tables.html
index e05f3f4..a5e5be6 100644
--- a/src/app/pages/tables/smart/tables.html
+++ b/src/app/pages/tables/smart/tables.html
@@ -2,25 +2,25 @@
 
   <div class="row">
     <div class="col-md-12">
-      <blur-panel title="Smart Table With Filtering, Sorting And Pagination" class-container="with-scroll">
+      <div ba-panel ba-panel-title="Smart Table With Filtering, Sorting And Pagination" ba-panel-class="with-scroll">
         <div include-with-scope="app/pages/tables/widgets/smartTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
 
   <div class="row">
     <div class="col-md-12">
-      <blur-panel title="Editable Cells" class-container="with-scroll">
+      <div ba-panel ba-panel-title="Editable Cells" ba-panel-class="with-scroll">
         <div include-with-scope="app/pages/tables/widgets/editableTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
 
   <div class="row">
     <div class="col-md-12">
-      <blur-panel title="Editable Rows" class-container="with-scroll">
+      <div ba-panel ba-panel-title="Editable Rows" ba-panel-class="with-scroll">
         <div include-with-scope="app/pages/tables/widgets/editableRowTable.html"></div>
-      </blur-panel>
+      </div>
     </div>
   </div>
 
diff --git a/src/app/tplSkin/thumbs/01_default.jpg b/src/assets/img/app/skin-thumbnails/01_default.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/01_default.jpg
rename to src/assets/img/app/skin-thumbnails/01_default.jpg
diff --git a/src/app/tplSkin/thumbs/02_transparent.jpg b/src/assets/img/app/skin-thumbnails/02_transparent.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/02_transparent.jpg
rename to src/assets/img/app/skin-thumbnails/02_transparent.jpg
diff --git a/src/app/tplSkin/thumbs/03_blue.jpg b/src/assets/img/app/skin-thumbnails/03_blue.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/03_blue.jpg
rename to src/assets/img/app/skin-thumbnails/03_blue.jpg
diff --git a/src/app/tplSkin/thumbs/04_peachy.jpg b/src/assets/img/app/skin-thumbnails/04_peachy.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/04_peachy.jpg
rename to src/assets/img/app/skin-thumbnails/04_peachy.jpg
diff --git a/src/app/tplSkin/thumbs/05_material.jpg b/src/assets/img/app/skin-thumbnails/05_material.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/05_material.jpg
rename to src/assets/img/app/skin-thumbnails/05_material.jpg
diff --git a/src/app/tplSkin/thumbs/06_transblue.jpg b/src/assets/img/app/skin-thumbnails/06_transblue.jpg
similarity index 100%
rename from src/app/tplSkin/thumbs/06_transblue.jpg
rename to src/assets/img/app/skin-thumbnails/06_transblue.jpg
diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-location.svg b/src/assets/img/theme/timeline/cd-icon-location.svg
similarity index 100%
rename from src/app/pages/dashboard/timeline/img/cd-icon-location.svg
rename to src/assets/img/theme/timeline/cd-icon-location.svg
diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-movie.svg b/src/assets/img/theme/timeline/cd-icon-movie.svg
similarity index 100%
rename from src/app/pages/dashboard/timeline/img/cd-icon-movie.svg
rename to src/assets/img/theme/timeline/cd-icon-movie.svg
diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-picture.svg b/src/assets/img/theme/timeline/cd-icon-picture.svg
similarity index 100%
rename from src/app/pages/dashboard/timeline/img/cd-icon-picture.svg
rename to src/assets/img/theme/timeline/cd-icon-picture.svg