cleanup, simplify implementation, drop theming for now