diff --git a/contrib/tagger/main.php b/contrib/tagger/main.php
index 7551d607..fbad7e1c 100644
--- a/contrib/tagger/main.php
+++ b/contrib/tagger/main.php
@@ -1,26 +1,24 @@
-<?php 
-// author: Erik Youngren 
-// email: artanis.00@gmail.com 
-class tagger extends Extension { 
-	var $theme; 
-
-	public function receive_event ($event) { 
-		if(is_null($this->theme)) 
-			$this->theme = get_theme_object("tagger", "taggerTheme");    
-		if(is_a($event,"DisplayingImageEvent")) { 
-			//show tagger box 
-			global $database; 
-			global $page; 
-
-			$tags = $database->Execute(" 
-					SELECT tag 
-					FROM `tags` 
-					WHERE count > 1 
-					ORDER BY tag"); 
-
-			$this->theme->build($page, $tags); 
-		} 
-	} 
-} 
-add_event_listener(new tagger()); 
+<?php
+class tagger extends Extension {
+	var $theme;
+	
+	public function receive_event ($event) {
+		if(is_null($this->theme))
+			$this->theme = get_theme_object("tagger", "taggerTheme");	
+		if(is_a($event,"DisplayingImageEvent")) {
+			//show tagger box
+			global $database;
+			global $page;
+			
+			$tags = $database->Execute("
+				SELECT tag
+				FROM `tags`
+				WHERE count > 1 AND substring(tag,1,1) != '.'
+				ORDER BY tag");
+				
+				$this->theme->build($page, $tags);
+		}
+	}
+}
+add_event_listener( new tagger());
 ?>
diff --git a/contrib/tagger/script.js b/contrib/tagger/script.js
index 5bd59a01..364acc67 100644
--- a/contrib/tagger/script.js
+++ b/contrib/tagger/script.js
@@ -1,184 +1,189 @@
-function byId(id) { 
-	return document.getElementById(id); 
-} 
-
-function tagExists(tag) { 
-	var tags = byId("tags"); 
-	tags_list = tags.value; 
-	tags_array = tags_list.split(" "); 
-
-	tags_list = ""; 
-	for (x in tags_array) { 
-		if(tags_array[x] == tag) { 
-			return true; 
-		} 
-	} 
-	return false; 
-} 
-
-function addTag(tag) { 
-	if (!tagExists(tag)) { 
-		// append tag to tag box. 
-		var tags = byId("tags"); 
-		tags.value = tags.value +" "+ tag; 
-	} 
-} 
-
-// Drag Code // 
-//***************************************************************************** 
-// Do not remove this notice. 
-// 
-// Copyright 2001 by Mike Hall. 
-// See http://www.brainjar.com for terms of use. 
-//***************************************************************************** 
-
-// Determine browser and version. 
-
-function Browser() { 
-
-	var ua, s, i; 
-
-	this.isIE    = false; 
-	this.isNS    = false; 
-	this.version = null; 
-
-	ua = navigator.userAgent; 
-
-	s = "MSIE"; 
-	if ((i = ua.indexOf(s)) >= 0) { 
-		this.isIE = true; 
-		this.version = parseFloat(ua.substr(i + s.length)); 
-		return; 
-	} 
-
-	s = "Netscape6/"; 
-	if ((i = ua.indexOf(s)) >= 0) { 
-		this.isNS = true; 
-		this.version = parseFloat(ua.substr(i + s.length)); 
-		return; 
-	} 
-
-	// Treat any other "Gecko" browser as NS 6.1. 
-
-	s = "Gecko"; 
-	if ((i = ua.indexOf(s)) >= 0) { 
-		this.isNS = true; 
-		this.version = 6.1; 
-		return; 
-	} 
-} 
-
-var browser = new Browser(); 
-
-// Global object to hold drag information. 
-
-var dragObj = new Object(); 
-dragObj.zIndex = 0; 
-
-function dragStart(event, id) { 
-
-	var el; 
-	var x, y; 
-
-	// If an element id was given, find it. Otherwise use the element being 
-	// clicked on. 
-
-	if (id) 
-		dragObj.elNode = document.getElementById(id); 
-	else { 
-		if (browser.isIE) 
-			dragObj.elNode = window.event.srcElement; 
-		if (browser.isNS) 
-			dragObj.elNode = event.target; 
-
-		// If this is a text node, use its parent element. 
-
-		if (dragObj.elNode.nodeType == 3) 
-			dragObj.elNode = dragObj.elNode.parentNode; 
-	} 
-
-	// Get cursor position with respect to the page. 
-
-	if (browser.isIE) { 
-		x = window.event.clientX + document.documentElement.scrollLeft 
-			+ document.body.scrollLeft; 
-		y = window.event.clientY + document.documentElement.scrollTop 
-			+ document.body.scrollTop; 
-	} 
-	if (browser.isNS) { 
-		x = event.clientX + window.scrollX; 
-		y = event.clientY + window.scrollY; 
-	} 
-
-	// Save starting positions of cursor and element. 
-
-	dragObj.cursorStartX = x; 
-	dragObj.cursorStartY = y; 
-	dragObj.elStartLeft  = parseInt(dragObj.elNode.style.left, 10); 
-	dragObj.elStartTop   = parseInt(dragObj.elNode.style.top,  10); 
-
-	if (isNaN(dragObj.elStartLeft)) dragObj.elStartLeft = 0; 
-	if (isNaN(dragObj.elStartTop))  dragObj.elStartTop  = 0; 
-
-	// Update element's z-index. 
-
-	dragObj.elNode.style.zIndex = ++dragObj.zIndex; 
-
-	// Capture mousemove and mouseup events on the page. 
-
-	if (browser.isIE) { 
-		document.attachEvent("onmousemove", dragGo); 
-		document.attachEvent("onmouseup",   dragStop); 
-		window.event.cancelBubble = true; 
-		window.event.returnValue = false; 
-	} 
-	if (browser.isNS) { 
-		document.addEventListener("mousemove", dragGo,   true); 
-		document.addEventListener("mouseup",   dragStop, true); 
-		event.preventDefault(); 
-	} 
-} 
-
-function dragGo(event) { 
-
-	var x, y; 
-
-	// Get cursor position with respect to the page. 
-
-	if (browser.isIE) { 
-		x = window.event.clientX + document.documentElement.scrollLeft 
-			+ document.body.scrollLeft; 
-		y = window.event.clientY + document.documentElement.scrollTop 
-			+ document.body.scrollTop; 
-	} 
-	if (browser.isNS) { 
-		x = event.clientX + window.scrollX; 
-		y = event.clientY + window.scrollY; 
-	} 
-
-	// Move drag element by the same amount the cursor has moved. 
-
-	dragObj.elNode.style.left = (dragObj.elStartLeft + x - dragObj.cursorStartX) + "px"; 
-	dragObj.elNode.style.top  = (dragObj.elStartTop  + y - dragObj.cursorStartY) + "px"; 
-
-	if (browser.isIE) { 
-		window.event.cancelBubble = true; 
-		window.event.returnValue = false; 
-	} 
-	if (browser.isNS) 
-		event.preventDefault(); 
-} 
-
-function dragStop(event) { 
-
-	// Stop capturing mousemove and mouseup events. 
-
-	if (browser.isIE) { 
-		document.detachEvent("onmousemove", dragGo); 
-		document.detachEvent("onmouseup",   dragStop); 
-	} 
-	if (browser.isNS) { 
-		document.removeEventListener("mousemove", dragGo,   true); 
-		document.removeEventListener("mouseup",   dragStop, true); 
-	} 
+function byId(id) {
+	return document.getElementById(id);
+}
+
+function tagExists(tag) {
+	var tags = byId("tags");
+	tags_list = tags.value;
+	tags_array = tags_list.split(" ");
+	
+	tags_list = "";
+	for (x in tags_array) {
+		if(tags_array[x] == tag) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function addTag(tag) {
+	if (!tagExists(tag)) {
+		// append tag to tag box.
+		var tags = byId("tags");
+		tags.value = tags.value +" "+ tag;
+	}
+}
+
+function addTagById(id) {
+	tag = byId(id);
+	addTag(tag.value);
+}
+
+// Drag Code //
+//*****************************************************************************
+// Do not remove this notice.
+//
+// Copyright 2001 by Mike Hall.
+// See http://www.brainjar.com for terms of use.
+//*****************************************************************************
+
+// Determine browser and version.
+
+function Browser() {
+
+  var ua, s, i;
+
+  this.isIE    = false;
+  this.isNS    = false;
+  this.version = null;
+
+  ua = navigator.userAgent;
+
+  s = "MSIE";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isIE = true;
+    this.version = parseFloat(ua.substr(i + s.length));
+    return;
+  }
+
+  s = "Netscape6/";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isNS = true;
+    this.version = parseFloat(ua.substr(i + s.length));
+    return;
+  }
+
+  // Treat any other "Gecko" browser as NS 6.1.
+
+  s = "Gecko";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isNS = true;
+    this.version = 6.1;
+    return;
+  }
+}
+
+var browser = new Browser();
+
+// Global object to hold drag information.
+
+var dragObj = new Object();
+dragObj.zIndex = 0;
+
+function dragStart(event, id) {
+
+  var el;
+  var x, y;
+
+  // If an element id was given, find it. Otherwise use the element being
+  // clicked on.
+
+  if (id)
+    dragObj.elNode = document.getElementById(id);
+  else {
+    if (browser.isIE)
+      dragObj.elNode = window.event.srcElement;
+    if (browser.isNS)
+      dragObj.elNode = event.target;
+
+    // If this is a text node, use its parent element.
+
+    if (dragObj.elNode.nodeType == 3)
+      dragObj.elNode = dragObj.elNode.parentNode;
+  }
+
+  // Get cursor position with respect to the page.
+
+  if (browser.isIE) {
+    x = window.event.clientX + document.documentElement.scrollLeft
+      + document.body.scrollLeft;
+    y = window.event.clientY + document.documentElement.scrollTop
+      + document.body.scrollTop;
+  }
+  if (browser.isNS) {
+    x = event.clientX + window.scrollX;
+    y = event.clientY + window.scrollY;
+  }
+
+  // Save starting positions of cursor and element.
+
+  dragObj.cursorStartX = x;
+  dragObj.cursorStartY = y;
+  dragObj.elStartLeft  = parseInt(dragObj.elNode.style.left, 10);
+  dragObj.elStartTop   = parseInt(dragObj.elNode.style.top,  10);
+
+  if (isNaN(dragObj.elStartLeft)) dragObj.elStartLeft = 0;
+  if (isNaN(dragObj.elStartTop))  dragObj.elStartTop  = 0;
+
+  // Update element's z-index.
+
+  dragObj.elNode.style.zIndex = ++dragObj.zIndex;
+
+  // Capture mousemove and mouseup events on the page.
+
+  if (browser.isIE) {
+    document.attachEvent("onmousemove", dragGo);
+    document.attachEvent("onmouseup",   dragStop);
+    window.event.cancelBubble = true;
+    window.event.returnValue = false;
+  }
+  if (browser.isNS) {
+    document.addEventListener("mousemove", dragGo,   true);
+    document.addEventListener("mouseup",   dragStop, true);
+    event.preventDefault();
+  }
+}
+
+function dragGo(event) {
+
+  var x, y;
+
+  // Get cursor position with respect to the page.
+
+  if (browser.isIE) {
+    x = window.event.clientX + document.documentElement.scrollLeft
+      + document.body.scrollLeft;
+    y = window.event.clientY + document.documentElement.scrollTop
+      + document.body.scrollTop;
+  }
+  if (browser.isNS) {
+    x = event.clientX + window.scrollX;
+    y = event.clientY + window.scrollY;
+  }
+
+  // Move drag element by the same amount the cursor has moved.
+
+  dragObj.elNode.style.left = (dragObj.elStartLeft + x - dragObj.cursorStartX) + "px";
+  dragObj.elNode.style.top  = (dragObj.elStartTop  + y - dragObj.cursorStartY) + "px";
+
+  if (browser.isIE) {
+    window.event.cancelBubble = true;
+    window.event.returnValue = false;
+  }
+  if (browser.isNS)
+    event.preventDefault();
+}
+
+function dragStop(event) {
+
+  // Stop capturing mousemove and mouseup events.
+
+  if (browser.isIE) {
+    document.detachEvent("onmousemove", dragGo);
+    document.detachEvent("onmouseup",   dragStop);
+  }
+  if (browser.isNS) {
+    document.removeEventListener("mousemove", dragGo,   true);
+    document.removeEventListener("mouseup",   dragStop, true);
+  }
 }
diff --git a/contrib/tagger/style.css b/contrib/tagger/style.css
new file mode 100644
index 00000000..15505767
--- /dev/null
+++ b/contrib/tagger/style.css
@@ -0,0 +1,27 @@
+/* Tagger Cascading Style Sheet                                              *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#tagger_window {
+	position:fixed;
+}
+ 
+#tagger_titlebar {
+	font-weight:bold;
+	text-align:center;
+	position:relative;
+	top:-0em;
+	padding:.25em;
+	border:2px solid;
+	border-bottom:1px solid;
+	-moz-border-radius:10px 10px 0px 0px;
+	background-color:white;
+	cursor:move;
+}
+
+#tagger_body {
+	overflow:scroll;
+	padding:1em;
+	border:2px solid;
+	border-top:none;
+	background-color:white;
+}
diff --git a/contrib/tagger/theme.php b/contrib/tagger/theme.php
index ecb8fcbb..131cfe18 100644
--- a/contrib/tagger/theme.php
+++ b/contrib/tagger/theme.php
@@ -1,16 +1,30 @@
-<?php 
-class taggerTheme extends Themelet { 
-	public function build ($page, $tags) { 
-		$html = "<div onmousedown='dragStart(event);' style='position:fixed;top:100px;left:800px;height:400px;overflow:scroll;padding:1em;border:2px solid;background-color:white;'>"; 
-		foreach ($tags as $tag) { 
-			$html .= "<input type='button' style='width:10em;' onclick='javascript:addTag(\"".$tag['tag']."\");' value='".$tag['tag']."'></input><br/>"; 
-		} 
-		$html .= "</div>"; 
-
-		$page->add_block( new Block(null, 
-					$html, 
-					"main", 
-					1000)); 
-	} 
-} 
+<?php
+class taggerTheme extends Themelet {
+	public function build ($page, $tags) {	
+	$html = "<div id='tagger_window' style='top:100px;left:800px;'>";
+	$html .= "<div id='tagger_titlebar' title='Drag to move' onmousedown='dragStart(event,\"tagger_window\");'>";
+	$html .= "Tagger";
+	$html .= "</div>";
+	$html .= "<div id='tagger_body' style='height:300px;'>";
+	$html .= "<input type='text' id='custTag' value=''></input><input type='button' value='Add' onclick='addTagById(\"custTag\")'></input><br/>";
+	foreach ($tags as $tag) {
+		$tag_name = $this->trimTag($tag['tag'],32);
+		$html .= "<a style='cursor:pointer;' onclick='addTag(\"".$tag['tag']."\");'title='Add \"".$tag['tag']."\" to the tag list'>".$tag_name."</a><br/>";
+	}
+	$html .= "</div></div>";
+	
+	$page->add_block( new Block("Tagger",
+		"<span style='font-size:.8em;'>Collapse this block to hide Tagger.</span><br/><br/>Use: Click the links to add the tag to the list, when done, press Set to save the tags.".$html,
+		"left",
+		0));
+	}
+	
+	public function trimTag($s,$len=80) {
+		if(strlen($s) > $len) {
+			$s = substr($s, 0,$len-1);
+			$s = substr($s,0, strrpos($s,'_'))."...";
+		}
+		return $s;
+	}
+}
 ?>