diff --git a/modules/announcement/_annc_widget17.html.erb b/modules/announcement/_annc_widget17.html.erb
index f6ab3de..01c1a98 100644
--- a/modules/announcement/_annc_widget17.html.erb
+++ b/modules/announcement/_annc_widget17.html.erb
@@ -128,7 +128,7 @@
 			num=1;
 		}
 	var flag=false;
-	$('.btn-left').click(function(){
+	$('[data-subpart-id=\"{{subpart-id}}\"] .btn-left').click(function(){
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
 			var ul_length = uls.length;
@@ -147,7 +147,7 @@
 			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){$("body").css("overflow-x","");flag=false;});
 		};
 	});
-	$('.btn-right').click(function(){
+	$('[data-subpart-id=\"{{subpart-id}}\"] .btn-right').click(function(){
 		var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length;
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb
new file mode 100644
index 0000000..f4ca0fd
--- /dev/null
+++ b/modules/text_marquee/_widget.html.erb
@@ -0,0 +1,31 @@
+<div class="marquee-1" module="text_marquee" data-ps="">
+	<ul class="marquee" data-level="0" data-list="texts">
+		<li>{{content}}</li>
+	</ul>
+</div>
+
+<script type="text/javascript">
+	(function(){
+		var main_div = $("div[data-subpart-id={{subpart-id}}]"),
+			total_texts = main_div.find("ul li").length - 1,
+			current_text = 0,
+			last_text = 0,
+			speed = 3000;
+		main_div.find("ul li").hide();
+		function textTransform(){
+			current_text = (current_text > total_texts ? 0 : current_text);
+			last_text = (current_text == 0 ? total_texts : current_text - 1);
+			speed = main_div.find("ul li").eq(current_text).find("> a").eq(0).attr('speed');
+			main_div.find("ul li").eq(last_text).stop(true, true).slideUp({duration: 500, queue: true});
+			main_div.find("ul li").eq(current_text).stop(true, true).slideDown({duration: 500, queue: true});
+			current_text++;
+			if(total_texts > 0){
+				if(window["{{subpart-id}}_time_out_id"])
+					clearTimeout(window["{{subpart-id}}_time_out_id"]);
+				window["{{subpart-id}}_time_out_id"] = setTimeout(textTransform,speed);
+			}
+			return;
+		}
+		textTransform();
+	})();
+</script>
diff --git a/modules/text_marquee/info.json b/modules/text_marquee/info.json
new file mode 100644
index 0000000..dc4f6df
--- /dev/null
+++ b/modules/text_marquee/info.json
@@ -0,0 +1,12 @@
+{
+    "widgets" : [
+        {
+            "filename" : "widget",
+            "name" : {
+                "zh_tw" : "跑馬燈",
+                "en" : "marquee"
+                },
+            "thumbnail" : "thumb.png"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/modules/text_marquee/thumbs/thumb.png b/modules/text_marquee/thumbs/thumb.png
new file mode 100644
index 0000000..266af56
Binary files /dev/null and b/modules/text_marquee/thumbs/thumb.png differ