Align to lib (+improve flag rendering)