diff --git a/netbeans/plugins/org-enclojure-plugin/pom.xml b/netbeans/plugins/org-enclojure-plugin/pom.xml
index 637d15b..54c6a87 100755
--- a/netbeans/plugins/org-enclojure-plugin/pom.xml
+++ b/netbeans/plugins/org-enclojure-plugin/pom.xml
@@ -683,6 +683,7 @@
                 <include>Bundle.properties</include>
                 <include>**/*.png</include>
                 <include>**/*.gif</include>
+                <include>**/*.clj</include>
             </includes>
             <targetPath>org/enclojure/ide/nb/editor/resources</targetPath>
         </resource>
diff --git a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties
index 9884eab..b86ca88 100755
--- a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties
+++ b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/Bundle.properties
@@ -40,4 +40,29 @@ CTL_AttachDebugProjectWithReplAction=Attach Debugger to Project REPL
 CTL_DetachDebugProjectWithReplAction=Detach Debugger from Project REPL
 CTL_LoadAllSourcesAction=REPL->Load-all Clojure Files in "%s"
 LBL_Maven_Quickstart_Archetype="Clojure quick start archetype"
-HINT_MavenQuickStart="clojure-quickstart"
\ No newline at end of file
+HINT_MavenQuickStart="clojure-quickstart"
+text/x-clojure=Clojure
+char=Character
+symbol=Symbol
+map-start=Map Start
+any=Any
+map-end=Map End
+vec-end=Vector End
+list-start=List Start
+keyword=Keyword
+deref=Deref
+list-end=List End
+meta=Metadata
+string=String
+vec-start=Vector Start
+number=Number
+unquote=Unquote
+comment=Comment
+quote=Quote
+function=Function
+macro=Macro
+ns-publics=Namespace Publics
+ns-interns=Namespace Interns
+ns-imports=Namespace Imports
+compiler-special=Compiler Special
+error=Error
\ No newline at end of file
diff --git a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml
index 5bb4f42..e012f42 100755
--- a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml
+++ b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/ClojureFontsColors.xml
@@ -1,34 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
 
-<!--
-.comment { color: gray; }
-.string {    color: teal; }
-.function { color: #00c; }
-.macro, .specialops { color: #60c; }
-.parens { color: #000; }
-.keyword { color: #c09; }
-.brackets { color: #006; }
-.curlybrackets { color: #906; }
--->
-
 <fontscolors>
-    <!--<fontcolor name="comment" foreColor="ff000000" default="default" />-->
-    <fontcolor name="any" foreColor="ff000000" default="default" />
-    <fontcolor name="char" foreColor="ff006600" default="default" />
-    <fontcolor name="symbol" foreColor="ff000000" default="default" />
-    <fontcolor name="string" foreColor="ff008080" default="keyword" />
-    <fontcolor name="list-start" foreColor="ff000000" default="keyword" />
-    <fontcolor name="list-end" foreColor="ff000000" default="keyword" />
-    <fontcolor name="keyword" foreColor="ffcc0099" default="keyword" />
-    <fontcolor name="vec-start" foreColor="ff000066" default="keyword" />
-    <fontcolor name="vec-end" foreColor="ff000066" default="keyword" />
-    <fontcolor name="map-start" foreColor="ff990066" default="keyword" />
-    <fontcolor name="map-end" foreColor="ff990066" default="keyword" />
-    <fontcolor name="function" foreColor="ff1100dd" default="keyword" />
-    <fontcolor name="macro" foreColor="ff1100dd" default="keyword" />
-    <fontcolor name="ns-publics" foreColor="ff110000" default="keyword" />
-    <fontcolor name="ns-interns" foreColor="ff1100dd" default="keyword" />
-    <fontcolor name="ns-imports" foreColor="ff1100ff" default="keyword" />
-    <fontcolor name="compiler-special" foreColor="ff1100dd" default="keyword" />
+    <fontcolor default="default" name="deref"/>
+    <fontcolor default="default" foreColor="ff000080" name="ns-imports">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="ff000080" name="ns-interns">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="ff000080" name="symbol"/>
+    <fontcolor default="default" name="error"/>
+    <fontcolor default="default" name="list-start"/>
+    <fontcolor default="default" foreColor="ff008000" name="char">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="ff660e7a" name="keyword">
+        <font style="bold+italic"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="blue" name="number"/>
+    <fontcolor default="default" name="map-end"/>
+    <fontcolor default="default" name="vec-end"/>
+    <fontcolor default="default" name="map-start"/>
+    <fontcolor default="default" name="list-end"/>
+    <fontcolor default="default" name="meta"/>
+    <fontcolor default="default" foreColor="orange" name="function"/>
+    <fontcolor default="default" foreColor="ff000080" name="ns-publics">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="ff000080" name="macro">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" name="unquote"/>
+    <fontcolor default="default" name="quote"/>
+    <fontcolor default="default" name="vec-start"/>
+    <fontcolor default="default" foreColor="ff008000" name="string">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" name="any"/>
+    <fontcolor default="default" foreColor="ff000080" name="compiler-special">
+        <font style="bold"/>
+    </fontcolor>
+    <fontcolor default="default" foreColor="lightGray" name="comment">
+        <font style="italic"/>
+    </fontcolor>
 </fontscolors>
\ No newline at end of file
diff --git a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
index 3e9821c..69efd26 100755
--- a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
+++ b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/layer.xml
@@ -21,6 +21,7 @@
     <folder name="Editors">
         <folder name="text">
             <folder name="x-clojure">
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.enclojure.ide.nb.editor.Bundle"/>
                 <folder name="Toolbars">
                     <folder name="Default">
                         <file name="Separator-before-comment.instance">
@@ -207,6 +208,11 @@
     </folder>
 
     <folder name="OptionsDialog">
+        <folder name="PreviewExamples">
+            <folder name="text">
+                <file name="x-clojure" url="resources/SampleClojureFile.clj"/>
+            </folder>
+        </folder>
         <file name="org-enclojure-ide-preferences-EnclojureOptionsCategory.instance">
             <attr name="position" intvalue="690"/>
         </file>
diff --git a/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/resources/SampleClojureFile.clj b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/resources/SampleClojureFile.clj
new file mode 100644
index 0000000..55eb9fe
--- /dev/null
+++ b/netbeans/plugins/org-enclojure-plugin/src/main/java/org/enclojure/ide/nb/editor/resources/SampleClojureFile.clj
@@ -0,0 +1,11 @@
+; Sample Clojure File
+
+(ns clojure.sample
+  (:use clojure.core))
+
+(def my-list '(1 2 3 a b c))
+
+(defn sample-method [x]
+ (println x my-list))
+
+(sample-method {:message "Hello World"})
diff --git a/org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj b/org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj
index b7e078d..890b18a 100755
--- a/org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj
+++ b/org-enclojure-ide/src/main/clojure/org/enclojure/ide/ClojureLexer.clj
@@ -75,7 +75,7 @@
       ])
 
 (def token-ids 
-     (into {} (map #(vector %1 (make-tokenid %1 %2 "keyword")) 
+     (into {} (map #(vector %1 (make-tokenid %1 %2 (name %1)))
 		   token-names 
 		   (range (count token-names)))))