Theme
Delete old implementation
Update