adjusted variables and moved common layout overrides to definitions.ily
added hymn 149