diff --git a/definitions/accidentals.inp b/definitions/accidentals.inp
new file mode 100644
index 0000000000000000000000000000000000000000..d875fa6d77cacd607e8daedee1ba26494d5ce9ed
--- /dev/null
+++ b/definitions/accidentals.inp
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file is part of the lilyglyphs package %
+% and defines one subset of glyphs            %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%
+% Accidentals %
+%%%%%%%%%%%%%%%
+
+% "accidentals.natural"
+\renewcommand*{\natural}{\raisebox{0.5ex}{\lilyGlyph[1.5]{"accidentals.natural"}}}
+\WithSuffix\newcommand\natural*{\natural{}}
+% "accidentals.flat"
+\renewcommand*{\flat}{\raisebox{0.2ex}{\lilyGlyph[1.5]{"accidentals.flat"}}}
+\WithSuffix\newcommand\flat*{\flat{}}
+% "accidentals.flatflat"
+\newcommand*{\flatflat}{\raisebox{0.2ex}{\lilyGlyph[1.5]{"accidentals.flatflat"}}}
+\WithSuffix\newcommand\flatflat*{\flatflat{}}
+% "accidentals.sharp"
+\renewcommand*{\sharp}{\raisebox{0.5ex}{\lilyGlyph[1.5]{"accidentals.sharp"}}}
+\WithSuffix\newcommand\sharp*{\sharp{}}
+% "accidentals.doublesharp"
+\newcommand*{\doublesharp}{\raisebox{0.35ex}{\lilyGlyph[1.5]{"accidentals.doublesharp"}}}
+\WithSuffix\newcommand\doublesharp*{\doublesharp{}}
diff --git a/definitions/clefs.inp b/definitions/clefs.inp
new file mode 100644
index 0000000000000000000000000000000000000000..4cfcc5bb1edbcc596ce3af9aec19d17d8b2886da
--- /dev/null
+++ b/definitions/clefs.inp
@@ -0,0 +1,27 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file is part of the lilyglyphs package %
+% and defines one subset of glyphs            %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%
+% Clef glyphs %
+%%%%%%%%%%%%%%%
+
+% The time signature glyphs don't need starred versions because they already
+% have trailing space built in
+
+% \treble clef
+\newcommand*{\clefGInline}{\raisebox{0.25ex}{\lilyGlyph[0.7]{"clefs.G"} }}
+\newcommand*{\clefG}{\raisebox{0.25ex}{\lilyGlyph[1.2]{"clefs.G"} }}
+
+% \bass clef
+\newcommand*{\clefFInline}{\raisebox{0.65ex}{\lilyGlyph[1]{"clefs.F"} }}
+\newcommand*{\clefF}{\raisebox{0.5ex}{\lilyGlyph[1.4]{"clefs.F"} }}
+
+% \alto clef
+\newcommand*{\clefCInline}{\raisebox{0.6ex}{\lilyGlyph[0.8]{"clefs.C"} }}
+\newcommand*{\clefC}{\raisebox{0.6ex}{\lilyGlyph[1.1]{"clefs.C"} }}
+
+% \time 2/2
+%\newcommand*{\lilyTimeCHalf}{\raisebox{0.7ex}{\lilyGlyph[1.4]{"timesig.C22"} }}
+
diff --git a/definitions/dynamics.inp b/definitions/dynamics.inp
new file mode 100644
index 0000000000000000000000000000000000000000..b280aede9fcb093fb0479600d54c2b99e0bbac47
--- /dev/null
+++ b/definitions/dynamics.inp
@@ -0,0 +1,74 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file is part of the lilyglyphs package %
+% and defines one subset of glyphs            %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Dynamic Script letters %
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%--------------
+% Single Glyphs
+
+% These aren't at any fancy Unicode positions but rather
+% at the places of the ordinary Roman letters
+
+% f for forte
+\newcommand{\lilyF}{\lilyGlyphByNumber{1.5}{66}}
+\WithSuffix\newcommand\lilyF*{\lilyF{}}
+% p for piano
+\newcommand{\lilyP}{\lilyGlyphByNumber{1.5}{70}}
+\WithSuffix\newcommand\lilyP*{\lilyP{}}
+% m for mezzo
+\newcommand{\lilyM}{\lilyGlyphByNumber{1.5}{6D}}
+\WithSuffix\newcommand\lilyM*{\lilyM{}}
+% r for rin-
+\newcommand{\lilyR}{\lilyGlyphByNumber{1.5}{72}}
+\WithSuffix\newcommand\lilyR*{\lilyR{}}
+% s for s- (as in sf)
+\newcommand{\lilyS}{\lilyGlyphByNumber{1.5}{73}}
+\WithSuffix\newcommand\lilyS*{\lilyS{}}
+% z for -z (as in sfz)
+\newcommand{\lilyZ}{\lilyGlyphByNumber{1.5}{7A}}
+\WithSuffix\newcommand\lilyZ*{\lilyZ{}}
+
+%-------------------------
+% Combined Dynamic Scripts
+
+% piano series
+% pianissimo
+\newcommand{\lilyPP}{\lilyP\lilyP}
+\WithSuffix\newcommand\lilyPP*{\lilyPP{}}
+% piano-pianissimo
+\newcommand{\lilyPPP}{\lilyP\lilyP\lilyP}
+\WithSuffix\newcommand\lilyPPP*{\lilyPPP{}}
+% pianissimo-pianissimo
+\newcommand{\lilyPPPP}{\lilyP\lilyP\lilyP\lilyP}
+\WithSuffix\newcommand\lilyPPPP*{\lilyPPPP{}}
+% mezzoforte
+\newcommand{\lilyMF}{\lilyM\lilyF}
+\WithSuffix\newcommand\lilyMF*{\lilyMF{}}
+
+% forte series
+% fortissimo
+\newcommand{\lilyFF}{\lilyF\lilyF}
+\WithSuffix\newcommand\lilyFF*{\lilyFF{}}
+% forte-fortissimo
+\newcommand{\lilyFFF}{\lilyF\lilyF\lilyF}
+\WithSuffix\newcommand\lilyFFF*{\lilyFFF{}}
+% fortissimo-fortissimo
+\newcommand{\lilyFFFF}{\lilyF\lilyF\lilyF\lilyF}
+\WithSuffix\newcommand\lilyFFFF*{\lilyFFFF{}}
+
+% sforzato
+\newcommand{\lilySF}{\lilyS\hspace*{0.1ex}\lilyF}
+\WithSuffix\newcommand\lilySF*{\lilySF{}}
+% sforzato with trailing z
+\newcommand{\lilySFZ}{\lilyS\hspace*{0.1ex}\lilyF\lilyZ}
+\WithSuffix\newcommand\lilySFZ*{\lilySFZ{}}
+% rinforzando 
+\newcommand{\lilyRF}{\lilyR\lilyF}
+\WithSuffix\newcommand\lilyRF*{\lilyRF{}}
+% rinforzando with trailing z
+\newcommand{\lilyRFZ}{\lilyR\lilyF\lilyZ}
+\WithSuffix\newcommand\lilyRFZ*{\lilyRFZ{}}
\ No newline at end of file
diff --git a/definitions/noteheads.inp b/definitions/noteheads.inp
new file mode 100644
index 0000000000000000000000000000000000000000..5728487d4bc453035eb7c649a7f7f416c9811afe
--- /dev/null
+++ b/definitions/noteheads.inp
@@ -0,0 +1,16 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file is part of the lilyglyphs package %
+% and defines one subset of glyphs            %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%
+% Notes and Noteheads %
+%%%%%%%%%%%%%%%%%%%%%%%
+
+%TODO This really is only a start
+%TODO There is esp. the question of Stems
+
+\newcommand*{\lilyHalfNotehead}{\lilyGlyph{1.5}{"noteheads.s1"} }
+
+\newcommand{\dottedHalf}{\lilyHalfNotehead \lilyDot}
+
diff --git a/definitions/timesignatures.inp b/definitions/timesignatures.inp
new file mode 100644
index 0000000000000000000000000000000000000000..1202df38389afc743bd15e8f266a2d837b81045b
--- /dev/null
+++ b/definitions/timesignatures.inp
@@ -0,0 +1,18 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% This file is part of the lilyglyphs package %
+% and defines one subset of glyphs            %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+% Time Signature glyphs %
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% The time signature glyphs don't need starred versions because they already
+% have trailing space built in
+
+% \time 4/4
+\newcommand*{\lilyTimeC}{\raisebox{0.7ex}{\lilyGlyph[1.4]{"timesig.C44"} }}
+
+% \time 2/2
+\newcommand*{\lilyTimeCHalf}{\raisebox{0.7ex}{\lilyGlyph[1.4]{"timesig.C22"} }}
+
diff --git a/editionkainhofer.sty b/editionkainhofer.sty
index 2d679b666bc4e6bea83ef8b036c6f8744ee216f3..00e4c5a30f17b697fcd7ff74d6b7931db7d32314 100644
--- a/editionkainhofer.sty
+++ b/editionkainhofer.sty
@@ -301,7 +301,8 @@
 \renewcommand\maketitle{\thispagestyle{empty}%
   \begin{titlepage}%
 %   \fontfamily{pbk}\selectfont
-    \fontspec{URW Bookman L}
+%     \fontspec{URW Bookman L}
+    \fontspec{DejaVu Serif}
 
 
   \let\footnotesize\small
@@ -315,7 +316,6 @@
   \null\vfill
   {\footnotesize \@date \par}
   \vspace{0.5em}
-
   \ifx\@composer\@empty%
   \else
     {\fontsize{22pt}{25pt}\selectfont\textbf{\@composer}\ifx\@composerdate\empty\else{} \relax \@composerdate\fi}%
diff --git a/measureCounterEngraver.ly b/measureCounterEngraver.ly
new file mode 100644
index 0000000000000000000000000000000000000000..2751a6b0f29c7c15d27fbf7842c5a76f5ff48c07
--- /dev/null
+++ b/measureCounterEngraver.ly
@@ -0,0 +1,59 @@
+\version "2.15.37"
+\include "measureCounterEngraver.ily"
+\new Staff {
+  \relative c' {
+    \override Staff.MeasureCounter #'font-encoding = #'fetaText
+    \override Staff.MeasureCounter #'font-size = #-2
+    \measureCounterStart
+    \repeat percent 4 { a'4 b c d }
+    \measureCounterEnd\measureCounterStart
+    \key fis \major
+    %\once \override Staff.MeasureCounter #'outside-staff-padding = #1
+    \acciaccatura gis8 fis4 eis dis cis
+    \repeat unfold 2 { fis eis dis cis }
+    \measureCounterEnd
+  }
+}
+
+\new StaffGroup <<
+  \new Staff {
+    \relative c' {
+      \override Staff.MeasureCounter #'font-encoding = #'fetaText
+      \override Staff.MeasureCounter #'font-size = #-2
+      \measureCounterStart
+      \repeat unfold 5 { a'4 b c d }
+      \measureCounterEnd\measureCounterStart
+      a' b c d
+      a b c d
+      \measureCounterEnd
+    }
+  }
+  \new Staff {
+    \relative c' {
+      \override Staff.MeasureCounter #'font-encoding = #'fetaText
+      \override Staff.MeasureCounter #'font-size = #-2
+      \repeat unfold 3 { a'4 b c d }
+      \measureCounterStart
+      \repeat unfold 3 { a'4 b c d }
+      \measureCounterEnd\measureCounterStart
+      \repeat unfold 4 { a, b c d }
+      \measureCounterEnd
+      \repeat unfold 3 { a'4 b c d }
+      \measureCounterStart
+      \repeat unfold 3 { a'4 b c d }
+    }
+  }
+>>
+
+% \layout {
+%   \context {
+%     \Global
+%     \grobdescriptions #all-grob-descriptions
+%   }
+%   \context{
+%     \Staff
+%     \consists \measureCounterEngraver
+%   }
+% }
+% 
+
diff --git a/measureCounterEngraver.pdf b/measureCounterEngraver.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..622553ad17956b2b796b3b9f77c62c4e48305f04
Binary files /dev/null and b/measureCounterEngraver.pdf differ
diff --git a/orchestrallily.ily b/orchestrallily.ily
index 7373a6b176feabbd38f6cd5c5bbd04862802903e..8cf79946ba1cb5821e0d679b81a260148c280d97 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -1181,6 +1181,22 @@ whiteoutf = #(make-dynamic-script (markup #:whiteout #:pad-markup 0.5 #:dynamic
 whiteoutff = #(make-dynamic-script (markup #:whiteout #:pad-markup 0.5 #:dynamic "ff"))
 
 
+setCrescWhiteout = \notemode {
+    \once \override DynamicTextSpanner.stencil =
+      #(lambda (grob)
+         (let* ((stencil (ly:text-interface::print grob))
+                (x-ext (ly:stencil-extent stencil X))
+                (y-ext (ly:stencil-extent stencil Y))
+                (y-ext (interval-widen y-ext 0.5)))
+           (ly:stencil-add
+             (stencil-with-color (ly:round-filled-box x-ext y-ext 0.0)
+                                 white)
+             stencil)))
+	  \once \override DynamicTextSpanner.whiteout = ##t 
+  }
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -1840,12 +1856,12 @@ bracketify = #(define-music-function (parser loc arg) (ly:music?)
 
 parenthesizeLeft = #(define-music-function (parser loc arg) (ly:music?)
 #{
-  -\tweak ParenthesesItem #'stencils #parentheses-item::calc-parenthesis-left-stencils
+  -\tweak ParenthesesItem.stencils #parentheses-item::calc-parenthesis-left-stencils
   -\parenthesize $arg 
 #})
 parenthesizeRight = #(define-music-function (parser loc arg) (ly:music?)
 #{
-  -\tweak ParenthesesItem #'stencils #parentheses-item::calc-parenthesis-right-stencils
+  -\tweak ParenthesesItem.stencils #parentheses-item::calc-parenthesis-right-stencils
   -\parenthesize $arg 
 #})
 
diff --git a/updates_todo.txt b/updates_todo.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe6850e64c02a5099eddb40c6c14ab98da79ce8f
--- /dev/null
+++ b/updates_todo.txt
@@ -0,0 +1,22 @@
+-) scorenumber -> instrumentnr in *_Instrument_*.ly *_Score_*.ly
+-) scorenumber -> scorenumberbase in *_Settings_Global.ily
+-) MOVE scorenumberbase to \header in *_Settings_Global.ily
+-) DELETE pdftitle in *_Score_.ily
+-) Adjust header:copyright to user header:scorenumber
+-) \year -> \yearpublished in TeX_*_Settings.itex
+-) \@year -> \@yearpublished in TeX_*.itex
+-) pdflatex -> xelatex in Makefile
+-) ADD shortcomposer in *_Settings_Global.ily
+
+
+
+-) HEADER: scorenumber -> instrumentnr
+    for i in *_Instrument_*.ly; do 
+      sed 's/scorenumber = \\markup\s*{\\scoreNumber\s*\(\\.*Number\)}/instrumentnr = \1/g' $i > $i.new;
+      mv $i.new $i
+    done
+
+
+ORCHESTRALLILY:
+
+-) UPdate lilypond htitleng (header/footer etc.) to use bookpart-first-page etc.