Fix settings listeners
Update bundles