diff --git a/app/templates/nccu/assets/stylesheets/template/base/_default.scss b/app/templates/nccu/assets/stylesheets/template/base/_default.scss
index df6d306..b26bdde 100644
--- a/app/templates/nccu/assets/stylesheets/template/base/_default.scss
+++ b/app/templates/nccu/assets/stylesheets/template/base/_default.scss
@@ -22,7 +22,6 @@ body {
 }
 
 h1, h2, h3, h4, h5, h6, label, legend {
-    font-family: Helvetica, Arial, sans-serif;
 }
 h3 {
     font-size: 18px;
@@ -3841,6 +3840,9 @@ img {
 .text-right {
     clear: both;
 }
+
+
+
 #main-content {
     padding-right: 20px;
     border-right: 1px solid #cfcfcf; 
diff --git a/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss b/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
index 858b30a..e30c502 100644
--- a/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
+++ b/app/templates/nccu/assets/stylesheets/template/modules/announcement.scss
@@ -223,16 +223,57 @@ $table-th-bgcolor: $theme-color-main;
         background-color: #e9e9e9;
     }
     td {
-        font-size: $w-table-td-font-size;
         border-bottom: 1px solid #d1d1d1;
         padding: 0.3rem;
-        font-size: 1.2em;
+        font-size: 15px;
+        font-family: Helvetica,Arial,sans-serif;
+        font-size: 0.9375rem;
     }
     .i-announcement__status {
         margin-bottom: 0.3rem;
     }
 }
 
+.i-tag-cloud {
+    margin: 0 0 20px;
+    min-height: 10px;
+    font-family: Helvetica,Arial,sans-serif;
+    line-height: 1.2;
+    .i-tag-cloud__widget-title {
+        border-bottom: 1px solid #7F7F7F;
+        font-size: 15px;
+        font: bold 0.9375rem/100% 微軟正黑體,新細明體,sans-serif;
+        margin: 0 0 10px;
+        padding: 0 0 10px 10px;
+    }
+    .hot1{
+        font-size: 21px;
+        font-size: 1.3125rem;
+    }
+    .hot2{
+        font-size: 18px;
+        font-size: 1.125rem;
+    }
+    .hot3{
+        font-size: 15px;
+        font-size: 0.9375rem;
+    }
+    .hot4{
+        font-size: 12px;
+        font-size: 0.75rem;
+    }
+    a {
+        color: #08C;
+    }
+    a:hover {
+        color: #005580;
+    }
+    .active {
+        background-color: #005580;
+        color: #FFF;
+    }
+}
+
 // Announcement SHOW
 .show-announcement {
     .show-title {
diff --git a/app/templates/nccu/assets/stylesheets/template/modules/news.scss b/app/templates/nccu/assets/stylesheets/template/modules/news.scss
index 6da7d3f..b423451 100644
--- a/app/templates/nccu/assets/stylesheets/template/modules/news.scss
+++ b/app/templates/nccu/assets/stylesheets/template/modules/news.scss
@@ -47,6 +47,8 @@
 }
 
 .i-category {
+    margin: 0 0 20px;
+    
     .i-category__widget-title {
         border-bottom: 1px solid #7F7F7F;
         font: bold 1.25em/100% 微軟正黑體,新細明體,sans-serif;
diff --git a/app/templates/nccu/modules/announcement/annc_index1.html.erb b/app/templates/nccu/modules/announcement/annc_index1.html.erb
index 068a146..5ef6f66 100644
--- a/app/templates/nccu/modules/announcement/annc_index1.html.erb
+++ b/app/templates/nccu/modules/announcement/annc_index1.html.erb
@@ -32,6 +32,13 @@
   </ul>   
  </div>
 
+<div class="i-tag-cloud">                                 
+    <h3 class="i-tag-cloud__widget-title">{{tag-cloud-title}}</h3> 
+    <div class="i-tag-cloud__list" data-level="0" data-list="tag-cloud">         
+            <a href="{{tag-link}}" class="{{tag-class}}">{{tag-name}}</a>
+    </div>                          
+</div>
+
   <script type="text/javascript">
   function submitform()
   {
diff --git a/app/templates/nccu/modules/announcement/annc_index2.html.erb b/app/templates/nccu/modules/announcement/annc_index2.html.erb
new file mode 100644
index 0000000..45f28be
--- /dev/null
+++ b/app/templates/nccu/modules/announcement/annc_index2.html.erb
@@ -0,0 +1,34 @@
+<!--
+    Announcement index-2
+    Fields: widget-title, date-head, title-head, postdate, title, pagination
+ -->
+<div class="i-announcement  annc-index-2  i-announcement--table">
+  <h3 class="i-announcement__widget-title">{{widget-title}}</h3>
+  <span class="search-result">搜尋標題有關 ' {{keyword}} ' 共搜尋到{{announcements_count}}筆資料</span>
+  <table class="i-announcement__table">
+    <tbody class="i-announcement__tbody" data-level="0" data-list="announcements">
+      <tr>
+        <td>
+          <a class="i-announcement__link  i-announcement__td--link" href="{{link_to_show}}">{{title}}</a>
+        </td>
+        <td>
+          <span class="i-announcement__date  i-announcement__td--postdate" date-format="%Y-%m-%d">{{postdate}}</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+{{pagination_goes_here}}
+<div class="i-sidebar">
+
+  <script type="text/javascript">
+  function submitform()
+  {
+      document.forms["myform"].submit();
+  }
+  </script>
+  <form class="i-search" action="../announcement/" id="myform">
+    <input class="i-search__text-field" name="keywords" placeholder="搜尋公告" type="text" value="" />
+      <a class="i-search__submit" href="javascript: submitform()"><input type="submit" value="Search" /></a>
+  </form>
+</div>
\ No newline at end of file
diff --git a/app/templates/nccu/modules/announcement/info.json b/app/templates/nccu/modules/announcement/info.json
index ff56833..89cda6c 100644
--- a/app/templates/nccu/modules/announcement/info.json
+++ b/app/templates/nccu/modules/announcement/info.json
@@ -3,11 +3,19 @@
 		{
 			"filename" : "annc_index1",
 			"name" : {
-				"zh_tw" : "1. 純文字無圖片 ( 模組標題, 日期, 標題 )",
-				"en" : "1. Text without image (widget-title, postdate, title)"
+				"zh_tw" : "1. 純文字無圖片 ( 模組標題, 日期, 標題, 類別 )",
+				"en" : "1. Text without image (widget-title, postdate, title, category)"
 				},
 			"thumbnail" : "thumbnail-block-list.png"
-		}
+		},
+        {
+            "filename" : "annc_index2",
+            "name" : {
+                "zh_tw" : "2. 純文字無圖片(招生公告專用) ( 模組標題, 日期, 標題 )",
+                "en" : "2. Text without image (widget-title, postdate, title)"
+                },
+            "thumbnail" : "thumbnail-block-list.png"
+        }
 	],
 	"widgets" : [
 		{
diff --git a/app/templates/nccu/modules/announcement/show.html.erb b/app/templates/nccu/modules/announcement/show.html.erb
index ad202b8..dca6065 100644
--- a/app/templates/nccu/modules/announcement/show.html.erb
+++ b/app/templates/nccu/modules/announcement/show.html.erb
@@ -11,12 +11,6 @@
           <i class="fa fa-male fa-fw"></i>
           <span class="author"><a href="{{dept_link}}">{{cache_dept}}</span></a>
     </li>
-    <li class="metadata-tags">
-      <i class="fa fa-tags fa-fw"></i>
-      <span data-list="tags" data-level="0">
-        <a href="{{url}}"><span class="tag">{{tag}}</span></a>
-      </span>
-    </li>
   </ul>
   <section class="post-section">
     <p class="post-content">{{body}}</p>
@@ -51,7 +45,12 @@
     </li>
   </ul>   
  </div>
-
+<div class="i-tag-cloud">                                 
+    <h3 class="i-tag-cloud__widget-title">{{tag-cloud-title}}</h3> 
+    <div class="i-tag-cloud__list" data-level="0" data-list="tag-cloud">         
+            <a href="{{tag-link}}" class="{{tag-class}}">{{tag-name}}</a>
+    </div>                          
+</div>
   <script type="text/javascript">
   function submitform()
   {