diff --git a/assets/images/design_thumb.png b/assets/images/design_thumb.png
index 16a1b3b..51dbf26 100644
Binary files a/assets/images/design_thumb.png and b/assets/images/design_thumb.png differ
diff --git a/assets/stylesheets/template/base/_autobackup.bak b/assets/stylesheets/template/base/_autobackup.bak
index f32b90b..c404de4 100644
--- a/assets/stylesheets/template/base/_autobackup.bak
+++ b/assets/stylesheets/template/base/_autobackup.bak
@@ -15,100 +15,4 @@
 }
 .response-content {
   justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
-.response-content {
-  justify-self: auto;
-}
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss
index 8a86402..c314361 100644
--- a/assets/stylesheets/template/base/_variables.scss
+++ b/assets/stylesheets/template/base/_variables.scss
@@ -105,6 +105,42 @@ $border-width: 4px;@import "../../bootstrap/variables";
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index b5297cc..219a213 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -156,7 +156,6 @@
 .layout-content-wrapper {
   box-shadow: rgba(0,0,0,.5) 0 0 10px;
   background-color: #fff;
-  width: 1000px;
   margin: auto;
   display: relative;
 }
diff --git a/modules/announcement/_annc_widget16.html.erb b/modules/announcement/_annc_widget16.html.erb
new file mode 100644
index 0000000..3d66823
--- /dev/null
+++ b/modules/announcement/_annc_widget16.html.erb
@@ -0,0 +1,131 @@
+<div class="w-annc  widget-announcement-4 w-annc  widget-announcement-15" style="position:relative;">
+  <div class="w-annc__more-wrap clearfix">
+    <h2 class="w-annc__widget-title">
+      <span>{{widget-title}}</span>
+    </h2>
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
+  <div style="position: absolute;top: 50%;bottom: 50%;width:100%;">
+	<button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: url(/assets/left-01.png) no-repeat;border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;"></button>
+	<button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background: url(/assets/right-01.png) no-repeat;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;"></button>
+  </div>
+  <ul class="w-annc__list  row" data-level="0" data-list="announcements">
+    <li class="w-annc__item  col-md-4">
+    <div class="w-annc__img-wrap bullseye">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+    </div>
+    <div class="w-annc__content-wrap">
+      <div class="w-annc__meta">
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label {{status-class}}">{{status}}</span>
+        </span>
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+          </span>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle">{{subtitle}}</p>
+    </div>
+    </li>
+  </ul>
+</div>
+<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script>
+	function combineul(){
+		for(var i=1;i<$('.widget-announcement-4 ul.w-annc__list').length;i++)
+			$('.widget-announcement-4 ul.w-annc__list').eq(0).find('>li').eq(-1).after($('.widget-announcement-4 ul.w-annc__list').eq(i).html());
+		var ullength = $('.widget-announcement-4 ul.w-annc__list').length;
+		for(var i = 1;i < ullength;i++)
+			$('.widget-announcement-4 ul.w-annc__list').eq(-1).remove();
+	};
+	var lilength = $('.widget-announcement-4 li.w-annc__item').length;
+	var num;
+	function reorganize(num){
+		combineul();
+		for(var i=1;i< Math.ceil(lilength/num);i++){
+			$('.widget-announcement-4 ul.w-annc__list').eq(-1).after('<ul class="w-annc__list  row" data-level="0" data-list="announcements"></ul>')
+			var lihtml="";
+			//var liheight=new Array(num);
+			if(i != (Math.ceil(lilength/num)-1)){
+				for(var j=0;j<num;j++){
+					lihtml += "<li class='w-annc__item  col-md-4'>"+$('.widget-announcement-4 li.w-annc__item').eq(i*num+j).html()+"</li>"
+					//liheight[j] = $('.widget-announcement-4 li.w-annc__item').eq(i*num+j).height()+20;//20=>margin-top+margin-bottom
+				};
+			}else{
+				for(var j=0;j< lilength - num *(Math.ceil(lilength/num)-1) ;j++){
+					lihtml += "<li class='w-annc__item  col-md-4'>"+$('.widget-announcement-4 li.w-annc__item').eq(i*num+j).html()+"</li>"
+					//liheight[j] = $('.widget-announcement-4 li.w-annc__item').eq(i*num+j).height()+20;//20=>margin-top+margin-bottom
+				};
+			};
+			$('.widget-announcement-4 ul.w-annc__list').eq(-1).html(lihtml);
+		};
+		if(Math.ceil(lilength/num) != 1 )
+			for(var i=0;i< lilength -num ; i++ )
+				$('.widget-announcement-4 ul.w-annc__list').eq(0).find("li.w-annc__item").eq(num).remove();
+		for(var i=0;i< Math.ceil(lilength/num);i++)
+			$('.widget-announcement-4 ul.w-annc__list').eq(i).attr("index",i);
+		$('.widget-announcement-4 ul.w-annc__list').css("display","none");
+		$('.widget-announcement-4 ul.w-annc__list').eq(0).css("display","flex");
+		$('.widget-announcement-4 ul.w-annc__list').eq(0).addClass("active");
+		$('.widget-announcement-4 ul.w-annc__list').css('padding','0 1.125em');
+		$('.widget-announcement-4 button').css('z-index','10');
+		$('.widget-announcement-4 ul.w-annc__list >li').css('width','calc('+100/num+'% - '+20/16+'em)'); //20px=>li的margin
+	  $('.widget-announcement-4 ul.w-annc__list >li').css('float','left');
+	};
+	$(window).resize(function(){
+		if($(window).width()>1024){
+			reorganize(3);
+			num=3;
+		}else if($(window).width()>576){
+			reorganize(2);
+			num=2;
+		}else{
+			reorganize(1);
+			num=1;
+		}
+	})
+	$(document).ready(function(){
+		if($(window).width()>1024){
+			reorganize(3);
+			num=3;
+		}else if($(window).width()>576){
+			reorganize(2);
+			num=2;
+		}else{
+			reorganize(1);
+			num=1;
+		}
+	var flag=false;
+	$('.btn-left').click(function(){	
+		if(!flag){
+		var currentul = Number($('.widget-announcement-4 ul.w-annc__list.active').attr("index"));
+		$('.widget-announcement-4 ul.w-annc__list').css('display','none');
+		if(currentul - 1 < 0)
+			currentul += Math.ceil(lilength/num);
+		$('.widget-announcement-4 ul.w-annc__list').removeClass("active");
+		$('.widget-announcement-4 ul.w-annc__list').eq(currentul-1).addClass("active");
+		flag=true;
+		$('.widget-announcement-4 ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){flag=false;});
+		};
+	});
+	$('.btn-right').click(function(){
+		if(!flag){
+		var currentul = Number($('.widget-announcement-4 ul.w-annc__list.active').attr("index"));
+		$('.widget-announcement-4 ul.w-annc__list').css("display","none");
+		if(currentul + 1 > Math.ceil(lilength/num) - 1)
+			currentul -= Math.ceil(lilength/num);
+		$('.widget-announcement-4 ul.w-annc__list').removeClass("active");
+		$('.widget-announcement-4 ul.w-annc__list').eq(currentul+1).addClass("active");
+		flag=true;
+		$('.widget-announcement-4 ul.w-annc__list.active').eq(0).effect("slide", { direction: "right", mode: 'show', duration: 500},function(){flag=false;});
+		};
+	});
+	});
+</script>
diff --git a/modules/announcement/_annc_widget17.html.erb b/modules/announcement/_annc_widget17.html.erb
new file mode 100644
index 0000000..f93db42
--- /dev/null
+++ b/modules/announcement/_annc_widget17.html.erb
@@ -0,0 +1,86 @@
+<div class="w-annc  widget-announcement-18">
+  <div class="w-annc__more-wrap clearfix">
+    <h2 class="w-annc__widget-title">
+      <span>{{widget-title}}</span>
+    </h2>
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
+  <ul class="w-annc__list  row" data-level="0" data-list="announcements">
+    <li class="w-annc__item  col-md-4">
+	    <div class="w-annc__img-wrap">
+	    	<a href="{{link_to_show}}" title="{{title}}">
+	      		<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+	      	</a>
+	    </div>
+	    <div class="w-annc__content-wrap">
+	      <h4 class="w-annc__entry-title">
+	        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+	      </h4>
+	      <div class="w-annc__subtitle">{{subtitle}}</div>
+	      <div class="w-annc_read_more"><a href="{{link_to_show}}" title="{{title}}">{{read_more_text}}</a></div>
+	    </div>
+    </li>
+  </ul>
+</div>
+<style type="text/css">
+  .widget-announcement-18 [data-list="announcements"] li > *{
+  	background: #ffffff;
+  	width: 100%;
+  	float: left;
+  }
+  .widget-announcement-18 [data-list="announcements"] .w-annc__img{
+  	width: 100%;
+  }
+  .widget-announcement-18 [data-list="announcements"] .w-annc__content-wrap{
+  	padding: 0 1em;
+  }
+  .widget-announcement-18 .w-annc__title {
+    line-height: 1.3;
+    font-size: 1.2rem;
+  }
+  .widget-announcement-18 .w-annc__widget-title { 
+  	float: left; 
+  }
+  .widget-announcement-18 .w-annc__more { 
+  	margin-top: 1.5em; 
+  }
+  .widget-announcement-18 .w-annc__list > .w-annc__item:nth-child(3n+1) {
+    clear: both;
+  }
+  .widget-announcement-18 li.w-annc__item{
+	float: left;
+  }
+
+  .widget-announcement-18 .w-annc__img-wrap {
+    padding: 0 0 1em 0;
+  }
+  .w-annc_read_more{	
+  	display: inline-block;
+  	padding: 1em;
+  }
+  .w-annc_read_more a{
+  	float: left;
+  	background: #4a97c2;
+  	color: #ffffff;
+  	padding: 0 0.5em;
+  	border-radius: 0.3em;
+  	border: 0.5em solid #4a97c2;
+  }
+  .w-annc__subtitle {
+  	padding-bottom: 0.3em;
+  }
+  .w-annc_read_more a:hover{
+  	background: #327397;
+  	border: 0.5em solid #327397;
+  }
+</style>
+<script type="text/javascript">
+	$(document).ready(function(){
+		$("[data-subpart-id=\"{{subpart-id}}\"] .w-annc__subtitle").each(function(i,v){
+			var subtitle = $(v).text();
+			if(subtitle.length > 15){
+				$(v).text(subtitle.slice(0,15) + "...");
+			}
+		})
+	})
+</script>
\ No newline at end of file
diff --git a/modules/announcement/_annc_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb
new file mode 100644
index 0000000..c72fa98
--- /dev/null
+++ b/modules/announcement/_annc_widget18.html.erb
@@ -0,0 +1,47 @@
+<div class="w-annc widget-announcement-16">
+
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  
+  <div class="slide-button">
+  <button class="cycle-prev btn btn-warning"> <i class="fa fa-angle-left"></i></button>
+  <button class="cycle-next btn btn-warning"> <i class="fa fa-angle-right"></i></button>
+  <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多+" : "More NEWS" %></a>
+  </div>
+  
+  <div class="w-annc__wrap cycle-slideshow" 
+    data-level="0" 
+    data-list="announcements"
+    data-cycle-slides=".w-annc__item"
+    data-cycle-fx="carousel"
+    data-cycle-carousel-fluid=true
+    data-cycle-pause-on-hover="true"
+    data-cycle-speed="200"
+    data-cycle-carousel-visible="1"
+    data-cycle-prev=".cycle-prev"
+    data-cycle-next=".cycle-next"
+    data-cycle-swipe=true
+    data-cycle-swipe-fx="carousel"
+    >
+
+    <div class="w-annc__item">
+      <div class="w-annc__img-wrap">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      </div>
+      <div class="w-annc__content-wrap">
+        <div class="w-annc__meta">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label {{status-class}}">{{status}}</span>
+          </span>
+          <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+            <span class="w-annc__postdate">{{postdate}}</span>
+          </span>
+        </div>
+        <h4 class="w-annc__entry-title">
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/modules/announcement/_annc_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb
new file mode 100644
index 0000000..cb7b210
--- /dev/null
+++ b/modules/announcement/_annc_widget19.html.erb
@@ -0,0 +1,31 @@
+<div class="w-annc  widget-announcement-17">
+  <div class="search_block">
+    <p>Search</p>
+    <form accept-charset="UTF-8" action="{{more_url}}" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"></div>
+      <p>
+        <input id="search_query" name="keywords" placeholder="搜尋" type="text">
+        <input type="submit" value="搜尋">
+      </p>
+    </form>
+  </div>
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item  row">
+        <span class="w-annc__postdate-wrap  col-sm-3" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <h4 class="w-annc__entry-title  col-sm-9">
+          <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+            <span class="w-annc__status label status {{status-class}}">{{status}}</span>
+          </span>
+          <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+        </h4>
+    </li>
+  </ul>
+  <div class="w-annc__more-wrap clearfix">
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/archive/archive_index7.html.erb b/modules/archive/archive_index7.html.erb
new file mode 100644
index 0000000..cd4449f
--- /dev/null
+++ b/modules/archive/archive_index7.html.erb
@@ -0,0 +1,60 @@
+<div class="i-archive index-archive-5">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="i-archive__list list-unstyled" id="index-archive-group" data-list="categories" data-level="0">
+   <h4 class="i-archive__category-title">{{category-title}}</h4>
+    <div class="i-items">
+        <div class="thead row">
+          <div class="col-sm-2 date-thead">上傳日期</div>
+          <div class="col-sm-3 title-thead">標題</div>
+          <div class="col-sm-3 description-thead">{{description-head}}</div>
+          <div class="col-sm-2 file-thead">檔案下載</div>
+          </div>
+        <div class="tbody">
+          <div class="i-archive__category-list list-unstyled" data-list="archives" data-level="1">
+          <div class="archive-items clearfix">
+              <div class="date col-sm-2">{{created_at}}</div>
+              <div class="head col-sm-3">
+                 {{archive-title}}
+                 <span class="i-archive__status-wrap" data-list="statuses" data-level="2">
+                 <span class="i-archive__status  label  status  {{status-class}}">{{status}}</span>
+               </span>
+              </div>
+              <div class="description col-sm-3" style="border-right: 0.05em solid #333;">{{description}}</div>
+              <div class="i-archive__file-list col-sm-2" data-list="files" data-level="2">
+                <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
+              </div>
+              </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+if( window.location.href.indexOf('/en/') > -1 ) {
+  $('.date-thead').replaceWith('<div class="col-sm-2 date-thead-en">Updated At</div>')
+  $('.title-thead').replaceWith('<div class="col-sm-7 title-thead-en">Title</div>')
+  $('.file-thead').replaceWith('<div class="col-sm-3 file-thead-en">Download file</div>')
+}
+$(document).ready(function(){
+  if(window.innerWidth >= 768){
+    $(".archive-items .date").each(function(i,d){
+      $(d).parent().eq(0).children().css("min-height",$(d).parent().height());
+    })
+  }else{
+    $(".archive-items >").css("min-height","");
+  }
+})
+$(window).resize(function(){
+  if(window.innerWidth >= 768){
+    $(".archive-items .date").each(function(i,d){
+      $(d).parent().eq(0).children().css("min-height",$(d).parent().height());
+    })
+  }else{
+    $(".archive-items >").css("min-height","");
+  }
+})
+</script>
\ No newline at end of file
diff --git a/modules/archive/archive_index8.html.erb b/modules/archive/archive_index8.html.erb
new file mode 100644
index 0000000..6e6ef93
--- /dev/null
+++ b/modules/archive/archive_index8.html.erb
@@ -0,0 +1,48 @@
+<div class="i-archive index-archive-6">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="i-archive__list list-unstyled" id="index-archive-group" data-list="categories" data-level="0">
+   <h4 class="i-archive__category-title">{{category-title}}</h4>
+    <div class="i-items">
+        <div class="thead row">
+          <div class="col-sm-2 date-thead">上傳日期</div>
+          <div class="col-sm-3 title-thead">標題</div>
+          <div class="col-sm-3 description-thead">{{description-head}}</div>
+          <div class="col-sm-2 file-thead">檔案下載</div>
+          </div>
+        <div class="tbody">
+          <div class="i-archive__category-list list-unstyled" data-list="archives" data-level="1">
+          <div class="archive-items clearfix">
+              <div class="date col-sm-2">{{created_at}}</div>
+              <div class="head col-sm-3">
+                <dl class="i-archive__file" data-list="files"  data-level="2">
+                <div class="file-name">
+                  <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                  <span class="i-archive__status-wrap" data-list="statuses" data-level="2">
+                  <span class="i-archive__status  label  status  {{status-class}}">{{status}}</span>
+                  </span>
+                </div>
+                </dl>
+              </div>
+              <div class="description col-sm-3">{{description}}</div>
+              <div class="i-archive__file-list col-sm-2" data-list="files" data-level="2">
+              <div class="file-item">
+                <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary">{{file-type}}</span></a>
+              </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+if( window.location.href.indexOf('/en/') > -1 ) {
+  $('.date-thead').replaceWith('<div class="col-sm-2 date-thead-en">Updated At</div>')
+  $('.title-thead').replaceWith('<div class="col-sm-7 title-thead-en">Title</div>')
+  $('.file-thead').replaceWith('<div class="col-sm-3 file-thead-en">Download file</div>')
+}
+</script>
\ No newline at end of file
diff --git a/modules/faq/faq_index2.html.erb b/modules/faq/faq_index2.html.erb
new file mode 100644
index 0000000..cce43c1
--- /dev/null
+++ b/modules/faq/faq_index2.html.erb
@@ -0,0 +1,31 @@
+<div class="index-faqs index2">
+  <h1 class="index-title">
+    <span>{{page-title}}</span>
+  </h1>
+  <ul class="list-unstyled" data-list="faqs" data-level="0">
+    <li class="index-content">
+      <h4>
+        <span class="index-content-title">{{question}}</span>
+        <span data-list="statuses" data-level="1">
+          <span class="label status {{status-class}}">{{status}}</span>
+        </span>
+      </h4>
+    <section class="post">
+    <p>{{answer}}</p>
+    <div data-list="qa_files" data-level="1"><div><a href="{{file_url}}" target="_blank">{{file_title}}</a></div></div>
+    </section>
+    </li>
+  </ul>
+</div>
+{{pagination_goes_here}}
+
+<script>
+$('.index-faqs.index2 .index-content h4').click(function(){
+  $('section.post').slideUp(200);
+  $(this).removeClass('open');
+  if($("+section",this).css("display")=="none"){
+      $("+section",this).slideDown(300);
+      $(this).addClass("open"); 
+}
+})
+</script>
\ No newline at end of file
diff --git a/modules/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb
new file mode 100644
index 0000000..0400a9b
--- /dev/null
+++ b/modules/gallery/_gallery_widget3.html.erb
@@ -0,0 +1,33 @@
+<div class="widget-gallery widget3 no-print">
+  <!-- <h3 class="w-annc__widget-title">
+    <span class="album_icon"></span><span>{{widget-title}}</span>
+  </h3> -->
+  <div class="cycle-slideshow widget-content"
+    data-level="0" data-list="images" data-cycle-slides="> a"
+    data-cycle-fx="carousel" data-cycle-timeout="3000" data-cycle-carousel-visible="1" data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
+    <a class="widget-pic" href="{{link_to_show}}" target="_blank" title="{{album-name}}">
+      <div class="mask_box">
+        <div class="mask_word">
+          <div class="mask_word_box">
+            <div class="mask_title">{{image_description}}</div>
+          </div>
+        </div>
+        <div class="mask">
+          <div class="circle_box"><img src="/assets/circle_icon.png" alt="">
+          </div>
+        </div>
+        <img
+          srcset="
+          {{thumb-large-src}} 1024w,
+          {{thumb-src}} 768w"
+          src="{{thumb-src}}"
+          alt="{{alt_title}}"
+        >
+      </div>
+    </a>
+
+  </div>
+  <div class="w-annc__more-wrap clearfix">
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= locale == :en ? 'more' : '更多照片' %></a>
+  </div>
+</div>
diff --git a/modules/gallery/_gallery_widget4.html.erb b/modules/gallery/_gallery_widget4.html.erb
new file mode 100644
index 0000000..67da31d
--- /dev/null
+++ b/modules/gallery/_gallery_widget4.html.erb
@@ -0,0 +1,38 @@
+<div class="widget-gallery gallery card-group widget4 no-print">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <link rel="stylesheet" type="text/css" href="/assets/gallery_card.css">
+  <div class="row widget-content" data-level="0" data-list="images">
+    <div class="card card-flip h-100">
+      <div class="card-front">
+        <div class="card-body" style="padding:0;">
+          <img
+            srcset="
+              {{thumb-large-src}} 1024w,
+              {{thumb-src}} 768w"
+            src="{{thumb-src}}"
+            alt="{{alt_title}}"
+          >
+          <div class="card-footer">
+            <h3 class="card-title">{{image_short_description}}</h3>
+          </div>
+        </div>
+      </div>
+      <div class="card-back">
+        <div class="card-body" style="background-color: {{album_color}};color: {{album_card_text_color}};">
+          <h3 class="card-title">{{image_short_description}}</h3>
+          {{image_description}}
+          <div class="card-button-group">
+            <a href="{{link_to_show}}" class="btn btn-secondary view ">
+              <i class="fa fa-link" aria-hidden="true"></i>
+            </a>
+            <a href="{{src}}" data-toggle="lightbox" data-gallery="gallery" class="btn btn-secondary preview" data-title="{{alt_title}}" data-type="image">
+              <i class="fa fa-eye" aria-hidden="true"></i>
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/gallery/_gallery_widget5.html.erb b/modules/gallery/_gallery_widget5.html.erb
new file mode 100644
index 0000000..70896f8
--- /dev/null
+++ b/modules/gallery/_gallery_widget5.html.erb
@@ -0,0 +1,72 @@
+<div class="widget-gallery gallery widget5 no-print">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <% OrbitHelper.render_css_in_head(["theater.css"]) %>
+  <%= javascript_include_tag "jquery.touchSwipe.min" %>
+  <%= javascript_include_tag "theater-widget" %>
+  <% OrbitHelper.render_meta_tags([{"name" => "mobile-web-app-capable","content" => "yes"},{"name" => "apple-mobile-web-app-status-bar-style","content" => "black-translucent"}]) %>
+  <div id="gallery-theater-stage">
+    <div class="show-gallery-2 gallery" style="margin-top: 2.4em;">
+      <div class="gallery-loader">
+        <div class="spinner">
+            <div class="rect1"></div>
+            <div class="rect2"></div>
+            <div class="rect3"></div>
+            <div class="rect4"></div>
+            <div class="rect5"></div>
+        </div>
+      </div>
+      <div class="gallery-actions">
+        <div class="gallery-show-original gallery-actions-btn">
+          <a title="<%= t('gallery.show_original_image') %>" href="/uploads/album_image/file/606574f19bb8189e640000ac/49b36_245.jpg"><i class="fa fa-image"></i></a>
+        </div>
+        <div class="gallery-toggle-desc gallery-actions-btn">
+          <i class="fa fa-comment"></i>
+        </div>
+        <div class="gallery-theme-switch gallery-actions-btn">
+          <i class="fa fa-circle"></i>
+        </div>
+         <div class="gallery-close gallery-actions-btn">
+           <i class="fa fa-times"></i>
+         </div>
+      </div>
+      <div class="image-container" id="image-container">
+      </div>
+      <div class="gallery-thumb-toggle gallery-thumb-line">
+        <i class="fa fa-angle-double-up"></i>
+      </div>
+      <div class="gallery-thumb-container">
+          <div class="gallery-thumb-navs show">
+            <div class="gallery-thumb-prev gallery-thumb-nav">
+              <i class="fa fa-arrow-circle-o-left"></i> 
+            </div>
+            <div class="gallery-thumb-next gallery-thumb-nav">
+              <i class="fa fa-arrow-circle-o-right"></i> 
+            </div>
+          </div>
+          <ul class="gallery-thumb-wrap" data-level="0" data-list="images">
+            <li class="gallery-item" data-index="{{i}}">
+              <a style="cursor: pointer;">
+                <img class="gallery-thumb" src="{{thumb-src}}" data-theater-url="{{theater-src}}" data-link="{{src}}" alt="{{alt_title}}">
+              </a>
+            </li>
+          </ul>
+      </div>
+      <div class="gallery-img-desc">
+        <div class="gallery-img-desc-inner">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+if(typeof Modernizr == "undefined"){
+  var script = $("<script>");
+  script.attr("src","/assets/modernizr.js");
+  $("head").append(script);
+}
+
+</script>
+</div>
\ No newline at end of file
diff --git a/modules/gallery/gallery_index5.html.erb b/modules/gallery/gallery_index5.html.erb
new file mode 100644
index 0000000..051a164
--- /dev/null
+++ b/modules/gallery/gallery_index5.html.erb
@@ -0,0 +1,32 @@
+<div class="index-gallery gallery card-group index5">
+  <h1 class="index-title">
+    <span>{{page-title}}</span>
+  </h1>
+  <link rel="stylesheet" type="text/css" href="/assets/gallery_card.css">
+  <div class="row" data-level="0" data-list="albums">
+    <div class="card card-flip h-100">
+      <div class="card-front">
+        <div class="card-body" style="padding:0;">
+          <img
+            src="{{thumb-src}}"
+            alt="{{alt_title}}"
+          >
+          <div class="card-footer">
+            <h3 class="card-title">{{album-name}}</h3>
+          </div>
+        </div>
+      </div>
+      <div class="card-back">
+        <div class="card-body" style="background-color: {{album_color}};color: {{album_card_text_color}};">
+          <h3 class="card-title">{{album-name}}</h3>
+          <div class="card-button-group">
+            <a href="{{link_to_show}}" class="btn btn-secondary view ">
+              <i class="fa fa-link" aria-hidden="true"></i>
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{{pagination_goes_here}}
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
new file mode 100644
index 0000000..b85221e
--- /dev/null
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -0,0 +1,18 @@
+<div class="widget-link widget1">
+  <h3 class="widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="list-unstyled" data-level="0" data-list="web_link">
+    <li class="widget-content widget-content-horizontal">
+      <a class="widget-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
+      <span data-list="statuses" data-level="1">
+        <span class="label status {{status-class}}">{{status}}</span>
+      </span>
+    </li>
+  </ul>
+</div>
+<style type="text/css">
+  .widget-content-horizontal{
+    float: left;
+  }
+</style>
\ No newline at end of file
diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb
new file mode 100644
index 0000000..6432ea6
--- /dev/null
+++ b/modules/web_resource/web_res_index2.html.erb
@@ -0,0 +1,17 @@
+<div class="index-link index2">
+  <h1 class="index-title">
+    <span>{{page-title}}</span>
+  </h1>
+  <ul class="list-unstyled" data-list="web_link" data-level="0">
+    <li class="index-content col-md-4 col-sm-4">
+      <h4>
+        <a class="index-content-title" href="{{link_to_show}}" target="_blank" title="{{title_text}}">{{title}}</a>
+        <span data-list="statuses" data-level="1">
+          <span class="label status {{status-class}}">{{status}}</span>
+        </span>
+      </h4>
+      <small class="index-context">{{context}}</small>
+    </li>
+  </ul>
+</div>
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/template.json b/template.json
index 09935db..9996100 100644
--- a/template.json
+++ b/template.json
@@ -1 +1,5 @@
-{"key":"asiaH1","title":"主選單於主Banner下方，主內容區塊分左右兩欄。可自行插入背景底圖","author":"亞洲大學公版橫式主選單1號版型(素淨)","thumbnail":"assets/images/design_thumb.png"}
\ No newline at end of file
+{
+	"title" : "主選單於主Banner下方，主內容區塊分左右兩欄。可自行插入背景底圖",
+	"key" : "asiaH1",
+	"author" : "亞洲大學公版橫式主選單1號版型(素淨)"
+}