WIP: bitmap and tweak other packages