fixed .bitmaps
merged, fixed macbook/.bitmaps