add decorate_scheme and stuff