Refactor Black and white version

- same deal as before with color version