diff --git a/lib/ace/mode/scheme_highlight_rules.js b/lib/ace/mode/scheme_highlight_rules.js
index 51d8fd40..fcfa629e 100644
--- a/lib/ace/mode/scheme_highlight_rules.js
+++ b/lib/ace/mode/scheme_highlight_rules.js
@@ -68,7 +68,7 @@ var SchemeHighlightRules = function() {
         },
         {
             "token": ["punctuation.definition.constant.character.scheme", "constant.character.scheme"],
-            "regex": "#:[^ ]+"
+            "regex": "#:\\S+"
         },
         {
             "token": ["punctuation.definition.variable.scheme", "variable.other.global.scheme", "punctuation.definition.variable.scheme"],
@@ -84,7 +84,7 @@ var SchemeHighlightRules = function() {
         },
         {
                 "token" : keywordMapper,
-                "regex" : "[a-zA-Z_#][a-zA-Z0-9_\\?\\!\\*]*"
+                "regex" : "[a-zA-Z_#][a-zA-Z0-9_\\-\\?\\!\\*]*"
         },
         {
             "token" : "string",