Merge metro styles into new theming structure