Added components and theming