diff --git a/assets/images/design_thumb.png b/assets/images/design_thumb.png
index 1c2a89a..f232b93 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
deleted file mode 100644
index e1f6687..0000000
--- a/assets/stylesheets/template/base/_autobackup.bak
+++ /dev/null
@@ -1,61 +0,0 @@
-
-.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;
-}
diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss
index 2134258..a3c4dff 100644
--- a/assets/stylesheets/template/base/_variables.scss
+++ b/assets/stylesheets/template/base/_variables.scss
@@ -25,7 +25,7 @@ $sub-font: "Roboto", "新細明體", "Helvetica Neue", Helvetica, sans-serif;
 
 // Font sizes
 $font-15: 0.9375rem;
-$font-13: 0.8125rem;
+$font-13: 0.9rem;
 
 $font-h1: 1.5rem;
 $font-h2: 1.35rem;
@@ -99,6 +99,13 @@ $border-width: 4px;
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index 3c1854b..4205ee7 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -34,25 +34,28 @@
 	  		background-color: #ebeae6;
 	  		margin: 0;
 	  		@media (min-width: $screen-lg) {
-	  			background: url(/assets/home-rowbg.jpg) right top repeat-y #ebeae6;
+	  			background-color: #ebeae6;
 	  		}
 	  	}
 	}
 
 	.layout-content-boxR {
-		padding: 30px 30px;
+		padding: 10px;
 		@media (min-width: $screen-sm){
-    	padding: 30px 50px;
+    	padding: 10px
     	}
 	}
-
-	.layout-content-boxL {
-	    padding: 30px 30px;
-	    background: #8A8782;
-	    @media (min-width: $screen-sm){
-	    	padding: 30px 30px;
-	    }
-	}
+    .page-home .layout-content .layout-content-boxL {
+      margin-top: 20px;
+      margin-left: -10px;
+      padding: 5px 10px 5px;
+      border-top-left-radius: 10px;
+      border-top-right-radius: 10px;
+      background-color: #49ccc1;
+          @media (min-width: $screen-sm){
+              padding: 10px;
+          }
+    }
 
 	}
 }
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index 51eb221..d4a3b94 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -153,6 +153,7 @@ h3.w-annc__widget-title {
   .w-annc__item {
     margin-bottom: 0.8em;
     padding-bottom: 0.8em;
+    padding-top: 0.8em;
     border-bottom: 1px dashed lighten($theme-gray, 65%);
   }
 
@@ -208,7 +209,7 @@ h3.w-annc__widget-title {
 .widget-announcement-8 {
   .w-annc__th {
     color: #fff;
-    background: $theme-color-main;
+    background: #bd7426;
     font-size: 0.8125em;
     border: none;
   }
@@ -256,6 +257,7 @@ h3.w-annc__widget-title {
   .w-annc__item {
     margin-bottom: 0.8em;
     padding-bottom: 0.8em;
+    padding-top: 0.8em;
     border-bottom: 1px dashed lighten($theme-gray, 65%);
   }
 
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index 5974fd3..605d563 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -6,20 +6,20 @@
   font-family: $sub-font;
   max-height: none;
   margin-bottom: 20px;
-  background-color: #333;
+  background-color: #e2d6b2;
 
   li {
     white-space: nowrap;
 
     & > a,
     & > .fa {
-      color: $theme-white;
+      color: #7d5b21;
     }
 
     &:hover {
       & > a,
       & > .fa {
-        color: $theme-white;
+        color: #7d3621;
         text-decoration: none;
       }
     }
@@ -56,11 +56,11 @@
     }
 
     .dropdown-toggle-icon.level-1 {
-      background-color: lighten($theme-gray, 10%);
+      background-color: #d0bf8f;
     }
 
     .dropdown-toggle-icon.level-2 {
-      background-color: lighten($theme-gray, 10%);
+      background-color: #d0bf8f;
     }
 
     & > li {
@@ -77,10 +77,11 @@
       }
 
       &:hover {
-        background-color: $theme-color-main;
+        background-color: #d0bf8f;
 
         & > a {
           background-color: transparent;
+          color: #fff;
         }
 
         @media (min-width: $screen-sm) {
@@ -90,7 +91,7 @@
 
       @media (min-width: $screen-sm) {
         position: relative;
-        margin: 0 8px;
+        margin: 0 4px;
         padding: 0;
         border-bottom: none;
         &:hover a{
diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss
index bf8487b..5af9e27 100644
--- a/assets/stylesheets/template/modules/web_resource.scss
+++ b/assets/stylesheets/template/modules/web_resource.scss
@@ -15,7 +15,7 @@
     }
     .widget-content {
       line-height: 1.3em;
-      margin-bottom: 5px;
+      margin-bottom: 8px;
       @media (min-width: $screen-xs)and(max-width: $screen-lg){
         width:50%;
         float: left;
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index 45d1b8b..ec95a9d 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -60,4 +60,38 @@ img.w-ba-banner__image {
     width: 100%;
 	margin: 5px 0 0 0px;
 }
-
+.tab-content {
+    margin: 0 15px;
+}
+.filter_tab {
+    background: transparent!important;
+}
+.w-annc h3.w-annc__widget-title span {
+  color: #999!important;
+}
+li.filter_tab.active {
+    border: 2px solid #999!important;
+    border-bottom-color: #999!important;
+}
+aside .list-unstyled {
+    background-color: #afaba2;
+    margin-left: -15px;
+    margin-right: -15px;
+    padding: 15px;
+}
+aside.layout-content-boxL.aside.col-lg-3 {
+    background-color: rgb(116, 157, 177);
+    padding-bottom: 20px;
+    border-radius: 10px;
+    margin-top: 20px;
+    margin-left: -10px;
+}
+li.widget-content:before {
+    content: " ";
+    display: inline-block;
+    border-radius: 50px;
+    background: #ffee6f;
+    margin-right: 10px;
+    height: 10px;
+    width: 10px;
+}
\ No newline at end of file
diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index f940539..39a85ae 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -4,27 +4,64 @@
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
       data-cycle-log="false"
-      data-overlay=".w-ba-banner__caption"
+      data-overlay=".w-ad-banner__overlay_{{subpart-id}}"
       data-cycle-auto-height="{{base_image}}"
       data-cycle-speed="{{speed}}"
       data-cycle-timeout="{{timeout}}"
       data-cycle-fx="{{ad_fx}}"
-      data-pager="#{{subpart-id}}"
-      data-pager-template="<li><a href='#'></a></li>"
+      data-cycle-pager=".banner_caption_{{subpart-id}}"
+      data-pager-template="<li><button></button></li>"
       data-pager-active-class="active-slide"
+      data-cycle-swipe=true
+      data-cycle-swipe-fx="scrollHorz"
     >
     <div class="w-ba-banner__slide {{class}}"
         data-link="{{link}}"
         data-cycle-title="{{title}}"
         data-cycle-desc="{{context}}"
-        data-overlay-template="<h2>{{title}}</h2>{{desc}}"
+        data-overlay-template="<h3>{{title}}</h3><p>{{desc}}</p>"
         data-target="{{target}}"
       >
-        <img class="w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
+       <a href="{{link}}" target="{{target}}" title="{{alt_title}}">
+           <img class="w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
+       </a>
+
     </div>
   </div>
-    <div class="w-ba-banner__caption"></div>
-    <ul id="{{subpart-id}}" class="w-ba-banner__pager-1 banner-pager"></ul>
+  <div class="ad-overlay w-ba-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
+    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
+    <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
+  <ul class="button-mid">
+    <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
+    <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
+  </ul>
 </div>
-
-
+<script>
+  var flag = 1;
+  $('.pause-slide').off('click').click(function(){
+    $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
+    $(this).addClass('active')
+    $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active')
+  });
+  $('.resume-slide').off('click').click(function(){
+    $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume');
+    $(this).addClass('active')
+    $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active')
+  });
+  $('.next-button').off('click').on('click',function(){
+    $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next");
+    
+  })
+  $('.prev-button').off('click').on('click',function(){
+    $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev");
+  })
+  
+</script>
+<style type="text/css">
+  .controlplay .resume-slide.active i{
+    color: #32D9C3;
+  }
+  .controlplay .pause-slide.active i{
+    color: #ff4500;
+  }
+</style>
\ No newline at end of file
diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index d4cb93e..725db51 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -1,24 +1,37 @@
-<div class="w-ba-banner ba-banner-widget-2 ba-banner-widget-youtube">
+<div class="w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
   <div class="w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
-      data-cycle-timeout="3000"
       data-cycle-slides=".w-ba-banner__slide"
       data-cycle-log="false"
-      data-overlay=".w-ba-banner__caption"
+      data-overlay=".w-ad-banner__overlay_{{subpart-id}}"
+      data-overlay-template="<h2><span>{{title}}</span></h2>{{desc}}"
       data-cycle-auto-height="{{base_image}}"
       data-cycle-speed="{{speed}}"
       data-cycle-timeout="{{timeout}}"
       data-cycle-fx="{{ad_fx}}"
-      data-pager=".w-ba-banner__pager-2"
-      data-pager-template="<li><a href='#'></a></li>"
+      data-pager=".banner_caption_{{subpart-id}}"
+      data-pager-template="<li><button></button></li>"
       data-pager-active-class="active-slide"
       data-cycle-youtube="true"
-      data-cycle-youtube-autostart="false">
+      data-cycle-youtube-autostart="false"
+      data-cycle-swipe="true"
+      data-cycle-prev=".banner_prev"
+      data-cycle-next=".banner_next"
+      data-cycle-pause-on-hover="true"
+      style="padding-bottom: 56.25%;"
+      >
 
     {{html}}
   </div>
-    <ul class="w-ba-banner__pager-2 banner-pager"></ul>
+  <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
+    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
+    <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
+    <ul class="button-mid">
+      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
+      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
+    </ul>
+  </div>
 </div>
 <script type="text/javascript">
   if (typeof ad_banners_count === 'undefined'){
@@ -55,13 +68,45 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
   }
 
   function onPlayerStateChange(event){
-    var iframe = $(event.target.getIframe()),
+    var iframe = $(event.target.h),
         cyclediv = iframe.parents("div.cycle-slideshow");
+    var widget = cyclediv.parents('.ba-banner-widget-youtube')
     if(event.data == YT.PlayerState.PLAYING || event.data == YT.PlayerState.BUFFERING){
       cyclediv.cycle("pause");
+      widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay').css('visibility','hidden')
     }else if(event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){
       cyclediv.cycle("resume");
+      widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay').css('visibility','')
     }
   }
+  $(document).ready(function(){
+    window.onYouTubePlayerAPIReady = function() {
+      onYouTubeIframeAPIReady();
+    };
+    $('.pause-slide').off('click').click(function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
+      $(this).addClass('active')
+      $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active')
+    });
+    $('.resume-slide').off('click').click(function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume');
+      $(this).addClass('active')
+      $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active')
+    });
+    $('.next-button').off('click').on('click',function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next");
+    })
+    $('.prev-button').off('click').on('click',function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev");
+    })
+  })
 }
-</script>
\ No newline at end of file
+</script>
+<style type="text/css">
+  .controlplay .resume-slide.active i{
+    color: #32D9C3;
+  }
+  .controlplay .pause-slide.active i{
+    color: #ff4500;
+  }
+</style>
\ No newline at end of file
diff --git a/modules/announcement/_annc_widget17.html.erb b/modules/announcement/_annc_widget17.html.erb
new file mode 100644
index 0000000..3d66823
--- /dev/null
+++ b/modules/announcement/_annc_widget17.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_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb
new file mode 100644
index 0000000..f93db42
--- /dev/null
+++ b/modules/announcement/_annc_widget18.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_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb
new file mode 100644
index 0000000..c72fa98
--- /dev/null
+++ b/modules/announcement/_annc_widget19.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_widget20.html.erb b/modules/announcement/_annc_widget20.html.erb
new file mode 100644
index 0000000..cb7b210
--- /dev/null
+++ b/modules/announcement/_annc_widget20.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/announcement/info.json b/modules/announcement/info.json
index 9433471..6a3b227 100644
--- a/modules/announcement/info.json
+++ b/modules/announcement/info.json
@@ -1,264 +1,294 @@
 {
-	"frontend": [
-		{
-			"filename" : "annc_index1",
-			"name" : {
-				"zh_tw" : "1. 標準標題列表-1A ( 模組標題, 類別, 狀態, 標題, 日期 )",
-				"en" : "1. Standard Title List-1 (widget-title, category, status, title, postdate)"
-				},
-			"thumbnail" : "annc_index1_thumbs.png"
-		},
-		{
-			"filename" : "annc_index2",
-			"name" : {
-				"zh_tw" : "2. 標準標題列表-1B ( 模組標題, 類別, 狀態, 標題, 日期, 瀏覽人次 )",
-				"en" : "2. Standard Title List-1B (widget-title, category, status, title, postdate, view-count)"
-				},
-			"thumbnail" : "annc_index2_thumbs.png"
-		},
-		{
-			"filename" : "annc_index3",
-			"name" : {
-				"zh_tw" : "3. 標準表格列表-2A ( 模組標題, 日期, 狀態, 標題, 類別 )",
-				"en" : "3. Standard Table List-2 (widget-title, postdate, status, title, category)"
-				},
-			"thumbnail" : "annc_index3_thumbs.png"
-		},
-		{
-			"filename" : "annc_index4",
-			"name" : {
-				"zh_tw" : "4. 標準表格列表-2B ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )",
-				"en" : "4. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)"
-				},
-			"thumbnail" : "annc_index4_thumbs.png"
-		},
-		{
-			"filename" : "annc_index5",
-			"name" : {
-				"zh_tw" : "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_index5_thumbs.png"
-		},
-		{
-			"filename" : "annc_index6",
-			"name" : {
-				"zh_tw" : "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_index6_thumbs.png"
-		},
-		{
-			"filename" : "annc_index7",
-			"name" : {
-				"zh_tw" : "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_index7_thumbs.png"
-		},
-		{
-			"filename" : "annc_index8",
-			"name" : {
-				"zh_tw" : "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
-				"en" : "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
-			},
-			"thumbnail" : "annc_index8_thumbs.png"
-		},
-		{
-			"filename" : "annc_index9",
-			"name" : {
-				"zh_tw" : "9. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
-				"en" : "9. Standard Title List-1 (widget-title, category, status, title, postdate)"
-				},
-			"thumbnail" : "annc_index9_thumbs.png"
-		},
-		{
-			"filename" : "annc_index10",
-			"name" : {
-				"zh_tw" : "10. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
-				"en" : "10. Standard Title List-2 (widget-title, postdate, status, title, category)"
-				},
-			"thumbnail" : "annc_index10_thumbs.png"
-		},
-		{
-			"filename" : "annc_index11",
-			"name" : {
-				"zh_tw" : "11. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
-				"en" : "11. Simple Title List-1 (widget-title, status, title, postdate)"
-				},
-			"thumbnail" : "annc_index11_thumbs.png"
-		},
-		{
-			"filename" : "annc_index12",
-			"name" : {
-				"zh_tw" : "12. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
-				"en" : "12. Simple Title List-2 (widget-title, postdate, status, title)"
-				},
-			"thumbnail" : "annc_index12_thumbs.png"
-		},
-		{
-			"filename" : "annc_index13",
-			"name" : {
-				"zh_tw" : "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
-				"en" : "13. Simple Table List (widget-title, status, title, postdate)"
-				},
-			"thumbnail" : "annc_index13_thumbs.png"
-		},
-		{
-			"filename" : "annc_index14",
-			"name" : {
-				"zh_tw" : "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
-				"en" : "14. Simple Table List (widget-title, postdate, status, title)"
-				},
-			"thumbnail" : "annc_index14_thumbs.png"
-		},
-		{
-			"filename" : "annc_index15",
-			"name" : {
-				"zh_tw" : "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )",
-				"en" : "15. Simple Table List (widget-title, postdate, status, title, view-count)"
-				},
-			"thumbnail" : "annc_index15_thumbs.png"
-		},
-		{
-			"filename" : "annc_index16",
-			"name" : {
-				"zh_tw" : "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )",
-				"en" : "16. Table List including Links and attachments (widget-title, category, status, title, view-count)"
-				},
-			"thumbnail" : "annc_index16_thumbs.png"
-		}
-	],
-	"widgets" : [
-		{
-			"filename" : "annc_widget1",
-			"name" : {
-				"zh_tw" : "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
-				},
-			"thumbnail" : "annc_widget1_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget2",
-			"name" : {
-				"zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_widget2_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget3",
-			"name" : {
-				"zh_tw" : "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_widget3_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget4",
-			"name" : {
-				"zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
-				"en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
-			},
-			"thumbnail" : "annc_widget4_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget5",
-			"name" : {
-				"zh_tw" : "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
-				"en" : "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
-			},
-			"thumbnail" : "annc_widget5_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget6",
-			"name" : {
-				"zh_tw" : "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
-				"en" : "6. Standard Title List-1 (widget-title, category, status, title, postdate)"
-				},
-			"thumbnail" : "annc_widget6_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget7",
-			"name" : {
-				"zh_tw" : "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
-				"en" : "7. Standard Title List-2 (widget-title, postdate, status, title, category)"
-				},
-			"thumbnail" : "annc_widget7_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget8",
-			"name" : {
-				"zh_tw" : "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
-				"en" : "8. Standard Table List-1 (widget-title, category, status, title, postdate)"
-				},
-			"thumbnail" : "annc_widget8_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget9",
-			"name" : {
-				"zh_tw" : "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
-				"en" : "9. Standard Table List-2 (widget-title, postdate, status, title, category)"
-				},
-			"thumbnail" : "annc_widget9_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget10",
-			"name" : {
-				"zh_tw" : "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
-				"en" : "10. Simple Title List-1 (widget-title, status, title, postdate)"
-				},
-			"thumbnail" : "annc_widget10_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget11",
-			"name" : {
-				"zh_tw" : "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
-				"en" : "11. Simple Title List-2 (widget-title, postdate, status, title)"
-				},
-			"thumbnail" : "annc_widget11_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget12",
-			"name" : {
-				"zh_tw" : "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
-				"en" : "12. Simple Table List (widget-title, status, title, postdate)"
-				},
-			"thumbnail" : "annc_widget12_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget13",
-			"name" : {
-				"zh_tw" : "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
-				"en" : "13. Simple Table List (widget-title, postdate, status, title)"
-				},
-			"thumbnail" : "annc_widget13_thumbs.png"
-		},
-		{
-			"filename" : "annc_widget14",
-			"name" : {
-				"zh_tw" : "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )",
-				"en" : "14. 1 Image + Title List (widget-title, image, status, title, postdate)"
-				},
-			"thumbnail" : "annc_widget14_thumbs.png"
-		}
-		,
-		{
-			"filename" : "annc_widget15",
-			"name" : {
-				"zh_tw" : "15. 首頁焦點公告樣式 ( 標題, 副標題 )",
-				"en" : "15. home Standard Text List (title, subtitle)"
-			},
-			"thumbnail" : "annc_widget5_thumbs.png"
-		}
-		,
-		{
-			"filename" : "annc_widget16",
-			"name" : {
-				"zh_tw" : "16. 首頁公告列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
-				"en" : "16. home Standard Text List (widget-title, postdate, category, status, title, subtitle)"
-			},
-			"thumbnail" : "annc_widget5_thumbs.png"
-		}
-	]
+  "frontend": [
+    {
+      "filename": "annc_index1",
+      "name": {
+        "zh_tw": "1. 標準標題列表-1A ( 模組標題, 類別, 狀態, 標題, 日期 )",
+        "en": "1. Standard Title List-1 (widget-title, category, status, title, postdate)"
+      },
+      "thumbnail": "annc_index1_thumbs.png"
+    },
+    {
+      "filename": "annc_index2",
+      "name": {
+        "zh_tw": "2. 標準標題列表-1B ( 模組標題, 類別, 狀態, 標題, 日期, 瀏覽人次 )",
+        "en": "2. Standard Title List-1B (widget-title, category, status, title, postdate, view-count)"
+      },
+      "thumbnail": "annc_index2_thumbs.png"
+    },
+    {
+      "filename": "annc_index3",
+      "name": {
+        "zh_tw": "3. 標準表格列表-2A ( 模組標題, 日期, 狀態, 標題, 類別 )",
+        "en": "3. Standard Table List-2 (widget-title, postdate, status, title, category)"
+      },
+      "thumbnail": "annc_index3_thumbs.png"
+    },
+    {
+      "filename": "annc_index4",
+      "name": {
+        "zh_tw": "4. 標準表格列表-2B ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )",
+        "en": "4. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)"
+      },
+      "thumbnail": "annc_index4_thumbs.png"
+    },
+    {
+      "filename": "annc_index5",
+      "name": {
+        "zh_tw": "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_index5_thumbs.png"
+    },
+    {
+      "filename": "annc_index6",
+      "name": {
+        "zh_tw": "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_index6_thumbs.png"
+    },
+    {
+      "filename": "annc_index7",
+      "name": {
+        "zh_tw": "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_index7_thumbs.png"
+    },
+    {
+      "filename": "annc_index8",
+      "name": {
+        "zh_tw": "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+        "en": "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+      },
+      "thumbnail": "annc_index8_thumbs.png"
+    },
+    {
+      "filename": "annc_index9",
+      "name": {
+        "zh_tw": "9. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+        "en": "9. Standard Title List-1 (widget-title, category, status, title, postdate)"
+      },
+      "thumbnail": "annc_index9_thumbs.png"
+    },
+    {
+      "filename": "annc_index10",
+      "name": {
+        "zh_tw": "10. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+        "en": "10. Standard Title List-2 (widget-title, postdate, status, title, category)"
+      },
+      "thumbnail": "annc_index10_thumbs.png"
+    },
+    {
+      "filename": "annc_index11",
+      "name": {
+        "zh_tw": "11. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+        "en": "11. Simple Title List-1 (widget-title, status, title, postdate)"
+      },
+      "thumbnail": "annc_index11_thumbs.png"
+    },
+    {
+      "filename": "annc_index12",
+      "name": {
+        "zh_tw": "12. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+        "en": "12. Simple Title List-2 (widget-title, postdate, status, title)"
+      },
+      "thumbnail": "annc_index12_thumbs.png"
+    },
+    {
+      "filename": "annc_index13",
+      "name": {
+        "zh_tw": "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+        "en": "13. Simple Table List (widget-title, status, title, postdate)"
+      },
+      "thumbnail": "annc_index13_thumbs.png"
+    },
+    {
+      "filename": "annc_index14",
+      "name": {
+        "zh_tw": "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+        "en": "14. Simple Table List (widget-title, postdate, status, title)"
+      },
+      "thumbnail": "annc_index14_thumbs.png"
+    },
+    {
+      "filename": "annc_index15",
+      "name": {
+        "zh_tw": "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )",
+        "en": "15. Simple Table List (widget-title, postdate, status, title, view-count)"
+      },
+      "thumbnail": "annc_index15_thumbs.png"
+    },
+    {
+      "filename": "annc_index16",
+      "name": {
+        "zh_tw": "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )",
+        "en": "16. Table List including Links and attachments (widget-title, category, status, title, view-count)"
+      },
+      "thumbnail": "annc_index16_thumbs.png"
+    }
+  ],
+  "widgets": [
+    {
+      "filename": "annc_widget1",
+      "name": {
+        "zh_tw": "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget1_thumbs.png"
+    },
+    {
+      "filename": "annc_widget2",
+      "name": {
+        "zh_tw": "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget2_thumbs.png"
+    },
+    {
+      "filename": "annc_widget3",
+      "name": {
+        "zh_tw": "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget3_thumbs.png"
+    },
+    {
+      "filename": "annc_widget4",
+      "name": {
+        "zh_tw": "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget4_thumbs.png"
+    },
+    {
+      "filename": "annc_widget5",
+      "name": {
+        "zh_tw": "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+        "en": "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+      },
+      "thumbnail": "annc_widget5_thumbs.png"
+    },
+    {
+      "filename": "annc_widget6",
+      "name": {
+        "zh_tw": "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+        "en": "6. Standard Title List-1 (widget-title, category, status, title, postdate)"
+      },
+      "thumbnail": "annc_widget6_thumbs.png"
+    },
+    {
+      "filename": "annc_widget7",
+      "name": {
+        "zh_tw": "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+        "en": "7. Standard Title List-2 (widget-title, postdate, status, title, category)"
+      },
+      "thumbnail": "annc_widget7_thumbs.png"
+    },
+    {
+      "filename": "annc_widget8",
+      "name": {
+        "zh_tw": "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+        "en": "8. Standard Table List-1 (widget-title, category, status, title, postdate)"
+      },
+      "thumbnail": "annc_widget8_thumbs.png"
+    },
+    {
+      "filename": "annc_widget9",
+      "name": {
+        "zh_tw": "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+        "en": "9. Standard Table List-2 (widget-title, postdate, status, title, category)"
+      },
+      "thumbnail": "annc_widget9_thumbs.png"
+    },
+    {
+      "filename": "annc_widget10",
+      "name": {
+        "zh_tw": "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+        "en": "10. Simple Title List-1 (widget-title, status, title, postdate)"
+      },
+      "thumbnail": "annc_widget10_thumbs.png"
+    },
+    {
+      "filename": "annc_widget11",
+      "name": {
+        "zh_tw": "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+        "en": "11. Simple Title List-2 (widget-title, postdate, status, title)"
+      },
+      "thumbnail": "annc_widget11_thumbs.png"
+    },
+    {
+      "filename": "annc_widget12",
+      "name": {
+        "zh_tw": "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+        "en": "12. Simple Table List (widget-title, status, title, postdate)"
+      },
+      "thumbnail": "annc_widget12_thumbs.png"
+    },
+    {
+      "filename": "annc_widget13",
+      "name": {
+        "zh_tw": "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+        "en": "13. Simple Table List (widget-title, postdate, status, title)"
+      },
+      "thumbnail": "annc_widget13_thumbs.png"
+    },
+    {
+      "filename": "annc_widget14",
+      "name": {
+        "zh_tw": "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )",
+        "en": "14. 1 Image + Title List (widget-title, image, status, title, postdate)"
+      },
+      "thumbnail": "annc_widget14_thumbs.png"
+    },
+    {
+      "filename": "annc_widget15",
+      "name": {
+        "zh_tw": "15. 首頁焦點公告樣式 ( 標題, 副標題 )",
+        "en": "15. home Standard Text List (title, subtitle)"
+      },
+      "thumbnail": "annc_widget5_thumbs.png"
+    },
+    {
+      "filename": "annc_widget16",
+      "name": {
+        "zh_tw": "16. 首頁公告列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+        "en": "16. home Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+      },
+      "thumbnail": "annc_widget5_thumbs.png"
+    },
+    {
+      "filename": "annc_widget17",
+      "name": {
+        "zh_tw": "17.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "17.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget4_thumbs.png"
+    },
+    {
+      "filename": "annc_widget18",
+      "name": {
+        "zh_tw": "18. 三欄圖文精簡版 ( 模組標題, 標題, 副標題(只顯示15字) )",
+        "en": "18. 3-Column Standard Image + Text Lite (widget-title, title, subtitle(only display 15 words))"
+      },
+      "thumbnail": "annc_widget4_thumbs.png"
+    },
+    {
+      "filename": "annc_widget19",
+      "name": {
+        "zh_tw": "19. 單欄圖文輪播 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題 )",
+        "en": "19. Image + Text slide (widget-title, image, status, postdate, category, title)"
+      },
+      "thumbnail": "annc_widget1_thumbs.png"
+    },
+    {
+      "filename": "annc_widget20",
+      "name": {
+        "zh_tw": "20. 含搜尋功能之精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+        "en": "20. Simple Title List-2 (widget-title, postdate, status, title), including search"
+      },
+      "thumbnail": "annc_widget11_thumbs.png"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb
index 1caf227..981db72 100644
--- a/modules/announcement/show.html.erb
+++ b/modules/announcement/show.html.erb
@@ -44,9 +44,169 @@
   </ul>
 
 </article>
+<div class="carousel_images" style="{{carousel_display_style}}">
+  <div class="w-ba-banner ba-banner-widget-1">
+    <div class="w-ba-banner__wrap  cycle-slideshow"
+        data-list="bulletin_carousel_images"
+        data-level="0"
+        data-cycle-slides=".bulletin_carousel_slide"
+        data-cycle-log="false"
+        data-cycle-auto-height="0"
+        data-cycle-speed="300"
+        data-cycle-timeout="5000"
+        data-cycle-fx="fade"
+        data-pager-active-class="active-slide"
+        data-cycle-swipe=true
+        data-cycle-swipe-fx="scrollHorz"
+      >
+      <div class="w-ba-banner__slide bulletin_carousel_slide"
+          data-cycle-title="{{description_text}}"
+        >
+             <img class="w-ba-banner__image banner-responsive" src="{{src}}" alt="{{description_text}}">
+             <div class="ad-overlay w-ad-banner__overlay bulletin_carousel__overlay">
+               <p><strong class="carousel__description">{{description}}</strong></p>
+             </div>
+             <div class="transitionfade"></div>
+      </div>
+    </div>
+      <ul class="controlplay"><a class="resume-slide" title = "{{resume_btn_title}}"><i></i></a><a class="pause-slide" title = "{{pause_btn_title}}"><i></i></a></ul>
+    <ul class="button-mid">
+      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "{{prev_btn_title}}"></i>
+      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "{{next_btn_title}}"></i>
+    </ul>
+  </div>
+  <div style="position: relative;">
+    <h4><span class="active_slide">1</span>/{{carousel_count}}</h4>
+    <ul class="carousel_images_slide w-annc__list  row list-unstyled" data-level="0" data-list="bulletin_carousel_images">
+      <li class="carousel_img_item  col-sm-3">
+      <div class="carousel_img-wrap">
+        <img class="carousel_img" src="{{src}}" alt="{{description_text}}">
+      </div>
+      </li>
+    </ul>
+    <ul class="button-mid">
+      <i class="fa fa-angle-left prev-button prev_img" aria-hidden="true" title = "{{prev_btn_title}}"></i>
+      <i class="fa fa-angle-right next-button next_img" aria-hidden="true" title = "{{next_btn_title}}"></i>
+    </ul>
+  </div>
+</div>
 
 {{link_to_edit}}
-
+<style type="text/css">
+  .carousel_img_item{
+    display: none;
+    float: left;
+  }
+  .controlplay {
+    position: absolute;
+    right: 1em;
+    top: 3%;
+    z-index: 200;
+  }
+  .controlplay a {
+    display: inline-block;
+    margin-right: 0.25em;
+    cursor: pointer;
+    padding: 5px 10px;
+    border: 1px solid rgba(255,255,255,0.5);
+    background: rgba(0,0,0,0.2);
+  }
+  .controlplay a i {
+    font-family: FontAwesome;
+    position: relative;
+    font-size: 1rem;
+    line-height: 1;
+    color: #FFF;
+    vertical-align: middle;
+    font-style: unset;
+  }
+  .controlplay .resume-slide i::before {
+    content: "\f04b";
+  }
+  .controlplay .pause-slide i::before {
+    content: "\f04c";
+  }
+  ul.button-mid .prev-button {
+      transition: 0.4s;
+      position: relative;
+      float: left;
+      left: 0.5rem;
+      width: 2.5rem;
+      height: 2.5rem;
+      font-size: 2.2rem;
+      color: #ffffff;
+      background: rgba(0,0,0,0.2);
+      text-align: center;
+      line-height: 2.5rem;
+      top: 50%;
+      position: absolute;
+      transform: translateY(-50%);
+      z-index: 999;
+  }
+  ul.button-mid .next-button {
+      float: right;
+      transition: 0.4s;
+      position: relative;
+      right: 0.5rem;
+      width: 2.5rem;
+      height: 2.5rem;
+      font-size: 2.2rem;
+      color: #fff;
+      background: rgba(0,0,0,0.2);
+      text-align: center;
+      line-height: 2.5rem;
+      top: 50%;
+      position: absolute;
+      transform: translateY(-50%);
+      z-index: 999;
+  }
+  .carousel_images_slide{
+    padding: 3em;
+  }
+  .carousel_img_item img{
+    cursor: pointer;
+  }
+  @media (max-width: 479px){
+    .carousel_img_item:nth-child(-n+1){
+      display: block;
+      width: 100%;
+      float: left;
+    }
+    .carousel_img_item{
+      width: 100%;
+    }
+  }
+  @media (min-width: 480px){
+    .carousel_img_item:nth-child(-n+2){
+      display: block;
+      width: 50%;
+      float: left;
+    }
+    .carousel_img_item{
+      width: 50%;
+    }
+  }
+  @media (min-width: 768px){
+    .carousel_img_item:nth-child(-n+3){
+      display: block;
+      width: 33%;
+      float: left;
+    }
+    .carousel_img_item{
+      width: 33%;
+    }
+  }
+  @media (min-width: 1280px){
+    .carousel_img_item:nth-child(-n+4){
+      display: block;
+      width: 25%;
+      float: left;
+    }
+    .carousel_img_item{
+      width: 25%;
+    }
+  }
+</style>
 <script>
   (function($) {
 
@@ -67,6 +227,108 @@
     hideEmptyEl($('.s-annc__link-title'), $('.s-annc__related-link'));
   
     $("img[src='']").remove();
-    
+    $('.pause-slide').click(function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
+    });
+    $('.resume-slide').click(function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume');
+    });
+    $('.next-button').off('click').on('click',function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next");
+    })
+    $('.prev-button').off('click').on('click',function(){
+      $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev");
+    })
+    window.active_slide = 0;
+    $('.prev_img').off('click').on('click',function(){
+      var carousel_images_slide = $('.carousel_images_slide');
+      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
+      if(carousel_images_slide_first_child.length > 0){
+        var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width());
+        content_size = Math.max(content_size,1);
+        if(carousel_images_slide.find(">li").length > content_size && active_slide > 0){
+          active_slide -= content_size;
+          carousel_images_slide.find(">li").css("display","none");
+          for(var i = active_slide; i < active_slide + content_size;i++){
+            carousel_images_slide.find(">li").eq(i).css("display","block");
+          }
+        }
+      }
+    })
+    $('.next_img').off('click').on('click',function(){
+      var carousel_images_slide = $('.carousel_images_slide');
+      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
+      if(carousel_images_slide_first_child.length > 0){
+        var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width());
+        content_size = Math.max(content_size,1);
+        var li_length = carousel_images_slide.find(">li").length;
+        if(li_length > content_size){
+          active_slide += content_size;
+          active_slide = Math.min(active_slide,li_length - 1);
+          carousel_images_slide.find(">li").css("display","none");
+          for(var i = active_slide; i < active_slide + content_size;i++){
+            carousel_images_slide.find(">li").eq(i).css("display","block");
+          }
+        }
+      }
+
+    })
+    $(".carousel_img_item img").off("click").on("click",function(){
+      $(".carousel_images .cycle-slideshow").cycle($(this).index(".carousel_img_item img"));
+    })
+    $(document).ready(function(){
+      $(".carousel_images .cycle-slideshow").cycle('pause');
+      var carousel_image_block_width = $('.carousel_images').width();
+      var heights = $(".bulletin_carousel_slide").map(function(i,v){
+        return $(v).height() * carousel_image_block_width / $(v).width();
+      })
+      var max_height = Math.max.apply(null,heights);
+      $(".bulletin_carousel_slide").each(function(i,v){
+        $(v).height(max_height);
+      })
+      $(".carousel_images .cycle-slideshow").cycle('resume');
+      $('.cycle-slideshow').on('cycle-after',function(){
+        $(".active_slide").text($('.bulletin_carousel_slide.cycle-slide-active').index());
+      })
+    })
+    $(window).on("load",function(){
+      $(".carousel_images .cycle-slideshow").cycle('pause');
+      var carousel_image_block_width = $('.carousel_images').width();
+      var heights = $(".bulletin_carousel_slide").map(function(i,v){
+        return $(v).height() * carousel_image_block_width / $(v).width();
+      })
+      var max_height = Math.max.apply(null,heights);
+      $(".bulletin_carousel_slide").each(function(i,v){
+        $(v).height(max_height);
+      })
+      $(".carousel_images .cycle-slideshow").cycle('resume');
+    })
+    $(window).resize(function(){
+      var carousel_images_slide = $('.carousel_images_slide');
+      var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide);
+      if(carousel_images_slide_first_child.length > 0){
+        var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width());
+        content_size = Math.max(content_size,1);
+        carousel_images_slide.find(">li").css("display","none");
+        var active_count = carousel_images_slide.find(">li").length - active_slide;
+        if(active_count < content_size){
+          active_slide -= (content_size - active_count);
+        }
+        active_slide = Math.max(active_slide,0);
+        console.log(content_size)
+        for(var i = active_slide; i < active_slide + content_size;i++){
+          carousel_images_slide.find(">li").eq(i).css("display","block");
+        }
+      }
+      var carousel_image_block_width = $('.carousel_images').width();
+      $(".bulletin_carousel_slide").css("height",'');
+      var heights = $(".bulletin_carousel_slide").map(function(i,v){
+        return $(v).height() * carousel_image_block_width / $(v).width();
+      })
+      var max_height = Math.max.apply(null,heights);
+      $(".bulletin_carousel_slide").each(function(i,v){
+        $(v).height(max_height);
+      })
+    })
   }(jQuery));
 </script>
\ 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/archive/info.json b/modules/archive/info.json
index 3ccb465..f3147b0 100644
--- a/modules/archive/info.json
+++ b/modules/archive/info.json
@@ -1,54 +1 @@
-{
-    "frontend": [
-        {
-            "filename" : "archive_index1",
-            "name" : {
-                "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
-                "en" : "1. List (widget-title, category, filename, download link)"
-                },
-            "thumbnail" : "thumb.png"
-        },
-        {
-            "filename" : "archive_index2",
-            "name" : {
-                "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
-                "en" : "2. Accordion list (widget-title, category, filename, download link)"
-                },
-            "thumbnail" : "thumb.png"
-        },
-        {
-            "filename" : "archive_index3",
-            "name" : {
-                "zh_tw" : "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )",
-                "en" : "3. List(no filename) (widget-title, category, download link)"
-                },
-            "thumbnail" : "thumb.png"
-        },
-        {
-            "filename" : "archive_index4",
-            "name" : {
-                "zh_tw" : "4. 手風琴式列表( 無檔案名稱  ( 模組標題, 類別標題, 下載連結 )",
-                "en" : "4. Accordion list(no filename) (widget-title, category, download link)"
-                },
-            "thumbnail" : "thumb.png"
-        }
-    ],
-    "widgets" : [
-        {
-            "filename" : "archive_widget1",
-            "name" : {
-                "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )",
-                "en" : "1. List (widget-title, category, link of download page)"
-                },
-            "thumbnail" : "thumb.png"
-        },
-        {
-            "filename" : "archive_widget2",
-            "name" : {
-                "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )",
-                "en" : "2. Accordion list (widget-title, category, link of download page)"
-            },
-            "thumbnail" : "thumb.png"
-        }
-    ]
-}
\ No newline at end of file
+{"frontend":[{"filename":"archive_index1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"1. List (widget-title, category, filename, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"2. Accordion list (widget-title, category, filename, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index3","name":{"zh_tw":"3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )","en":"3. List(no filename) (widget-title, category, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index4","name":{"zh_tw":"4. 手風琴式列表( 無檔案名稱  ( 模組標題, 類別標題, 下載連結 )","en":"4. Accordion list(no filename) (widget-title, category, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index7","name":{"zh_tw":"7. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"7. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index8","name":{"zh_tw":"8. 表格列表 ( 模組標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"8. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"}],"widgets":[{"filename":"archive_widget1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )","en":"1. List (widget-title, category, link of download page)"},"thumbnail":"thumb.png"},{"filename":"archive_widget2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )","en":"2. Accordion list (widget-title, category, link of download page)"},"thumbnail":"thumb.png"}]}
\ 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/gallery/info.json b/modules/gallery/info.json
index ba96b1c..fbf4ac8 100644
--- a/modules/gallery/info.json
+++ b/modules/gallery/info.json
@@ -31,6 +31,14 @@
                 "en" : "4. Thumbnail ( gallery thumbnail, page navigation )"
                 },
             "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "gallery_index5",
+            "name" : {
+                "zh_tw" : "5. 卡片",
+                "en" : "5. Card"
+            },
+            "thumbnail" : "thumb.png"
         }
     ],
     "widgets" : [
@@ -45,8 +53,32 @@
         {
             "filename" : "gallery_widget2",
             "name" : {
-                "zh_tw" : "2. 相本排版",
-                "en" : "2. Thumbnail"
+                "zh_tw" : "2. 相本排版 ( 模組標題, 圖片 )",
+                "en" : "2. Thumbnail (widget-title, image)"
+            },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "gallery_widget3",
+            "name" : {
+                "zh_tw" : "3. 單本相簿跑馬燈 ( 圖片 )",
+                "en" : "3. Single Picture With Carousel Effect (image)"
+            },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "gallery_widget4",
+            "name" : {
+                "zh_tw" : "4. 卡片",
+                "en" : "4. Card"
+            },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "gallery_widget5",
+            "name" : {
+                "zh_tw" : "5. 投影片式輪播",
+                "en" : "5. Slide"
             },
             "thumbnail" : "thumb.png"
         }
diff --git a/modules/gallery/show.html.erb b/modules/gallery/show.html.erb
index f3083ff..2cb9386 100644
--- a/modules/gallery/show.html.erb
+++ b/modules/gallery/show.html.erb
@@ -7,7 +7,7 @@
     <div class="show-content col-xs-6 col-sm-2">
       <div class="show-content-inner">
         <div class="show-pic">
-          <a href="{{link_to_show}}" onclick="window.location.hash = '{{link_to_show}}';GalleryTheater();">
+          <a href="{{link_to_show}}" onclick="window.location.hash = '{{link_to_show}}';GalleryTheater();return false;">
             <img class="img" src="{{thumb-src}}" alt="{{alt_title}}">
           </a>
           <p class="show-description">{{image-description}}</p>
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index 82a9a94..5b3ef48 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -4,13 +4,10 @@
   </h3>
   <ul class="list-unstyled" data-level="0" data-list="web_link">
     <li class="widget-content">
-      <a class="widget-content-title" href="{{link_to_show}}" target="_blank">{{title}}</a>
+      <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 class="w-annc__more-wrap clearfix">
-    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><i class="fa fa-caret-right"></i>Learn more</a>
-  </div>
 </div>
\ No newline at end of file
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/info.json b/modules/web_resource/info.json
index 253d909..df326f5 100644
--- a/modules/web_resource/info.json
+++ b/modules/web_resource/info.json
@@ -1,22 +1,38 @@
-{
-    "frontend": [
-        {
-            "filename" : "web_res_index1",
-            "name" : {
-                "zh_tw" : "1. 列表 ( 模組標題, 連結, 連結說明 )",
-                "en" : "1. List (widget-title, link, link description)"
-                },
-            "thumbnail" : "thumb.png"
-        }
-    ],
-    "widgets" : [
-        {
-            "filename" : "web_res_widget1",
-            "name" : {
-                "zh_tw" : "1. 列表 ( 模組標題, 連結 )",
-                "en" : "1. List (widget-title, link)"
-                },
-            "thumbnail" : "thumb.png"
-        }
-    ]
+{
+    "frontend": [
+        {
+            "filename" : "web_res_index1",
+            "name" : {
+                "zh_tw" : "1. 列表 ( 模組標題, 連結, 連結說明 )",
+                "en" : "1. List (widget-title, link, link description)"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "web_res_index2",
+            "name" : {
+                "zh_tw" : "2. 三欄式列表 ( 模組標題, 連結, 連結說明 )",
+                "en" : "2. 3 column List (widget-title, link, link description)"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ],
+    "widgets" : [
+        {
+            "filename" : "web_res_widget1",
+            "name" : {
+                "zh_tw" : "1. 直式列表 ( 模組標題, 連結 )",
+                "en" : "1. Vertical List (widget-title, link)"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "web_res_widget2",
+            "name" : {
+                "zh_tw" : "2. 橫式列表 ( 模組標題, 連結 )",
+                "en" : "2. Horizontal List (widget-title, link)"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb
index 2ba1beb..f225a23 100644
--- a/modules/web_resource/web_res_index1.html.erb
+++ b/modules/web_resource/web_res_index1.html.erb
@@ -1,11 +1,11 @@
 <div class="index-link index1">
-  <h3 class="index-title">
+  <h1 class="index-title">
     <span>{{page-title}}</span>
-  </h3>
+  </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content">
       <h4>
-        <a class="index-content-title" href="{{link_to_show}}" target="_blank">{{title}}</a>
+        <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>
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