diff --git a/js/WikiTextRules.js b/js/WikiTextRules.js
index 6a0752c47..5cc47f977 100755
--- a/js/WikiTextRules.js
+++ b/js/WikiTextRules.js
@@ -437,21 +437,21 @@ WikiTextRules.rules = [
 		this.lookaheadRegExp.lastIndex = w.matchStart;
 		var lookaheadMatch = this.lookaheadRegExp.exec(w.source);
 		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
-			var e;
+			var e = {type: "a", children: []};
 			var text = lookaheadMatch[1];
 			if(lookaheadMatch[3]) {
 				// Pretty bracketted link
 				var link = lookaheadMatch[3];
-				if(!lookaheadMatch[2] && WikiTextRules.isExternalLink(w,link)) {
-					e = {type: "a", children: []};
-				} else {
-					e = {type: "tiddlerLink", children: []};
-				}
 				WikiTextRules.setAttr(e,"href",link);
+				if(!lookaheadMatch[2] && WikiTextRules.isExternalLink(w,link)) {
+					WikiTextRules.setAttr(e,"className","externalLink");
+				} else {
+					WikiTextRules.setAttr(e,"className","tiddlyLink");
+				}
 			} else {
 				// Simple bracketted link
-				e = {type: "tiddlerLink", children: []};
 				WikiTextRules.setAttr(e,"href",text);
+				WikiTextRules.setAttr(e,"className","tiddlyLink");
 			}
 			w.output.push(e);
 			e.children.push({type: "text", value: text});
@@ -479,8 +479,9 @@ WikiTextRules.rules = [
 			}
 		}
 		if(w.autoLinkWikiWords) {
-			var link = {type: "tiddlerLink", children: []};
+			var link = {type: "a", children: []};
 			WikiTextRules.setAttr(link,"href",w.matchText);
+			WikiTextRules.setAttr(link,"className","tiddlyLink");
 			w.output.push(link);
 			w.outputText(link.children,w.matchStart,w.nextMatch);
 		} else {
diff --git a/wikitest.js b/wikitest.js
index 5c67ee2e2..f45797b86 100644
--- a/wikitest.js
+++ b/wikitest.js
@@ -45,9 +45,9 @@ wikiTest({ tiddlers:
             children: [ { type: 'text', value: 'text' } ] },
           { type: 'text',
             value: ' of the first tiddler, with a link to the ' },
-          { type: 'tiddlerLink',
+          { type: 'a',
             children: [ { type: 'text', value: 'SecondTiddler' } ],
-          	attributes: {href: 'SecondTiddler'} },
+          	attributes: {href: 'SecondTiddler', className: 'tiddlyLink' } },
           { type: 'text', value: ', too.' } ] },
      { tiddler: 'SecondTiddler',
        output: 
@@ -70,13 +70,13 @@ wikiTest({ tiddlers:
      { tiddler: 'ThirdTiddler',
        output: 
 		[ { type: 'text', value: 'An explicit link ' },
-		  { type: 'tiddlerLink',
+		  { type: 'a',
 		    children: [ { type: 'text', value: 'Fourth Tiddler' } ],
-		    attributes: { href: 'Fourth Tiddler' } },
+		    attributes: { href: 'Fourth Tiddler', className: 'tiddlyLink' } },
 		  { type: 'text', value: ' and ' },
-		  { type: 'tiddlerLink',
+		  { type: 'a',
 		    children: [ { type: 'text', value: 'a pretty link' } ],
-		    attributes: { href: 'Fourth Tiddler' } } ] },
+		    attributes: { href: 'Fourth Tiddler', className: 'tiddlyLink' } } ] },
      { tiddler: 'Fourth Tiddler',
        output: 
         [ { type: 'text', value: 'An image ' },