Update theming organization and add a few components