a bit of cleanup and switching to colored backgrounds instead of images