Add marker for current year. Move replacements directly to the fluidtempalte - fixes #72