diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index b5a6dfb..1547748 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -1203,6 +1203,19 @@ $(document).ready(function() {
     // if($('.show-announcement').hasClass('show-announcement')) {
     //   $('.').css('', '');
     // }
+    if($('.s-annc').length){
+      $(".carousel_images h4").remove();
+      $('.carousel_images').addClass('carousel_images2');
+      $(".carousel_images .w-ba-banner").next("div").find(".button-mid").remove();
+      $(".s-annc__post-wrap").next("hr").remove();
+      // $(".carousel_images").insertAfter(".s-annc__meta-wrap");   
+      $('.breadcrumb-wrap').css('display', 'block');
+      // $(".main-content").css({
+      //   "max-width": "920px",
+      //   "margin": "auto"
+      // });
+    }
+  $('.s-annc__tag-wrap ').after($('.s-annc__post-orbithashtags'));
    $('a').each(function () {
         const $a = $(this);
 
diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss
index 9d436d4..ce9d706 100644
--- a/assets/stylesheets/template/base/_unity.scss
+++ b/assets/stylesheets/template/base/_unity.scss
@@ -18,13 +18,14 @@
       }
   }
 }
-.page-home{
+
   .unity-title {
     span{
     width: 100%;
     display: flex;
     justify-content: center;
     align-items: center;
+    flex-wrap: wrap;
       &:before{
           background: url(/assets/titleicon.png) no-repeat left center;
           display: block;
@@ -39,7 +40,7 @@
       }
     }
   }
-}
+
 // Title
 .unity-title {
   line-height: 1.5;
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index 28f5154..18a6687 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -56,7 +56,7 @@
   }
   .header-banner { overflow: hidden; }
   .header-nav {
-    padding:1em 0 0 0;
+    padding:0;
     font-family: $main-font;
     text-transform:uppercase;
     display: flex;
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index a7800c7..f3dcd6d 100644
--- a/assets/stylesheets/template/modules/ad_banner.scss
+++ b/assets/stylesheets/template/modules/ad_banner.scss
@@ -8,6 +8,28 @@
 
 // Widget
 // ## gerenral styles
+ul.button-mid{
+	.prev-button{
+    height: 2em !important;
+    width: 2em !important;
+    font-size: 1em !important;
+    line-height: 2rem !important;
+    border-radius: 1em;
+    &:hover {
+      background: rgba(0,0,0,0.1);
+    }
+	}
+	.next-button{
+    height: 2em !important;
+    width: 2em !important;
+    font-size: 1em !important;
+    line-height: 2rem !important;
+    border-radius: 1em;
+    &:hover {
+      background: rgba(0,0,0,0.1);
+    }
+	}
+}
 ul.button-mid{
   margin:0;
   z-index: 201;
@@ -69,7 +91,7 @@ iframe{
   @include list-reset;
   position: absolute;
   bottom: 0.5rem!important;
-  z-index: 1000;
+  z-index: 100;
   text-align:center;
   width: 100%;
   li {
@@ -234,7 +256,7 @@ ul.button-mid{
   .banner-pager {
     right: 1em;
     top: -2em;
-    z-index: 102;
+    z-index: 100;
     display: none;
   }
   .button-mid{
@@ -306,7 +328,7 @@ ul.button-mid{
     padding: 3.5em 5em;
     background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000);
     position: absolute;
-    z-index: 999;
+    z-index: 99;
     color: #fff;
   }
   .w-ba-banner__caption {
@@ -357,7 +379,7 @@ ul.button-mid{
   .banner-pager {
     right: 1em;
     top: -2em;
-    z-index: 102;
+    z-index: 100;
     display: none;
   }
 }
@@ -400,9 +422,7 @@ ul.button-mid{
 .ba-banner-widget-5 {
   margin: 1em 0;
   .slide-img {
-    @media(min-width:769px){
       padding: 0;
-    }    
     }
   .slide-content {
     z-index: 200;
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index 3df9986..4d5d061 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -53,11 +53,17 @@
 .w-annc__table{
   background-color: #fff;
   .w-annc__th{
-    border-bottom: 0.125em solid #ddd;
+    // border-bottom: 0.125em solid #ddd;
   }
   tr{
     @media(max-width: $screen-xs){
-    margin-bottom: 10px;
+        margin-bottom: 10px;
+        display: flex;
+        flex-wrap: wrap;
+        width: 100%;
+        td{
+          width: 100%;
+        }
     }
   }
 }
@@ -294,9 +300,6 @@
   .w-annc__list > .w-annc__item:nth-child(3n+1) {
     clear: both;
   }
-  .w-annc__entry-title {
-    height: 2.5em;
-  }
   .w-annc__img-wrap {
     height: 14.5em;
     margin:0;
@@ -908,7 +911,6 @@
    font-family: $main-font;
    font-weight: bold;
  }
- .w-annc__widget-title { float: left; }
  .w-annc__more {
    margin-top: 1.5em;
    display: none;
@@ -2066,6 +2068,9 @@
 }
 //widget 15
 .widget-announcement-15 {
+  .w-annc__entry-title{
+    height: 2.5em;
+  }
   .cycle-carousel-wrap{
     display: flex;
     align-items: baseline;
@@ -2479,7 +2484,6 @@
   .i-annc__item {
     list-style: none;
     overflow: hidden;
-    border-bottom: 1px solid #bbb;
     padding: 1em 0;
     // box-shadow: #0000004d 0 0 4px;
     // background: #fff;
@@ -2518,7 +2522,7 @@
     }
   }
   tr{
-      border: 0.0625em solid #ddd!important;
+      // border: 0.0625em solid #ddd!important;
   }
   td {
     font-size: 1rem;
@@ -2599,7 +2603,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr>td:first-child:before, table.dataT
 table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th:first-child:before {
   background-color: $theme-gray !important;
 }
-
+.i-annc__table{
+  border: 0.0625em solid #ddd !important;
+}
 .i-annc__table .child span.dtr-data li {
   padding: 0 0.5em;
 }
@@ -2756,11 +2762,13 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
     clear: both;
 
   }
-
+  .i-annc__content-wrap{
+    margin: 0.5em;
+  }
   .i-annc__img-wrap {
     overflow: hidden;
     height: 13.5em;
-    margin: 1em 0.5em;
+    margin: 0.5em;
     img {
       @media (max-width:767px) {
        transform: scale(1) !important;
@@ -2880,7 +2888,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 // Index-13
 .index-announcement-13 {
   thead{
-        border-bottom: 0.125em solid #ddd;
+
   }
   .child{
     li{
@@ -2904,7 +2912,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 // Index-14
 .index-announcement-14 {
   thead{
-        border-bottom: 0.125em solid #ddd;
+        // border-bottom: 0.125em solid #ddd;
   }
   .child{
     li{
@@ -2980,8 +2988,12 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 // Index-17
 .index-announcement-17 {
   @media(max-width: $screen-xs){
+    .i-annc__table{
+          border: 0 !important;
+    }
     tr{
         margin-bottom: 10px;
+        border: 0.0625em solid #ddd !important;
     }
     th{
       width: 100%;
@@ -3205,7 +3217,8 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
   border-radius: 4px;
   behavior: url("/assets/ie_support/PIE2/PIE.htc");
   -webkit-border-radius: 4px;
-  -moz-border-radius: 4px
+  -moz-border-radius: 4px;
+  z-index: 100;
 }
 
 .VivaTimeline dl dd {
@@ -3464,6 +3477,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
       border-radius: 10px;
       transition: all 0.3s;
       width: calc( 100%/5 - 1.5em);
+      margin-bottom: 1em;
       &:hover{
           box-shadow: 2px 2px 7px 2px rgba(0, 0, 0, 0.5);
           transform: translateY(-5px);
diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss
index 8f823f5..501260a 100644
--- a/assets/stylesheets/template/modules/archives.scss
+++ b/assets/stylesheets/template/modules/archives.scss
@@ -7,6 +7,11 @@
 //
 // Widget
 // ## gerenral styles
+.i-archive__list{
+  .date-thead{
+    min-width: 4em;
+  }
+}
 .i-archive{
   tr{
     border: 0.0625em solid #ddd!important;
diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss
index 6e02aa0..c30b4c3 100644
--- a/assets/stylesheets/template/modules/event_news.scss
+++ b/assets/stylesheets/template/modules/event_news.scss
@@ -1,6 +1,12 @@
 @charset "utf-8";
 
 @import "../initial";
+[data-list="event_news_links"]{
+  padding: 0;
+  li{
+        list-style: none;
+  }
+}
 .w-annc__list{
   clear: both;
 }
@@ -431,7 +437,6 @@
   @media(max-width: $screen-xs){
     tr{
         margin-bottom: 10px;
-        // border: 0.125em solid #ddd !important;
     }
     th{
       width: 100%;
@@ -586,7 +591,8 @@
 .index-eventnews-11 {
 
   .i-annc__item{
-     width: 100%
+     width: 100%;
+     border-bottom: 0.0625em solid #ddd;
   }
   .child{
     li{
@@ -608,29 +614,19 @@
 // Index-12
 .index-eventnews-12 {
   .i-annc__item{
-     width: 100%
+     width: 100%;
+    border-bottom: 0.0625em solid #ddd;
   }
   .child{
     li{
       list-style: none;
     }
   }
-  @media(max-width: $screen-xs){
-    .i-annc__th--date{
-      width:50%!important;
-    }
-    .i-annc__th--title{
-      width:50%!important;
-    }
-  }
-  table tr{
-    flex-wrap: unset!important;
-  }
 }
 // Index-13
 .index-eventnews-13 {
   thead{
-        border-bottom: 0.125em solid #ddd;
+
   }
   .child{
     li{
@@ -654,7 +650,7 @@
 // Index-14
 .index-eventnews-14 {
   thead{
-        border-bottom: 0.125em solid #ddd;
+
   }
   .child{
     li{
@@ -747,7 +743,7 @@
   @media(max-width: $screen-xs){
     tr{
         margin-bottom: 10px;
-        // border: 0.125em solid #ddd !important;
+
     }
     th{
       width: 100%;
@@ -781,7 +777,7 @@
   @media(max-width: $screen-xs){
     tr{
         margin-bottom: 10px;
-        // border: 0.125em solid #ddd !important;
+
     }
     th{
       width: 100%;
@@ -1181,4 +1177,32 @@
 }
 .widget-event-news-calendar-2.w-calendar .w-calendar-title{
   background:$theme-color-second;
-}
\ No newline at end of file
+}
+
+
+  .carousel_images_slide{
+    transform: scale(0.8);
+    width: 10em;
+    margin: auto!important;
+    display: flex;
+    justify-content: center;
+  }
+  .carousel_img-wrap{
+    width: 25px;
+    height: 25px;
+    border-radius: 2em;
+    overflow: hidden;
+    -webkit-filter: grayscale(100%);
+    filter: grayscale(100%);
+    backdrop-filter: saturate(180%) blur(20px);
+    img{
+      border-radius: 1em;
+       overflow: hidden;
+    }
+  }
+  .carousel_images_slide{
+    margin-top: 1em !important;
+  }
+  .carousel_img_item{
+    display: block!important;
+  }
diff --git a/assets/stylesheets/template/modules/hashtag.scss b/assets/stylesheets/template/modules/hashtag.scss
new file mode 100644
index 0000000..cfdd4c8
--- /dev/null
+++ b/assets/stylesheets/template/modules/hashtag.scss
@@ -0,0 +1,25 @@
+@charset "utf-8";
+
+@import "../initial";
+
+
+
+p.s-annc__post-orbithashtags{
+    clear: both;
+}
+a.orbit-hash-tag {
+    list-style: none;
+    background: #e0edff;
+    color: #0a84ff;
+    margin-right: 0.5em;
+    border-radius: 0.5em;
+    padding: 0.2em 0.5em;
+    margin-bottom: 0.5em;
+    display: inline-block;
+    &:hover{
+        background: #0a84ff;
+        transform: translatey(-2px);
+        transition: transform 0.4s;
+        color: #fff;
+    }
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss
index 25c7f06..4937ab1 100644
--- a/assets/stylesheets/template/modules/member.scss
+++ b/assets/stylesheets/template/modules/member.scss
@@ -471,6 +471,13 @@
 // Show page
 .show-member {
   font-family: $sub-font;
+  .memberul{
+    padding: 0;
+    li{
+      margin-bottom: 0.5em;
+      list-style: none;
+    }
+  }
 
   th, td {
     font-size: 0.938em;
@@ -526,3 +533,8 @@
     .member-data { width: 100%; }
   }
 }
+.show-member{
+  .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
+      border: 0;
+  }
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index 022d0d4..271b22b 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -2,6 +2,79 @@
 
 @import "../initial";
 
+// // 選單樣式2
+// .modules-menu .modules-menu-level-1 > li:hover, .modules-menu .modules-menu-level-1 > li.hover-class{
+//   background-color: transparent!important;
+//   >a{
+//     text-decoration: underline;
+//   }
+// }
+// .modules-menu{
+//     @media (min-width: $screen-sm){
+//       li{
+//           padding-left: 0!important;
+//       }
+//       .modules-menu-level-1 > li > a{
+//         color: $theme-color-second!important;
+//       }
+//     }
+//   .modules-menu-level-0 > li{
+//     @media (min-width: $screen-sm){
+//       position: static!important;
+//     }
+//   }
+//
+//   .modules-menu-level-1{
+//
+//     @media (min-width: $screen-sm){
+//       min-width:unset;
+//       flex-wrap: wrap;
+//       justify-content: flex-start;
+//       display: flex!important;
+//       visibility: hidden;
+//       opacity: 0;
+//       width: 100vw!important;
+//       box-shadow: 2px 2px 5px #00000033;
+//       margin:0;
+//       padding:1em 13% 3em!important;
+//       transition-duration: 0.5s;
+//       background: #f0f0f0;
+//     }
+//   }
+//   .modules-menu-level-0 > li:hover .modules-menu-level-1, .modules-menu .modules-menu-level-0 > li.hover-class .modules-menu-level-1{
+//     visibility: visible!important;
+//     opacity: 1!important;
+//   }
+//
+//   .modules-menu-level-2 {
+//     right:auto!important;
+//     display: block;
+//     top: auto!important;
+//     left: auto!important;
+//     background-color: transparent!important;
+//     position: relative!important;
+//   }
+//   .modules-menu-level-1{
+//     @media (min-width: $screen-sm) {
+//       & > li {
+//         width: 25%;
+//         & > a {
+//           padding-left: 1em;
+//           padding: 5px 0;
+//         }
+//
+//         &:hover {
+//           .modules-menu-level-2 {
+//             display: block;
+//           }
+//         }
+//       }
+//       .modules-menu-level-2{
+//         display: block;
+//       }
+//     }
+//   }
+// }
 
 //固定選單
 .navFixed {
@@ -21,7 +94,7 @@
   min-width: 100%;
   -webkit-backdrop-filter: saturate(180%) blur(20px);
   backdrop-filter: saturate(180%) blur(20px);
-  background-color: #ffffffd9;
+  background-color: #fff;
   -webkit-transition: all .3s ease;
   -moz-transition: all .3s ease;
   -ms-transition: all .3s ease;
@@ -29,6 +102,69 @@
   transition: all .3s ease;
 }
 
+// //直式選單更改css
+// .navbar-brand{
+//   h1{
+//     @media(min-width: 769px){
+//       margin-top:0.5em;
+//     }
+//   }
+// }
+// #layout-navigation{
+//   @media(min-width: 769px){
+//     position: absolute;
+//     width: 20%!important;
+//     left: 0;
+//     background-color: #fff;
+//     margin-top: 5em;
+//     padding-right: 0;
+//     #main-nav{
+//       padding: 0;
+//     }
+//     .modules-menu-level-0{
+//       width: 100%!important;
+//     }
+//     .modules-menu-level-0 > li{
+//       width: 100%;
+//     }
+//     .modules-menu-level-1{
+//       min-width: 100%;
+//       left: 100%;
+//       top: 0;
+//     }
+//   }
+// }
+// .verticalhome{
+//   .layout-content{
+//     @media(min-width: 769px){
+//       float: right!important;
+//       width: 80%!important;
+//     }
+//   }
+// }
+// .homebanner{
+//   @media(min-width: 769px){
+//     float: right!important;
+//     width: 80%!important;
+//     .ba-banner-widget-0 img{
+//       transform: none!important;
+//     }
+//   }
+// }
+// .container{
+//   @media(min-width: 1200px){
+//     width: 95%!important;
+//     max-width: unset!important;
+//   }
+// }
+// .layout-header .navbar-header .navbar-brand{
+//   @media(min-width: 1200px){
+//     padding-left: 0;
+//   }
+// }
+
+
+
 
 
 
@@ -38,7 +174,7 @@
   }
 }
 .navbar-collapse.in {
-      overflow: scroll!important;
+  overflow-y: unset;
 }
 
 .modules-menu {
@@ -47,11 +183,8 @@
   z-index: 1020;
 
   li {
-    white-space: nowrap;
+    padding: 1em;
     list-style: none;
-    @media(max-width: 768px){
-      padding: 1em;
-    }
   }
   .menu-drop.opened {
     transform: rotateX(180deg);
@@ -60,19 +193,20 @@
   .modules-menu-level-0 {
       width: 100%;
       padding: 0;
-    @media (min-width:769px) {
-      margin: 0 0 0.8em 0;
-      -webkit-flex-flow: row wrap;
+      @media (min-width:769px)and(max-width: 1024px){
+        display: flex;
+        flex-wrap: wrap;
+        justify-content:space-between;
+        padding: 0;
+        width: 100%;
+      }
+    @media (min-width:1025px) {
+      margin: 0;
       list-style: none;
-      float: left !important;
-      padding-top: 10px;
       display: flex;
-      width: 100%;
-      justify-content: start;
-      padding-left: 0;
-      padding-left: 6em;
-      padding-right: 3em;
-      padding-bottom: 4em;
+      flex-wrap: wrap;
+      justify-content: flex-end;
+      width: 65%;
       }
     .has-dropdown.level-1.active {
       .modules-menu-level-1 {
@@ -110,7 +244,7 @@
       text-align: center;
       border-radius: 0.13em;
       top: 2em;
-      @media(max-width: 768px){
+      @media(max-width: 769px){
         top: 1em;
         font-size: 1em;
       }
@@ -130,21 +264,12 @@
       margin: 0;
       padding: 0.5em;
       border-bottom: 0.0625em solid lighten($theme-gray, 5%);
-      i{
-            color: #fff;
-            @media(max-width: 768px){
-              color: $theme-color-main;
-            }
-      }
+
       & > a {
         display: block;
-        padding: 1.125em 0;
+        padding: 1em;
         font-family: $main-font;
         font-size: 1.1em;
-        color: #fff;
-        @media(max-width: 768px){
-          color: $theme-color-main;
-        }
         &:after{
           content:'';
           position:absolute;
@@ -162,7 +287,7 @@
           bottom:0;
         }
         &.active {
-          text-decoration: revert;
+          color: $theme-color-second;
           background: none;
           &:after{
             width:100%;
@@ -173,7 +298,7 @@
 
       &:hover {
         & > a {
-          text-decoration: revert;
+          color: $theme-color-second;
           background: transparent;
           box-shadow:none;
           &:after{
@@ -184,21 +309,37 @@
         }
 
         @media (min-width: $screen-sm) {
-          // background-text-decoration: revert;
+          // background-color: $theme-color-second;
           // border-radius: 0.5em;
         }
       }
+      @media (min-width: $screen-sm)and(max-width: 1439px){
+        &:last-child{
+          .modules-menu-level-1 {
+            right: 0;
+           }
+        }
+        &:nth-last-child(2){
+          .modules-menu-level-1 {
+            right: 0;
+          }
+        }
 
+      }
       @media (min-width: $screen-sm) {
         margin: 0;
         padding: 0;
         border-bottom: none;
-        width: 30%;
 
         &:first-child {
           margin-left: 0;
         }
-
+        &:nth-last-child(2){
+          .modules-menu-level-2 {
+            right: 100%;
+            left: auto;
+          }
+        }
         &:last-child {
           margin-right: 0;
 
@@ -211,6 +352,8 @@
             }
 
             & > li {
+              padding-right: 1em;
+              padding-left: 1em;
 
               & > a {
                 padding-left: 0;
@@ -225,12 +368,10 @@
         }
 
         & > a {
-          font-size:1.2em;
-          color:#fff;
-          font-weight: 900;
+          font-size:1.1em;
+          color:#686868;
+          font-weight: bold;
           position: relative;
-          border-bottom: 2px solid #f8f9fa;
-          margin-right: 1em;
         }
 
         &:hover {
@@ -245,15 +386,18 @@
   }
 
   .modules-menu-level-1 {
+    display: none;
     list-style: none;
     z-index: 1;
     padding:0;
     left: auto;
     @media(min-width:769px){
-      display: block !important;
+      min-width: 200px;
+      width:max-content;
+      box-shadow: 2px 2px 5px #00000033;
       margin:0;
       transition-duration: 0.5s;
-      padding-right: 1em;
+      background: #f0f0f0;
       & > a {
         padding: 1em 1.5em;
       }
@@ -261,9 +405,7 @@
 
     & > li {
       position: relative;
-      padding-top: 1em;
-      padding-left: 0;
-          list-style: none;
+      padding: 1em;
       // & + li {
       //   border-top: 0.0625em solid lighten($theme-gray, 5%);
       // }
@@ -272,23 +414,25 @@
         display: block;
         font-family: $main-font;
         font-weight: 600;
-        color: #fff;
+        color: #686868;
         font-size: 1.1em;
-        @media(max-width: 768px){
-          color: $theme-color-main;
-        }
       }
 
       &:hover {
-        // background-text-decoration: revert;
-        & > a {
-          text-decoration: revert;
-          color: $theme-color-second;
+/*        background-color: $theme-color-second;*/
+        @media(max-width: 769px){
+          a,i {
+           color:$theme-color-second;
+         }
+        }
+         &>a {
+          color:$theme-color-second;
         }
       }
     }
 
     @media (min-width: $screen-sm) {
+      position: absolute;
 
       & > li {
         & > a {
@@ -297,7 +441,8 @@
 
         &:hover {
           .modules-menu-level-2 {
-
+            display: block;
+            position: absolute;
           }
         }
       }
@@ -308,35 +453,35 @@
     margin: 0;
     padding: 0;
     list-style: none;
+    display: none;
 
     & > li {
       & + li {
-        list-style: none;
         // border-top: 0.0625em solid lighten($theme-gray, 5%);
       }
 
       & > a {
         display: block;
-        color:#fff;
+        font-family: $main-font;
+        color:#686868;
         font-weight: 500;
         font-weight: bold;
-        padding-top: 1em;
-        @media(max-width: 768px){
-          color: $theme-color-main;
-        }
       }
       &:hover {
         a{
           transition: all 0.3s ease-in-out;
-          text-decoration: revert;
-          margin-left: 0.5rem;
           color: $theme-color-second;
+          margin-left: 0.5rem;
         }
       }
     }
 
     @media (min-width: $screen-sm) {
-
+      top: 0;
+      left: 100%;
+      background-color: #dbdbdb;
+      position: absolute;
+      min-width: 150px;
     }
   }
 }
@@ -362,14 +507,7 @@
     padding: 0;
   }
 }
-.navbar-toggle{
-  @media(min-width: 769px){
-    margin-top: 1em;
-    right:6%;
-    position: absolute;
-    display: block;
-  }
-}
+
 //mobile
 .mobile-menu {
   z-index: 1051;
@@ -385,57 +523,30 @@
   }
 
   .modules-menu {
-    width: 100%;
+    width: 80%;
     position: absolute;
     right: 0;
-    background: #222222a6;
+    background: #ffffff;
     height: 100%;
-    top: 40px;
-    padding-top: 0;
-    @media(max-width: 768px){
-      width: 80%;
-      position: absolute;
-      right: 0;
-      background: #ffffff;
-      height: 100%;
-      top: 0;
-      padding-top: 40px;
-    }
+    top: 0;
+    padding-top: 40px;
   }
   .modules-menu .modules-menu-level-0 > li > a, .modules-menu .modules-menu-level-0 ,.modules-menu .modules-menu-level-0 > li {
     font-weight:bold;
   }
 .menu-drop{
-  font-size: 10px ;
+
 }
   .navbar-toggle {
-
-    @media(max-width: 768px){
-      display: block!important;
-      position: absolute;
-      left: 0;
-      background: transparent;
-      top: 40px;
-      z-index: 1;
-      height: 100vh;
-      margin: 0;
-      width: 20%;
-      border: 0;
-    }
-    @media(min-width: 769px){
-      position: absolute;
-      right: 3%;
-      background: transparent;
-      top: 3.5em;
-      z-index: 11111;
-      height: 40px;
-      margin: 0;
-      border: 0;
-      -webkit-transition: -webkit-transform 0.3s;
-      transition: -webkit-transform 0.3s;
-      transition: transform 0.3s;
-      transition: transform 0.3s, -webkit-transform 0.3s;
-    }
+    position: absolute;
+    left: 0;
+    background: transparent;
+    top: 40px;
+    z-index: 1;
+    height: 100vh;
+    margin: 0;
+    width: 20%;
+    border: 0;
   }
   .cover {
     position: fixed;
@@ -464,20 +575,20 @@
   transition-property:transform;
 }
 .mobile-menu .modules-menu.collapse.in {
-  transform: translateX(100%);
-  -webkit-transition-timing-function: ease;
-  -o-transition-timing-function: ease;
-  transition-timing-function: ease;
-  -webkit-transition-duration: .35s;
-  -o-transition-duration: .35s;
-  transition-duration: .35s;
-  -webkit-transition-property: transform;
-  -o-transition-property: transform;
-  transition-property: transform;
+  transform: translateX(0%);
+  -webkit-transition-timing-function:ease;
+  -o-transition-timing-function:ease;
+  transition-timing-function:ease;
+  -webkit-transition-duration:.35s;
+  -o-transition-duration:.35s;
+  transition-duration:.35s;
+  -webkit-transition-property:transform;
+  -o-transition-property:transform;
+  transition-property:transform;
 }
 
 .mobile-menu .collapse.navbar-collapse.modules-menu {
-  transform: translateX(0%);
+      overflow-y: scroll;
 }
 .display-on{
    display:block!important;
@@ -494,7 +605,7 @@
     align-self: center;
     margin-left: 10px;
     z-index: 999;
-    @media(max-width: 768px){
+    @media(max-width: 769px){
       position: absolute;
       right: 0.3em;
       width: 2.5em;
@@ -517,26 +628,23 @@
   display: block!important;
   visibility: visible!important;
 }
-.mobile-menu .collapse.navbar-collapse.modules-menu{
-  @media(min-width: 769px){
-    // overflow-y: scroll !important;
-    height: 100% !important;
-    padding: 0;
+.mobile-menu2{
+  &>a{
+      padding-right: 1em;
+  }
+  .menu-drop{
+    top: 0.6em!important;
   }
 }
-.mobile-menu1{
-  @media(min-width: 769px){
-    &>.menu-drop{
-      display: none;
+html[lang="en"]{
+  .modules-menu .modules-menu-level-0{
+    @media (min-width: 1025px){
+      width: 50%;
+    }
+  }
+  .modules-menu-level-1{
+    @media(min-width:769px){
+      min-width: 220px!important;
     }
   }
 }
-.navbar-toggle0{
-  @media(min-width: 769px){
-    position: absolute;
-    right: 0;
-    .navbar-toggle{
-      transform: translateX(-100%);
-    }
-  }
-}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss
index f648323..0df16c3 100644
--- a/assets/stylesheets/template/modules/universal-table.scss
+++ b/assets/stylesheets/template/modules/universal-table.scss
@@ -1,6 +1,7 @@
 @charset "utf-8";
 
 @import "../initial";
+
 .universal-table-index tbody{
   width:100% ;
 }
@@ -104,6 +105,7 @@
   @media(max-width: $screen-xs){
     margin-top: 0.5em;
     right:0;
+    top:-4em;
   }
   .searchbtn2, .universal-btn {
     line-height: 2em;
@@ -166,7 +168,6 @@
     display: flex;
     flex-wrap: wrap;
     padding: 0;
-    margin-top: 3em;
   }
 
   .row > div {
@@ -329,3 +330,41 @@
     }
   }
 }
+@media (max-width: 768px) {
+  #hashtag-wordcloud {
+    width: 800px!important;
+    height: 500px!important;
+  }
+
+  /* 讓外層容器可以左右滑動 */
+  #hashtag-wordcloud-wrapper {
+    overflow-x: auto;
+    width: 100%;
+  }
+}
+#hashtag-wordcloud{
+      margin-top: 1.5em;
+      position: relative;
+      margin:1.5em auto; 
+      width: 80%;
+      height:400px;  
+      overflow: hidden;
+  a{   
+    border-radius: 0.5em;
+    padding: 0.2em;
+    &:hover{
+      -webkit-transform: translateY(-6px);
+    -ms-transform: translateY(-6px);
+    transform: translateY(-6px);
+    box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033;
+    -webkit-box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033;
+        -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+    filter: brightness(0.4) saturate(1.3);
+    transform: scale(1.1);
+    }
+  }
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss
index b697e7c..dcf46e8 100644
--- a/assets/stylesheets/template/modules/video.scss
+++ b/assets/stylesheets/template/modules/video.scss
@@ -963,4 +963,7 @@
         background-color: #1515154d;
       }
     }
-}
\ No newline at end of file
+}
+// .wordcloud-link{
+//   font-size: 1.2em;
+// }
\ No newline at end of file
diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss
index d0325c2..bfb9f68 100644
--- a/assets/stylesheets/template/widget/sitemenu.scss
+++ b/assets/stylesheets/template/widget/sitemenu.scss
@@ -5,10 +5,15 @@
   z-index: 1;
   position: relative;
 }
+.sitemenu-title{
+  @extend .unity-title;
+}
 .sitemenu-wrap{
   // padding-right: 0.9375em!important;
   // padding-left: 0.9375em!important;
   margin-bottom: 1em;
+  z-index: 1;
+  position: relative;
 }
 .sitemenu-item{
       list-style: none;
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index b0b0939..8135e52 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -53,7 +53,7 @@
     </li>
   </ul>
 </div>
-<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <!-- <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/announcement/_annc_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb
index cfd29dd..93e4023 100644
--- a/modules/announcement/_annc_widget19.html.erb
+++ b/modules/announcement/_annc_widget19.html.erb
@@ -49,7 +49,7 @@
     </li>
   </ul>
 </div>
-<!-- <script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<!-- <script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/announcement/_annc_widget22.html.erb b/modules/announcement/_annc_widget22.html.erb
index 7632cac..fa3b1c7 100644
--- a/modules/announcement/_annc_widget22.html.erb
+++ b/modules/announcement/_annc_widget22.html.erb
@@ -41,7 +41,7 @@
     </li>
   </ul>
 </div>
-<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/announcement/annc_index1.html.erb b/modules/announcement/annc_index1.html.erb
index d1070d2..c245d9d 100644
--- a/modules/announcement/annc_index1.html.erb
+++ b/modules/announcement/annc_index1.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-1">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item  row">
         <span class="i-annc__category-wrap  col-sm-2">
diff --git a/modules/announcement/annc_index10.html.erb b/modules/announcement/annc_index10.html.erb
index 639ae09..30c0a2f 100644
--- a/modules/announcement/annc_index10.html.erb
+++ b/modules/announcement/annc_index10.html.erb
@@ -1,7 +1,7 @@
 <div class="i-annc index-eventnews-10">
 
 
-<h3 class="i-annc__page-title">{{page-title}}</h3>
+  <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
 
     <div class="VivaTimeline">
         <dl>
diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb
index 247ae11..bb7f002 100644
--- a/modules/announcement/annc_index11.html.erb
+++ b/modules/announcement/annc_index11.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-announcement-11 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb
index 11fd986..93b478e 100644
--- a/modules/announcement/annc_index12.html.erb
+++ b/modules/announcement/annc_index12.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-announcement-12 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index13.html.erb b/modules/announcement/annc_index13.html.erb
index 4c18442..6c508bc 100644
--- a/modules/announcement/annc_index13.html.erb
+++ b/modules/announcement/annc_index13.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-13 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index14.html.erb b/modules/announcement/annc_index14.html.erb
index f3379e4..bfdbd78 100644
--- a/modules/announcement/annc_index14.html.erb
+++ b/modules/announcement/annc_index14.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-announcement-14 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb
index 8ec70c0..1d757b3 100644
--- a/modules/announcement/annc_index15.html.erb
+++ b/modules/announcement/annc_index15.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-announcement-15 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb
index 22406ee..317b1c0 100644
--- a/modules/announcement/annc_index16.html.erb
+++ b/modules/announcement/annc_index16.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-announcement-16 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped dt-responsive">
     <thead>
       <tr>
diff --git a/modules/announcement/annc_index18.html.erb b/modules/announcement/annc_index18.html.erb
index 6a85713..778bb74 100644
--- a/modules/announcement/annc_index18.html.erb
+++ b/modules/announcement/annc_index18.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-18">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item rotate0">
     <div class="i-annc__img-wrap bullseye">
diff --git a/modules/announcement/annc_index19.html.erb b/modules/announcement/annc_index19.html.erb
index 6821c32..36690e9 100644
--- a/modules/announcement/annc_index19.html.erb
+++ b/modules/announcement/annc_index19.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-19">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item col-md-3 col-sm-3">
     <a  href="{{link_to_show}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/announcement/annc_index2.html.erb b/modules/announcement/annc_index2.html.erb
index 4297cd1..5863ccb 100644
--- a/modules/announcement/annc_index2.html.erb
+++ b/modules/announcement/annc_index2.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-2">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item  row">
         <span class="i-annc__postdate-wrap  col-sm-2" date-format="%Y-%m/%d">
diff --git a/modules/announcement/annc_index20.html.erb b/modules/announcement/annc_index20.html.erb
index 26d1d38..300c7bc 100644
--- a/modules/announcement/annc_index20.html.erb
+++ b/modules/announcement/annc_index20.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-20">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item">
     <div class="i-annc__content-wrap">
diff --git a/modules/announcement/annc_index21.html.erb b/modules/announcement/annc_index21.html.erb
index 2a45524..834e6f4 100644
--- a/modules/announcement/annc_index21.html.erb
+++ b/modules/announcement/annc_index21.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-21">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item">
     <div class="i-annc__content-wrap">
diff --git a/modules/announcement/annc_index3.html.erb b/modules/announcement/annc_index3.html.erb
index 803c38d..73e6ee9 100644
--- a/modules/announcement/annc_index3.html.erb
+++ b/modules/announcement/annc_index3.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-3">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item  row">
         <h4 class="i-annc__entry-title  col-sm-9">
diff --git a/modules/announcement/annc_index4.html.erb b/modules/announcement/annc_index4.html.erb
index df13df5..13f3b6a 100644
--- a/modules/announcement/annc_index4.html.erb
+++ b/modules/announcement/annc_index4.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-4">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item  row">
         <span class="i-annc__postdate-wrap  col-sm-3" date-format="%Y-%m/%d">
diff --git a/modules/announcement/annc_index5.html.erb b/modules/announcement/annc_index5.html.erb
index 8e8a03d..b5a5586 100644
--- a/modules/announcement/annc_index5.html.erb
+++ b/modules/announcement/annc_index5.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-5">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item row">
      <a  href="{{link_to_show}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/announcement/annc_index6.html.erb b/modules/announcement/annc_index6.html.erb
index 395e45e..a093928 100644
--- a/modules/announcement/annc_index6.html.erb
+++ b/modules/announcement/annc_index6.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-6">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="announcements">
     <li class="i-annc__item row">
     <a  href="{{link_to_show}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/announcement/annc_index7.html.erb b/modules/announcement/annc_index7.html.erb
index 808ff38..8dfc394 100644
--- a/modules/announcement/annc_index7.html.erb
+++ b/modules/announcement/annc_index7.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-7">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item col-md-4 col-sm-4">
     <a href="{{link_to_show}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/announcement/annc_index8.html.erb b/modules/announcement/annc_index8.html.erb
index 1a0a51b..80cefdc 100644
--- a/modules/announcement/annc_index8.html.erb
+++ b/modules/announcement/annc_index8.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-8">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item">
     <div class="i-annc__content-wrap">
diff --git a/modules/announcement/annc_index9.html.erb b/modules/announcement/annc_index9.html.erb
index 4eb083b..6ebb8e8 100644
--- a/modules/announcement/annc_index9.html.erb
+++ b/modules/announcement/annc_index9.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-9">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="announcements">
     <li class="i-annc__item">
     <div class="i-annc__content-wrap">
diff --git a/modules/custom_announcement/_annc_widget15.html.erb b/modules/custom_announcement/_annc_widget15.html.erb
index 7d7dc70..f51bfe8 100644
--- a/modules/custom_announcement/_annc_widget15.html.erb
+++ b/modules/custom_announcement/_annc_widget15.html.erb
@@ -36,7 +36,7 @@
     </li>
   </ul>
 </div>
-<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/custom_announcement/annc_index7.html.erb b/modules/custom_announcement/annc_index7.html.erb
index b731bc9..423abcb 100644
--- a/modules/custom_announcement/annc_index7.html.erb
+++ b/modules/custom_announcement/annc_index7.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-announcement-7">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="custom_announcements">
     <li class="i-annc__item  col-md-4">
     <div class="i-annc__img-wrap bullseye">
diff --git a/modules/event_news_mod/_event_news_widget15.html.erb b/modules/event_news_mod/_event_news_widget15.html.erb
index 1f13ed4..33eb9d3 100644
--- a/modules/event_news_mod/_event_news_widget15.html.erb
+++ b/modules/event_news_mod/_event_news_widget15.html.erb
@@ -54,7 +54,7 @@
   <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= t("event_news.more") %></a>
 </div>
 </div>
-<!-- <script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<!-- <script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/event_news_mod/_event_news_widget22.html.erb b/modules/event_news_mod/_event_news_widget22.html.erb
index 3968a36..b66f82c 100644
--- a/modules/event_news_mod/_event_news_widget22.html.erb
+++ b/modules/event_news_mod/_event_news_widget22.html.erb
@@ -46,7 +46,7 @@
     </li>
   </ul>
 </div>
-<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
diff --git a/modules/event_news_mod/event_news_index1.html.erb b/modules/event_news_mod/event_news_index1.html.erb
index 132646a..bb01d57 100644
--- a/modules/event_news_mod/event_news_index1.html.erb
+++ b/modules/event_news_mod/event_news_index1.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-1 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index10.html.erb b/modules/event_news_mod/event_news_index10.html.erb
index c2653d8..47d086d 100644
--- a/modules/event_news_mod/event_news_index10.html.erb
+++ b/modules/event_news_mod/event_news_index10.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-10">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item  row">
         <span class="i-annc__postdate-wrap  col-sm-2" date-format="%Y-%m-%d">
diff --git a/modules/event_news_mod/event_news_index11.html.erb b/modules/event_news_mod/event_news_index11.html.erb
index 9aacd56..cb8a51c 100644
--- a/modules/event_news_mod/event_news_index11.html.erb
+++ b/modules/event_news_mod/event_news_index11.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-11">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item  row">
         <h4 class="i-annc__entry-title  col-sm-9">
diff --git a/modules/event_news_mod/event_news_index12.html.erb b/modules/event_news_mod/event_news_index12.html.erb
index a440134..c66cfe6 100644
--- a/modules/event_news_mod/event_news_index12.html.erb
+++ b/modules/event_news_mod/event_news_index12.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-12">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item  row">
         <span class="i-annc__postdate-wrap  col-sm-3" date-format="%Y-%m-%d">
diff --git a/modules/event_news_mod/event_news_index14.html.erb b/modules/event_news_mod/event_news_index14.html.erb
index 6e25c8f..8bb6cfb 100644
--- a/modules/event_news_mod/event_news_index14.html.erb
+++ b/modules/event_news_mod/event_news_index14.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-14 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index15.html.erb b/modules/event_news_mod/event_news_index15.html.erb
index 5c496c4..16c2254 100644
--- a/modules/event_news_mod/event_news_index15.html.erb
+++ b/modules/event_news_mod/event_news_index15.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-15 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index16.html.erb b/modules/event_news_mod/event_news_index16.html.erb
index d326696..01960f0 100644
--- a/modules/event_news_mod/event_news_index16.html.erb
+++ b/modules/event_news_mod/event_news_index16.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-16 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index17.html.erb b/modules/event_news_mod/event_news_index17.html.erb
index 3aa8189..41db8b1 100644
--- a/modules/event_news_mod/event_news_index17.html.erb
+++ b/modules/event_news_mod/event_news_index17.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-1 index-eventnews-17{{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index18.html.erb b/modules/event_news_mod/event_news_index18.html.erb
index 8092083..3d8f110 100644
--- a/modules/event_news_mod/event_news_index18.html.erb
+++ b/modules/event_news_mod/event_news_index18.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-1 index-eventnews-18 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index19.html.erb b/modules/event_news_mod/event_news_index19.html.erb
index 36b5878..68574f1 100644
--- a/modules/event_news_mod/event_news_index19.html.erb
+++ b/modules/event_news_mod/event_news_index19.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-12 index-eventnews-19 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index2.html.erb b/modules/event_news_mod/event_news_index2.html.erb
index 5521400..c32d83d 100644
--- a/modules/event_news_mod/event_news_index2.html.erb
+++ b/modules/event_news_mod/event_news_index2.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-2 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index20.html.erb b/modules/event_news_mod/event_news_index20.html.erb
index e3d5499..5478af2 100644
--- a/modules/event_news_mod/event_news_index20.html.erb
+++ b/modules/event_news_mod/event_news_index20.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-12 index-eventnews-20 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index21.html.erb b/modules/event_news_mod/event_news_index21.html.erb
index 0d74504..fccd2d5 100644
--- a/modules/event_news_mod/event_news_index21.html.erb
+++ b/modules/event_news_mod/event_news_index21.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-21 event-widget-announcement-7">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="event_news">
     <li class="i-annc__item  col-md-4">
 	<a href="{{link_to_show}}">
@@ -73,12 +73,12 @@
 			reorganize(4);
 			num=1;
 		}
-		$('.i-annc__postdate').each(function () {
-			var text = $(this).text().trim();
-			if (text !== '') {
-			$(this).text('公視+線上看：' + text);
-			}
-		});
+		# $('.i-annc__postdate').each(function () {
+		# 	var text = $(this).text().trim();
+		# 	if (text !== '') {
+		# 	$(this).text('公視+線上看：' + text);
+		# 	}
+		# });
 	});
 	$(window).resize(function(){
 		if($(window).width()>1024){
diff --git a/modules/event_news_mod/event_news_index3.html.erb b/modules/event_news_mod/event_news_index3.html.erb
index 7b2cad4..3990134 100644
--- a/modules/event_news_mod/event_news_index3.html.erb
+++ b/modules/event_news_mod/event_news_index3.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-3 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index4.html.erb b/modules/event_news_mod/event_news_index4.html.erb
index d0234f1..9d7ede9 100644
--- a/modules/event_news_mod/event_news_index4.html.erb
+++ b/modules/event_news_mod/event_news_index4.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-eventnews-4 {{display}}">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/event_news_mod/event_news_index5.html.erb b/modules/event_news_mod/event_news_index5.html.erb
index 992b509..af2bce9 100644
--- a/modules/event_news_mod/event_news_index5.html.erb
+++ b/modules/event_news_mod/event_news_index5.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-5">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item row">
         <a href="{{link_to_show}}" title="{{img_description}}">
diff --git a/modules/event_news_mod/event_news_index6.html.erb b/modules/event_news_mod/event_news_index6.html.erb
index ffb79cc..4e9e440 100644
--- a/modules/event_news_mod/event_news_index6.html.erb
+++ b/modules/event_news_mod/event_news_index6.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-6">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item row">
      <a href="{{link_to_show}}" title="{{img_description}}">
diff --git a/modules/event_news_mod/event_news_index7.html.erb b/modules/event_news_mod/event_news_index7.html.erb
index 2c92cf1..fc35668 100644
--- a/modules/event_news_mod/event_news_index7.html.erb
+++ b/modules/event_news_mod/event_news_index7.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-7 event-widget-announcement-7">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="event_news">
     <li class="i-annc__item  col-md-4">
 	<a href="{{link_to_show}}" title="{{img_description}}">
diff --git a/modules/event_news_mod/event_news_index8.html.erb b/modules/event_news_mod/event_news_index8.html.erb
index 01ac63b..7803260 100644
--- a/modules/event_news_mod/event_news_index8.html.erb
+++ b/modules/event_news_mod/event_news_index8.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-8">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="event_news">
     <li class="i-annc__item">
     <div class="i-annc__content-wrap">
diff --git a/modules/event_news_mod/event_news_index9.html.erb b/modules/event_news_mod/event_news_index9.html.erb
index 305c868..18177ff 100644
--- a/modules/event_news_mod/event_news_index9.html.erb
+++ b/modules/event_news_mod/event_news_index9.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-eventnews-9">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="event_news">
     <li class="i-annc__item  row">
       <div class="i-annc__content-wrap">
diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb
index ea66f67..6e49b1e 100644
--- a/modules/member/show.html.erb
+++ b/modules/member/show.html.erb
@@ -6,7 +6,10 @@
     <div class="member-data col-xs-9">
       <table class="table table-striped">
         <div data-list="profile_data" data-level="0">
-          <tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
+          <tr class="row">
+            <th class="{{title_class}} col-sm-2">{{title}}</th>
+            <td class="{{value_class}} col-sm-10">{{value}}</td>
+          </tr>
         </div>
       </table>
     </div>
@@ -87,5 +90,11 @@ $('.tab-pane table').each(function(){
       autoWidth: false
     });
   }
-});;
+});
+
+$(document).ready(function () {
+  $('.member-data-value-5 a').each(function () {
+    $(this).replaceWith($(this).html()); // 把<a>替換成它裡面的內容
+  });
+});
 </script>
diff --git a/modules/personal_journal/index.html.erb b/modules/personal_journal/index.html.erb
index 310fed8..32a6804 100644
--- a/modules/personal_journal/index.html.erb
+++ b/modules/personal_journal/index.html.erb
@@ -1,8 +1,29 @@
+<style>
+
+@media(min-width:500px){
+  [data-list="headers"] th:first-child {
+    width: 5em;       
+    max-width: 5em;
+    white-space: nowrap;
+  }
+
+
+  [data-list="journal_papers"] td:first-child {
+    width: 5em;
+    max-width: 5em;
+    white-space: nowrap;
+  }
+}
+.breadcrumb{
+      padding-left: 0;
+}
+</style>
+
 <table class="table table-hover table-striped projects-index">
-  <caption><h3>{{widget-title}}</h3></caption>
+  <caption><h3 class="journal-title">{{widget-title}}</h3></caption>
   <thead>
     <tr data-level="0" data-list="headers">
-      <th class="col-md-{{col}}">{{head-title}}</th>
+      <th class="">{{head-title}}</th>
     </tr>
   </thead>
   <tbody data-level="0" data-list="journal_papers">
diff --git a/modules/personal_journal/index_search1.html.erb b/modules/personal_journal/index_search1.html.erb
index c4f71a1..68466c3 100644
--- a/modules/personal_journal/index_search1.html.erb
+++ b/modules/personal_journal/index_search1.html.erb
@@ -8,7 +8,27 @@ $( ".selectbox" ).ready(function() {
   }
 });
 </script>
-<h3>{{widget-title}}</h3>
+<style>
+
+@media(min-width:500px){
+  [data-list="headers"] th:first-child {
+    width: 5em;       
+    max-width: 5em;
+    white-space: nowrap;
+  }
+
+
+  [data-list="journal_papers"] td:first-child {
+    width: 5em;
+    max-width: 5em;
+    white-space: nowrap;
+  }
+}
+.breadcrumb{
+      padding-left: 0;
+}
+</style>
+<h3 class="journal-title">{{widget-title}}</h3>
 <div class="search-widget">
   <form action="{{url}}"  method="get">
     <input type="hidden" name="authenticity_token" value="{{csrf_value}}">
diff --git a/modules/publication/publications_index1.html.erb b/modules/publication/publications_index1.html.erb
index aae30f9..7446657 100644
--- a/modules/publication/publications_index1.html.erb
+++ b/modules/publication/publications_index1.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc  index-publications-1">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <table class="i-annc__table  table  table-striped">
     <thead>
       <tr>
diff --git a/modules/publication/publications_index2.html.erb b/modules/publication/publications_index2.html.erb
index 77028d8..b4c7345 100644
--- a/modules/publication/publications_index2.html.erb
+++ b/modules/publication/publications_index2.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-publications-2">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list" data-level="0" data-list="publications">
     <li class="i-annc__item row">
       <div class="i-annc__img-wrap col-sm-4">
diff --git a/modules/publication/publications_index3.html.erb b/modules/publication/publications_index3.html.erb
index 2b09968..6656d81 100644
--- a/modules/publication/publications_index3.html.erb
+++ b/modules/publication/publications_index3.html.erb
@@ -1,5 +1,5 @@
 <div class="i-annc index-publications-3">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="i-annc__list  row" data-level="0" data-list="publications">
     <li class="i-annc__item  col-md-4">
       <a  href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}">
diff --git a/modules/universal_table/_tag_cloud.html.erb b/modules/universal_table/_tag_cloud.html.erb
new file mode 100644
index 0000000..3978ab5
--- /dev/null
+++ b/modules/universal_table/_tag_cloud.html.erb
@@ -0,0 +1,112 @@
+<ul id="hashtag-list" data-list="hashtags" data-level="0" style="display:none;">
+  <li class="tag-weight-{{count}}"><a href="{{url_to_show}}" title="{{title}}">#{{title}}</a></li>
+</ul>
+<div id="hashtag-wordcloud-wrapper">
+<div id="hashtag-wordcloud" style="  "></div>
+</div>
+
+<script>
+function generateWordCloud() {
+  const container = $('#hashtag-wordcloud');
+  const containerWidth = container.width();
+  const containerHeight = container.height();
+  const placedRects = [];
+
+  function isOverlap(r1, r2, padding = 4) {
+    return !(r2.left > r1.right + padding ||
+             r2.right < r1.left - padding ||
+             r2.top > r1.bottom + padding ||
+             r2.bottom < r1.top - padding);
+  }
+
+  function hasCollision(rect) {
+    return placedRects.some(r => isOverlap(r, rect));
+  }
+
+  function getRandomColor() {
+    const hue = Math.floor(Math.random() * 360);
+    const saturation = Math.floor(Math.random() * 20) + 10;
+    const lightness = Math.floor(Math.random() * 20) + 45;
+    return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
+  }
+
+  container.empty();
+
+  $('#hashtag-list li').each(function () {
+    const $li = $(this);
+    const weightClass = $li.attr('class');
+    const weightMatch = weightClass.match(/tag-weight-(\d+)/);
+    const weight = weightMatch ? parseInt(weightMatch[1], 10) : 1;
+
+    const $a = $li.find('a');
+    let text = $a.text();
+    if (text.startsWith('#')) {
+      text = text.substring(1);
+    }
+    const href = $a.attr('href');
+    const title = $a.attr('title');
+
+    const fontSize = Math.min(36, Math.max(16, weight / 100 * 36));
+
+    const $word = $('<a></a>')
+      .attr('href', href)
+      .attr('title', title)
+      .text(text)
+      .css({
+        position: 'absolute',
+        fontSize: fontSize + 'px',
+        color: getRandomColor(),
+        whiteSpace: 'nowrap',
+        cursor: 'pointer',
+        userSelect: 'none',
+        textDecoration: 'none',
+        visibility: 'hidden',
+        display: 'inline-block'
+      });
+
+    container.append($word);
+
+    const width = $word.outerWidth();
+    const height = $word.outerHeight();
+
+    let maxAttempts = 1000;
+    let placed = false;
+
+    while (!placed && maxAttempts > 0) {
+      const left = Math.random() * (containerWidth - width);
+      const top = Math.random() * (containerHeight - height);
+
+      const rect = {
+        left: left,
+        top: top,
+        right: left + width,
+        bottom: top + height
+      };
+
+      if (!hasCollision(rect)) {
+        $word.css({
+          left: left + 'px',
+          top: top + 'px',
+          visibility: 'visible'
+        });
+        placedRects.push(rect);
+        placed = true;
+      }
+      maxAttempts--;
+    }
+
+    if (!placed) {
+      $word.remove(); // 放不下就不強塞
+    }
+  });
+}
+
+$(function() {
+  generateWordCloud();
+
+  // RWD時重新生成文字雲
+  $(window).on('resize', function() {
+    generateWordCloud();
+  });
+});
+</script>
diff --git a/modules/universal_table/info.json b/modules/universal_table/info.json
index 3a6438a..99d7285 100644
--- a/modules/universal_table/info.json
+++ b/modules/universal_table/info.json
@@ -34,5 +34,15 @@
               "thumbnail" : "thumb.png",
               "default": true
             }
+    ],
+    "widgets" : [
+        {
+            "filename" : "tag_cloud",
+            "name" : {
+                "zh_tw" : "0. Tag Cloud",
+                "en" : "0. Tag Cloud"
+                },
+            "thumbnail" : "_tag_cloud_thumb.png"
+        }
     ]
 }
diff --git a/modules/video_pro/_video_pro_widget_jqcloud1.html.erb b/modules/video_pro/_video_pro_widget_jqcloud1.html.erb
index 3544d03..d8211ef 100644
--- a/modules/video_pro/_video_pro_widget_jqcloud1.html.erb
+++ b/modules/video_pro/_video_pro_widget_jqcloud1.html.erb
@@ -20,7 +20,7 @@
     container_{{subpart-id}}.on('wordcloudstop', function (e) {
       $(this).children('span').each(function (i, v) {
         var text = $(this).html();
-        $(this).html('<a title="'+ list_{{subpart-id}}[i][0] + '" style="color: inherit" href="' + list_{{subpart-id}}[i][2]  +'">' + text + '</a>');
+        $(this).html('<a class="wordcloud-link" title="'+ list_{{subpart-id}}[i][0] + '" style="color: inherit" href="' + list_{{subpart-id}}[i][2]  +'">' + text + '</a>');
       });
     });
     function wordCloud_{{subpart-id}}(){
@@ -30,7 +30,7 @@
       WordCloud(container_{{subpart-id}}[0], {
         list: list_{{subpart-id}},
         gridSize: 3,
-        weightFactor: jqcloud_words_{{subpart-id}}.length * Math.min(width, 1200) / 770,
+        weightFactor: jqcloud_words_{{subpart-id}}.length * Math.min(width, 1200) / 770 * 1.5,
         rotateRatio: 0,
         shuffle: false,
         drawOutOfBound: false,
diff --git a/modules/video_pro/info.json b/modules/video_pro/info.json
index 7810abe..dbface8 100644
--- a/modules/video_pro/info.json
+++ b/modules/video_pro/info.json
@@ -7,7 +7,7 @@
                 "zh_tw" : "1. 影片列表1 ( 縮圖, 影片資訊, 頁面連結)",
                 "en" : "1. Video List 1 ( snapshot, video info, page link)"
                 },
-            "thumbnail" : "thumb.png"
+            "thumbnail" : "video_pro_widget1_thumb.png"
         },
         {
             "filename" : "video_pro_widget2",
@@ -16,7 +16,7 @@
                 "zh_tw" : "2. 影片列表2 ( 縮圖, 影片資訊, 頁面連結)",
                 "en" : "2. Video List 2 ( snapshot, video info, page link)"
                 },
-            "thumbnail" : "thumb.png"
+            "thumbnail" : "video_pro_widget2_thumb.png"
         },
         {
             "filename" : "video_pro_widget3",
@@ -25,16 +25,16 @@
                 "zh_tw" : "3. 影片列表倫波 ( 縮圖, 影片資訊, 頁面連結)",
                 "en" : "3.carousel-Video List  ( snapshot, video info, page link)"
                 },
-            "thumbnail" : "thumb.png"
+            "thumbnail" : "video_pro_widget3_thumb.png"
         },
         {
-                "filename" : "video_pro_widget4",
-                "force_cover": "true",
-                "name" : {
-                    "zh_tw" : "4. 四欄影片列表 ( 縮圖, 影片資訊, 頁面連結)",
-                    "en" : "4. 4col-Video List 1 ( snapshot, video info, page link)"
-                    },
-                "thumbnail" : "thumb.png"
+            "filename" : "video_pro_widget4",
+            "force_cover": "true",
+            "name" : {
+                 "zh_tw" : "4. 四欄影片列表 ( 縮圖, 影片資訊, 頁面連結)",
+                 "en" : "4. 4col-Video List 1 ( snapshot, video info, page link)"
+                 },
+            "thumbnail" : "video_pro_widget4_thumb.png"
          },
         {
             "filename" : "video_pro_widget5",
@@ -43,7 +43,7 @@
                 "zh_tw" : "5. 大圖影片列表倫波 ( 縮圖, 影片資訊, 頁面連結)",
                 "en" : "5.bigcarousel-Video List  ( snapshot, video info, page link)"
                 },
-            "thumbnail" : "thumb.png"
+            "thumbnail" : "video_pro_widget5_thumb"
         },
         {
             "filename" : "video_pro_widget_jqcloud1",
@@ -52,7 +52,7 @@
                 "zh_tw" : "2. 影片文字雲(標籤)",
                 "en" : "2. Video Word Cloud(tags)"
                 },
-            "thumbnail" : "thumb.png"
+            "thumbnail" : "video_pro_widget6_thumb"
         }
     ],
     "frontend" : [
diff --git a/modules/video_pro/thumbs/video_pro_widget1_thumb.png b/modules/video_pro/thumbs/video_pro_widget1_thumb.png
new file mode 100644
index 0000000..625dc97
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget1_thumb.png differ
diff --git a/modules/video_pro/thumbs/video_pro_widget2_thumb.png b/modules/video_pro/thumbs/video_pro_widget2_thumb.png
new file mode 100644
index 0000000..5c7bfb7
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget2_thumb.png differ
diff --git a/modules/video_pro/thumbs/video_pro_widget3_thumb.png b/modules/video_pro/thumbs/video_pro_widget3_thumb.png
new file mode 100644
index 0000000..a95a7b4
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget3_thumb.png differ
diff --git a/modules/video_pro/thumbs/video_pro_widget4_thumb.png b/modules/video_pro/thumbs/video_pro_widget4_thumb.png
new file mode 100644
index 0000000..44a2cb4
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget4_thumb.png differ
diff --git a/modules/video_pro/thumbs/video_pro_widget5_thumb.png b/modules/video_pro/thumbs/video_pro_widget5_thumb.png
new file mode 100644
index 0000000..0020450
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget5_thumb.png differ
diff --git a/modules/video_pro/thumbs/video_pro_widget6_thumb.png b/modules/video_pro/thumbs/video_pro_widget6_thumb.png
new file mode 100644
index 0000000..643edaa
Binary files /dev/null and b/modules/video_pro/thumbs/video_pro_widget6_thumb.png differ
diff --git a/modules/video_pro/video_pro_index1.html.erb b/modules/video_pro/video_pro_index1.html.erb
index b48457f..4f62214 100644
--- a/modules/video_pro/video_pro_index1.html.erb
+++ b/modules/video_pro/video_pro_index1.html.erb
@@ -1,5 +1,5 @@
 <div class="i-video_data video_data-index-1">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
     <li class="video_data col-sm-12 row" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="  video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
diff --git a/modules/video_pro/video_pro_index2.html.erb b/modules/video_pro/video_pro_index2.html.erb
index d659050..7c156fd 100644
--- a/modules/video_pro/video_pro_index2.html.erb
+++ b/modules/video_pro/video_pro_index2.html.erb
@@ -1,5 +1,5 @@
 <div class="i-video_data video_data-index-2">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <div class="video_filter_area col-sm-12">
     <form>
       <div class="category_box col-sm-6">
diff --git a/modules/video_pro/video_pro_index2_tag.html.erb b/modules/video_pro/video_pro_index2_tag.html.erb
index 0d0e6bc..10e6210 100644
--- a/modules/video_pro/video_pro_index2_tag.html.erb
+++ b/modules/video_pro/video_pro_index2_tag.html.erb
@@ -1,5 +1,5 @@
 <div class="i-video_data video_data-index-2">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <div class="video_filter_area col-sm-12">
     <form>
       <div class="category_box col-sm-6">
diff --git a/modules/video_pro/video_pro_index3.html.erb b/modules/video_pro/video_pro_index3.html.erb
index 948b9fd..3b652bb 100644
--- a/modules/video_pro/video_pro_index3.html.erb
+++ b/modules/video_pro/video_pro_index3.html.erb
@@ -12,7 +12,7 @@
       </div>
     </div>
   </div>
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
     <li class="video_data col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="video_link" href="javascript:void(0)" title="{{video_title_escape}}" data-api-url="{{api_url}}">
diff --git a/modules/video_pro/video_pro_index4.html.erb b/modules/video_pro/video_pro_index4.html.erb
index 87f4b76..0810517 100644
--- a/modules/video_pro/video_pro_index4.html.erb
+++ b/modules/video_pro/video_pro_index4.html.erb
@@ -1,5 +1,5 @@
 <div class="i-video_data video_data-index-4">
-  <h3 class="i-annc__page-title">{{page-title}}</h3>
+    <h3 class="i-annc__page-title"><span>{{page-title}}</span></h3>
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
     <li class="video_data col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
diff --git a/modules/web_resource/_web_res_widget3.html.erb b/modules/web_resource/_web_res_widget3.html.erb
index 51d8afc..f1d8004 100644
--- a/modules/web_resource/_web_res_widget3.html.erb
+++ b/modules/web_resource/_web_res_widget3.html.erb
@@ -34,7 +34,7 @@
     margin-top: 1em;
   }
 </style>
-<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="//code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
 <script>
 	function combineul_{{subpart-id}}(){
 		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.widget-link__list').parent();
diff --git a/widgets/site_menu_widget/_site_menu_widget1.html.erb b/widgets/site_menu_widget/_site_menu_widget1.html.erb
index c2eb989..9f45f32 100644
--- a/widgets/site_menu_widget/_site_menu_widget1.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget1.html.erb
@@ -1,7 +1,9 @@
 <div class="sitemenu-wrap sitemenu-horizontal no-print">
 	{{expand-script}}
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
-	<h3 class="sitemenu-title" aria-label="次選單標題">{{widget_title}}</h3>
+	<h3 class="sitemenu-title">
+		<span>{{widget_title}}</span>
+	</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
 		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb
index 9b1e28e..aa7d666 100644
--- a/widgets/site_menu_widget/_site_menu_widget2.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb
@@ -1,7 +1,9 @@
 <div class="sitemenu-wrap sitemenu-vertical no-print">
 	{{expand-script}}
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
-	<h3 class="sitemenu-title" aria-label="次選單標題">{{widget_title}}</h3>
+		<h3 class="sitemenu-title">
+		<span>{{widget_title}}</span>
+	</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
 		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
diff --git a/widgets/site_menu_widget/_site_menu_widget3.html.erb b/widgets/site_menu_widget/_site_menu_widget3.html.erb
index 18a2009..acdbfd0 100644
--- a/widgets/site_menu_widget/_site_menu_widget3.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget3.html.erb
@@ -1,7 +1,9 @@
 <div class="sitemenu-wrap sitemenu-vertical2 no-print">
 	{{expand-script}}
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
-	<h3 class="sitemenu-title" aria-label="次選單標題">{{widget_title}}</h3>
+		<h3 class="sitemenu-title">
+		<span>{{widget_title}}</span>
+	</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
 		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
diff --git a/widgets/site_menu_widget/_site_menu_widget4.html.erb b/widgets/site_menu_widget/_site_menu_widget4.html.erb
index 4764ee3..9c8b9fd 100644
--- a/widgets/site_menu_widget/_site_menu_widget4.html.erb
+++ b/widgets/site_menu_widget/_site_menu_widget4.html.erb
@@ -1,7 +1,9 @@
 <div class="sitemenu-wrap sitemenu4 no-print">
 	{{expand-script}}
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
-	<h3 class="sitemenu-title" aria-label="次選單標題">{{widget_title}}</h3>
+		<h3 class="sitemenu-title">
+		<span>{{widget_title}}</span>
+	</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
 		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>