2016-10-25 10:03:00

52 files changed, 2126 insertions, 652 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 0a50da857..ccbf33ef8 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.10.22 10:43}
+\newcontextversion{2016.10.25 09:57}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index f275566cc..a8c8bd00b 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.10.22 10:43}
+\edef\contextversion{2016.10.25 09:57}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-fil.mkiv b/tex/context/base/mkiv/cont-fil.mkiv
index 19c1c93ac..4e5075b6b 100644
--- a/tex/context/base/mkiv/cont-fil.mkiv
+++ b/tex/context/base/mkiv/cont-fil.mkiv
@@ -81,13 +81,19 @@
 %definefilesynonym [pre-more]        [pre-29]
 %definefilesynonym [pre-more]        [pre-30]
 
-\definefilesynonym [pre-tiles]       [pre-41]
-
-\definefilesynonym [pre-stepwise]    [pre-60]
-\definefilesynonym [pre-stepper]     [pre-61]
-
-\definefilesynonym [pre-punk]        [pre-70]
-\definefilesynonym [pre-random]      [pre-71]
+\definefilesynonym [pre-41]          [present-tiles]
+\definefilesynonym [pre-62]          [present-overlap]
+
+\definefilesynonym [pre-60]          [present-stepwise]
+\definefilesynonym [pre-61]          [present-stepper]
+\definefilesynonym [pre-69]          [present-wobbling]
+\definefilesynonym [pre-70]          [present-punk]
+\definefilesynonym [pre-71]          [present-random]
+
+\definefilesynonym [pre-stepwise]    [present-stepwise]
+\definefilesynonym [pre-stepper]     [present-stepper]
+\definefilesynonym [pre-random]      [present-random]
+\definefilesynonym [pre-punk]        [present-punk]
 
 \definefilesynonym [abr-pseudocaps]  [abr-01]
 \definefilesynonym [abr-smallcaps]   [abr-02]
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 980b1502b..e78789676 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.10.22 10:43}
+\newcontextversion{2016.10.25 09:57}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 1dee0f025..8f31103a2 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.10.22 10:43}
+\edef\contextversion{2016.10.25 09:57}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/file-job.mkvi b/tex/context/base/mkiv/file-job.mkvi
index 78ec0d9a4..75362d5a9 100644
--- a/tex/context/base/mkiv/file-job.mkvi
+++ b/tex/context/base/mkiv/file-job.mkvi
@@ -325,6 +325,17 @@
 \unexpanded\def\presetdocument[#settings]%
   {\checkvariables[\s!document][#settings]}
 
+% We silently ignore missing documents. Beware: there are no begin/end setups
+% invoked as we expect the loaded document to be wrapped in \startdocument ...
+% \stopdocument. This is just a convenient variant of input.
+%
+% \unexpanded\def\document
+%   {\dosingleempty\syst_document}
+%
+% \def\syst_document[#1]#2%
+%    \startdocument[#1]
+%    \readfile{#2}{}{}}
+
 % metadata:author  metadata:title  metadata:subject
 
 \setvariables
diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index 0eb6955d0..8905cabc0 100644
--- a/tex/context/base/mkiv/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
@@ -160,9 +160,10 @@ if _LUAVERSION < 5.2  then
     formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced")
 
 else
+    -- somehow can fail:
 
     formatters.add(formatters,"font:name",    [["'"..fontname(%s).."'"]],          { fontname  = helpers.name })
-    formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced    })
+    formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced })
 
 end
 
@@ -540,10 +541,11 @@ local function presetcontext(name,parent,features) -- will go to con and shared
         for p in gmatch(parent,"[^, ]+") do
             local s = setups[p]
             if s then
-                for k,v in next, s do
-                    if features[k] == nil then
+                for k, v in next, s do
+-- no, as then we cannot overload: e.g. math,mathextra
+--                     if features[k] == nil then
                         features[k] = v
-                    end
+--                     end
                 end
             else
                 -- just ignore an undefined one .. i.e. we can refer to not yet defined
@@ -1093,7 +1095,7 @@ do  -- else too many locals
         local scaledfontmode  = scaninteger() -- \scaledfontmode
 
         if trace_defining then
-            report_defining("start stage two: %s (size %s)",str,size)
+            report_defining("start stage two: %s, size %s, features %a & %a",str,size,classfeatures,fontfeatures)
         end
         -- name is now resolved and size is scaled cf sa/mo
         local lookup, name, sub, method, detail = getspecification(str or "")
diff --git a/tex/context/base/mkiv/font-pre.mkiv b/tex/context/base/mkiv/font-pre.mkiv
index 732a9e6fb..d3a4d5584 100644
--- a/tex/context/base/mkiv/font-pre.mkiv
+++ b/tex/context/base/mkiv/font-pre.mkiv
@@ -252,6 +252,7 @@
    mathnolimitsmode={0,800}, % this looks okay on the average font
    mathalternates=yes,
    mathitalics=yes, % we pass them
+   mathdimensions=all,
  % mathgaps=yes,
    language=dflt,
    script=math]
diff --git a/tex/context/base/mkiv/font-sel.mkvi b/tex/context/base/mkiv/font-sel.mkvi
index 83b7a6b25..a78742928 100644
--- a/tex/context/base/mkiv/font-sel.mkvi
+++ b/tex/context/base/mkiv/font-sel.mkvi
@@ -176,7 +176,7 @@
 %D The \tex{definefontfamily} creates like \tex{definetypeface} a collection of font
 %D with different styles which can be later called with the \tex{setupbodyfont} command.
 %D
-%D The command takes three mendatory commands which are (a) the name of the fontclass,
+%D The command takes three mandatory commands which are (a) the name of the fontclass,
 %D (b) the styles of the font and (c) the name of the font.
 %D
 %D \starttyping
@@ -290,4 +290,4 @@
        \s!rscale=\selectfontparameter\c!scale,
         \c!scale=1]
 
-\protect
\ No newline at end of file
+\protect
diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index c36f629c5..b4c8be7b1 100644
--- a/tex/context/base/mkiv/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
@@ -1188,23 +1188,13 @@ end
 
 do
 
- -- local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ %s EMC ET"]
- -- local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ %s EMC ET"]
- -- local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ "]
- -- local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ "]
- -- local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> BDC [<feff>] TJ "]
- -- local s_actual_text_e     = "EMC ET"
- -- local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC [<feff>] TJ "]
- -- local s_actual_text_e_not = "EMC"
- -- local f_actual_text       = formatters["/Span <</ActualText %s >> BDC"]
-
-    local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> %s EMC ET"]
-    local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> %s EMC ET"]
-    local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> "]
-    local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> "]
-    local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> "]
+    local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> BDC %s EMC ET"]
+    local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC %s EMC ET"]
+    local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC"]
+    local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC"]
+    local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> BDC"]
     local s_actual_text_e     = "EMC ET"
-    local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> "]
+    local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC"]
     local s_actual_text_e_not = "EMC"
     local f_actual_text       = formatters["/Span <</ActualText %s >> BDC"]
 
diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua
index 83ea0996b..602c3dc89 100644
--- a/tex/context/base/mkiv/math-act.lua
+++ b/tex/context/base/mkiv/math-act.lua
@@ -301,7 +301,9 @@ function mathematics.overloaddimensions(target,original,set)
     end
 end
 
-sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions")
+-- no, it's a feature now (see good-mth):
+--
+-- sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions")
 
 -- a couple of predefined tweaks:
 
diff --git a/tex/context/base/mkiv/mlib-int.lua b/tex/context/base/mkiv/mlib-int.lua
index 91ac970ba..13124807d 100644
--- a/tex/context/base/mkiv/mlib-int.lua
+++ b/tex/context/base/mkiv/mlib-int.lua
@@ -68,11 +68,11 @@ function mp.NOfPages            () mpprint(getcount("lastpageno"))
 function mp.CurrentColumn       () mpprint(getcount("mofcolumns"))                  end
 function mp.NOfColumns          () mpprint(getcount("nofcolumns"))                  end
 
-function mp.BaseLineSkip        () mpprint(getdimen("baselineskip")        *factor) end
+function mp.BaseLineSkip        () mpprint(get     ("baselineskip").width  *factor) end
 function mp.LineHeight          () mpprint(getdimen("lineheight")          *factor) end
 function mp.BodyFontSize        () mpprint(getdimen("bodyfontsize")        *factor) end
 
-function mp.TopSkip             () mpprint(getdimen("topskip")             *factor) end
+function mp.TopSkip             () mpprint(get     ("topskip").width       *factor) end
 function mp.StrutHeight         () mpprint(getdimen("strutht")             *factor) end
 function mp.StrutDepth          () mpprint(getdimen("strutdp")             *factor) end
 
@@ -80,8 +80,8 @@ function mp.PageNumber          () mpprint(getcount("pageno"))
 function mp.RealPageNumber      () mpprint(getcount("realpageno"))                  end
 function mp.NOfPages            () mpprint(getcount("lastpageno"))                  end
 
-function mp.CurrentWidth        () mpprint(get("hsize")                    *factor) end
-function mp.CurrentHeight       () mpprint(get("vsize")                    *factor) end
+function mp.CurrentWidth        () mpprint(get     ("hsize")               *factor) end
+function mp.CurrentHeight       () mpprint(get     ("vsize")               *factor) end
 
 function mp.EmWidth             () mpprint(emwidths [false]*factor) end
 function mp.ExHeight            () mpprint(exheights[false]*factor) end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1b3bf27bf..3e2ac5f8c 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 8d45cf09a..f98279189 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-tag.lua b/tex/context/base/mkiv/strc-tag.lua
index 8f2e18978..9d1fec33e 100644
--- a/tex/context/base/mkiv/strc-tag.lua
+++ b/tex/context/base/mkiv/strc-tag.lua
@@ -315,7 +315,7 @@ function tags.start(tag,specification)
             metadata = nil
         end
         local userdata = specification.userdata
-        if user ~= "" and type(userdata) == "string"  then
+        if userdata ~= "" and type(userdata) == "string"  then
             specification.userdata = settings_to_hash(userdata)
         end
         local detail = specification.detail
diff --git a/tex/context/base/mkiv/util-tab.lua b/tex/context/base/mkiv/util-tab.lua
index 9266598db..0ebe1b5b1 100644
--- a/tex/context/base/mkiv/util-tab.lua
+++ b/tex/context/base/mkiv/util-tab.lua
@@ -491,7 +491,7 @@ function table.twowaymapper(t)
         t = { }
     else
         local zero = rawget(t,0)
-        for i=zero or 1,#t do
+        for i=zero and 0 or 1,#t do
             local ti = t[i]       -- t[1]     = "one"
             if ti then
                 local i = tostring(i)
@@ -499,7 +499,6 @@ function table.twowaymapper(t)
                 t[ti]   = i       -- t["one"] = "1"
             end
         end
-        t[""] = zero or ""
     end
  -- setmetatableindex(t,"key")
     setmetatable(t,selfmapper)
diff --git a/tex/context/fonts/mkiv/lm.lfg b/tex/context/fonts/mkiv/lm.lfg
index 7ea5059e9..aebedd01b 100644
--- a/tex/context/fonts/mkiv/lm.lfg
+++ b/tex/context/fonts/mkiv/lm.lfg
@@ -26,6 +26,15 @@ return {
          -- default = {
          -- },
             -- driven by 'mathdimensions' feature
+            default = {
+                -- the root is quite displaced
+                [0x221A] = {
+                    -- 73, -960, 853, 40
+                    yoffset = 960 - 40,
+                    height  = 960,
+                    depth   =  40,
+                },
+            },
             signs   = {
                 -- set dimensions
              -- [0x00B1] = { -- ±
diff --git a/tex/context/fonts/mkiv/type-imp-asana.mkiv b/tex/context/fonts/mkiv/type-imp-asana.mkiv
index b87c969e2..c48d3b7ad 100644
--- a/tex/context/fonts/mkiv/type-imp-asana.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-asana.mkiv
@@ -21,7 +21,7 @@
 
     \starttypescript [\s!math] [asana] [\s!name]
         \loadfontgoodies[asana-math]
-        \definefontsynonym [MathRoman] [AsanaMath] [\s!features=\s!math\mathsizesuffix,\s!goodies=asana-math]
+        \definefontsynonym [MathRoman] [AsanaMath] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=asana-math]
     \stoptypescript
 
     \starttypescript[asana]
diff --git a/tex/context/fonts/mkiv/type-imp-cambria.mkiv b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
index 8154817bd..f5679fd92 100644
--- a/tex/context/fonts/mkiv/type-imp-cambria.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-cambria.mkiv
@@ -42,15 +42,15 @@
 
     \starttypescript [\s!math] [cambria,cambria-m,cambria-a] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math\mathsizesuffix,\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=cambria-math]
     \stoptypescript
     \starttypescript [\s!math] [cambria-x] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math,\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math,mathextra},\s!goodies=cambria-math]
     \stoptypescript
     \starttypescript [\s!math] [cambria-y] [\s!name]
         \loadfontgoodies[cambria-math]
-        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features=\s!math-nostack\mathsizesuffix,\s!goodies=cambria-math]
+        \definefontsynonym [\s!MathRoman] [CambriaMath] [\s!features={\s!math-nostack\mathsizesuffix,mathextra},\s!goodies=cambria-math]
     \stoptypescript
 
     \starttypescript [\s!serif] [cambria,cambria-m,cambria-a] [\s!name]
diff --git a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
index 6ae26e0a7..710aada5d 100644
--- a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv
@@ -41,8 +41,7 @@
 
     \starttypescript [\s!math][dejavu][\s!name]
         \loadfontgoodies[dejavu-math]
-      % \definefontsynonym[\s!MathRoman][file:dejavu-math.otf][\s!features=\s!math\mathsizesuffix]
-        \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features=\s!math\mathsizesuffix,\s!goodies=dejavu-math]
+        \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math]
     \stoptypescript
 
     \starttypescript[dejavu]
diff --git a/tex/context/fonts/mkiv/type-imp-euler.mkiv b/tex/context/fonts/mkiv/type-imp-euler.mkiv
index d3b552b56..e98a6e963 100644
--- a/tex/context/fonts/mkiv/type-imp-euler.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-euler.mkiv
@@ -49,7 +49,7 @@
 
     \starttypescript [\s!math] [eulernova] [\s!name]
         \loadfontgoodies[euler-math]
-        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features=\s!math\mathsizesuffix]
+        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
     \stoptypescript
 
     \starttypescript [pagella-eulernova]
@@ -67,11 +67,11 @@
     \stoptypescript
 
     \starttypescript [\s!math] [euleroverpagella] [\s!name]
-        \definefontsynonym [MathRoman] [texgyrepagella-math] [\s!features=\s!math\mathsizesuffix,\s!fallbacks=euleroverpagella]
+        \definefontsynonym [MathRoman] [texgyrepagella-math] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=euleroverpagella]
     \stoptypescript
 
     \starttypescript [\s!math] [pagellaovereuler] [\s!name]
-        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features=\s!math\mathsizesuffix,\s!fallbacks=pagellaovereuler]
+        \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!fallbacks=pagellaovereuler]
     \stoptypescript
 
     \starttypescript [pagella-with-euler]
diff --git a/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv b/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv
index 44176b67c..b878c9f4e 100644
--- a/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-koeielettersot.mkiv
@@ -72,27 +72,27 @@
     \starttypescript [\s!all] [cowsotf]
         \definefontsynonym [Cows]         [koeielettersot][\s!features=cowsdefault]
         \definefontsynonym [CowsLogo]     [koeielettersot][\s!features=cowslogos]
-        \definefontsynonym [CowsMathRoman][koeielettersot][\s!goodies=koeielettersot]
+        \definefontsynonym [CowsMathRoman][koeielettersot][\s!features=mathextra,\s!goodies=koeielettersot]
     \stoptypescript
 
     \starttypescript [\s!all] [koeielettersotf,sheepotf]
         \definefontsynonym [Sheep]         [koeielettersot][\s!features=sheepdefault]
         \definefontsynonym [SheepLogo]     [koeielettersot][\s!features=cowslogos]
-        \definefontsynonym [SheepMathRoman][koeielettersot][\s!features=mathsheepdigits,\s!goodies=koeielettersot]
+        \definefontsynonym [SheepMathRoman][koeielettersot][\s!features={mathsheepdigits,mathextra},\s!goodies=koeielettersot]
     \stoptypescript
 
-%   \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features=\s!math\mathsizesuffix,\s!goodies=dejavu-math]
+%   \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math]
 
     \starttypescript [\s!all] [coloredcowsotf]
         \definefontsynonym [Cows]         [koeielettersot][\s!features=cowscolored]
         \definefontsynonym [CowsLogo]     [koeielettersot][\s!features=cowslogos]
-        \definefontsynonym [CowsMathRoman][koeielettersot][\s!goodies=koeielettersot]
+        \definefontsynonym [CowsMathRoman][koeielettersot][\s!features=mathextra,\s!goodies=koeielettersot]
     \stoptypescript
 
     \starttypescript [\s!all] [coloredsheepotf]
         \definefontsynonym [Sheep]         [koeielettersot][\s!features=sheepcolored]
         \definefontsynonym [SheepLogo]     [koeielettersot][\s!features=cowslogos]
-        \definefontsynonym [SheepMathRoman][koeielettersot][\s!features=mathsheepdigits,\s!goodies=koeielettersot]
+        \definefontsynonym [SheepMathRoman][koeielettersot][\s!features={mathsheepdigits,mathextra},\s!goodies=koeielettersot]
     \stoptypescript
 
     \starttypescript [\s!serif] [cowsotf,coloredcowsotf]
diff --git a/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
index fe4b669bd..0ff75a977 100644
--- a/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv
@@ -173,14 +173,14 @@
 
 %     \starttypescript [\s!math] [modern,latin-modern]
 %         \loadfontgoodies[lm]
-%         \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lm]
-%         \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lm]
+%         \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lm]
+%         \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lm]
 %     \stoptypescript
 
     \starttypescript [\s!math] [modern,latin-modern]
         \loadfontgoodies[lm]
-        \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math},\s!goodies=lm]
-        \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math},\s!goodies=lm]
+        \definefontsynonym [LMMathRoman-Regular] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,mathextra},\s!goodies=lm]
+        \definefontsynonym [LMMathRoman-Bold]    [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,mathextra},\s!goodies=lm]
     \stoptypescript
 
     \starttypescript [modern-designsize-virtual]
diff --git a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
index 62da09e16..1ceda8737 100644
--- a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv
@@ -67,8 +67,8 @@
     \stoptypescript
 
     \starttypescript [\s!math] [libertinus] [\s!name]
-        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features=\s!math\mathsizesuffix]
-        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features=\s!math\mathsizesuffix]
+        \definefontsynonym[\s!MathRoman    ] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
+        \definefontsynonym[\s!MathRomanBold] [\s!file:libertinusmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
     \stoptypescript
 
     \starttypescript [libertinus]
diff --git a/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
index f39ed6e1f..61002ff06 100644
--- a/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv
@@ -65,8 +65,8 @@
     \stoptypescript
 
     \starttypescript [\s!math] [lucidaot,lucidadk]
-        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features=\s!math\mathsizesuffix,\s!goodies=lucida-opentype-math]
-        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features=\s!math\mathsizesuffix,\s!goodies=lucida-opentype-math]
+        \definefontsynonym [\s!MathRoman]     [\s!file:LucidaBrightMathOT.otf]      [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math]
+        \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math]
     \stoptypescript
 
     \starttypescript [\s!handwriting] [lucidaot,lucidadk]
diff --git a/tex/context/fonts/mkiv/type-imp-minion.mkiv b/tex/context/fonts/mkiv/type-imp-minion.mkiv
index 06bc842ac..b158deddf 100644
--- a/tex/context/fonts/mkiv/type-imp-minion.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-minion.mkiv
@@ -34,14 +34,14 @@
 
     \starttypescript [\s!math][minion][\s!all]
         \loadfontgoodies[minion-math]
-        \definefontsynonym[\s!MathRoman]    [Minion-Math]    [\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
-        \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
+        \definefontsynonym[\s!MathRoman]    [Minion-Math]    [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
+        \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
     \stoptypescript
 
     \starttypescript [\s!math][minion-medium][\s!all]
         \loadfontgoodies[minion-math]
-        \definefontsynonym[\s!MathRoman]    [Minion-Math]      [\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
-        \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
+        \definefontsynonym[\s!MathRoman]    [Minion-Math]      [\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback]
+        \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features={\s!math\mathsizesuffix,mathextra},\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback]
     \stoptypescript
 
     \starttypescript [minion,minion-medium]
diff --git a/tex/context/fonts/mkiv/type-imp-source.mkiv b/tex/context/fonts/mkiv/type-imp-source.mkiv
index b20c6383c..91396f965 100644
--- a/tex/context/fonts/mkiv/type-imp-source.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-source.mkiv
@@ -53,7 +53,7 @@
 
     \starttypescript [\s!math][source][\s!name]
       % \loadfontgoodies[texgyre]
-        \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features=\s!math\mathsizesuffix,\s!goodies=dejavu-math]
+        \definefontsynonym[\s!MathRoman][file:texgyredejavu-math][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=dejavu-math]
     \stoptypescript
 
     \starttypescript[source]
diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
index 64861a6ef..a7c2d06be 100644
--- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -237,8 +237,8 @@
 
         \starttypescript [\s!math][times,termes][\s!all]
           % \loadfontgoodies[texgyre]
-          % \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
-            \definefontsynonym[\s!MathRoman][file:texgyretermes-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=termes-math]
+          % \definefontsynonym[\s!MathRoman][file:texgyre-termes-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyretermes-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=termes-math]
         \stoptypescript
 
     \stoptypescriptcollection
@@ -265,8 +265,8 @@
 
         \starttypescript [\s!math][palatino,pagella][\s!all]
           % \loadfontgoodies[texgyre]
-          % \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
-            \definefontsynonym[\s!MathRoman][file:texgyrepagella-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=pagella-math]
+          % \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
+            \definefontsynonym[\s!MathRoman][file:texgyrepagella-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=pagella-math]
         \stoptypescript
 
     \stoptypescriptcollection
@@ -277,8 +277,8 @@
 
     \starttypescript [\s!math][bookman,bonum][\s!all]
       % \loadfontgoodies[texgyre]
-      % \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
-        \definefontsynonym[\s!MathRoman][file:texgyrebonum-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=bonum-math]
+      % \definefontsynonym[\s!MathRoman][file:texgyre-bonum-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyrebonum-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=bonum-math]
     \stoptypescript
 
 \stoptypescriptcollection
@@ -287,8 +287,8 @@
 
     \starttypescript [\s!math][schoolbook,schola][\s!all]
       % \loadfontgoodies[texgyre]
-      % \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=texgyre]
-        \definefontsynonym[\s!MathRoman][file:texgyreschola-math.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=schola-math]
+      % \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyreschola-math.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=schola-math]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/tex/context/fonts/mkiv/type-imp-xits.mkiv b/tex/context/fonts/mkiv/type-imp-xits.mkiv
index f83050e14..145ddc7a8 100644
--- a/tex/context/fonts/mkiv/type-imp-xits.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-xits.mkiv
@@ -23,12 +23,12 @@
 
     \starttypescript [\s!math] [xits,xitsbidi] [\s!name]
         \loadfontgoodies[xits-math]
-        \definefontsynonym[\s!MathRoman        ][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
-        \definefontsynonym[\s!MathRoman     L2R][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
-        \definefontsynonym[\s!MathRoman     R2L][\s!file:xits-math.otf]    [\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
-        \definefontsynonym[\s!MathRomanBold    ][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix,\s!goodies=xits-math]
-        \definefontsynonym[\s!MathRomanBold L2R][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-l2r,\s!goodies=xits-math]
-        \definefontsynonym[\s!MathRomanBold R2L][\s!file:xits-mathbold.otf][\s!features=\s!math\mathsizesuffix-r2l,\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRoman        ][\s!file:xits-math.otf]    [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRoman     L2R][\s!file:xits-math.otf]    [\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRoman     R2L][\s!file:xits-math.otf]    [\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold    ][\s!file:xits-mathbold.otf][\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold L2R][\s!file:xits-mathbold.otf][\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math]
+        \definefontsynonym[\s!MathRomanBold R2L][\s!file:xits-mathbold.otf][\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math]
     \stoptypescript
 
     \starttypescript [\s!serif] [xits] [\s!name]
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 2951ea756..1db82c2d1 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 09567097e..93802e7c4 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/common/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex
index 551c5ebbc..48974f6c5 100644
--- a/tex/context/modules/common/s-pre-11.tex
+++ b/tex/context/modules/common/s-pre-11.tex
@@ -57,7 +57,7 @@
    \dorecurse{\CurrentMaxItem}
      {\startMPdrawing
         initialize_box(\MPpos{item-\realfolio-\recurselevel}) ;
-        linewidth := .25cm ; 
+        linewidth := .25cm ;
         q[\recurselevel] := tensecircle (wxy,hxy,linewidth) shifted cxy ;
         fill q[\recurselevel] withcolor .9white  ;
         pickup pencircle scaled linewidth ;
@@ -69,20 +69,20 @@
       \stopMPdrawing}%
    \dostepwiserecurse{2}{\CurrentTopic}{1}
      {\startMPdrawing
-        draw 
-          rt  point 3 of p[\recurselevel-1] -- 
-          lft point 7 of p[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
+        draw
+          rt  point 3 of p[\recurselevel-1] --
+          lft point 7 of p[\recurselevel]
+          withcolor \MPcolor{ArrowColor} ;
       \stopMPdrawing}%
    \dostepwiserecurse{2}{\CurrentMaxItem}{1}
      {\startMPdrawing
-        draw 
-          bot point 9 of q[\recurselevel-1] -- 
-          top point 5 of q[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
+        draw
+          bot point 9 of q[\recurselevel-1] --
+          top point 5 of q[\recurselevel]
+          withcolor \MPcolor{ArrowColor} ;
       \stopMPdrawing}%
    \startMPdrawing
-     draw Page 
+     draw Page
        withpen pencircle scaled .5cm
        withcolor \MPcolor{EdgeColor} ;
      StopPage ;
@@ -139,7 +139,7 @@
   {\startstandardmakeup
    \dontcomplain
    \vskip.875cm
-   \hbox to \makeupwidth 
+   \hbox to \makeupwidth
      {\hfill
       \dorecurse{\CurrentTopic}
         {\edef\Topic{topic-\realfolio-\recurselevel}%
@@ -156,7 +156,7 @@
    \vfilll
    \dorecurse{\CurrentMaxItem}
      {\edef\Item{item-\realfolio-\recurselevel}
-      \hbox to \makeupwidth 
+      \hbox to \makeupwidth
         {\hfill
          \hpos
            {\Item}
@@ -179,42 +179,42 @@
 
 \doifnotmode{demo}{\endinput}
 
-\starttext 
+\starttext
 
-\StartIdea 
+\StartIdea
   \StartTopic
      A Nice Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\StartIdea 
+\StartIdea
   \StartTopic
      One More Nice Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\StartIdea 
+\StartIdea
   \StartTopic
      The Last Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input tufte \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\stoptext 
+\stoptext
diff --git a/tex/context/modules/common/s-pre-61.tex b/tex/context/modules/mkii/s-pre-61.mkii
index 48b9d09a0..48b9d09a0 100644
--- a/tex/context/modules/common/s-pre-61.tex
+++ b/tex/context/modules/mkii/s-pre-61.mkii
diff --git a/tex/context/modules/common/s-pre-62.tex b/tex/context/modules/mkii/s-pre-62.mkii
index a1a405c23..a1a405c23 100644
--- a/tex/context/modules/common/s-pre-62.tex
+++ b/tex/context/modules/mkii/s-pre-62.mkii
diff --git a/tex/context/modules/mkiv/s-pre-69.mkiv b/tex/context/modules/mkiv/s-pre-69.mkiv
deleted file mode 100644
index cc6af9ad3..000000000
--- a/tex/context/modules/mkiv/s-pre-69.mkiv
+++ /dev/null
@@ -1,336 +0,0 @@
-%D \module
-%D   [      file=s-pre-69,
-%D        version=2010.04.28,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 69,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\setuppapersize[S6][S6]
-\setuppapersize[SM][SM]
-
-\usemodule
-  [abr-01,pre-60]
-
-\setupinteraction
-  [state=start,
-   contrastcolor=white,
-   color=white,
-   click=no]
-
-\setuplayout
-  [location=middle,
-   topspace=60pt,
-   bottomspace=80pt,
-   backspace=80pt,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-\setupcolors
-  [textcolor=white]
-
-\setupbodyfont[euler]
-
-\definecolor[maincolor] [blue]
-\definecolor[extracolor][green]
-
-% \definecolor[maincolor] [red]
-% \definecolor[extracolor][blue]
-
-\startMPinitializations
-    if unknown MyColor[1] :
-        color MyColor[] ;
-        MyColor[1] := transparent(1,.25,\MPcolor{maincolor}) ;
-        MyColor[2] := transparent(1,.25,\MPcolor{extracolor}) ;
-
-        picture MySoFar ; MySoFar := nullpicture ;
-        path MyLastOne ; MyLastOne := origin -- cycle ;
-        color MyPageColor ; MyPageColor := MyColor[1] ;
-        path MyLeftSteps, MyRightSteps ;
-        boolean MyPageDone ; MyPageDone := false ;
-
-        vardef MySmallShape(expr parent) =
-            path p ; p := boundingbox parent ;
-            p := boundingbox parent ;
-            numeric w, h ; w := bbwidth(p) ; h := bbheight(p) ;
-            urcorner p shifted (-uniformdeviate w/4,0) --
-            lrcorner p shifted (0,uniformdeviate h/4) --
-            llcorner p shifted (uniformdeviate w/4,0) --
-            ulcorner p shifted (0,-uniformdeviate h/4) -- cycle
-        enddef ;
-
-        vardef MyShape(expr parent) =
-            path p ; p := boundingbox parent ;
-            if MyPageDone :
-                MyPageDone := false ;
-                urcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
-                lrcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
-                llcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) --
-                ulcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) -- cycle
-            else :
-                MyPageDone := true ;
-                urcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) --
-                lrcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
-                llcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
-                ulcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) -- cycle
-            fi
-        enddef ;
-
-        vardef MyMakeOne =
-            MyLastOne := MyShape(Page) ;
-        enddef ;
-
-        vardef MyAddOne =
-            addto MySoFar also image(fill MyLastOne withcolor MyPageColor ; ) ;
-        enddef ;
-
-        vardef MyDrawOne =
-            fill MyLastOne withcolor black ;
-            fill MyLastOne withcolor MyPageColor ;
-        enddef ;
-
-        vardef MyDrawPage =
-            draw MySoFar ;
-        enddef ;
-
-        vardef MySetSteps =
-            path l, r ; numeric s ; path ll[], rr[] ; path t ;
-            l := point 2 of MyLastOne -- point 3 of MyLastOne ;
-            r := point 0 of MyLastOne -- point 1 of MyLastOne ;
-            t := topboundary Field[Text][Text] rightenlarged TextWidth leftenlarged TextWidth ;
-            s := bbheight(Field[Text][Text])/LineHeight + 2 ;
-            t := t shifted (0,-TopSkip) ;
-            for i=1 upto s :
-                ll[i] := t intersectionpoint l ;
-                rr[i] := t intersectionpoint r ;
-                t := t shifted (0,-LineHeight) ;
-            endfor ;
-            MyLeftSteps  := for i=1 upto s : ll[i] -- endfor cycle ;
-            MyRightSteps := for i=1 upto s : rr[i] -- endfor cycle ;
-        enddef ;
-
-        vardef MyDrawText(expr txt) =
-            pair a ; a := (point 1 of MyLastOne) - (point 2 of MyLastOne) ;
-            picture p ; p := txt ;
-            p := p
-                shifted (-EmWidth,EmWidth)
-                shifted ulcorner txt
-                shifted point 1 of MyLastOne ;
-            p := p rotatedaround(lrcorner p, radian * tan(ypart a/xpart a)) ;
-            setbounds p to origin -- cycle ;
-            draw p ;
-        enddef ;
-
-        vardef MyDrawTitle(expr txt) =
-        %   pair a ; a := (point 2 of MyLastOne) - (point 3 of MyLastOne) ;
-            pair a ; a := (point 3 of MyLastOne) - (point 4 of MyLastOne) ;
-            picture p ;
-            if bbheight(txt) > bbwidth(txt) :
-                p := txt ysized(0.8*TextHeight) ;
-            else :
-                p := txt xsized(0.8*TextWidth) ;
-            fi ;
-            numeric d ; d := arclength(point 2 of MyLastOne -- point 3 of MyLastOne) - bbheight(p) ;
-            p := p
-                shifted (BackSpace,-d/2)
-                shifted -ulcorner p
-                shifted point 3 of MyLastOne ;
-        %   p := p rotatedaround(ulcorner p, - radian * tan(xpart a/ypart a)) ;
-        %   p := p rotatedaround(ulcorner p,  radian * tan(ypart a/xpart a)) ;
-            setbounds p to origin -- cycle ;
-            draw p ;
-        enddef ;
-
-        vardef MyDrawSteps =
-            s := bbheight(Field[Text][Text])/LineHeight + 2 ;
-            for i=1 upto s :
-                draw ll[i] withpen pencircle scaled 1mm ;
-                draw rr[i] withpen pencircle scaled 1mm ;
-                draw ll[i] -- rr[i] ;
-            endfor ;
-            draw Field[Text][Text] ;
-        enddef ;
-
-    fi ;
-\stopMPinitializations
-
-\startuseMPgraphic{initialization}
-    StartPage ;
-        MySoFar := image(fill Page enlarged 12pt withcolor MyPageColor) ;
-        MyMakeOne ;
-        MySetSteps ;
-    StopPage ;
-\stopuseMPgraphic
-
-\appendtoks
-    \startnointerference
-        \useMPgraphic{initialization}
-    \stopnointerference
-\to \everystarttext
-
-\startuseMPgraphic{page}
-    StartPage ;
-        MyDrawPage ;
-        MyDrawOne ;
-        MySetSteps ;
-        MyDrawTitle(textext("\getvariable{document}{title}")) ;
-        MyDrawText(textext("\getvariable{document}{topic}")) ;
-        %
-        % we have multiple runs when we have text
-        %
-%         MyDrawSteps ;
-%         MyMakeOne ;
-%         MySetSteps ;
-    StopPage ;
-\stopuseMPgraphic
-
-\appendtoks
-    \startnointerference
-        \startMPcode
-            MyAddOne ;
-            MyMakeOne ;
-            MySetSteps ;
-        \stopMPcode
-    \stopnointerference
-\to \everyshipout
-
-\defineoverlay[page][\useMPgraphic{page}]
-
-\startuseMPgraphic{symbol}
-    color cc ; cc := MyColor[2] ;
-    path p ; p := MySmallShape(unitsquare scaled (.6*LineHeight)) ;
-    fill p withcolor white ;
-    fill p withcolor cc ;
-\stopuseMPgraphic
-
-\definesymbol[mysymbol][\struttedbox{\useMPgraphic{symbol}}]
-
-\setupitemgroup[itemize][1][symbol=mysymbol]
-
-\setupbackgrounds
-  [page]
-  [background=page]
-
-\startluacode
-    local texdimen = tex.dimen
-    function document.SetParShape()
-        local leftpath  = metapost.getclippath("metafun","metafun","clip currentpicture to MyLeftSteps ;")
-        local rightpath = metapost.getclippath("metafun","metafun","clip currentpicture to MyRightSteps ;")
-        local shape = { }
-        for i=1,#leftpath do
-            local left  = leftpath[i].x_coord
-            local right = rightpath[i].x_coord
-            local hsize = right - left - (texdimen.backspace + texdimen.cutspace)*number.dimenfactors.bp
-            shape[#shape+1] = string.format("%sbp %sbp",left,hsize)
-        end
-     -- print(table.serialize(shape))
-     -- context.parshape(string.format("%s %s ",#shape,table.concat(shape," ")))
-        context("\\parshape %s %s ",#shape,table.concat(shape," "))
-    end
-\stopluacode
-
-\nopenalties \dontcomplain
-
-\setupwhitespace[none]
-
-\def\StartText#1#2%
-  {\starttext
-   \setvariable{document}{title}{\framed[frame=off,offset=0pt,align=flushleft,foregroundstyle=\tfd\setupinterlinespace]{\begstrut#1\endstrut}}
-   \setvariable{document}{topic}{\tfb#2}
-   \startstandardmakeup
-     % dummy page
-   \stopstandardmakeup
-   \setvariable{document}{title}{}
-   \setvariable{document}{topic}{}}
-
-\def\StopText
-  {\stoptext}
-
-\def\StartItems#1%
-  {\setvariable{document}{topic}{\tfb#1}
-   \startstandardmakeup[top=,bottom=\vss]
-   \startelement[items][title={#1}]%
-   \ctxlua{document.SetParShape()}
-   \StartSteps}
-
-\def\StopItems
-  {\StopSteps
-   \stopelement
-   \stopstandardmakeup}
-
-\def\StartItem
-  {\dontleavehmode
-   \startelement[item]%
-   \llap{\symbol[mysymbol]\quad}% graphic
-   \ignorespaces}
-
-\def\StopItem
-  {\removeunwantedspaces
-   \nobreak
-   \crlf
-   \stopelement
-   \crlf
-   \FlushStep}
-
-\def\ShapeParagraph
-  {\ctxlua{document.SetParShape()}}
-
-% no parshape yet
-
-\def\StartParagraphs#1%
-  {\setvariable{document}{topic}{\tfb#1}
-   \startstandardmakeup[top=,bottom=\vss]
-  %\ctxlua{document.SetParShape()}
-   \startelement[paragraphs]%
-   \StartSteps}
-
-\def\StopParagraphs
-  {\StopSteps
-   \stopelement
-   \stopstandardmakeup}
-
-\def\StartParagraph
-  {\startelement[paragraph]}
-
-\def\StopParagraph
-  {\par
-   \stopelement
-   \FlushStep}
-
-% experiment .. likely to change
-
-\setelementexporttag[items]     [nature][display]
-\setelementexporttag[item]      [nature][mixed]
-\setelementexporttag[paragraphs][nature][display]
-\setelementexporttag[paragraph] [nature][mixed]
-
-\continueifinputfile{s-pre-69.mkiv}
-
-% finetuning: \StartText{\TEX\ and Reality\vskip2exClashing Mindsets?\vskip1ex}{Bacho\TEX, May 1, 2010}
-
-\StartText{Just\\A Demo}{Bacho\TEX, May 1, 2010}
-
-\StartItems{Quote from Tufte and Ward}
-    \StartItem
-        \input tufte
-    \StopItem
-    \StartItem
-        \input ward
-    \StopItem
-\StopItems
-
-% \dorecurse{20}{
-%     \ctxlua{document.SetParShape()}
-%     \input tufte
-%     \page
-% }
-
-\StopText
-
diff --git a/tex/context/modules/mkiv/s-pre-71.mkiv b/tex/context/modules/mkiv/s-pre-71.mkiv
deleted file mode 100644
index 38dae61df..000000000
--- a/tex/context/modules/mkiv/s-pre-71.mkiv
+++ /dev/null
@@ -1,170 +0,0 @@
-% engine=luatex
-
-%D \module
-%D   [      file=s-pre-71,
-%D        version=2008.08.05,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 71,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D I might improve this module so consider it experimental.
-
-% \enablemode[numbers]
-% \enablemode[paper]
-
-\usemodule[pre-60,abr-02]
-
-\registerctxluafile{s-pre-71}{}
-
-\setupinteraction[state=start,click=off]
-
-\definepapersize[wide][width=900pt,height=600pt]
-
-\setuppapersize[wide][wide]
-
-\setuplayout[page]
-
-% \setupbodyfont[15pt]
-
-\usetypescriptfile[type-hgz]
-\usetypescript[palatino-informal]
-\setupbodyfont[palatino-informal,15pt]
-
-\setupsorting[logo][style=]
-
-\startnotmode[paper]
-    \setupbackgrounds[page][background=color,backgroundcolor=black]
-\stopnotmode
-
-\TransparencyHack
-
-\definelayer[page][width=\paperwidth,height=\paperheight]
-
-\definecolor[TopicColor-1][r=.3,g=.4,b=.5]
-\definecolor[TopicColor-2][r=.3,g=.5,b=.4]
-\definecolor[TopicColor-3][r=.4,g=.3,b=.5]
-\definecolor[TopicColor-4][r=.4,g=.5,b=.3]
-\definecolor[TopicColor-5][r=.5,g=.3,b=.4]
-\definecolor[TopicColor-6][r=.5,g=.4,b=.3]
-\definecolor[TopicColor-7][r=.35,g=.35,b=.6]
-\definecolor[TopicColor-8][r=.6,g=.35,b=.35]
-\definecolor[TopicColor-9][r=.35,g=.6,b=.35]
-
-\definecolor[TopicColor-0][t=.5,a=1,s=.5]
-\definecolor[TopicColor]  [s=1]
-
-\setupcolors[state=start]
-\setupcolors[textcolor=TopicColor]
-
-\def\StartTopics
-  {\startstandardmakeup
-   \ctxlua{moduledata.steps.reset_locations()}
-   \doifnotmode{paper}{\StartLocalSteps}}
-
-\def\StopTopics
-  {\doifnotmode{paper}{\StopLocalSteps}
-   \flushlayer[page]
-   \stopstandardmakeup}
-
-\def\StartTopic
-  {\dosingleempty\doStartTopic}
-
-\def\doStartTopic[#1]%
-  {\doifnotmode{paper}{\NextStep}
-   \ctxlua{moduledata.steps.next_location("#1")}
-   \startnotmode[paper]
-     \doifnothing{#1}
-       {\ifcase\ctxlua{moduledata.steps.previous_n()}\else
-          \setlayer
-            [page]
-            [preset=\ctxlua{moduledata.steps.previous_location()}]
-             \bgroup
-               \doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-               \framed
-                 [offset=20pt,
-                  strut=no,
-                  align=normal,
-                  frame=off,
-                  height=\dimexpr\paperheight/3\relax,
-                  width=\dimexpr\paperwidth/3\relax,
-                  background=color,
-                  backgroundcolor=TopicColor-0]
-                 {}%
-               \doifnotmode{paper}{\stopviewerlayer}%
-             \egroup
-         \fi}
-   \stopnotmode
-   \setlayer
-     [page]
-     [preset=\ctxlua{moduledata.steps.current_location()}]
-     \bgroup
-       \doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-       \framed
-         [offset=20pt,
-          strut=no,
-          align=\expdoifelse{#1}{}{normal}{middle,lohi},
-          align=\expdoifelse{#1}{}{flushleft,verytolerant}{middle,lohi},
-          frame=off,
-          height=\dimexpr\paperheight/3\relax,
-          width=\dimexpr\paperwidth/3\relax,
-          background=color,
-          backgroundcolor=TopicColor-\ctxlua{moduledata.steps.current_n()}]
-         \bgroup
-         \ignorespaces}
-
-\def\StopTopic
-  {\removeunwantedspaces
-   \egroup
-   \doifnotmode{paper}{\stopviewerlayer}%
-   \egroup
-   \startmode[numbers]
-   \setlayerframed
-     [page]
-     [preset=\ctxlua{moduledata.steps.current_location()}]
-     [height=\dimexpr\paperheight/3\relax,
-      width=\dimexpr\paperwidth/3\relax,
-      frame=off,
-      foregroundstyle=\bfa,
-      align={flushright,low}]
-     {\doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-      \ctxlua{moduledata.steps.step()}\kern\strutdepth
-      \doifnotmode{paper}{\stopviewerlayer}}
-   \stopmode}
-
-\logo [METAPOST] {MetaPost}
-
-\definefont[TitleFont][SansBold at 60pt]
-\definefont[TempFont] [SansBold at 12pt]
-
-\let\StartText\starttext
-\let\StopText \stoptext
-
-\continueifinputfile{s-pre-71.mkiv}
-
-\starttext
-
-\StartTopics
-    \StartTopic[1] A \StopTopic
-    \StartTopic[5] B \StopTopic
-    \StartTopic[9] C \StopTopic
-\StopTopics
-
-\StartTopics
-    \StartTopic A \StopTopic
-    \StartTopic B \StopTopic
-    \StartTopic C \StopTopic
-    \StartTopic D \StopTopic
-    \StartTopic E \StopTopic
-    \StartTopic F \StopTopic
-    \StartTopic G \StopTopic
-    \StartTopic H \StopTopic
-    \StartTopic I \StopTopic
-\StopTopics
-
-\stoptext
diff --git a/tex/context/modules/mkiv/s-present-banner.mkiv b/tex/context/modules/mkiv/s-present-banner.mkiv
new file mode 100644
index 000000000..2ecafe3b9
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-banner.mkiv
@@ -0,0 +1,132 @@
+%D \module
+%D   [      file=s-present-banner,
+%D        version=2016.04.30, % around
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Banner,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This style was made for the Bacho\TeX\ 2016 conference. The banner below
+%D the text advances through the title.
+
+\startmodule[present-banner]
+
+\definecolor[maincolor] [b=.65]
+\definecolor[othercolor][s=.35]
+
+\startluacode
+    function mp.Banner(s,mode)
+     -- local r = tex.count.realpageno
+        local r = tex.count.realpageno - 1
+        local n = #s
+        local i = mode and 1 or 0
+        local t = string.gsub(s,".",function(s)
+            if s == " " or i > n then
+                return s
+            elseif i == r then
+                i = i + 1
+                if mode then
+                    return "\\color[othercolor]{" .. s .. "}"
+                else
+                    return "\\maincolor " .. s
+                end
+            else
+                i = i + 1
+                return s
+            end
+        end)
+        mp.quoted(t)
+    end
+\stopluacode
+
+\startuseMPgraphic{page}
+    StartPage ;
+        fill Page withcolor \MPcolor{maincolor} ;
+        draw anchored(image (
+          % draw textext.top (lua.mp.Banner("\documentvariable{title}",true))
+            draw textext.top (lua.mp.Banner("\documentvariable{title}",false))
+                xsized (.9PaperWidth)
+                withcolor white;
+        ), center bottomboundary Page);
+      % fill Field[Text][Text] enlarged 10pt withcolor (\MPcolor{maincolor})/1.5 ;
+        fill Field[Text][Text] enlarged 10pt withcolor .1white ;
+    StopPage ;
+\stopuseMPgraphic
+
+\setupbackgrounds
+  [page]
+  [background=page]
+
+\defineoverlay
+  [page]
+  [\useMPgraphic{page}]
+
+\setupbodyfont
+  [lucidaot,10pt]
+
+\setuppapersize
+  [S6]
+
+\setuplayout
+  [backspace=30pt,
+   width=middle,
+   height=middle,
+   topspace=30pt,
+   bottomspace=100pt,
+   header=0pt,
+   footer=0pt,
+   margin=0pt]
+
+\setupcolors
+  [textcolor=white]
+
+\setupwhitespace
+  [big]
+
+\setuphead
+  [chapter]
+  [style=\bfd,
+   after={\blank[big]}]
+
+\setuphead
+  [section]
+  [style=\bfa,
+   before=\blank,
+   after={\blank[medium]}]
+
+\definehighlight[nb][style=bold]
+
+\setupitemgroup[itemize][before=,after=]
+\setupitemgroup[itemize][packed]
+
+\setupdocument
+  [title=Title,
+   subtitle=Subtitle,
+   location=\currentdate]
+
+\startsetups document:start
+
+    \startstandardmakeup
+
+        \raggedcenter
+
+        \dontleavehmode\scale[width=1.00\textwidth]{\documentvariable{title}}    \vfil
+        \dontleavehmode\scale[width=0.75\textwidth]{\documentvariable{subtitle}} \vfil
+        \dontleavehmode\scale[width=0.45\textwidth]{\documentvariable{location}} \vfil
+
+    \stopstandardmakeup
+
+\stopsetups
+
+\stopmodule
+
+\continueifinputfile{s-present-banner.mkiv}
+
+\usemodule[present-common]
+
+\inputpresentationfile{bachotex/2016/bachotex-2016-opentype.tex}
diff --git a/tex/context/modules/mkiv/s-present-bars.mkiv b/tex/context/modules/mkiv/s-present-bars.mkiv
new file mode 100644
index 000000000..13c09ff3b
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-bars.mkiv
@@ -0,0 +1,128 @@
+%D \module
+%D   [      file=s-present-bars,
+%D        version=2012.07.10,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment bars,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Okay, this one makes me a bit ashamed as it's probably too simple and unattractive but
+%D as it was used for a whole bunch of presentations it made it into a module anyway.
+
+\startmodule[present-bars]
+
+\setupbodyfont
+  [dejavu]
+
+\setuppapersize
+  [S6]
+
+\setuplayout
+  [backspace=12pt,
+   width=middle,
+   height=middle,
+   topspace=12pt,
+   header=36pt,
+   footer=36pt,
+   headerdistance=12pt,
+   footerdistance=12pt]
+
+\definecolor
+  [maincolor]
+  [darkblue]
+
+\startreusableMPgraphic{page}
+    StartPage ;
+        fill
+            Page
+            withcolor \MPcolor{maincolor} ;
+        fill
+            Field[Text][Header]
+                leftenlarged BackSpace
+                rightenlarged CutSpace
+            withcolor darkgray ;
+        fill
+            Field[Text][Footer]
+                leftenlarged BackSpace
+                rightenlarged CutSpace
+            withcolor darkgray ;
+    StopPage ;
+\stopreusableMPgraphic
+
+\setupheader
+  [color=maincolor,
+   style=bold,
+   before=\vss,
+   after=\vss]
+
+\setupheader
+  [color=maincolor,
+   style=bold,
+   before=\vss,
+   after=\vss]
+
+\setupheadertexts
+  [Breskens 2012]
+  [\getvariable{document}{title}]
+
+\setupbackgrounds
+  [page]
+  [background=page]
+
+\defineoverlay
+  [page]
+  [\reuseMPgraphic{page}]
+
+\setupbackgrounds
+  [footer][text]
+  [background=goback]
+
+\defineoverlay
+  [goback]
+  [\overlaybutton{PreviousPage}]
+
+\setuppagenumbering
+  [location=]
+
+\setupcolors
+  [textcolor=white]
+
+\setvariables
+  [document]
+  [maincolor=darkblue,
+   set=\setups{document:setup}]
+
+\startsetups document:setup
+
+    \doifsomething {\getvariable{document}{color}} {
+
+       \definecolor[maincolor][\getvariable{document}{color}]
+
+    }
+
+\stopsetups
+
+\setupinteraction
+  [state=start,
+   click=no]
+
+\usemodule[abr-01]
+\usemodule[pre-60]
+
+\stopmodule
+
+\continueifinputfile{s-present-bars.mkiv}
+
+\usemodule[present-common]
+
+%\inputpresentationfile{context/2012/context-2012-after-the-cleanup.tex}
+%\inputpresentationfile{context/2012/context-2012-the-script.tex}
+%\inputpresentationfile{context/2012/context-2012-lexing-sources.tex}
+%\inputpresentationfile{context/2012/context-2012-mixed-columns.tex}
+%\inputpresentationfile{context/2012/context-2012-visual-debugging.tex}
+\inputpresentationfile{context/2012/context-2012-xml-news.tex}
diff --git a/tex/context/modules/mkiv/s-present-common.mkiv b/tex/context/modules/mkiv/s-present-common.mkiv
new file mode 100644
index 000000000..64da8b700
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-common.mkiv
@@ -0,0 +1,41 @@
+%D \module
+%D   [      file=s-present-common,
+%D        version=2016.10.20,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Common Helpers,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\startluacode
+
+    -- sources               -> presentations
+    -- tex/context/base/mkiv -> doc/context/presentations
+
+    function commands.inputpresentationfile(name)
+        local mkivpath = file.pathpart(resolvers.findfile("context.mkiv"))
+        local filename = file.join(mkivpath,"../presentations",name)
+        if lfs.isfile(filename) then
+            context.input(filename)
+            return
+        end
+        filename = file.join(mkivpath,"../../../../doc/context/presentations",name)
+        if lfs.isfile(filename) then
+            context.input(filename)
+            return
+        end
+        context.starttext()
+        context.formatted.type("missing file: %s",name)
+        context.stoptext()
+    end
+
+\stopluacode
+
+\unexpanded\def\inputpresentationfile#1%
+  {\ctxcommand{inputpresentationfile("#1")}}
+
+\endinput
diff --git a/tex/context/modules/mkiv/s-present-four.mkiv b/tex/context/modules/mkiv/s-present-four.mkiv
new file mode 100644
index 000000000..347790e26
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-four.mkiv
@@ -0,0 +1,188 @@
+%D \module
+%D   [      file=s-present-four,
+%D        version=2011.04.15, % about
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Four,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Just another one-time used Bacho\TEX\ presentation style that I found back
+%D when cleaning up old files. It's just simple pages in a shape and this time
+%D we hook it into a section command.
+
+\startmodule[present-four]
+
+\setupbodyfont
+  [dejavu,11pt]
+
+\setupcolors
+  [textcolor=white]
+
+\setupalign
+  [flushleft]
+
+\startuseMPgraphic{page}
+    vardef One =
+            ulcorner Page --
+        .75[ulcorner Page, urcorner Page] --
+        .60[ulcorner Page, lrcorner Page] --
+        .75[ulcorner Page, llcorner Page] --
+            cycle
+    enddef;
+    vardef One =
+            ulcorner Page --
+        .80[ulcorner Page, urcorner Page] --
+        .65[ulcorner Page, lrcorner Page] --
+        .80[ulcorner Page, llcorner Page] --
+            cycle
+    enddef;
+    vardef Two   = One rotatedaround(center Page, 90) enddef ;
+    vardef Three = One rotatedaround(center Page,180) enddef ;
+    vardef Four  = One rotatedaround(center Page,270) enddef ;
+    StartPage ;
+        if CurrentLayout = "layout:0" :
+            fill Two   withcolor .25[red,blue] ;
+            fill Three withcolor .25[blue,yellow] ;
+            fill Four  withcolor .25[yellow,blue] ;
+            fill One   withcolor .5white ;
+        elseif CurrentLayout = "layout:1" :
+            fill Two   withcolor .25[red,blue] ;
+            fill Three withcolor .25[blue,yellow] ;
+            fill Four  withcolor .25[yellow,blue] ;
+            fill One   withcolor .25[green,red] ;
+        elseif CurrentLayout = "layout:2" :
+            fill One   withcolor .25[green,red] ;
+            fill Two   withcolor .25[red,blue] ;
+            fill Three withcolor .25[blue,yellow] ;
+            fill Four  withcolor .25[yellow,blue] ;
+        elseif CurrentLayout = "layout:3" :
+            fill One   withcolor .25[green,red] ;
+            fill Two   withcolor .25[red,blue] ;
+            fill Four  withcolor .25[yellow,blue] ;
+            fill Three withcolor .25[blue,yellow] ;
+        elseif CurrentLayout = "layout:4" :
+            fill One   withcolor .25[green,red] ;
+            fill Three withcolor .25[blue,yellow] ;
+            fill Four  withcolor .25[yellow,blue] ;
+            fill Two   withcolor .25[red,blue] ;
+        fi ;
+    StopPage ;
+\stopuseMPgraphic
+
+\setupbackgrounds
+  [page]
+  [background={page}]
+
+\setupinteraction
+  [state=start,
+   click=no]
+
+\setupinteractionscreen
+  [option=max]
+
+\defineoverlay
+  [page]
+  [\useMPgraphic{page}]
+
+\definepapersize
+  [mine]
+  [width=400pt,
+   height=400pt]
+
+\setuppapersize
+  [mine]
+
+\setuplayout
+  [header=0pt,
+   footer=0pt,
+   margin=0pt,
+   width=middle,
+   height=middle]
+
+% \showframe
+
+\definelayout
+  [layout:0]
+  [backspace=10pt,cutspace=.375\paperwidth,
+   bottomspace=.35\paperheight,topspace=10pt]
+
+\definelayout
+  [layout:1]
+  [backspace=10pt,cutspace=.375\paperwidth,
+   bottomspace=.35\paperheight,topspace=10pt]
+
+\definelayout
+  [layout:2]
+  [backspace=.35\paperwidth,cutspace=10pt,
+   bottomspace=.375\paperheight,topspace=10pt]
+
+\definelayout
+  [layout:3]
+  [backspace=.375\paperwidth,cutspace=10pt,
+   bottomspace=10pt,topspace=.375\paperheight]
+
+\definelayout
+  [layout:4]
+  [backspace=10pt,cutspace=.375\paperwidth,
+   bottomspace=10pt,topspace=.35\paperheight]
+
+\setuptyping
+  [space=fixed]
+
+\startluacode
+    local n = -1
+    function documentdata.StartPage()
+        if n == 4 then
+            n = 1
+        else
+            n = n + 1
+        end
+        context.setuplayout { string.format("layout:%s",n) }
+    end
+    function documentdata.StopPage()
+        context.page()
+    end
+\stopluacode
+
+\unexpanded\def\StartPage
+  {\bgroup
+   \ctxlua{documentdata.StartPage()}}
+
+\unexpanded\def\StopPage
+  {\ctxlua{documentdata.StopPage()}
+   \egroup}
+
+\startsetups subject:start
+    \bgroup
+    \ctxlua{documentdata.StartPage()}
+\stopsetups
+
+\startsetups subject:stop
+    \ctxlua{documentdata.StopPage()}
+    \egroup
+\stopsetups
+
+\setuphead[subject]
+  [beforesection=\directsetup{subject:start},
+   aftersection=\directsetup{subject:stop}]
+
+\startsetups document:start
+    \StartPage
+        \definedfont[SerifBold*default at 48pt]
+        \setupinterlinespace
+        \documentvariable{title}
+    \StopPage
+\stopsetups
+
+\stopmodule
+
+\continueifinputfile{s-present-four.mkiv}
+
+\usemodule[present-common]
+
+\inputpresentationfile{bachotex/2011/bachotex-2011-cld-and-mkvi.tex}
diff --git a/tex/context/modules/mkiv/s-present-ovals.mkiv b/tex/context/modules/mkiv/s-present-ovals.mkiv
new file mode 100644
index 000000000..45af6c823
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-ovals.mkiv
@@ -0,0 +1,94 @@
+%D \module
+%D   [      file=s-present-ovals,
+%D        version=2015.04.20,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Ovals,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This style was made for some of the font and language related presentations at
+%D Bacho\TeX\ 2015. It's a bit boring but it suits simple presentations. It provides
+%D no structure as each page content is kind of special.
+
+\startmodule[s-present-ovals]
+
+\setuppapersize[S6]
+
+\definecolor[maincolor] [darkred]
+\definecolor[othercolor][maincolor]
+
+\startuseMPgraphic{page}
+
+    fill Page enlarged 2mm withcolor .5[white,\MPcolor{othercolor}] ;
+
+    if NOfPages > 1 :
+
+        numeric PageFraction ; PageFraction := (RealPageNumber-1) / (NOfPages-1) ;
+        numeric WidthDelta   ; WidthDelta   := 2 * PaperWidth  / 10 ;
+        numeric HeightDelta  ; HeightDelta  := 2 * PaperHeight / 10 ;
+        numeric WidthOffset  ; WidthOffset  := WidthDelta  + PageFraction*(PaperWidth  - 2WidthDelta ) ;
+        numeric HeightOffset ; HeightOffset := HeightDelta + PageFraction*(PaperHeight - 2HeightDelta) ;
+
+        fill
+            (ulcorner Page) shifted (WidthOffset,0)   ..
+            (urcorner Page) shifted (0,-HeightOffset) ..
+            (lrcorner Page) shifted (-WidthOffset,0)  ..
+            (llcorner Page) shifted (0,HeightOffset)  ..
+            cycle withcolor \MPcolor{maincolor} ;
+
+        clip currentpicture to Page ;
+
+    fi ;
+
+\stopuseMPgraphic
+
+% e-mess has always been okay by definition which makes it easier to blame generators
+
+\defineoverlay
+  [page]
+  [\useMPgraphic{page}]
+
+\setupbackgrounds
+  [page]
+  [background=page]
+
+\setupalign
+  [middle,broad]
+
+\setupcolors
+  [textcolor=white]
+
+\setupbodyfont
+  [pagella,17.3pt]
+
+\setuplayout
+  [height=middle,
+   width=middle,
+   topspace=.05\paperheight,
+   backspace=.15\paperwidth,
+   header=0pt,
+   footer=0pt]
+
+\setupwhitespace
+  [line]
+
+\setuphead
+  [title]
+  [style=\bfb,
+   alternative=middle,
+   before=,
+   number=no]
+
+\stopmodule
+
+\continueifinputfile{s-present-ovals.mkiv}
+
+\usemodule[present-common]
+
+\inputpresentationfile{bachotex/2015/bachotex-2015-ligatures.tex}
+%inputpresentationfile{bachotex/2015/context-2015-status.tex}
diff --git a/tex/context/modules/mkiv/s-present-overlap.mkiv b/tex/context/modules/mkiv/s-present-overlap.mkiv
new file mode 100644
index 000000000..053455b4b
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-overlap.mkiv
@@ -0,0 +1,233 @@
+%D \module
+%D   [      file=s-present-overlap, % was s-pre-62,
+%D        version=2005.03.04,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Overlap,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\usemodule[present-stepwise]
+
+\startmodule[present-overlap]
+
+\doifmodeelse {atpragma} {
+
+    \usetypescriptfile
+      [type-ghz]
+
+    \definetypeface[mainface][rm][serif][melior]  [default][encoding=texnansi]
+    \definetypeface[mainface][tt][mono] [modern]  [default][encoding=texnansi,rscale=1.05]
+    \definetypeface[mainface][ss][serif][melior]  [default][encoding=texnansi]
+    \definetypeface[mainface][mm][math] [palatino][default][encoding=texnansi,rscale=0.95]
+
+    \setupbodyfont
+      [mainface,14.4pt]
+
+} {
+
+    \setupbodyfont[dejavu,14.4pt]
+
+}
+
+\setuppapersize
+  [S6][S6]
+
+\setvariables[layout][dx=0,dy=1,nx=2,ny=2,step=64]
+
+\definemeasure[layoutwd][\dimexpr\paperwidth /\getvariable{layout}{step}\relax]
+\definemeasure[layoutht][\dimexpr\paperheight/\getvariable{layout}{step}\relax]
+
+\setuplayout
+  [      width=middle,
+        height=middle,
+        header=0pt,
+        footer=0pt,
+        margin=0pt,
+     backspace=5\measured{layoutwd},
+      topspace=5\measured{layoutht}]
+
+\definelayout
+  [step]
+  [  backspace=\numexpr2+                         \getvariable{layout}{dx}\relax\measured{layoutwd},
+      cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measured{layoutwd},
+      topspace=\numexpr2+                         \getvariable{layout}{dy}\relax\measured{layoutht},
+   bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measured{layoutht}]
+
+\definecolor[layout:left]  [t=.5,a=1,b=1]
+\definecolor[layout:right] [t=.5,a=1,r=1]
+\definecolor[layout:top]   [t=.5,a=1,g=1]
+\definecolor[layout:bottom][t=.5,a=1,y=1]
+\definecolor[layout:page]  [s=.75]
+
+\definehspace[menu][\measured{layoutwd}]
+
+\setupinteraction
+  [state=start,
+   click=off,
+   style=,
+   color=interactioncolor,
+   contrastcolor=interactioncolor]
+
+\setupinteractionscreen
+  [option=max]
+
+\setupbuttons
+  [color=maincolor,
+   contrastcolor=maincolor,
+   style=\tf, % acceptable
+   height=2\measure{layoutht},
+   width=2\measure{layoutwd},
+   offset=overlay,
+   frame=off]
+
+\definecolor[interactioncolor][darkgray]
+\definecolor[maincolor]       [lightgray]
+
+\setuptexttexts
+  []
+  [\vbox to \textheight{\vfill\hfill\setups{menu:content}}]
+
+\startsetups menu:content
+
+    \button{\symbol[firstpage]}[firstpage]
+    \hspace[menu]
+    \button{\symbol[previouspage]}[previouspage]
+    \hspace[menu]
+    \button{\StartBusy\symbol[PauseRendering]\StopBusy}[InvokeStepper]
+    \hspace[menu]
+    \button{\symbol[nextpage]}[nextpage]
+    \hspace[menu]
+    \button{\symbol[lastpage]}[lastpage]
+    \hspace[menu]
+    \button{\symbol[CloseDocument]}[CloseDocument]
+
+\stopsetups
+
+\startuseMPgraphic{page}{step}
+    StartPage ;
+        numeric dx ; dx := PaperWidth /\MPvar{step} ;
+        numeric dy ; dy := PaperHeight/\MPvar{step} ;
+        fill Page withcolor .5white ;
+        fill
+            ulcorner Page -- urcorner Page --
+            urcorner Page shifted (0,-TopSpace+dy) -- ulcorner Page shifted (0,-TopSpace+dy) -- cycle
+            withcolor "layout:top" ;
+        fill
+            llcorner Page -- lrcorner Page --
+            lrcorner Page shifted (0,BottomSpace-dy) -- llcorner Page shifted (0,BottomSpace-dy) -- cycle
+            withcolor "layout:bottom" ;
+        fill
+            ulcorner Page -- llcorner Page --
+            llcorner Page shifted (BackSpace-dx,0) -- ulcorner Page shifted (BackSpace-dx,0) -- cycle
+            withcolor "layout:left" ;
+        fill
+            urcorner Page -- lrcorner Page --
+            lrcorner Page shifted (-CutSpace+dx,0) -- urcorner Page shifted (-CutSpace+dx,0) -- cycle
+            withcolor "layout:right" ;
+        fill Field[Text][Text] enlarged (dx,dy) withcolor white ;
+        fill Field[Text][Text] enlarged (dx,dy) withcolor "layout:page" ;
+    StopPage ;
+\stopuseMPgraphic
+
+\defineoverlay[page][\useMPgraphic{page}{step=\getvariable{layout}{step}}]
+
+\setupbackgrounds
+  [page]
+  [background=page]
+
+\setupcolors
+  [state=start]
+
+\startsetups nextstep
+  % pagebreak handlers are grouped, so we need to set global
+  \ifnum\getvariable{layout}{dx}=\getvariable{layout}{nx}\relax
+    \ifnum\getvariable{layout}{dy}=\getvariable{layout}{ny}\relax
+      \setxvariables[layout][dy=1]
+    \else
+      \setxvariables[layout][dy=\the\numexpr\getvariable{layout}{dy}+1\relax]
+    \fi
+    \setxvariables[layout][dx=1]
+  \else
+    \setxvariables[layout][dx=\the\numexpr\getvariable{layout}{dx}+1\relax]
+  \fi
+  % global anyway
+  \setuplayout[step]
+\stopsetups
+
+\appendtoks
+    \definefont[ChapterTitleFont][SerifBold*default sa 2]
+    \NormalizeFontHeight \SubTitleFont      {\setstrut\strut\quad} {3\lineheight} {SerifBold*default}
+    \NormalizeFontHeight \ChapterNumberFont {XVI}                  {4\lineheight} {SerifBold*default}
+\to \everystarttext
+
+\setupsection
+  [section-2]
+  [bodypartconversion=Romannumerals]
+
+\installpagebreakhandler {step} {\setups{nextstep}}
+
+\definepagebreak[chapter][yes,step]
+
+\setuphead
+  [chapter]
+  [page=chapter,
+   command=\MyChapterCommand,
+   after=\nowhitespace]
+
+\definehead[Topic][chapter]
+\definehead[Nopic][title]
+
+\setuphead[chapter,Topic,Nopic]
+  [numberstyle=\ChapterNumberFont,
+   textstyle=\ChapterTitleFont,
+   numbercolor=lightgray,
+   textcolor=darkgray]
+
+\unexpanded\def\MyChapterCommand#1#2%
+  {\hbox \bgroup % we need to nil the strut added by the headplacement
+     \setupframed[frame=off,lines=3,offset=overlay]%
+     \rlap{\hskip2\lineheight\framed{\setnostrut#1}}%
+     \framed{#2}%
+   \egroup}
+
+\setupitemize
+  [each]
+  [R,broad]
+  [stopper=,
+   color=lightgray]
+
+\startsetups document:start
+
+    \startstandardmakeup[headerstate=high,textstate=stop]
+
+        \setupalign[middle]
+
+        \vfil
+        \startcolor[darkgray]
+            \dontleavehmode\scale[width=.9\textwidth]{\bf\setstrut\strut\documentvariable{title}}
+            \vfil
+            \dontleavehmode\scale[width=.7\textwidth]{\bf\setstrut\strut\documentvariable{subtitle}}
+            \vfil \vfil \vfil
+            \dontleavehmode\scale[width=.5\textwidth]{\bf\setstrut\strut\documentvariable{location}}
+        \stopcolor
+        \vfil \vfil \vfil
+
+    \stopstandardmakeup
+
+\stopsetups
+
+\stopmodule
+
+\continueifinputfile{s-present-overlap.mkiv}
+
+\usemodule[present-common]
+
+\inputpresentationfile{context/2011/context-2011-mathml-update.tex}
+%\inputpresentationfile{context/2011/context-2011-metapost-how-we-adapt.tex}
+%\inputpresentationfile{context/2011/context-2011-ebook-export.tex}
+%\inputpresentationfile{context/2011/context-2011-sorting-registers.tex}
diff --git a/tex/context/modules/mkiv/s-present-phone.mkiv b/tex/context/modules/mkiv/s-present-phone.mkiv
new file mode 100644
index 000000000..d041ad822
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-phone.mkiv
@@ -0,0 +1,108 @@
+%D \module
+%D   [      file=s-present-phone,
+%D        version=2016.04.20, % or about
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Phone,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D The theme of Bacho\TeX\ was \quote {Getting \TEX\ out of the closet}. And, as I'm
+%D always a bit sceptical about efforts to get a specialized toolbox like \TEX\
+%D accepted in a large scale generic user base, I decided to give a talk dedicated
+%D to Jerzy (the always optimistic organizer). (One can actually wonder if \TEX\ was
+%D ever hidden in a closet.) And, because I had to get the attention of some nephew
+%D and nieces I took there I gave the presentation without beamer but on my phone.
+%D On such a device one just swipes but I still added two buttons. Watch the small
+%D full|-|hd|-|ratio paper dimensions and 6 point font size.
+
+\startmodule[s-present-phone]
+
+\setupinteraction
+  [state=start]
+
+\definepapersize
+  [phone]
+  [width=108.0pt,
+   height=192.0pt]
+
+\definelayout
+  [phone]
+  [backspace=3pt,
+   topspace=6pt,
+   bottomspace=3pt,
+   header=0pt,
+   footer=0pt,
+   bottom=10pt,
+   bottomdistance=5pt,
+   height=fit,
+   width=middle]
+
+\setuplayout
+  [phone]
+
+\setuppapersize
+  [phone]
+
+\setupbodyfont
+  [dejavu,ss,6pt]
+
+\setupalign
+  [tolerant,flushleft]
+
+\setupbackgrounds
+  [page]
+  [background=color,
+   backgroundcolor=maincolor]
+
+\setupbackgrounds
+  [bottom]
+  [text]
+  [background=color,
+   backgroundcolor=othercolor,
+   backgroundoffset=\backspace]
+
+\definecolor[maincolor] [r=.7,g=.3,b=0]
+\definecolor[othercolor][r=0,g=.3,b=.7]
+
+\setupcolors
+  [textcolor=white]
+
+\setupinteraction
+  [menu=on,
+   color=white,
+   contrastcolor=white]
+
+\setupinteractionmenu
+  [bottom]
+  [state=start,
+   style=\ss\bf]
+
+\setupitemgroup
+  [itemize]
+  [inbetween={\blank[medium]}]
+
+\startinteractionmenu[bottom]
+    \startgot [previouspage] \textminus \stopgot
+    \starttxt \getmarking[section]      \stoptxt
+    \startgot [nextpage]     \textplus  \stopgot
+\stopinteractionmenu
+
+\setuphead
+  [section]
+  [page=yes,
+   before=,
+   after={\blank[disable]},
+   placehead=empty]
+
+\stopmodule
+
+\continueifinputfile{s-present-phone.mkiv}
+
+\usemodule[present-common]
+
+\inputpresentationfile{bachotex/2016/bachotex-2016-toolbox.tex}
diff --git a/tex/context/modules/mkiv/s-pre-70.mkiv b/tex/context/modules/mkiv/s-present-punk.mkiv
index 2c8bb2d26..a43639690 100644
--- a/tex/context/modules/mkiv/s-pre-70.mkiv
+++ b/tex/context/modules/mkiv/s-present-punk.mkiv
@@ -1,8 +1,8 @@
 %D \module
-%D   [      file=s-pre-70,
+%D   [      file=s-present-punk,
 %D        version=2008.04.15,
 %D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 70,
+%D       subtitle=Presentation Environment Punk,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
@@ -48,7 +48,7 @@
 
 \setupinteraction
   [state=start,
-   %click=off,
+  %click=off,
    menu=on]
 
 %D We predefine a few palets. Of course you can define more.
@@ -67,8 +67,8 @@
 
 \setuppalet[punk-one]
 
-%D We use a few backgrounds. The hyperlink that invokes the
-%D stepper is hooked into the text background.
+%D We use a few backgrounds. The hyperlink that invokes the stepper is hooked
+%D into the text background.
 
 \definelayer
   [page]
@@ -101,8 +101,7 @@
    color=white, % pagecolor,
    contrastcolor=white] % pagecolor,
 
-%D We define a rather simple navigational panel at the
-%D bottom
+%D We define a rather simple navigational panel at the bottom
 
 \setupinteractionmenu
   [bottom]
@@ -139,7 +138,8 @@
     \definesymbol[next]      [\string>\string>]
 \stopsymbolset
 
-\setupinteraction[symbolset=punk]
+\setupinteraction
+  [symbolset=punk]
 
 %D Because the font is rather large, we use less whitespace.
 
@@ -147,12 +147,9 @@
   [chapter]
   [after={\blank[big]}]
 
-%D Run this file with the command: \type {context --mode=demo s-pre-70}
-%D in order to get an example.
-
-\continueifinputfile{s-pre-70.mkiv}
+\continueifinputfile{s-present-punk.mkiv}
 
-\usemodule[pre-60] % use the stepper
+\usemodule[pre-stepwise]
 
 \starttext
 
diff --git a/tex/context/modules/mkiv/s-pre-71.lua b/tex/context/modules/mkiv/s-present-random.lua
index bfa45a705..f32d7aaea 100644
--- a/tex/context/modules/mkiv/s-pre-71.lua
+++ b/tex/context/modules/mkiv/s-present-random.lua
@@ -1,11 +1,14 @@
-if not modules then modules = { } end modules ['steps'] = {
+if not modules then modules = { } end modules ['present-random'] = {
     version   = 1.001,
-    comment   = "companion to steps.mkiv",
+    comment   = "companion to s-present-random.mkiv",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
     copyright = "PRAGMA ADE / ConTeXt Development Team",
     license   = "see context related readme files"
 }
 
+-- For the moment we keep the namespace steps because it can become some
+-- shared module some day.
+
 moduledata.steps = moduledata.steps or { }
 local steps      = moduledata.steps
 
diff --git a/tex/context/modules/mkiv/s-present-random.mkiv b/tex/context/modules/mkiv/s-present-random.mkiv
new file mode 100644
index 000000000..f63dc7851
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-random.mkiv
@@ -0,0 +1,243 @@
+%D \module
+%D   [      file=s-present-random,
+%D        version=2008.08.05, % updated 2016.10.20
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Random,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Unfortunately there are not that many viewers that support javascript
+%D control over layers.
+
+% \enablemode[numbers]
+% \enablemode[paper]
+% \usemodule[present-stepwise]
+
+\registerctxluafile{s-present-random}{}
+
+\setupinteraction
+  [state=start,
+   click=off]
+
+\definepapersize
+  [wide]
+  [width=900pt,
+   height=600pt]
+
+\setuppapersize
+  [wide]
+  [wide]
+
+\setuplayout
+  [page]
+
+\setupsorting
+  [logo]
+  [style=]
+
+\startnotmode[paper]
+
+    \setupbackgrounds
+      [page]
+      [background=color,
+       backgroundcolor=black]
+
+\stopnotmode
+
+\definelayer
+  [page]
+  [width=\paperwidth,
+   height=\paperheight]
+
+\definecolor[TopicColor-1][r=.3,g=.4,b=.5]
+\definecolor[TopicColor-2][r=.3,g=.5,b=.4]
+\definecolor[TopicColor-3][r=.4,g=.3,b=.5]
+\definecolor[TopicColor-4][r=.4,g=.5,b=.3]
+\definecolor[TopicColor-5][r=.5,g=.3,b=.4]
+\definecolor[TopicColor-6][r=.5,g=.4,b=.3]
+\definecolor[TopicColor-7][r=.35,g=.35,b=.6]
+\definecolor[TopicColor-8][r=.6,g=.35,b=.35]
+\definecolor[TopicColor-9][r=.35,g=.6,b=.35]
+
+\definecolor[TopicColor-0][t=.5,a=1,s=.5]
+\definecolor[TopicColor]  [s=1]
+
+\setupcolors
+  [textcolor=TopicColor]
+
+\starttexdefinition unexpanded StartTopics
+    \doifelsemode {paper} {
+        \disablemode[stepper]
+        \enablemode[onepagestepper]
+    } {
+        \doifelsedefined {NextStep} {
+            \enablemode[stepper]
+            \disablemode[onepagestepper]
+        } {
+            \disablemode[stepper]
+            \disablemode[onepagestepper]
+        }
+    }
+    \doifelsemode {onepagestepper} {
+        \startstandardmakeup[top=,bottom=\vfill]
+    } {
+        \setuplayer[state=repeat]
+        \resetlayer[page]
+    }
+    \ctxlua{moduledata.steps.reset_locations()}
+    \doifmode {interactivestepper} {
+        \StartLocalSteps
+    }
+\stoptexdefinition
+
+\starttexdefinition unexpanded StopTopics
+    \doifmode {interactivestepper} {
+        \StopLocalSteps
+    }
+    \doifelsemode {onepagestepper} {
+        \flushlayer[page]
+        \stopstandardmakeup
+    } {
+        \resetlayer[page]
+    }
+\stoptexdefinition
+
+\starttexdefinition unexpanded StartTopic
+    \dosingleempty\doStartTopic
+\stoptexdefinition
+
+\starttexdefinition unexpanded doStartTopic [#1]
+    \doifmode {interactivestepper} {
+        \NextStep
+    }
+    \ctxlua{moduledata.steps.next_location("#1")}
+    \doifmode {paper} {
+        \doifnothing {#1} {
+            \ifcase\ctxlua{moduledata.steps.previous_n()}\else
+                \setlayer
+                    [page]
+                    [preset=\ctxlua{moduledata.steps.previous_location()}]
+                \bgroup
+                    \doifmode {interactivestepper} {
+                        \startviewerlayer[\StepLayer]
+                    }
+                    \framed
+                        [offset=20pt,
+                         strut=no,
+                         align=normal,
+                         frame=off,
+                         height=\dimexpr\paperheight/3\relax,
+                         width=\dimexpr\paperwidth/3\relax,
+                         background=color,
+                         backgroundcolor=TopicColor-0]
+                        {}
+                    \doifmode {interactivestepper} {
+                        \stopviewerlayer
+                    }
+             \egroup
+         \fi
+        }
+    }
+    \setlayer
+        [page]
+        [preset=\ctxlua{moduledata.steps.current_location()}]
+        \bgroup
+            \doifmode {interactivestepper} {
+                \startviewerlayer[\StepLayer]
+            }
+            \framed
+                [offset=20pt,
+                 strut=no,
+                 align=\expdoifelse{#1}{}{normal}{middle,lohi},
+                 align=\expdoifelse{#1}{}{flushleft,verytolerant}{middle,lohi},
+                 frame=off,
+                 height=\dimexpr\paperheight/3\relax,
+                 width=\dimexpr\paperwidth/3\relax,
+                 background=color,
+                 backgroundcolor=TopicColor-\ctxlua{moduledata.steps.current_n()}]
+                \bgroup
+                    \ignorespaces
+\stoptexdefinition
+
+\starttexdefinition unexpanded StopTopic
+                    \removeunwantedspaces
+                \egroup
+            \doifmode {interactivestepper} {
+                \stopviewerlayer
+            }
+        \egroup
+    \doifmode {numbers} {
+        \setlayerframed
+            [page]
+            [preset=\ctxlua{moduledata.steps.current_location()}]
+            [height=\dimexpr\paperheight/3\relax,
+             width=\dimexpr\paperwidth/3\relax,
+             frame=off,
+             foregroundstyle=\bfa,
+             align={flushright,low}]
+           \bgroup
+                \doifmode {interactivestepper} {
+                    \startviewerlayer[\StepLayer]
+                }
+                \ctxlua{moduledata.steps.step()}\kern\strutdepth
+                \doifmode {interactivestepper} {
+                    \stopviewerlayer
+                }
+            \egroup
+    }
+    \doifnotmode {onepagestepper} {
+        \startstandardmakeup[top=,bottom=\vfill]
+            \flushlayer[page]
+        \stopstandardmakeup
+    }
+\stoptexdefinition
+
+\definefont[TitleFont][SansBold*default at 60pt]
+\definefont[TempFont] [SansBold*default at 12pt]
+
+\let\StartText\starttext % for old times sake
+\let\StopText \stoptext  % for old times sake
+
+\continueifinputfile{s-present-random.mkiv}
+
+% \enablemode[paper]
+
+% \usemodule[present-stepwise]
+\usemodule[abr-02]
+
+\doifelsemode {atpragma} {
+    \usetypescriptfile[type-hgz]
+    \usetypescript[palatino-informal]
+    \setupbodyfont[palatino-informal,15pt]
+} {
+    \setupbodyfont[modern-variable,15pt]
+}
+
+\logo [METAPOST] {MetaPost}
+
+\starttext
+
+\StartTopics
+    \StartTopic[1] A \StopTopic
+    \StartTopic[5] B \StopTopic
+    \StartTopic[9] C \StopTopic
+\StopTopics
+
+\StartTopics
+    \StartTopic A \StopTopic
+    \StartTopic B \StopTopic
+    \StartTopic C \StopTopic
+    \StartTopic D \StopTopic
+    \StartTopic E \StopTopic
+    \StartTopic F \StopTopic
+    \StartTopic G \StopTopic
+    \StartTopic H \StopTopic
+    \StartTopic I \StopTopic
+\StopTopics
+
+\stoptext
diff --git a/tex/context/modules/mkiv/s-present-shaded.mkiv b/tex/context/modules/mkiv/s-present-shaded.mkiv
new file mode 100644
index 000000000..debcca0f1
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-shaded.mkiv
@@ -0,0 +1,167 @@
+%D \module
+%D   [      file=s-present-shaded,
+%D        version=2014.04.30,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Shaded Content,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D As usual, this style was made for a Bacho\TeX\ conference. It doesn't do anything
+%D special apart from progressively changing the shaded backgrounds. You can
+%D redefine the colors \type {maincolor} and \type {othercolor} to suit your taste.
+
+\startmodule[present-shaded]
+
+\setuppapersize[S6]
+
+\setuplayout
+  [cutspace=120pt,
+   rightmargin=100pt,
+   margindistance=10pt,
+   rightmargin=0pt,
+   margindistance=0pt,
+   rightedge=100pt,
+   edgedistance=12.5pt,
+   backspace=10pt,
+   topspace=10pt,
+   bottomspace=10pt,
+   header=0pt,
+   footer=0pt,
+   width=middle,
+   height=middle]
+
+\setupbodyfont
+  [dejavu]
+
+\setuplist
+  [chapter]
+  [before=,
+   after=,
+   inbetween=\vskip5pt,
+   inbetween=\vfill,
+   alternative=e,
+   width=\hsize,
+   height=\measure{menu-item-height},
+   style=bold,
+   frame=off,
+   background=color,
+   backgroundcolor=\structurelistuservariable{color},
+   criterium=text]
+
+\setupcolors
+  [textcolor=white]
+
+\setupinteraction
+  [state=start,
+   menu=on,
+   color=white,
+   click=off,
+   contrastcolor=white]
+
+\setupinteractionmenu
+  [right]
+  [topoffset=5pt,
+   bottomoffset=5pt]
+
+\startinteractionmenu[right]
+    \placelist[chapter]
+\stopinteractionmenu
+
+\definecolor[maincolor] [b=.4]
+\definecolor[othercolor][s=.4]
+
+\definecolor[verydark][s=.2]
+\definecolor[lessdark][1.5(verydark)]
+
+%  we need some extra counter values: \getstructurenumber{self}
+
+\setupmodule
+  [n=\the\numexpr\lastpage-\plusone\relax]
+
+\appendtoks
+    \dorecurse {\moduleparameter{present-shaded}{n}} {
+        \definecolor[shade:#1][\luaexpr{.8*#1/\moduleparameter{present-shaded}{n}}(maincolor,othercolor)]
+    }
+\to \everystarttext
+
+\setupbackgrounds
+  [page]
+  [background=color,
+   backgroundoffset=5pt,
+   backgroundcolor=verydark]
+
+\setupbackgrounds
+  [text]
+  [background={invoke,color},
+   backgroundoffset=5pt,
+   backgroundcolor=\namedstructureuservariable{chapter}{color}]
+
+\definemeasure
+  [menu-item-height]
+  [(\textheight-\numexpr\moduleparameter{present-shaded}{n}-1\relax\dimexpr5pt\relax)/\moduleparameter{present-shaded}{n}]
+
+\setupitemgroup
+  [itemize]
+  [packed]
+
+\setuphead
+  [chapter]
+  [number=no,
+   style=\bfc]
+
+\setuphead
+  [section]
+  [number=no,
+   style=\bf,
+   before=\blank,
+   after=\blank]
+
+\setupdocument
+  [title=Title,
+   subtitle=Subtitle,
+   location=\currentdate]
+
+\startsetups document:start
+
+    \setupbackgrounds
+      [text]
+      [backgroundcolor=lessdark]
+
+    \startstandardmakeup
+
+        \setupalign[middle]
+
+        \vfil
+        \dontleavehmode \scale[width=.8\textwidth] {\documentvariable{title}}
+        \vfil
+        \dontleavehmode \scale[width=.6\textwidth] {\documentvariable{subtitle}}
+        \vfil \vfil \vfil
+        \dontleavehmode \scale[width=.4\textwidth] {\documentvariable{location}}
+        \vfil
+
+    \stopstandardmakeup
+
+    \setupbackgrounds
+      [text]
+      [backgroundcolor=\namedstructureuservariable{chapter}{color}]
+
+\stopsetups
+
+\stopmodule
+
+\continueifinputfile{s-present-shaded.mkiv}
+
+\startdocument
+    \dorecurse {10} {
+        \startchapter[title={Whatever}][color=shade:#1]
+            \section{test}
+            test #1
+            \namedstructureuservariable{chapter}{color}
+        \stopchapter
+    }
+\stopdocument
diff --git a/tex/context/modules/mkiv/s-present-stepper.mkiv b/tex/context/modules/mkiv/s-present-stepper.mkiv
new file mode 100644
index 000000000..c697a36e3
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-stepper.mkiv
@@ -0,0 +1,275 @@
+%D \module
+%D   [      file=s-pre-61,
+%D        version=2004.03.15,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment 61,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D Optima
+
+\usemodule[pre-60]
+
+\doifmodeelse {mkiv} {
+    \usetypescriptfile[ghz]
+    \definetypeface[mainface][ss][sans][optima-nova][default]
+} {
+    \usetypescriptfile[type-ghz]
+    \definetypeface[mainface][ss][sans][optima-nova][default][encoding=\defaultencoding]
+}
+
+\setupbodyfont[mainface,ss,18pt]
+\setupinterlinespace[line=3.25ex]
+
+\setuppapersize
+  [S6][S6]
+
+% \setuppapersize
+%   [SW][SW]
+
+\setuplayout
+  [topspace=10pt,
+   header=30pt,
+   headerdistance=20pt,
+   height=middle,
+   footerdistance=20pt,
+   footer=0pt,
+   bottomdistance=20pt,
+   bottom=20pt,
+   bottomspace=50pt,
+   backspace=30pt,
+   width=middle]
+
+\setupinteraction
+  [state=start,
+   click=off,
+   menu=on,
+   style=,
+   color=interactioncolor,
+   contrastcolor=interactioncolor]
+
+\setupinteractionscreen
+  [option=max]
+
+\setupinteractionmenu
+  [bottom]
+  [color=maincolor,
+   contrastcolor=maincolor,
+   style=\tfa, % acceptable
+   left=\hfill,
+   middle=,
+   right=,
+   height=\bottomheight,
+   width=2\bottomheight,
+   offset=overlay,
+   frame=off]
+
+\startinteractionmenu[bottom]
+  \but [firstpage]               \symbol[firstpage]      \\
+  \but [previouspage]            \symbol[previouspage]   \\
+  \but [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \\
+  \but [nextpage]                \symbol[nextpage]       \\
+  \but [lastpage]                \symbol[lastpage]       \\
+  \but [CloseDocument]           \symbol[CloseDocument]  \\
+\stopinteractionmenu
+
+% maybe in colo-sjk : \setupcolor[sjk]
+
+\definecolor [dark]      [s=.4]
+\definecolor [bright]    [s=.9]
+
+\definecolor [red]       [r=.4,g=.2,b=.2]
+\definecolor [green]     [r=.2,g=.4,b=.2]
+\definecolor [blue]      [r=.2,g=.2,b=.4]
+
+\definecolor [cyan]      [r=.2,g=.4,b=.4]
+\definecolor [magenta]   [r=.4,g=.2,b=.4]
+\definecolor [yellow]    [r=.4,g=.4,b=.2]
+
+\definecolor [pagecolor] [dark]
+\definecolor [maincolor] [bright]
+\definecolor [textcolor] [red]
+
+\definecolor [interactioncolor] [r=.8,g=.8,b=.6]
+
+\setupcolors
+  [state=start,
+   textcolor=maincolor]
+
+\setupbackgrounds
+  [page]
+  [background=page,
+   backgroundcolor=textcolor]
+
+\setupbackgrounds
+  [text]% [text]
+  [background={comments,text,invoke}]
+
+\definelayer
+  [text]
+  [width=\textwidth,
+   height=\textheight]
+
+\defineoverlay
+  [comments]
+  [{\setlayer[text][preset=middle]{\placecomments}}]
+
+\defineoverlay[page][\uniqueMPgraphic{page-\ifcase\realpageno\or one\else plus\fi}]
+
+\startuniqueMPgraphic{page-one}
+  StartPage ;
+    fill Page
+      enlarged 4pt
+      withcolor \MPcolor{pagecolor} ;
+    fill Field[Text][Text]
+      enlarged 10pt
+    % topenlarged   (HeaderHeight+HeaderDistance)
+      leftenlarged  (BackSpace+4pt)
+      rightenlarged (CutSpace +4pt)
+      withcolor OverlayColor ;
+  StopPage ;
+\stopuniqueMPgraphic
+
+\startuniqueMPgraphic{page-plus}
+  StartPage ;
+    fill Page
+      enlarged 4pt
+      withcolor \MPcolor{pagecolor} ;
+    fill Field[Text][Text]
+      enlarged 10pt
+      leftenlarged  (BackSpace+4pt)
+      rightenlarged (CutSpace+4pt)
+      withcolor OverlayColor ;
+  StopPage ;
+\stopuniqueMPgraphic
+
+% this needs to be sorted out !
+
+\appendtoks
+    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
+    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
+    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
+    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
+\to \everystarttext
+
+\appendtoks
+    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
+    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
+    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
+    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
+\to \everystoptext
+
+\setuphead
+  [chapter]
+  [placehead=empty,
+   after={\blank[medium]},
+   color=maincolor,
+   placenumber=no,
+   style=\HeadFont]
+
+\setupheadertexts
+  [\doiftextelse{\currentheadnumber}{\placeheadtext[Topic]}{\placeheadtext[Nopic]}]
+  []
+
+\setuppagenumbering
+  [location=]
+
+\definesymbol
+  [emdash]
+  [\emdash]
+
+\setupitemize
+  [each]
+  [loose,serried,joinedup,broad]
+  [symbol=emdash]
+
+\setupalign
+  [broad,right]
+
+\def\doTitlePage#1#2#3%
+  {\startstandardmakeup[headerstate=high]
+     \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
+     #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil
+   \stopstandardmakeup}
+
+\unexpanded\def\TitlePage   {\doTitlePage\TitleFont\relax}
+\unexpanded\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont}
+
+\definehead[Topic][chapter]
+\definehead[Nopic][title]
+
+\unexpanded\def\Topics#1%
+  {\Nopic[topics]{#1}
+   \startcolumns
+     \placelist[Topic]
+   \stopcolumns}
+
+\setuplist
+  [Topic]
+  [alternative=f,
+   color=maincolor,
+   contrastcolor=maincolor,
+   criterium=all]
+
+\defineoverlay[topics][\overlaybutton{topics}]
+
+\setupbackgrounds
+  [bottom] [text]
+  [background=topics]
+
+\continueifinputfile{s-present-stepper.tex}
+
+\starttext
+
+\TitlePage{Stepwise\\Refinement}
+
+\Topics{Topics}
+
+\Topic{Female Artists}
+
+\StartSteps
+
+\startitemize
+\item Fiona Apple \FlushStep
+\item Tori Amos \FlushStep
+\item Kate Bush \FlushStep
+\item Heather Nova \FlushStep
+\item Alanis Morissette \FlushStep
+\item Suzanne Vega \FlushStep
+\stopitemize
+
+\StopSteps
+
+\Topic{Male Composers}
+
+\StartSteps
+
+\startitemize
+\item John Adams \FlushStep
+\item Steve Reich \FlushStep
+\item Louis Andriessen \FlushStep
+\item Olivier Messiaen \FlushStep
+\stopitemize
+
+\StopSteps
+
+\Topic{And Some More}
+
+\StartSteps
+
+\startitemize
+\item Mark Hollis   \FlushStep
+\item Roger Waters  \FlushStep
+\item David Gilmore \FlushStep
+\item Peter Gabriel \FlushStep
+\item Randy Newman  \FlushStep
+\stopitemize
+
+\StopSteps
+
+\stoptext
diff --git a/tex/context/modules/mkiv/s-pre-60.mkiv b/tex/context/modules/mkiv/s-present-stepwise.mkiv
index 70f8978b0..70f8978b0 100644
--- a/tex/context/modules/mkiv/s-pre-60.mkiv
+++ b/tex/context/modules/mkiv/s-present-stepwise.mkiv
diff --git a/tex/context/modules/mkiv/s-present-tiles.mkiv b/tex/context/modules/mkiv/s-present-tiles.mkiv
index b68a34ef4..566a610a4 100644
--- a/tex/context/modules/mkiv/s-present-tiles.mkiv
+++ b/tex/context/modules/mkiv/s-present-tiles.mkiv
@@ -11,15 +11,18 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D The Bacho\TeX\ 2013 style.
+%D In this style the table of contents is a bunch of rectangular blobs. The layout
+%D adapts itself upto 25 pages. This style was made for Bacho\TeX\ 2013.
+
+\startmodule[present-tiles]
 
 \setupbodyfont[pagella,14.4pt]
 
 \setuppapersize[S6][S6]
 
-\definecolor[primarycolor]  [.50(darkblue,darkgreen)]
-\definecolor[secondarycolor][.25(darkblue,darkyellow)]
-\definecolor[mixedcolor]    [s=.35]
+\definecolor[maincolor] [.50(darkblue,darkgreen)]
+\definecolor[othercolor][.25(darkblue,darkyellow)]
+\definecolor[mixedcolor][s=.35]
 
 \setupcolors
   [textcolor=white]
@@ -88,7 +91,7 @@
    background=color,
    frame=off,
    foregroundstyle=MyTopicListFont,
-   backgroundcolor=primarycolor,
+   backgroundcolor=maincolor,
    foregroundcolor=white]
 
 \setupwhitespace
@@ -171,7 +174,7 @@
    frame=off]
 
 \defineframed[nb] [bb] [empty=yes]
-\defineframed[rb] [bb] [backgroundcolor=white,foregroundcolor=secondarycolor]
+\defineframed[rb] [bb] [backgroundcolor=white,foregroundcolor=othercolor]
 \defineframed[db] [bb] [backgroundcolor=mixedcolor,foregroundcolor=white]
 
 \definepushbutton [prev]
@@ -235,7 +238,7 @@
    align={flushleft,lohi},
    background=color,
    backgroundcolor=white,
-   foregroundcolor=secondarycolor]
+   foregroundcolor=othercolor]
 
 \startsetups [document:titlepage]
 
@@ -245,12 +248,12 @@
     \setupbackgrounds
       [page]
       [background={color,menupage},
-       backgroundcolor=secondarycolor]
+       backgroundcolor=othercolor]
 
     \setupbackgrounds
       [text]
       [background={color,menupage},
-       backgroundcolor=secondarycolor]
+       backgroundcolor=othercolor]
 
     \starttopicmakeup[reference=homepage]
 
@@ -277,12 +280,12 @@
     \setupbackgrounds
       [page]
       [background={color,homepage},
-       backgroundcolor=secondarycolor]
+       backgroundcolor=othercolor]
 
     \setupbackgrounds
       [text]
       [background={color,menupage},
-       backgroundcolor=secondarycolor]
+       backgroundcolor=othercolor]
 
     \startcontentmakeup[reference=menupage]
 
@@ -296,23 +299,33 @@
       [page]
     % [background={color,menupage},
       [background={color,invoke},
-       backgroundcolor=primarycolor]
+       backgroundcolor=maincolor]
 
     \setupbackgrounds
       [text]
     % [background={color,nextpage,setbuttons,buttons},
       [background={color,setbuttons,buttons},
-       backgroundcolor=secondarycolor]
+       backgroundcolor=othercolor]
 
 \stopsetups
 
 \setupdocument
   [before=\directsetup{document:titlepage}]
 
-\continueifinputfile{s-present-tiles.mkiv}
-
-\startdocument[title=Whatever We\\Want Here,subtitle=Whatever We\\Want There]
+\stopmodule
 
-    \dorecurse{12}{\starttopic[title=Topic #1]\input tufte \stoptopic}
+\continueifinputfile{s-present-tiles.mkiv}
 
-\stopdocument
+\usemodule[present-common]
+
+%inputpresentationfile{examples/present-tiles-001.tex}
+%inputpresentationfile{context/2013/context-2013-speed.tex}
+\inputpresentationfile{context/2013/context-2013-math.tex}
+%inputpresentationfile{bachotex/2013/bachotex-2013-bits.tex}
+%inputpresentationfile{bachotex/2013/bachotex-2013-bits.pdf}
+%inputpresentationfile{bachotex/2013/bachotex-2013-luatex.tex}
+%inputpresentationfile{bachotex/2013/bachotex-2013-luatex.pdf}
+%inputpresentationfile{bachotex/2013/bachotex-2013-sense.tex}
+%inputpresentationfile{bachotex/2013/bachotex-2013-sense.pdf}
+%inputpresentationfile{bachotex/2013/bachotex-2013-speed.tex}
+%inputpresentationfile{bachotex/2013/bachotex-2013-speed.pdf}
diff --git a/tex/context/modules/mkiv/s-present-wobbling.mkiv b/tex/context/modules/mkiv/s-present-wobbling.mkiv
new file mode 100644
index 000000000..e61b262f4
--- /dev/null
+++ b/tex/context/modules/mkiv/s-present-wobbling.mkiv
@@ -0,0 +1,339 @@
+%D \module
+%D   [      file=s-prent-wobbling,
+%D        version=2010.04.28,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Presentation Environment Wobbling,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D This a bit old stuyls and I should adapt it a bit but as it sort of works ok I'll
+%D  not do that now.
+
+\startmodule[present-wobbling]
+
+%setuppapersize[S6][S6]
+\setuppapersize[SM][SM]
+
+\setupinteraction
+  [state=start,
+   contrastcolor=white,
+   color=white,
+   click=no]
+
+\setuplayout
+  [location=middle,
+   topspace=60pt,
+   bottomspace=80pt,
+   backspace=80pt,
+   header=0pt,
+   footer=0pt,
+   width=middle,
+   height=middle]
+
+\setupcolors
+  [textcolor=white]
+
+\setupbodyfont[pagella]
+
+\definecolor[maincolor] [blue]
+\definecolor[extracolor][green]
+
+% \definecolor[maincolor] [red]
+% \definecolor[extracolor][blue]
+
+\startMPdefinitions
+    picture MySoFar ; MySoFar := nullpicture ;
+    path MyLastOne ; MyLastOne := origin -- cycle ;
+    path MyLeftSteps, MyRightSteps ;
+    boolean MyPageDone ; MyPageDone := false ;
+
+    vardef MySmallShape(expr parent) =
+        path p ; p := boundingbox parent ;
+        numeric w, h ; w := bbwidth(p) ; h := bbheight(p) ;
+        urcorner p shifted (-uniformdeviate w/4,0) --
+        lrcorner p shifted (0,uniformdeviate h/4) --
+        llcorner p shifted (uniformdeviate w/4,0) --
+        ulcorner p shifted (0,-uniformdeviate h/4) -- cycle
+    enddef ;
+
+    vardef MyShape(expr parent) =
+        path p ; p := boundingbox parent ;
+        if MyPageDone :
+            MyPageDone := false ;
+            urcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
+            lrcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
+            llcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) --
+            ulcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) -- cycle
+        else :
+            MyPageDone := true ;
+            urcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) --
+            lrcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
+            llcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
+            ulcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) -- cycle
+        fi
+    enddef ;
+
+    vardef MyMakeOne =
+        MyLastOne := MyShape(Page) ;
+    enddef ;
+
+    vardef MyAddOne =
+        addto MySoFar also image(fill MyLastOne withcolor "maincolor" withtransparency(1,.25) ; ) ;
+    enddef ;
+
+    vardef MyDrawOne =
+        fill MyLastOne withcolor black ;
+        fill MyLastOne withcolor "maincolor" withtransparency(1,.25) ;
+    enddef ;
+
+    vardef MyDrawPage =
+        draw MySoFar ;
+    enddef ;
+
+    vardef MySetSteps =
+        path l, r ; numeric s ; path ll[], rr[] ; path t ;
+        l := point 2 of MyLastOne -- point 3 of MyLastOne ;
+        r := point 0 of MyLastOne -- point 1 of MyLastOne ;
+        t := topboundary Field[Text][Text] rightenlarged TextWidth leftenlarged TextWidth ;
+        s := bbheight(Field[Text][Text])/LineHeight + 2 ;
+        t := t shifted (0,-TopSkip) ;
+        for i=1 upto s :
+            ll[i] := t intersectionpoint l ;
+            rr[i] := t intersectionpoint r ;
+            t := t shifted (0,-LineHeight) ;
+        endfor ;
+        MyLeftSteps  := for i=1 upto s : ll[i] -- endfor cycle ;
+        MyRightSteps := for i=1 upto s : rr[i] -- endfor cycle ;
+    enddef ;
+
+    vardef MyDrawText(expr txt) =
+        pair a ; a := (point 1 of MyLastOne) - (point 2 of MyLastOne) ;
+        picture p ; p := txt ;
+        p := p
+            shifted (-EmWidth,EmWidth)
+            shifted ulcorner txt
+            shifted point 1 of MyLastOne ;
+        p := p rotatedaround(lrcorner p, radian * tan(ypart a/xpart a)) ;
+        setbounds p to origin -- cycle ;
+        draw p ;
+    enddef ;
+
+    vardef MyDrawTitle(expr txt) =
+      % pair a ; a := (point 2 of MyLastOne) - (point 3 of MyLastOne) ;
+        pair a ; a := (point 3 of MyLastOne) - (point 4 of MyLastOne) ;
+        picture p ;
+        if bbheight(txt) > bbwidth(txt) :
+            p := txt ysized(0.8*TextHeight) ;
+        else :
+            p := txt xsized(0.8*TextWidth) ;
+        fi ;
+        numeric d ; d := arclength(point 2 of MyLastOne -- point 3 of MyLastOne) - bbheight(p) ;
+        p := p
+            shifted (BackSpace,-d/2)
+            shifted -ulcorner p
+            shifted point 3 of MyLastOne ;
+      % p := p rotatedaround(ulcorner p, - radian * tan(xpart a/ypart a)) ;
+      % p := p rotatedaround(ulcorner p,  radian * tan(ypart a/xpart a)) ;
+        setbounds p to origin -- cycle ;
+        draw p ;
+    enddef ;
+
+    vardef MyDrawSteps =
+        s := bbheight(Field[Text][Text])/LineHeight + 2 ;
+        for i=1 upto s :
+            draw ll[i] withpen pencircle scaled 1mm ;
+            draw rr[i] withpen pencircle scaled 1mm ;
+            draw ll[i] -- rr[i] ;
+        endfor ;
+        draw Field[Text][Text] ;
+    enddef ;
+
+\stopMPdefinitions
+
+\startuseMPgraphic{initialization}
+    StartPage ;
+        MySoFar := image(fill Page enlarged 12pt withcolor "maincolor" withtransparency(1,.25) ;) ;
+        MyMakeOne ;
+        MySetSteps ;
+    StopPage ;
+\stopuseMPgraphic
+
+\appendtoks
+    \startnointerference
+        \useMPgraphic{initialization}
+    \stopnointerference
+\to \everystarttext
+
+\unexpanded\def\TitleCommand#1%
+  {\framed
+     [frame=off,
+      offset=overlay,
+      align=flushleft,
+      foregroundcolor=white,
+      foregroundstyle={\tfd},
+      bottom=\vskip2\lineheight]
+     {\setupinterlinespace
+      \setupwhitespace[halfline]%
+     %\showstruts
+      \begstrut
+      #1%
+      \endstrut}}
+
+\unexpanded\def\TopicCommand#1%
+  {\color[white]{\tfb#1}}
+
+\startuseMPgraphic{page}
+    StartPage ;
+        MyDrawPage ;
+        MyDrawOne ;
+        MySetSteps ;
+        if RealPageNumber == 1 :
+            MyDrawTitle(textext("\TitleCommand{\documentvariable{title}}")) ;
+            MyDrawText (textext("\TopicCommand{\documentvariable{topic}}")) ;
+        fi ;
+        %
+        % we have multiple runs when we have text
+        %
+      % MyDrawSteps ;
+      % MyMakeOne ;
+      % MySetSteps ;
+    StopPage ;
+\stopuseMPgraphic
+
+\appendtoks
+    \startnointerference
+        \startMPcode
+            MyAddOne ;
+            MyMakeOne ;
+            MySetSteps ;
+        \stopMPcode
+    \stopnointerference
+\to \everyshipout
+
+\defineoverlay[page][\useMPgraphic{page}]
+
+\startuseMPgraphic{symbol}
+    path p ; p := MySmallShape(unitsquare scaled (.6*LineHeight)) ;
+    fill p withcolor white ;
+    fill p withcolor "extracolor" withtransparency(1,.25) ;
+\stopuseMPgraphic
+
+\definesymbol[mysymbol][\struttedbox{\useMPgraphic{symbol}}]
+
+\setupitemgroup
+  [itemize] [1]
+  [symbol=mysymbol]
+
+\setupbackgrounds
+  [page]
+  [background=page]
+
+\startluacode
+    local texdimen = tex.dimen
+    function document.SetParShape()
+        local leftpath  = metapost.getclippath { mpx = "metafun", data = "clip currentpicture to MyLeftSteps ;" }
+        local rightpath = metapost.getclippath { mpx = "metafun", data = "clip currentpicture to MyRightSteps ;" }
+        local shape = { }
+        for i=1,#leftpath do
+            local left  = leftpath[i].x_coord
+            local right = rightpath[i].x_coord
+            local hsize = right - left - (texdimen.backspace + texdimen.cutspace)*number.dimenfactors.bp
+            shape[#shape+1] = string.format("%sbp %sbp",left,hsize)
+        end
+     -- print(table.serialize(shape))
+     -- context.parshape(string.format("%s %s ",#shape,table.concat(shape," ")))
+        context("\\parshape %s %s ",#shape,table.concat(shape," "))
+    end
+\stopluacode
+
+\nopenalties \dontcomplain
+
+\setupwhitespace[none]
+
+\startsetups document:start
+    \bgroup
+    \let\crlf\endgraf % \par in a mp textext doesn't work well
+    \startstandardmakeup
+        % dummy page
+    \stopstandardmakeup
+    \egroup
+\stopsetups
+
+\unexpanded\def\StartText#1#2% for old times sake
+  {\startdocument[title={#1},subtitle={#2}]}
+
+\unexpanded\def\StopText
+  {\stopdocument
+   \setupdocument[title=,topic=]}
+
+\unexpanded\def\StartItems#1%
+  {\setupdocument[topic={#1}]
+   \startstandardmakeup[top=,bottom=\vss]
+   \startelement[items][title={#1}]%
+   \ctxlua{document.SetParShape()}
+   \StartSteps}
+
+\unexpanded\def\StopItems
+  {\StopSteps
+   \stopelement
+   \stopstandardmakeup}
+
+\unexpanded\def\StartItem
+  {\dontleavehmode
+   \startelement[item]%
+   \llap{\symbol[mysymbol]\quad}% graphic
+   \ignorespaces}
+
+\unexpanded\def\StopItem
+  {\removeunwantedspaces
+   \nobreak
+   \crlf
+   \stopelement
+   \crlf
+   \FlushStep}
+
+\unexpanded\def\ShapeParagraph
+  {\ctxlua{document.SetParShape()}}
+
+% no parshape yet
+
+\unexpanded\def\StartParagraphs#1%
+  {\setupdocument[topic={#1}]
+   \startstandardmakeup[top=,bottom=\vss]
+  %\ctxlua{document.SetParShape()}
+   \startelement[paragraphs]%
+   \StartSteps}
+
+\unexpanded\def\StopParagraphs
+  {\StopSteps
+   \stopelement
+   \stopstandardmakeup}
+
+\unexpanded\def\StartParagraph
+  {\startelement[paragraph]}
+
+\unexpanded\def\StopParagraph
+  {\par
+   \stopelement
+   \FlushStep}
+
+% experiment .. likely to change
+
+\setelementexporttag[items]     [nature][display]
+\setelementexporttag[item]      [nature][mixed]
+\setelementexporttag[paragraphs][nature][display]
+\setelementexporttag[paragraph] [nature][mixed]
+
+\stopmodule
+
+\continueifinputfile{s-present-wobbling.mkiv}
+
+\usemodule[present-common]
+
+%inputpresentationfile{bachotex/2010/bachotex-2010-clash.tex}
+\inputpresentationfile{bachotex/2010/bachotex-2010-move.tex}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 287ef1a0d..3b4f6effd 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 10/22/16 10:43:17
+-- merge date  : 10/25/16 09:57:25
 
 do -- begin closure to overcome local limits and interference