diff --git a/demos/lcd/lcd.factor b/demos/lcd/lcd.factor
index 18566b1570..a4948b01fe 100644
--- a/demos/lcd/lcd.factor
+++ b/demos/lcd/lcd.factor
@@ -6,7 +6,7 @@ ui.gadgets.labels ;
 in: lcd
 
 : lcd-digit ( digit row -- str )
-    [ dup char: : = [ drop 10 ] [ char: 0 - ] if ] dip {
+    [ dup char: \: = [ drop 10 ] [ char: 0 - ] if ] dip {
         "  _       _  _       _   _   _   _   _      "
         " | |  |   _| _| |_| |_  |_    | |_| |_|  *  "
         " |_|  |  |_  _|   |  _| |_|   | |_|   |  *  "
diff --git a/demos/morse/morse.factor b/demos/morse/morse.factor
index a35830bf23..3c5e36c81d 100755
--- a/demos/morse/morse.factor
+++ b/demos/morse/morse.factor
@@ -60,18 +60,18 @@ CONSTANT: morse-code-table $[
         { char: , "--..--" }
         { char: ? "..--.." }
         { char: ' ".----." }
-        { char: ! "-.-.--" }
+        { char: \! "-.-.--" }
         { char: / "-..-."  }
-        { char: ( "-.--."  }
+        { char: \( "-.--."  }
         { char: ) "-.--.-" }
         { char: & ".-..."  }
-        { char: : "---..." }
+        { char: \: "---..." }
         { char: ; "-.-.-." }
         { char: = "-...- " }
         { char: + ".-.-."  }
         { char: - "-....-" }
         { char: _ "..--.-" }
-        { char: " ".-..-." }
+        { char: \" ".-..-." }
         { char: $ "...-..-" }
         { char: @ ".--.-." }
         { char: \s "/" }
diff --git a/demos/project-euler/001/001.factor b/demos/project-euler/001/001.factor
index 6c97f45734..39d869b579 100644
--- a/demos/project-euler/001/001.factor
+++ b/demos/project-euler/001/001.factor
@@ -66,4 +66,4 @@ PRIVATE>
 ! [ euler001d ] 100 ave-time
 ! 0 ms ave run time - 0.08 SD (100 trials)
 
-SOLUTION: euler001
+solution: euler001
diff --git a/demos/project-euler/002/002.factor b/demos/project-euler/002/002.factor
index e6fbe5aa49..da93e0b15d 100644
--- a/demos/project-euler/002/002.factor
+++ b/demos/project-euler/002/002.factor
@@ -77,4 +77,4 @@ PRIVATE>
 ! [ euler002b ] 100 ave-time
 ! 0 ms ave run time - 0.0 SD (100 trials)
 
-SOLUTION: euler002b
+solution: euler002b
diff --git a/demos/project-euler/003/003.factor b/demos/project-euler/003/003.factor
index 1ef594546f..50d8572ea1 100644
--- a/demos/project-euler/003/003.factor
+++ b/demos/project-euler/003/003.factor
@@ -22,4 +22,4 @@ in: project-euler.003
 ! [ euler003 ] 100 ave-time
 ! 1 ms ave run time - 0.49 SD (100 trials)
 
-SOLUTION: euler003
+solution: euler003
diff --git a/demos/project-euler/004/004.factor b/demos/project-euler/004/004.factor
index 70c4a78340..7b29269350 100644
--- a/demos/project-euler/004/004.factor
+++ b/demos/project-euler/004/004.factor
@@ -34,4 +34,4 @@ PRIVATE>
 ! [ euler004 ] 100 ave-time
 ! 1164 ms ave run time - 39.35 SD (100 trials)
 
-SOLUTION: euler004
+solution: euler004
diff --git a/demos/project-euler/005/005.factor b/demos/project-euler/005/005.factor
index 80c0964716..ad660f962a 100644
--- a/demos/project-euler/005/005.factor
+++ b/demos/project-euler/005/005.factor
@@ -23,4 +23,4 @@ in: project-euler.005
 ! [ euler005 ] 100 ave-time
 ! 0 ms ave run time - 0.14 SD (100 trials)
 
-SOLUTION: euler005
+solution: euler005
diff --git a/demos/project-euler/006/006.factor b/demos/project-euler/006/006.factor
index af01962cf4..8a6aab775e 100644
--- a/demos/project-euler/006/006.factor
+++ b/demos/project-euler/006/006.factor
@@ -40,4 +40,4 @@ PRIVATE>
 ! [ euler006 ] 100 ave-time
 ! 0 ms ave run time - 0.24 SD (100 trials)
 
-SOLUTION: euler006
+solution: euler006
diff --git a/demos/project-euler/007/007.factor b/demos/project-euler/007/007.factor
index 4d44f125c9..ffd16f9712 100644
--- a/demos/project-euler/007/007.factor
+++ b/demos/project-euler/007/007.factor
@@ -23,4 +23,4 @@ in: project-euler.007
 ! [ euler007 ] 100 ave-time
 ! 5 ms ave run time - 1.13 SD (100 trials)
 
-SOLUTION: euler007
+solution: euler007
diff --git a/demos/project-euler/008/008.factor b/demos/project-euler/008/008.factor
index 8962bfeee1..0ff3b82416 100644
--- a/demos/project-euler/008/008.factor
+++ b/demos/project-euler/008/008.factor
@@ -69,4 +69,4 @@ PRIVATE>
 ! [ euler008 ] 100 ave-time
 ! 2 ms ave run time - 0.79 SD (100 trials)
 
-SOLUTION: euler008
+solution: euler008
diff --git a/demos/project-euler/009/009.factor b/demos/project-euler/009/009.factor
index 2a8350b5ce..ab952e7863 100644
--- a/demos/project-euler/009/009.factor
+++ b/demos/project-euler/009/009.factor
@@ -50,4 +50,4 @@ PRIVATE>
 ! [ euler009 ] 100 ave-time
 ! 1 ms ave run time - 0.73 SD (100 trials)
 
-SOLUTION: euler009
+solution: euler009
diff --git a/demos/project-euler/010/010.factor b/demos/project-euler/010/010.factor
index 822b8a0253..9fe95be3c6 100644
--- a/demos/project-euler/010/010.factor
+++ b/demos/project-euler/010/010.factor
@@ -22,4 +22,4 @@ in: project-euler.010
 ! [ euler010 ] 100 ave-time
 ! 15 ms ave run time - 0.41 SD (100 trials)
 
-SOLUTION: euler010
+solution: euler010
diff --git a/demos/project-euler/011/011.factor b/demos/project-euler/011/011.factor
index c8e283fe1a..c0ca3f74ff 100644
--- a/demos/project-euler/011/011.factor
+++ b/demos/project-euler/011/011.factor
@@ -101,4 +101,4 @@ PRIVATE>
 ! [ euler011 ] 100 ave-time
 ! 3 ms ave run time - 0.77 SD (100 trials)
 
-SOLUTION: euler011
+solution: euler011
diff --git a/demos/project-euler/012/012.factor b/demos/project-euler/012/012.factor
index 75ce2edd3e..9686b52665 100644
--- a/demos/project-euler/012/012.factor
+++ b/demos/project-euler/012/012.factor
@@ -39,4 +39,4 @@ in: project-euler.012
 ! [ euler012 ] 10 ave-time
 ! 6573 ms ave run time - 346.27 SD (10 trials)
 
-SOLUTION: euler012
+solution: euler012
diff --git a/demos/project-euler/013/013.factor b/demos/project-euler/013/013.factor
index 83355efebd..618a365999 100644
--- a/demos/project-euler/013/013.factor
+++ b/demos/project-euler/013/013.factor
@@ -230,4 +230,4 @@ PRIVATE>
 ! [ euler013 ] 100 ave-time
 ! 0 ms ave run time - 0.31 SD (100 trials)
 
-SOLUTION: euler013
+solution: euler013
diff --git a/demos/project-euler/014/014.factor b/demos/project-euler/014/014.factor
index d7d86fda66..049330de46 100644
--- a/demos/project-euler/014/014.factor
+++ b/demos/project-euler/014/014.factor
@@ -70,4 +70,4 @@ PRIVATE>
 
 ! TODO: try using memoization
 
-SOLUTION: euler014a
+solution: euler014a
diff --git a/demos/project-euler/015/015.factor b/demos/project-euler/015/015.factor
index 6888bcb644..e69be5eef1 100644
--- a/demos/project-euler/015/015.factor
+++ b/demos/project-euler/015/015.factor
@@ -30,4 +30,4 @@ PRIVATE>
 ! [ euler015 ] 100 ave-time
 ! 0 ms ave run time - 0.2 SD (100 trials)
 
-SOLUTION: euler015
+solution: euler015
diff --git a/demos/project-euler/016/016.factor b/demos/project-euler/016/016.factor
index 8fc7a04d34..b480ec53b1 100644
--- a/demos/project-euler/016/016.factor
+++ b/demos/project-euler/016/016.factor
@@ -22,4 +22,4 @@ in: project-euler.016
 ! [ euler016 ] 100 ave-time
 ! 0 ms ave run time - 0.67 SD (100 trials)
 
-SOLUTION: euler016
+solution: euler016
diff --git a/demos/project-euler/017/017.factor b/demos/project-euler/017/017.factor
index b036f434a3..c154d76ba4 100644
--- a/demos/project-euler/017/017.factor
+++ b/demos/project-euler/017/017.factor
@@ -29,4 +29,4 @@ in: project-euler.017
 ! [ euler017 ] 100 ave-time
 ! 15 ms ave run time - 1.71 SD (100 trials)
 
-SOLUTION: euler017
+solution: euler017
diff --git a/demos/project-euler/018/018.factor b/demos/project-euler/018/018.factor
index e42debf76e..50f1d02d90 100644
--- a/demos/project-euler/018/018.factor
+++ b/demos/project-euler/018/018.factor
@@ -90,4 +90,4 @@ PRIVATE>
 ! [ euler018a ] 100 ave-time
 ! 0 ms ave run time - 0.39 SD (100 trials)
 
-SOLUTION: euler018a
+solution: euler018a
diff --git a/demos/project-euler/019/019.factor b/demos/project-euler/019/019.factor
index 98773ee407..d0e39c25a1 100644
--- a/demos/project-euler/019/019.factor
+++ b/demos/project-euler/019/019.factor
@@ -63,4 +63,4 @@ PRIVATE>
 ! [ euler019a ] 100 ave-time
 ! 17 ms ave run time - 2.13 SD (100 trials)
 
-SOLUTION: euler019
+solution: euler019
diff --git a/demos/project-euler/020/020.factor b/demos/project-euler/020/020.factor
index b0936d220b..363f4a510c 100644
--- a/demos/project-euler/020/020.factor
+++ b/demos/project-euler/020/020.factor
@@ -22,4 +22,4 @@ in: project-euler.020
 ! [ euler020 ] 100 ave-time
 ! 0 ms ave run time - 0.55 (100 trials)
 
-SOLUTION: euler020
+solution: euler020
diff --git a/demos/project-euler/021/021.factor b/demos/project-euler/021/021.factor
index f1c72c3181..545525d1dd 100644
--- a/demos/project-euler/021/021.factor
+++ b/demos/project-euler/021/021.factor
@@ -35,4 +35,4 @@ in: project-euler.021
 ! [ euler021 ] 100 ave-time
 ! 335 ms ave run time - 18.63 SD (100 trials)
 
-SOLUTION: euler021
+solution: euler021
diff --git a/demos/project-euler/022/022.factor b/demos/project-euler/022/022.factor
index 7e78eb85ca..329a35b364 100644
--- a/demos/project-euler/022/022.factor
+++ b/demos/project-euler/022/022.factor
@@ -42,4 +42,4 @@ PRIVATE>
 ! [ euler022 ] 100 ave-time
 ! 74 ms ave run time - 5.13 SD (100 trials)
 
-SOLUTION: euler022
+solution: euler022
diff --git a/demos/project-euler/023/023.factor b/demos/project-euler/023/023.factor
index 5f81fb00b4..f7624d617a 100644
--- a/demos/project-euler/023/023.factor
+++ b/demos/project-euler/023/023.factor
@@ -55,4 +55,4 @@ PRIVATE>
 ! [ euler023 ] time
 ! 2.15542 seconds
 
-SOLUTION: euler023
+solution: euler023
diff --git a/demos/project-euler/024/024.factor b/demos/project-euler/024/024.factor
index 4f2160adab..6b9d629034 100644
--- a/demos/project-euler/024/024.factor
+++ b/demos/project-euler/024/024.factor
@@ -29,4 +29,4 @@ in: project-euler.024
 ! [ euler024 ] 100 ave-time
 ! 0 ms ave run time - 0.27 SD (100 trials)
 
-SOLUTION: euler024
+solution: euler024
diff --git a/demos/project-euler/025/025.factor b/demos/project-euler/025/025.factor
index b59665888b..70d9300734 100644
--- a/demos/project-euler/025/025.factor
+++ b/demos/project-euler/025/025.factor
@@ -78,4 +78,4 @@ PRIVATE>
 ! [ euler025a ] 100 ave-time
 ! 0 ms ave run time - 0.17 SD (100 trials)
 
-SOLUTION: euler025a
+solution: euler025a
diff --git a/demos/project-euler/026/026.factor b/demos/project-euler/026/026.factor
index 336921e6ea..3241499bba 100644
--- a/demos/project-euler/026/026.factor
+++ b/demos/project-euler/026/026.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler026 ] 100 ave-time
 ! 290 ms ave run time - 19.2 SD (100 trials)
 
-SOLUTION: euler026
+solution: euler026
diff --git a/demos/project-euler/027/027.factor b/demos/project-euler/027/027.factor
index bd42cea48c..726cdf96de 100644
--- a/demos/project-euler/027/027.factor
+++ b/demos/project-euler/027/027.factor
@@ -72,4 +72,4 @@ PRIVATE>
 
 ! TODO: generalize max-consecutive/max-product (from #26) into a new word
 
-SOLUTION: euler027
+solution: euler027
diff --git a/demos/project-euler/028/028.factor b/demos/project-euler/028/028.factor
index 19ab719c2e..c859812338 100644
--- a/demos/project-euler/028/028.factor
+++ b/demos/project-euler/028/028.factor
@@ -43,4 +43,4 @@ PRIVATE>
 ! [ euler028 ] 100 ave-time
 ! 0 ms ave run time - 0.39 SD (100 trials)
 
-SOLUTION: euler028
+solution: euler028
diff --git a/demos/project-euler/029/029.factor b/demos/project-euler/029/029.factor
index 4af431d6c2..c161325d8d 100644
--- a/demos/project-euler/029/029.factor
+++ b/demos/project-euler/029/029.factor
@@ -34,4 +34,4 @@ in: project-euler.029
 ! [ euler029 ] 100 ave-time
 ! 704 ms ave run time - 28.07 SD (100 trials)
 
-SOLUTION: euler029
+solution: euler029
diff --git a/demos/project-euler/030/030.factor b/demos/project-euler/030/030.factor
index 0ff96a34fe..dbcb25ffe0 100644
--- a/demos/project-euler/030/030.factor
+++ b/demos/project-euler/030/030.factor
@@ -43,4 +43,4 @@ PRIVATE>
 ! [ euler030 ] 100 ave-time
 ! 1700 ms ave run time - 64.84 SD (100 trials)
 
-SOLUTION: euler030
+solution: euler030
diff --git a/demos/project-euler/031/031.factor b/demos/project-euler/031/031.factor
index ee17eb8993..d64a65e33b 100644
--- a/demos/project-euler/031/031.factor
+++ b/demos/project-euler/031/031.factor
@@ -60,4 +60,4 @@ PRIVATE>
 
 ! TODO: generalize to eliminate duplication; use a sequence to specify denominations?
 
-SOLUTION: euler031
+solution: euler031
diff --git a/demos/project-euler/032/032.factor b/demos/project-euler/032/032.factor
index 55837d0e15..82d0fd8725 100644
--- a/demos/project-euler/032/032.factor
+++ b/demos/project-euler/032/032.factor
@@ -77,4 +77,4 @@ PRIVATE>
 ! [ euler032a ] 10 ave-time
 ! 2624 ms ave run time - 131.91 SD (10 trials)
 
-SOLUTION: euler032a
+solution: euler032a
diff --git a/demos/project-euler/033/033.factor b/demos/project-euler/033/033.factor
index b4bee740a3..4a6b20dd31 100644
--- a/demos/project-euler/033/033.factor
+++ b/demos/project-euler/033/033.factor
@@ -52,4 +52,4 @@ PRIVATE>
 ! [ euler033 ] 100 ave-time
 ! 7 ms ave run time - 1.31 SD (100 trials)
 
-SOLUTION: euler033
+solution: euler033
diff --git a/demos/project-euler/034/034.factor b/demos/project-euler/034/034.factor
index 5b772fab60..7d4fd6c09b 100644
--- a/demos/project-euler/034/034.factor
+++ b/demos/project-euler/034/034.factor
@@ -44,4 +44,4 @@ PRIVATE>
 ! [ euler034 ] 10 ave-time
 ! 5506 ms ave run time - 144.0 SD (10 trials)
 
-SOLUTION: euler034
+solution: euler034
diff --git a/demos/project-euler/035/035.factor b/demos/project-euler/035/035.factor
index d97e957e6d..37d0d62c68 100644
--- a/demos/project-euler/035/035.factor
+++ b/demos/project-euler/035/035.factor
@@ -58,4 +58,4 @@ PRIVATE>
 ! TODO: try using bit arrays or other methods outlined here:
 !     http://home.comcast.net/~babdulbaki/Circular_Primes.html
 
-SOLUTION: euler035
+solution: euler035
diff --git a/demos/project-euler/036/036.factor b/demos/project-euler/036/036.factor
index aa94612e2d..57d2c8f7c6 100644
--- a/demos/project-euler/036/036.factor
+++ b/demos/project-euler/036/036.factor
@@ -36,4 +36,4 @@ PRIVATE>
 ! [ euler036 ] 100 ave-time
 ! 1703 ms ave run time - 96.6 SD (100 trials)
 
-SOLUTION: euler036
+solution: euler036
diff --git a/demos/project-euler/037/037.factor b/demos/project-euler/037/037.factor
index 2481ab8da9..290a43a29e 100644
--- a/demos/project-euler/037/037.factor
+++ b/demos/project-euler/037/037.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler037 ] 100 ave-time
 ! 130 ms ave run time - 6.27 SD (100 trials)
 
-SOLUTION: euler037
+solution: euler037
diff --git a/demos/project-euler/038/038.factor b/demos/project-euler/038/038.factor
index f7493b8ac4..2990e42843 100644
--- a/demos/project-euler/038/038.factor
+++ b/demos/project-euler/038/038.factor
@@ -53,4 +53,4 @@ PRIVATE>
 ! [ euler038 ] 100 ave-time
 ! 11 ms ave run time - 1.5 SD (100 trials)
 
-SOLUTION: euler038
+solution: euler038
diff --git a/demos/project-euler/039/039.factor b/demos/project-euler/039/039.factor
index 0e2ac99888..95ff7ee22e 100644
--- a/demos/project-euler/039/039.factor
+++ b/demos/project-euler/039/039.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler039 ] 100 ave-time
 ! 1 ms ave run time - 0.37 SD (100 trials)
 
-SOLUTION: euler039
+solution: euler039
diff --git a/demos/project-euler/040/040.factor b/demos/project-euler/040/040.factor
index eb9a4758d9..99201a0460 100644
--- a/demos/project-euler/040/040.factor
+++ b/demos/project-euler/040/040.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler040 ] 100 ave-time
 ! 444 ms ave run time - 23.64 SD (100 trials)
 
-SOLUTION: euler040
+solution: euler040
diff --git a/demos/project-euler/041/041.factor b/demos/project-euler/041/041.factor
index 60ae591a63..7ebf02e2b3 100644
--- a/demos/project-euler/041/041.factor
+++ b/demos/project-euler/041/041.factor
@@ -37,4 +37,4 @@ in: project-euler.041
 ! [ euler041 ] 100 ave-time
 ! 64 ms ave run time - 4.22 SD (100 trials)
 
-SOLUTION: euler041
+solution: euler041
diff --git a/demos/project-euler/042/042.factor b/demos/project-euler/042/042.factor
index 41182881cc..e44fb52c32 100644
--- a/demos/project-euler/042/042.factor
+++ b/demos/project-euler/042/042.factor
@@ -71,4 +71,4 @@ PRIVATE>
 ! [ euler042a ] 100 ave-time
 ! 21 ms ave run time - 2.2 SD (100 trials)
 
-SOLUTION: euler042a
+solution: euler042a
diff --git a/demos/project-euler/043/043.factor b/demos/project-euler/043/043.factor
index 094a7cca0c..81de043ff2 100644
--- a/demos/project-euler/043/043.factor
+++ b/demos/project-euler/043/043.factor
@@ -98,4 +98,4 @@ PRIVATE>
 ! [ euler043a ] 100 ave-time
 ! 10 ms ave run time - 1.37 SD (100 trials)
 
-SOLUTION: euler043a
+solution: euler043a
diff --git a/demos/project-euler/044/044.factor b/demos/project-euler/044/044.factor
index b851391535..27574ccef0 100644
--- a/demos/project-euler/044/044.factor
+++ b/demos/project-euler/044/044.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler044 ] 10 ave-time
 ! 289 ms ave run time - 0.27 SD (10 trials)
 
-SOLUTION: euler044
+solution: euler044
diff --git a/demos/project-euler/045/045.factor b/demos/project-euler/045/045.factor
index cf5d045ed8..2c3ff6637e 100644
--- a/demos/project-euler/045/045.factor
+++ b/demos/project-euler/045/045.factor
@@ -46,4 +46,4 @@ PRIVATE>
 ! [ euler045 ] 100 ave-time
 ! 12 ms ave run time - 1.71 SD (100 trials)
 
-SOLUTION: euler045
+solution: euler045
diff --git a/demos/project-euler/046/046.factor b/demos/project-euler/046/046.factor
index e94fe3c9f0..1f288545d1 100644
--- a/demos/project-euler/046/046.factor
+++ b/demos/project-euler/046/046.factor
@@ -50,4 +50,4 @@ PRIVATE>
 ! [ euler046 ] 100 ave-time
 ! 37 ms ave run time - 3.39 SD (100 trials)
 
-SOLUTION: euler046
+solution: euler046
diff --git a/demos/project-euler/047/047.factor b/demos/project-euler/047/047.factor
index 1156513c4f..fca24bd3db 100644
--- a/demos/project-euler/047/047.factor
+++ b/demos/project-euler/047/047.factor
@@ -93,4 +93,4 @@ PRIVATE>
 ! TODO: I don't like that you have to specify the upper bound, maybe try making
 ! this lazy so it could also short-circuit when it finds the answer?
 
-SOLUTION: euler047a
+solution: euler047a
diff --git a/demos/project-euler/048/048.factor b/demos/project-euler/048/048.factor
index 8bcff15479..4ea5c046e4 100644
--- a/demos/project-euler/048/048.factor
+++ b/demos/project-euler/048/048.factor
@@ -23,4 +23,4 @@ in: project-euler.048
 ! [ euler048 ] 100 ave-time
 ! 276 ms run / 1 ms GC ave time - 100 trials
 
-SOLUTION: euler048
+solution: euler048
diff --git a/demos/project-euler/049/049.factor b/demos/project-euler/049/049.factor
index e5d6c774cc..16ef7a0ccd 100644
--- a/demos/project-euler/049/049.factor
+++ b/demos/project-euler/049/049.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler049 ] 100 ave-time
 ! 206 ms ave run time - 10.25 SD (100 trials)
 
-SOLUTION: euler049
+solution: euler049
diff --git a/demos/project-euler/050/050.factor b/demos/project-euler/050/050.factor
index 69708dd53e..e3141ae2cf 100644
--- a/demos/project-euler/050/050.factor
+++ b/demos/project-euler/050/050.factor
@@ -85,4 +85,4 @@ PRIVATE>
 ! [ euler050 ] 100 ave-time
 ! 291 ms run / 20.6 ms GC ave time - 100 trials
 
-SOLUTION: euler050
+solution: euler050
diff --git a/demos/project-euler/051/051.factor b/demos/project-euler/051/051.factor
index 600a19906c..88afa55f65 100644
--- a/demos/project-euler/051/051.factor
+++ b/demos/project-euler/051/051.factor
@@ -81,4 +81,4 @@ PRIVATE>
 : euler051 ( -- answer )
     2 (euler051) ;
 
-SOLUTION: euler051
+solution: euler051
diff --git a/demos/project-euler/052/052.factor b/demos/project-euler/052/052.factor
index acfea339e0..f7e354cc54 100644
--- a/demos/project-euler/052/052.factor
+++ b/demos/project-euler/052/052.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler052 ] 100 ave-time
 ! 92 ms ave run time - 6.29 SD (100 trials)
 
-SOLUTION: euler052
+solution: euler052
diff --git a/demos/project-euler/053/053.factor b/demos/project-euler/053/053.factor
index a317b8ada9..2828ad651e 100644
--- a/demos/project-euler/053/053.factor
+++ b/demos/project-euler/053/053.factor
@@ -32,4 +32,4 @@ in: project-euler.053
 ! [ euler053 ] 100 ave-time
 ! 52 ms ave run time - 4.44 SD (100 trials)
 
-SOLUTION: euler053
+solution: euler053
diff --git a/demos/project-euler/054/054.factor b/demos/project-euler/054/054.factor
index 9fdae62baa..061c1fc40b 100644
--- a/demos/project-euler/054/054.factor
+++ b/demos/project-euler/054/054.factor
@@ -81,4 +81,4 @@ PRIVATE>
 ! [ euler054 ] 100 ave-time
 ! 34 ms ave run time - 2.65 SD (100 trials)
 
-SOLUTION: euler054
+solution: euler054
diff --git a/demos/project-euler/055/055.factor b/demos/project-euler/055/055.factor
index e389c906f8..d5f054eb80 100644
--- a/demos/project-euler/055/055.factor
+++ b/demos/project-euler/055/055.factor
@@ -66,4 +66,4 @@ PRIVATE>
 ! [ euler055 ] 100 ave-time
 ! 478 ms ave run time - 30.63 SD (100 trials)
 
-SOLUTION: euler055
+solution: euler055
diff --git a/demos/project-euler/056/056.factor b/demos/project-euler/056/056.factor
index 4d04266933..7d5bd2f720 100644
--- a/demos/project-euler/056/056.factor
+++ b/demos/project-euler/056/056.factor
@@ -29,4 +29,4 @@ in: project-euler.056
 ! [ euler056 ] 100 ave-time
 ! 22 ms ave run time - 2.13 SD (100 trials)
 
-SOLUTION: euler056
+solution: euler056
diff --git a/demos/project-euler/057/057.factor b/demos/project-euler/057/057.factor
index 07d6c864ef..0ab2d2b8fa 100644
--- a/demos/project-euler/057/057.factor
+++ b/demos/project-euler/057/057.factor
@@ -41,4 +41,4 @@ in: project-euler.057
 ! [ euler057 ] 100 ave-time
 ! 1728 ms ave run time - 80.81 SD (100 trials)
 
-SOLUTION: euler057
+solution: euler057
diff --git a/demos/project-euler/058/058.factor b/demos/project-euler/058/058.factor
index 4e1f2c88e1..3ab112e42a 100644
--- a/demos/project-euler/058/058.factor
+++ b/demos/project-euler/058/058.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler058 ] 10 ave-time
 ! 12974 ms ave run time - 284.46 SD (10 trials)
 
-SOLUTION: euler058
+solution: euler058
diff --git a/demos/project-euler/059/059.factor b/demos/project-euler/059/059.factor
index 2e3d98d636..ae1706ecde 100644
--- a/demos/project-euler/059/059.factor
+++ b/demos/project-euler/059/059.factor
@@ -89,4 +89,4 @@ PRIVATE>
 ! [ euler059 ] 100 ave-time
 ! 8 ms ave run time - 1.4 SD (100 trials)
 
-SOLUTION: euler059
+solution: euler059
diff --git a/demos/project-euler/062/062.factor b/demos/project-euler/062/062.factor
index 8349be2e8d..9fbe36dedc 100644
--- a/demos/project-euler/062/062.factor
+++ b/demos/project-euler/062/062.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler062 ] 100 ave-time
 ! 78 ms ave run time - 0.9 SD (100 trials)
 
-SOLUTION: euler062
+solution: euler062
diff --git a/demos/project-euler/063/063.factor b/demos/project-euler/063/063.factor
index fab98bfaac..9794f5b717 100644
--- a/demos/project-euler/063/063.factor
+++ b/demos/project-euler/063/063.factor
@@ -34,4 +34,4 @@ in: project-euler.063
 ! [ euler063 ] 100 ave-time
 ! 0 ms ave run time - 0.0 SD (100 trials)
 
-SOLUTION: euler063
+solution: euler063
diff --git a/demos/project-euler/065/065.factor b/demos/project-euler/065/065.factor
index ab4adf459d..8374f473a3 100644
--- a/demos/project-euler/065/065.factor
+++ b/demos/project-euler/065/065.factor
@@ -74,4 +74,4 @@ PRIVATE>
 ! [ euler065 ] 100 ave-time
 ! 4 ms ave run time - 0.33 SD (100 trials)
 
-SOLUTION: euler065
+solution: euler065
diff --git a/demos/project-euler/067/067.factor b/demos/project-euler/067/067.factor
index 9dedff0f23..fe05fbf61c 100644
--- a/demos/project-euler/067/067.factor
+++ b/demos/project-euler/067/067.factor
@@ -59,4 +59,4 @@ PRIVATE>
 ! [ euler067a ] 100 ave-time
 ! 21 ms ave run time - 2.65 SD (100 trials)
 
-SOLUTION: euler067a
+solution: euler067a
diff --git a/demos/project-euler/069/069.factor b/demos/project-euler/069/069.factor
index 54231701c9..795f1fc8ff 100644
--- a/demos/project-euler/069/069.factor
+++ b/demos/project-euler/069/069.factor
@@ -81,4 +81,4 @@ PRIVATE>
 ! [ euler069a ] 100 ave-time
 ! 0 ms ave run time - 0.01 SD (100 trials)
 
-SOLUTION: euler069a
+solution: euler069a
diff --git a/demos/project-euler/070/070.factor b/demos/project-euler/070/070.factor
index 10d963fa3a..d583addd75 100644
--- a/demos/project-euler/070/070.factor
+++ b/demos/project-euler/070/070.factor
@@ -65,4 +65,4 @@ PRIVATE>
 ! [ euler070 ] 100 ave-time
 ! 379 ms ave run time - 1.15 SD (100 trials)
 
-SOLUTION: euler070
+solution: euler070
diff --git a/demos/project-euler/071/071.factor b/demos/project-euler/071/071.factor
index 2c6dceed8e..048cca8320 100644
--- a/demos/project-euler/071/071.factor
+++ b/demos/project-euler/071/071.factor
@@ -39,4 +39,4 @@ in: project-euler.071
 ! [ euler071 ] 100 ave-time
 ! 155 ms ave run time - 6.95 SD (100 trials)
 
-SOLUTION: euler071
+solution: euler071
diff --git a/demos/project-euler/072/072.factor b/demos/project-euler/072/072.factor
index 325b0e5482..d1f6750c5d 100644
--- a/demos/project-euler/072/072.factor
+++ b/demos/project-euler/072/072.factor
@@ -35,4 +35,4 @@ in: project-euler.072
 ! [ euler072 ] 100 ave-time
 ! 5274 ms ave run time - 102.7 SD (100 trials)
 
-SOLUTION: euler072
+solution: euler072
diff --git a/demos/project-euler/073/073.factor b/demos/project-euler/073/073.factor
index d69c2f817b..41b62efa25 100644
--- a/demos/project-euler/073/073.factor
+++ b/demos/project-euler/073/073.factor
@@ -48,4 +48,4 @@ PRIVATE>
 ! [ euler073 ] 10 ave-time
 ! 20506 ms ave run time - 937.07 SD (10 trials)
 
-SOLUTION: euler073
+solution: euler073
diff --git a/demos/project-euler/074/074.factor b/demos/project-euler/074/074.factor
index 108089094c..bffddfe1af 100644
--- a/demos/project-euler/074/074.factor
+++ b/demos/project-euler/074/074.factor
@@ -64,4 +64,4 @@ PRIVATE>
 ! [ euler074 ] 10 ave-time
 ! 25134 ms ave run time - 31.96 SD (10 trials)
 
-SOLUTION: euler074
+solution: euler074
diff --git a/demos/project-euler/075/075.factor b/demos/project-euler/075/075.factor
index f341370611..c8c1c5eae5 100644
--- a/demos/project-euler/075/075.factor
+++ b/demos/project-euler/075/075.factor
@@ -75,4 +75,4 @@ PRIVATE>
 ! [ euler075 ] 10 ave-time
 ! 3341 ms ave run timen - 157.77 SD (10 trials)
 
-SOLUTION: euler075
+solution: euler075
diff --git a/demos/project-euler/076/076.factor b/demos/project-euler/076/076.factor
index 8017c37293..1212a43bf7 100644
--- a/demos/project-euler/076/076.factor
+++ b/demos/project-euler/076/076.factor
@@ -56,4 +56,4 @@ PRIVATE>
 ! [ euler076 ] 100 ave-time
 ! 560 ms ave run time - 17.74 SD (100 trials)
 
-SOLUTION: euler076
+solution: euler076
diff --git a/demos/project-euler/079/079.factor b/demos/project-euler/079/079.factor
index 158916127e..309fd72550 100644
--- a/demos/project-euler/079/079.factor
+++ b/demos/project-euler/079/079.factor
@@ -63,4 +63,4 @@ PRIVATE>
 ! TODO: set words on sequences are relatively slow; topological sort could be
 ! cleaned up and generalized much better, but it works for this problem
 
-SOLUTION: euler079
+solution: euler079
diff --git a/demos/project-euler/081/081.factor b/demos/project-euler/081/081.factor
index abe4ceebdc..341b849131 100644
--- a/demos/project-euler/081/081.factor
+++ b/demos/project-euler/081/081.factor
@@ -72,4 +72,4 @@ PRIVATE>
 ! [ euler081 ] 100 ave-time
 ! 9 ms ave run time - 0.39 SD (100 trials)
 
-SOLUTION: euler081
+solution: euler081
diff --git a/demos/project-euler/085/085.factor b/demos/project-euler/085/085.factor
index 2adc1f6e08..f32f6aca8d 100644
--- a/demos/project-euler/085/085.factor
+++ b/demos/project-euler/085/085.factor
@@ -58,4 +58,4 @@ PRIVATE>
 ! [ euler085 ] 100 ave-time
 ! 791 ms ave run time - 17.15 SD (100 trials)
 
-SOLUTION: euler085
+solution: euler085
diff --git a/demos/project-euler/089/089.factor b/demos/project-euler/089/089.factor
index 7687aec6a2..a821da6493 100644
--- a/demos/project-euler/089/089.factor
+++ b/demos/project-euler/089/089.factor
@@ -45,4 +45,4 @@ in: project-euler.089
 ! [ euler089 ] 100 ave-time
 ! 14 ms ave run time - 0.27 SD (100 trials)
 
-SOLUTION: euler089
+solution: euler089
diff --git a/demos/project-euler/092/092.factor b/demos/project-euler/092/092.factor
index 601a9d25e3..a93ad4d4b5 100644
--- a/demos/project-euler/092/092.factor
+++ b/demos/project-euler/092/092.factor
@@ -50,4 +50,4 @@ PRIVATE>
 
 ! TODO: this solution is not very efficient, much better optimizations exist
 
-SOLUTION: euler092
+solution: euler092
diff --git a/demos/project-euler/097/097.factor b/demos/project-euler/097/097.factor
index d3ab5174e0..99b1aebaa6 100644
--- a/demos/project-euler/097/097.factor
+++ b/demos/project-euler/097/097.factor
@@ -28,4 +28,4 @@ in: project-euler.097
 ! [ euler097 ] 100 ave-time
 ! 0 ms ave run timen - 0.22 SD (100 trials)
 
-SOLUTION: euler097
+solution: euler097
diff --git a/demos/project-euler/099/099.factor b/demos/project-euler/099/099.factor
index 93b831acd0..056d1babeb 100644
--- a/demos/project-euler/099/099.factor
+++ b/demos/project-euler/099/099.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler099 ] 100 ave-time
 ! 16 ms ave run timen - 1.67 SD (100 trials)
 
-SOLUTION: euler099
+solution: euler099
diff --git a/demos/project-euler/100/100.factor b/demos/project-euler/100/100.factor
index eeb6ca4bf8..7635558fd0 100644
--- a/demos/project-euler/100/100.factor
+++ b/demos/project-euler/100/100.factor
@@ -32,4 +32,4 @@ in: project-euler.100
 ! [ euler100 ] 100 ave-time
 ! 0 ms ave run time - 0.14 SD (100 trials)
 
-SOLUTION: euler100
+solution: euler100
diff --git a/demos/project-euler/102/102.factor b/demos/project-euler/102/102.factor
index ac9ac4a279..7aa3287e35 100644
--- a/demos/project-euler/102/102.factor
+++ b/demos/project-euler/102/102.factor
@@ -61,4 +61,4 @@ PRIVATE>
 ! [ euler102 ] 100 ave-time
 ! 12 ms ave run time - 0.92 SD (100 trials)
 
-SOLUTION: euler102
+solution: euler102
diff --git a/demos/project-euler/112/112.factor b/demos/project-euler/112/112.factor
index fc7eddd86c..fe83ff91ee 100644
--- a/demos/project-euler/112/112.factor
+++ b/demos/project-euler/112/112.factor
@@ -49,4 +49,4 @@ PRIVATE>
 ! [ euler112 ] 100 ave-time
 ! 2749 ms ave run time - 33.76 SD (100 trials)
 
-SOLUTION: euler112
+solution: euler112
diff --git a/demos/project-euler/116/116.factor b/demos/project-euler/116/116.factor
index de0efec5f6..da61373139 100644
--- a/demos/project-euler/116/116.factor
+++ b/demos/project-euler/116/116.factor
@@ -57,4 +57,4 @@ PRIVATE>
 ! [ euler116 ] 100 ave-time
 ! 0 ms ave run time - 0.34 SD (100 trials)
 
-SOLUTION: euler116
+solution: euler116
diff --git a/demos/project-euler/117/117.factor b/demos/project-euler/117/117.factor
index 5e4eddea7f..cc7ad0be36 100644
--- a/demos/project-euler/117/117.factor
+++ b/demos/project-euler/117/117.factor
@@ -41,4 +41,4 @@ PRIVATE>
 ! [ euler117 ] 100 ave-time
 ! 0 ms ave run time - 0.29 SD (100 trials)
 
-SOLUTION: euler117
+solution: euler117
diff --git a/demos/project-euler/124/124.factor b/demos/project-euler/124/124.factor
index fc1b7da2f9..0b43345cc3 100644
--- a/demos/project-euler/124/124.factor
+++ b/demos/project-euler/124/124.factor
@@ -60,4 +60,4 @@ PRIVATE>
 ! array in the way of the sieve of eratosthene would scale
 ! better on bigger values.
 
-SOLUTION: euler124
+solution: euler124
diff --git a/demos/project-euler/134/134.factor b/demos/project-euler/134/134.factor
index 5b81b2103f..628377c01f 100644
--- a/demos/project-euler/134/134.factor
+++ b/demos/project-euler/134/134.factor
@@ -45,4 +45,4 @@ PRIVATE>
 ! [ euler134 ] 10 ave-time
 ! 933 ms ave run timen - 19.58 SD (10 trials)
 
-SOLUTION: euler134
+solution: euler134
diff --git a/demos/project-euler/148/148.factor b/demos/project-euler/148/148.factor
index a4be3246ac..7bee3095d3 100644
--- a/demos/project-euler/148/148.factor
+++ b/demos/project-euler/148/148.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler148 ] 100 ave-time
 ! 0 ms ave run time - 0.17 SD (100 trials)
 
-SOLUTION: euler148
+solution: euler148
diff --git a/demos/project-euler/150/150.factor b/demos/project-euler/150/150.factor
index 339e883e62..02cb5ab50e 100644
--- a/demos/project-euler/150/150.factor
+++ b/demos/project-euler/150/150.factor
@@ -70,4 +70,4 @@ PRIVATE>
 ! [ euler150 ] 10 ave-time
 ! 30208 ms ave run time - 593.45 SD (10 trials)
 
-SOLUTION: euler150
+solution: euler150
diff --git a/demos/project-euler/151/151.factor b/demos/project-euler/151/151.factor
index f5c9249dd5..4c55e128c9 100644
--- a/demos/project-euler/151/151.factor
+++ b/demos/project-euler/151/151.factor
@@ -74,4 +74,4 @@ defer: (euler151)
 ! [ euler151 ] 100 ave-time
 ! ? ms run time - 100 trials
 
-SOLUTION: euler151
+solution: euler151
diff --git a/demos/project-euler/164/164.factor b/demos/project-euler/164/164.factor
index 2308b78e9d..847f1188ae 100644
--- a/demos/project-euler/164/164.factor
+++ b/demos/project-euler/164/164.factor
@@ -35,4 +35,4 @@ PRIVATE>
 ! [ euler164 ] 100 ave-time
 ! 7 ms ave run time - 1.23 SD (100 trials)
 
-SOLUTION: euler164
+solution: euler164
diff --git a/demos/project-euler/169/169.factor b/demos/project-euler/169/169.factor
index a0982ceaec..4077d47ec5 100644
--- a/demos/project-euler/169/169.factor
+++ b/demos/project-euler/169/169.factor
@@ -39,4 +39,4 @@ MEMO: fn ( n -- x )
 ! [ euler169 ] 100 ave-time
 ! 0 ms ave run time - 0.2 SD (100 trials)
 
-SOLUTION: euler169
+solution: euler169
diff --git a/demos/project-euler/173/173.factor b/demos/project-euler/173/173.factor
index 900157d32e..4c4d7c2ce3 100644
--- a/demos/project-euler/173/173.factor
+++ b/demos/project-euler/173/173.factor
@@ -35,4 +35,4 @@ PRIVATE>
 ! [ euler173 ] 100 ave-time
 ! 0 ms ave run time - 0.35 SD (100 trials)
 
-SOLUTION: euler173
+solution: euler173
diff --git a/demos/project-euler/175/175.factor b/demos/project-euler/175/175.factor
index d162c0b1a4..af0dc7f1c3 100644
--- a/demos/project-euler/175/175.factor
+++ b/demos/project-euler/175/175.factor
@@ -55,4 +55,4 @@ PRIVATE>
 ! [ euler175 ] 100 ave-time
 ! 0 ms ave run time - 0.31 SD (100 trials)
 
-SOLUTION: euler175
+solution: euler175
diff --git a/demos/project-euler/186/186.factor b/demos/project-euler/186/186.factor
index d665101a7d..e006b1aa1c 100644
--- a/demos/project-euler/186/186.factor
+++ b/demos/project-euler/186/186.factor
@@ -73,4 +73,4 @@ in: project-euler.186
 ! [ euler186 ] 10 ave-time
 ! 18572 ms ave run time - 796.87 SD (10 trials)
 
-SOLUTION: euler186
+solution: euler186
diff --git a/demos/project-euler/188/188.factor b/demos/project-euler/188/188.factor
index 9ab9e3c146..46bc907630 100644
--- a/demos/project-euler/188/188.factor
+++ b/demos/project-euler/188/188.factor
@@ -40,4 +40,4 @@ PRIVATE>
 ! [ euler188 ] 100 ave-time
 ! 4 ms ave run time - 0.05 SD (100 trials)
 
-SOLUTION: euler188
+solution: euler188
diff --git a/demos/project-euler/190/190.factor b/demos/project-euler/190/190.factor
index 0219631237..a85f3a9fe8 100644
--- a/demos/project-euler/190/190.factor
+++ b/demos/project-euler/190/190.factor
@@ -51,4 +51,4 @@ PRIVATE>
 ! [ euler150 ] 100 ave-time
 ! 5 ms ave run time - 1.01 SD (100 trials)
 
-SOLUTION: euler190
+solution: euler190
diff --git a/demos/project-euler/203/203.factor b/demos/project-euler/203/203.factor
index 6ecc41c938..5ee982af15 100644
--- a/demos/project-euler/203/203.factor
+++ b/demos/project-euler/203/203.factor
@@ -62,4 +62,4 @@ PRIVATE>
 ! [ euler203 ] 100 ave-time
 ! 12 ms ave run time - 1.6 SD (100 trials)
 
-SOLUTION: euler203
+solution: euler203
diff --git a/demos/project-euler/206/206.factor b/demos/project-euler/206/206.factor
index ef4708d082..0c83131912 100644
--- a/demos/project-euler/206/206.factor
+++ b/demos/project-euler/206/206.factor
@@ -44,4 +44,4 @@ PRIVATE>
 ! [ euler206 ] 100 ave-time
 ! 321 ms ave run time - 8.33 SD (100 trials)
 
-SOLUTION: euler206
+solution: euler206
diff --git a/demos/project-euler/215/215.factor b/demos/project-euler/215/215.factor
index af123999f9..92028c28c4 100644
--- a/demos/project-euler/215/215.factor
+++ b/demos/project-euler/215/215.factor
@@ -89,4 +89,4 @@ PRIVATE>
 ! [ euler215 ] 100 ave-time
 ! 208 ms ave run time - 9.06 SD (100 trials)
 
-SOLUTION: euler215
+solution: euler215
diff --git a/demos/project-euler/255/255.factor b/demos/project-euler/255/255.factor
index dbbe8088d0..c02a946e66 100644
--- a/demos/project-euler/255/255.factor
+++ b/demos/project-euler/255/255.factor
@@ -104,4 +104,4 @@ PRIVATE>
 ! [ euler255 ] gc time
 ! Running time: 37.468911341 seconds
 
-SOLUTION: euler255
+solution: euler255
diff --git a/demos/project-euler/265/265.factor b/demos/project-euler/265/265.factor
index 52a41072bd..b57650bba5 100644
--- a/demos/project-euler/265/265.factor
+++ b/demos/project-euler/265/265.factor
@@ -61,4 +61,4 @@ CONSTANT: N 5 ;
 ! [ euler265 ] time
 ! Running time: 0.376389019 seconds
 
-SOLUTION: euler265
+solution: euler265
diff --git a/demos/project-euler/common/common.factor b/demos/project-euler/common/common.factor
index 94f04fb496..5b5668dc22 100644
--- a/demos/project-euler/common/common.factor
+++ b/demos/project-euler/common/common.factor
@@ -164,3 +164,10 @@ SYNTAX: SOLUTION:
     [ drop current-vocab main<< ]
     [ [ . ] swap prefix ( -- ) define-declared ]
     2bi ;
+
+SYNTAX: solution:
+    scan-word
+    [ name>> "-main" append create-word-in ] keep
+    [ drop current-vocab main<< ]
+    [ [ . ] swap prefix ( -- ) define-declared ]
+    2bi ;
diff --git a/demos/webkit-demo/webkit-demo.factor b/demos/webkit-demo/webkit-demo.factor
index ae05e5d337..f9b52f6f15 100644
--- a/demos/webkit-demo/webkit-demo.factor
+++ b/demos/webkit-demo/webkit-demo.factor
@@ -19,7 +19,7 @@ CONSTANT: window-style
         NSMiniaturizableWindowMask
         NSResizableWindowMask
         NSTitledWindowMask
-    }
+    } ;
 
 : <WebWindow> ( -- id )
     <WebView> rect window-style <ViewWindow> ;
diff --git a/demos/window-controls-demo/window-controls-demo.factor b/demos/window-controls-demo/window-controls-demo.factor
index fef7409d8c..be3cfb82b5 100644
--- a/demos/window-controls-demo/window-controls-demo.factor
+++ b/demos/window-controls-demo/window-controls-demo.factor
@@ -14,7 +14,7 @@ CONSTANT: window-control-sets-to-test
         { "Close, minimize, and maximize buttons" { normal-title-bar close-button minimize-button maximize-button } }
         { "Resizable" { normal-title-bar close-button minimize-button maximize-button resize-handles } }
         { "Textured background" { normal-title-bar close-button minimize-button maximize-button resize-handles textured-background } }
-    }
+    } ;
 
 TUPLE: window-controls-demo-world < world
     windows ;