HALO cleanup & better drawables