text alignment on bonfire buttons; semi-transparent overlay
merge conflict fixed