diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index dfd56e9..5686156 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -30,26 +30,38 @@
   </div>
   <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" 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">
+    <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>
+  </ul>
 </div>
 <script>
-	var flag = 1;
-	$('.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");
+  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>
\ 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/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index 003f7d8..725db51 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -1,8 +1,7 @@
-<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="10000"
       data-cycle-slides=".w-ba-banner__slide"
       data-cycle-log="false"
       data-overlay=".w-ad-banner__overlay_{{subpart-id}}"
@@ -11,25 +10,29 @@
       data-cycle-speed="{{speed}}"
       data-cycle-timeout="{{timeout}}"
       data-cycle-fx="{{ad_fx}}"
-      data-pager=".w-ba-banner__pager-2 .banner_caption_{{subpart-id}}"
+      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-swipe=true
+      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 banner_caption_{{subpart-id}}"></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>
+      <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'){
     var ad_banners_count = 0;
@@ -65,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/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb
index 91a290e..0400a9b 100644
--- a/modules/gallery/_gallery_widget3.html.erb
+++ b/modules/gallery/_gallery_widget3.html.erb
@@ -3,7 +3,7 @@
     <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-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">
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>