finish implementing components w new theming