Updated xmap/omap for quotes and braces