Package and style updates