New branding (reverted from commit f3cefc0b6b354ff2b6d0a72d567ab00f9e6dee16)