diff --git a/templates/default/tmpl/exceptions.tmpl b/templates/default/tmpl/exceptions.tmpl
index ea02ff56..426c07be 100644
--- a/templates/default/tmpl/exceptions.tmpl
+++ b/templates/default/tmpl/exceptions.tmpl
@@ -4,18 +4,13 @@
 </div>
 <?js } ?>
 
-<?js if (data.type && data.type.names) { ?>
+<?js if (data.type) {?>
 <dl>
 	<dt>
 		Type
 	</dt>
 	<dd>
-		<?js
-			var typeNames = data.type.names,
-                self = this;
-			typeNames.forEach(function(name, i) { ?>
-		<span class="param-type"><?js= self.linkto(name, self.htmlsafe(name)) ?></span> <?js if (i < typeNames.length-1) { ?>|<?js } ?>
-		<?js }); ?>
+		<?js= self.partial('type.tmpl', data.type) ?>
 	</dd>
 </dl>
 <?js } ?>
\ No newline at end of file
diff --git a/templates/default/tmpl/method.tmpl b/templates/default/tmpl/method.tmpl
index 6527074e..4f27c299 100644
--- a/templates/default/tmpl/method.tmpl
+++ b/templates/default/tmpl/method.tmpl
@@ -13,6 +13,15 @@
         <?js= data.description ?>
     </div>
     <?js } ?>
+
+    <?js if (kind === 'event' && data.type) {?>
+        <h5>Type:</h5>
+        <ul>
+            <li>
+                <?js= self.partial('type.tmpl', data.type) ?>
+            </li>
+        </ul>
+    <?js } ?>
     
     <?js if (data['this']) { ?>
         <h5>This:</h5>
diff --git a/templates/default/tmpl/params.tmpl b/templates/default/tmpl/params.tmpl
index 4bc50f0e..0c301e9a 100644
--- a/templates/default/tmpl/params.tmpl
+++ b/templates/default/tmpl/params.tmpl
@@ -72,14 +72,9 @@
             <?js } ?>
             
             <td class="type">
-            <?js
-                if (param.type && param.type.names) {
-                    param.type.names.forEach(function(name, i) { ?>
-                        <?js= self.linkto(name, self.htmlsafe(name)) ?>
-                        <?js if (i < param.type.names.length-1) { ?> | <?js } ?>
-                    <?js }); 
-                }
-            ?>
+            <?js if (param.type) {?>
+                <?js= self.partial('type.tmpl', param.type) ?>
+            <?js } ?>
             </td>
             
             <?js if (params.hasAttributes) {?>
diff --git a/templates/default/tmpl/properties.tmpl b/templates/default/tmpl/properties.tmpl
index 9ec1a997..2f5be2ab 100644
--- a/templates/default/tmpl/properties.tmpl
+++ b/templates/default/tmpl/properties.tmpl
@@ -72,14 +72,9 @@
             <?js } ?>
             
             <td class="type">
-            <?js
-                if (prop.type && prop.type.names) {
-                    prop.type.names.forEach(function(name, i) { ?>
-                        <?js= self.linkto(name, self.htmlsafe(name)) ?>
-                        <?js if (i < prop.type.names.length-1) { ?> | <?js } ?>
-                    <?js }); 
-                }
-            ?>
+            <?js if (prop.type) {?>
+                <?js= self.partial('type.tmpl', prop.type) ?>
+            <?js } ?>
             </td>
             
             <?js if (props.hasAttributes) {?>
diff --git a/templates/default/tmpl/returns.tmpl b/templates/default/tmpl/returns.tmpl
index 257550f9..cbcaf3a8 100644
--- a/templates/default/tmpl/returns.tmpl
+++ b/templates/default/tmpl/returns.tmpl
@@ -4,24 +4,13 @@
 </div>
 <?js } ?>
 
-<?js
-	if (data.type) {
-		with(type) {
-?>
-
+<?js if (data.type) {?>
 <dl>
 	<dt>
 		Type
 	</dt>
 	<dd>
-		<?js
-            var self = this;
-			names.forEach(function(name, i) { ?>
-		<span class="param-type"><?js= self.htmlsafe(name) ?></span> <?js if (i < names.length-1) { ?>|<?js } ?>
-		<?js }); ?>
+		<?js= this.partial('type.tmpl', data.type) ?>
 	</dd>
 </dl>
-<?js 
-		}
-	}
-?>
\ No newline at end of file
+<?js } ?>
\ No newline at end of file
diff --git a/templates/default/tmpl/type.tmpl b/templates/default/tmpl/type.tmpl
new file mode 100644
index 00000000..781c1830
--- /dev/null
+++ b/templates/default/tmpl/type.tmpl
@@ -0,0 +1,9 @@
+<?js if (data.names) { ?>
+    <?js
+        var names = data.names,
+            self = this;
+        names.forEach(function(name, i) { ?>
+    <span class="param-type"><?js= self.linkto(name, self.htmlsafe(name)) ?></span>
+    <?js if (i < names.length-1) { ?>|<?js } ?>
+    <?js }); ?>
+<?js } ?>
\ No newline at end of file