diff --git a/demo/kitchen-sink/doclist.js b/demo/kitchen-sink/doclist.js
index 1266c620..7cc17e3e 100644
--- a/demo/kitchen-sink/doclist.js
+++ b/demo/kitchen-sink/doclist.js
@@ -90,7 +90,7 @@ var docs = {
     "docs/latex.tex": {name: "LaTeX", wrapped: true},
     "docs/less.less": "LESS",
     "docs/lisp.lisp": "Lisp",
-    "docs/scheme.scheme": "Scheme",
+    "docs/scheme.scm": "Scheme",
     "docs/liquid.liquid": "Liquid",
     "docs/lua.lua": "Lua",
     "docs/lucene.lucene": "Lucene",
diff --git a/demo/kitchen-sink/docs/scheme.scheme b/demo/kitchen-sink/docs/scheme.scm
similarity index 73%
rename from demo/kitchen-sink/docs/scheme.scheme
rename to demo/kitchen-sink/docs/scheme.scm
index a8579b83..8c78359c 100644
--- a/demo/kitchen-sink/docs/scheme.scheme
+++ b/demo/kitchen-sink/docs/scheme.scm
@@ -3,14 +3,11 @@
     for CD"
    (prompt-read "Title" 1.53 1 2/4 1.7 1.7e0 2.9E-4 +42 -7 #b001 #b001/100 #o777 #O777 #xabc55 #c(0 -5.6))
    (prompt-read "Artist")
-   (or (parse-integer (prompt-read "Rating") #:junk-allowed t) 0)
+   (or (parse-integer (prompt-read "Rating") #:junk-allowed #t) 0)
   (if x (format #t "yes") (format #f "no") ;and here comment
   ) 
   ;; second line comment
   '(+ 1 2)
-  (define-syntax get-line
-    (syntax-rules ()
-      ((_ x) x)))                ; nonsense, just a highlight test
   (position-if-not char-set:whitespace line #:start beg))
   (quote (privet 1 2 3))
   '(hello world)
diff --git a/lib/ace/mode/_test/tokens_scheme.json b/lib/ace/mode/_test/tokens_scheme.json
index da9f93e0..74753d14 100644
--- a/lib/ace/mode/_test/tokens_scheme.json
+++ b/lib/ace/mode/_test/tokens_scheme.json
@@ -1,10 +1,10 @@
-[
+[[
    "start",
   ["text","("],
   ["storage.type.function-type.scheme","define"],
-  ["text"," "],
-  ["entity.name.function.scheme","prompt-for-cd"],
-  ["text"," ()"]
+  ["text"," ("],
+  ["identifier","prompt-for-cd"],
+  ["text",")"]
 ],[
    "start",
   ["text","   "],
@@ -19,9 +19,7 @@
 ],[
    "start",
   ["text","   ("],
-  ["identifier","prompt"],
-  ["text","-"],
-  ["identifier","read"],
+  ["identifier","prompt-read"],
   ["text"," "],
   ["string","\"Title\""],
   ["text"," "],
@@ -43,23 +41,19 @@
   ["text"," "],
   ["constant.numeric","-7"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","b001"],
+  ["constant.numeric","#b001"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","b001/100"],
+  ["constant.numeric","#b001"],
+  ["text","/"],
+  ["constant.numeric","100"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","o777"],
+  ["constant.numeric","#o777"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","O777"],
+  ["constant.numeric","#O777"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","xabc55"],
+  ["constant.numeric","#xabc55"],
   ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","c"],
+  ["identifier","#c"],
   ["text","("],
   ["constant.numeric","0"],
   ["text"," "],
@@ -68,34 +62,24 @@
 ],[
    "start",
   ["text","   ("],
-  ["identifier","prompt"],
-  ["text","-"],
-  ["identifier","read"],
+  ["identifier","prompt-read"],
   ["text"," "],
   ["string","\"Artist\""],
-  ["text"," &"],
-  ["identifier","rest"],
   ["text",")"]
 ],[
    "start",
   ["text","   ("],
   ["keyword.operator","or"],
   ["text"," ("],
-  ["identifier","parse"],
-  ["text","-"],
-  ["identifier","integer"],
+  ["identifier","parse-integer"],
   ["text"," ("],
-  ["identifier","prompt"],
-  ["text","-"],
-  ["identifier","read"],
+  ["identifier","prompt-read"],
   ["text"," "],
   ["string","\"Rating\""],
-  ["text",") :"],
-  ["identifier","junk"],
-  ["text","-"],
-  ["identifier","allowed"],
+  ["text",") "],
+  ["punctuation.definition.constant.character.scheme","#:junk-allowed"],
   ["text"," "],
-  ["support.function","t"],
+  ["constant.language","#t"],
   ["text",") "],
   ["constant.numeric","0"],
   ["text",")"]
@@ -108,25 +92,20 @@
   ["text"," ("],
   ["support.function","format"],
   ["text"," "],
-  ["support.function","#t"],
+  ["constant.language","#t"],
   ["text"," "],
   ["string","\"yes\""],
   ["text",") ("],
   ["support.function","format"],
   ["text"," "],
-  ["support.function","#t"],
+  ["constant.language","#f"],
   ["text"," "],
   ["string","\"no\""],
-  ["text"," "],
-  ["constant.language","#f"],
   ["text",") "],
   ["comment",";and here comment"]
 ],[
    "start",
-  ["text","  ) "],
-  ["constant.numeric","0xFFLL"],
-  ["text"," "],
-  ["constant.numeric","-23ull"]
+  ["text","  ) "]
 ],[
    "start",
   ["text","  "],
@@ -141,28 +120,15 @@
 ],[
    "start",
   ["text","  ("],
-  ["identifier","define"],
+  ["identifier","position-if-not"],
   ["text"," "],
-  ["punctuation.definition.variable.scheme","*"],
-  ["variable.other.global.scheme","lines"],
-  ["punctuation.definition.variable.scheme","*"],
-  ["text",")                "],
-  ["comment","; list of all lines"]
-],[
-   "start",
-  ["text","  ("],
-  ["identifier","position"],
-  ["text","-"],
-  ["keyword.control","if"],
-  ["text","-"],
-  ["identifier","not"],
-  ["text"," "],
-  ["punctuation.definition.constant.character.scheme","#"],
-  ["constant.character.scheme","'sys::whitespacep"],
+  ["identifier","char-set"],
+  ["text",":"],
+  ["identifier","whitespace"],
   ["text"," "],
   ["identifier","line"],
-  ["text"," :"],
-  ["identifier","start"],
+  ["text"," "],
+  ["punctuation.definition.constant.character.scheme","#:start"],
   ["text"," "],
   ["identifier","beg"],
   ["text","))"]
@@ -206,8 +172,8 @@
   ["text",")"]
 ],[
    "start",
-  ["text","  (:"],
-  ["identifier","use"],
+  ["text","  ("],
+  ["punctuation.definition.constant.character.scheme","#:use"],
   ["text"," "],
   ["string","\"aaaa\""],
   ["text",")"]
@@ -235,8 +201,7 @@
   ["text","))"]
 ],[
    "start",
-  ["text","  ) "],
-  ["support.function","LAmbDa"]
+  ["text","  ) "]
 ],[
    "start"
 ],[
@@ -245,4 +210,6 @@
   ["string","\"asdad"],
   ["constant.character.escape.scheme","\\0"],
   ["string","eqweqe\""]
-]]
+],[
+   "start"
+]]
\ No newline at end of file