Remake Eogonek with a separate ogonek component