added map support and new styles